From 8b27e09bc63c6524842874bc52bf5392a6cac243 Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Thu, 23 Mar 2023 13:58:25 +0700
Subject: [PATCH] add filed

---
 Models/budget/building_four.cs     |  1 +
 wwwroot/reports/building_fours.frx | 34 ++++++++++++++++--------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Models/budget/building_four.cs b/Models/budget/building_four.cs
index 94766bb..a10a92c 100644
--- a/Models/budget/building_four.cs
+++ b/Models/budget/building_four.cs
@@ -75,6 +75,7 @@ namespace rmutr_report.Models
         public List<building_styles> building_style{ get; set; }
         public List<usage_per_target> usage_per_target{ get; set; }
         public string text_footer { get; set; }
+        public string remark  { get; set; }
 
     }
     public class building_styles
diff --git a/wwwroot/reports/building_fours.frx b/wwwroot/reports/building_fours.frx
index 0d9637b..047a90a 100644
--- a/wwwroot/reports/building_fours.frx
+++ b/wwwroot/reports/building_fours.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/02/2023 21:57:02" ReportInfo.Modified="03/23/2023 10:21:46" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/02/2023 21:57:02" ReportInfo.Modified="03/23/2023 13:58:08" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="building_four" ReferenceName="building_four" DataType="null" Enabled="true">
       <Column Name="agency_faculty" DataType="System.String"/>
@@ -48,6 +48,7 @@
         <Column Name="type_name" DataType="System.String"/>
         <Column Name="text" DataType="System.String"/>
         <Column Name="text_footer" DataType="System.String"/>
+        <Column Name="remark" DataType="System.String"/>
         <BusinessObjectDataSource Name="building_style" DataType="null" Enabled="true">
           <Column Name="list" DataType="System.String"/>
           <Column Name="location" DataType="System.String"/>
@@ -302,37 +303,38 @@
           </DataFooterBand>
         </DataBand>
       </DataBand>
-      <DataBand Name="Data9" Top="812.51" Width="718.2" Height="85.05">
+      <DataBand Name="Data9" Top="812.51" Width="718.2" Height="113.4">
         <TextObject Name="Text75" Left="47.25" Width="670.95" Height="85.05" Text="[building_four.building_type.text_footer]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH SarabunPSK, 16pt"/>
+        <TextObject Name="Text120" Left="47.25" Top="85.05" Width="670.95" Height="28.35" Text="[building_four.building_type.remark]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH SarabunPSK, 16pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data8" Top="902.26" Width="718.2" Height="28.35">
+    <DataBand Name="Data8" Top="930.61" Width="718.2" Height="28.35">
       <TextObject Name="Text76" Width="699.3" Height="28.35" Text="3.  ความพร้อมในการดำเนินการ" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <DataBand Name="Data10" Top="935.32" Width="718.2" Height="28.35" DataSource="readiness_action">
+      <DataBand Name="Data10" Top="963.67" Width="718.2" Height="28.35" DataSource="readiness_action">
         <TextObject Name="Text77" Left="47.25" Width="661.5" Height="28.35" Text="[building_four.readiness_action.list]" Font="TH SarabunPSK, 16pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data11" Top="968.38" Width="718.2" Height="189">
+    <DataBand Name="Data11" Top="996.73" Width="718.2" Height="189">
       <TextObject Name="Text78" Width="699.3" Height="28.35" Text="4.  เหตุผลความจำเป็น" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text79" Left="28.35" Top="28.35" Width="661.5" Height="132.3" Text="[building_four.necessity_reason]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH SarabunPSK, 14pt"/>
       <TextObject Name="Text80" Top="160.65" Width="699.3" Height="28.35" Text="5.  วัตถุประสงค์" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <DataBand Name="Data12" Top="1162.08" Width="718.2" Height="28.35" DataSource="objective">
+      <DataBand Name="Data12" Top="1190.43" Width="718.2" Height="28.35" DataSource="objective">
         <TextObject Name="Text81" Left="47.25" Width="661.5" Height="28.35" Text="[building_four.objective.list]" Font="TH SarabunPSK, 16pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data13" Top="1195.14" Width="718.2" Height="56.7">
+    <DataBand Name="Data13" Top="1223.49" Width="718.2" Height="56.7">
       <TextObject Name="Text82" Width="718.2" Height="28.35" Text="6.  ประโยชน์ใช้สอย" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text83" Left="47.25" Top="28.35" Width="661.5" Height="28.35" Text="[building_four.utility]" Font="TH SarabunPSK, 16pt"/>
     </DataBand>
-    <DataBand Name="Data14" Top="1256.54" Width="718.2" Height="94.5">
+    <DataBand Name="Data14" Top="1284.89" Width="718.2" Height="94.5">
       <TextObject Name="Text84" Width="718.2" Height="28.35" Text="7. ระยะเวลาดำเนินการ [building_four.processing_time] ปี     " Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text85" Left="47.25" Top="28.35" Width="670.95" Height="28.35" Text="เริ่มต้นปี [building_four.start_date] สิ้นสุดปี [building_four.end_date] รวม [building_four.total_day] วัน" Font="TH SarabunPSK, 16pt"/>
       <TextObject Name="Text86" Top="66.15" Width="718.2" Height="28.35" Text="8. ข้อมูลเบื้องต้น" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <DataBand Name="Data15" Top="1355.75" Width="718.2" Height="28.35" DataSource="basic_information">
+      <DataBand Name="Data15" Top="1384.1" Width="718.2" Height="28.35" DataSource="basic_information">
         <TextObject Name="Text87" Left="47.25" Width="661.5" Height="28.35" Text="[building_four.basic_information.list]" Font="TH SarabunPSK, 16pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data16" Top="1388.81" Width="718.2" Height="66.15">
+    <DataBand Name="Data16" Top="1417.16" Width="718.2" Height="66.15">
       <TextObject Name="Text88" Width="359.1" Height="28.35" Text="9. วงเงินงบประมาณ" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text89" Left="463.05" Width="255.15" Height="28.35" Text="หน่วย : บาท" HorzAlign="Right" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TableObject Name="Table24" Top="37.8" Width="718.2" Height="28.35">
@@ -347,7 +349,7 @@
           <TableCell Name="Cell165" Border.Lines="All" Text="รวมทั้งสิ้น" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data17" Top="1459.66" Width="718.2" Height="28.35" DataSource="budget_limit">
+      <DataBand Name="Data17" Top="1488.01" Width="718.2" Height="28.35" DataSource="budget_limit">
         <TableObject Name="Table25" Width="718.2" Height="28.35">
           <TableColumn Name="Column116" Width="207.9"/>
           <TableColumn Name="Column117" Width="198.45"/>
@@ -360,7 +362,7 @@
             <TableCell Name="Cell169" Border.Lines="All" Text="[building_four.budget_limit.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
           </TableRow>
         </TableObject>
-        <DataFooterBand Name="DataFooter2" Top="1492.72" Width="718.2" Height="28.35">
+        <DataFooterBand Name="DataFooter2" Top="1521.07" Width="718.2" Height="28.35">
           <TableObject Name="Table26" Width="718.2" Height="28.35">
             <TableColumn Name="Column120" Width="207.9"/>
             <TableColumn Name="Column121" Width="198.45"/>
@@ -376,10 +378,10 @@
         </DataFooterBand>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data18" Top="1525.77" Width="718.2" Height="56.7">
+    <DataBand Name="Data18" Top="1554.12" Width="718.2" Height="56.7">
       <TextObject Name="Text90" Width="359.1" Height="28.35" Text="10. แบบรูปรายการ" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text92" Left="56.7" Top="28.35" Width="661.5" Height="28.35" Text="- มีแบบรูปรายการ" Font="TH SarabunPSK, 16pt"/>
-      <DataBand Name="Data19" Top="1587.18" Width="718.2" Height="170.1" DataSource="list_format">
+      <DataBand Name="Data19" Top="1615.53" Width="718.2" Height="170.1" DataSource="list_format">
         <TextObject Name="Text91" Left="47.25" Width="661.5" Height="28.35" Text="[building_four.list_format.pending]" Font="TH SarabunPSK, 16pt"/>
         <TextObject Name="Text93" Left="47.25" Top="28.35" Width="661.5" Height="28.35" Text="[building_four.list_format.done]" Font="TH SarabunPSK, 16pt"/>
         <TextObject Name="Text94" Left="66.15" Top="56.7" Width="642.6" Height="28.35" Text="- ดำเนินการออกแบบรูปรายการ  เดือน [building_four.list_format.pending_design_month]" Font="TH SarabunPSK, 16pt"/>
@@ -388,9 +390,9 @@
         <TextObject Name="Text97" Left="66.15" Top="141.75" Width="642.6" Height="28.35" Text="- ทำสัญญาก่อสร้าง  เดือน [building_four.list_format.construction_contract_month]" Font="TH SarabunPSK, 16pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data20" Top="1761.99" Width="718.2" Height="28.35">
+    <DataBand Name="Data20" Top="1790.34" Width="718.2" Height="28.35">
       <TextObject Name="Text98" Width="359.1" Height="28.35" Text="11. ราคาประมาณการ (BOQ)" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <DataBand Name="Data21" Top="1795.04" Width="718.2" Height="141.75" DataSource="boq">
+      <DataBand Name="Data21" Top="1823.39" Width="718.2" Height="141.75" DataSource="boq">
         <TextObject Name="Text99" Left="47.25" Width="661.5" Height="28.35" Text="[building_four.boq.text1]" Font="TH SarabunPSK, 16pt"/>
         <TextObject Name="Text100" Left="66.15" Top="28.35" Width="642.6" Height="28.35" Text="[building_four.boq.text2]" Font="TH SarabunPSK, 16pt"/>
         <TextObject Name="Text101" Left="66.15" Top="56.7" Width="642.6" Height="28.35" Text="[building_four.boq.text3]" Font="TH SarabunPSK, 16pt"/>