Merge remote-tracking branch 'origin/master'

Models/budget/durable_articles_three.cs

@@ -44,8 +44,8 @@ namespace rmutr_report.Models
         public List<specification_datas> specification_data { get; set; }
         public string specification { get; set; }
         public string quantity_specification { get; set; }
-        public decimal? unit_price_specification { get; set; }
-        public decimal? amount_specification { get; set; }
+        public string unit_price_specification { get; set; }
+        public string amount_specification { get; set; }
         public List<budget_spending_plans> budget_spending_plan {get; set; }
         public string procurement_process { get; set; }
         public string incurring_debt { get; set; }

obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d24ac73eb6a84b9782a89ece7242baf7e7e2e5ae")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2a8c6920cc53b17bc219268341f228fe657671f5")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache

@@ -1 +1 @@
-e3630c4be34080a946c725e65afbfae73a8e4cd046f78d8b9100dd2fd253c50e
+836a80720f2f8243c5ce706e7774077a966a1fb6b3c3aeda70e8df7dc0fb4c96

obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5f44fa4ecbad606ad73975fffc8699ac8e1af4ea")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2a8c6920cc53b17bc219268341f228fe657671f5")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache

@@ -1 +1 @@
-1135665427bbeecf8c2ad531dc444d715aaefb436e07fb44d540ba2feb6dd557
+836a80720f2f8243c5ce706e7774077a966a1fb6b3c3aeda70e8df7dc0fb4c96

obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache

@@ -1 +1 @@
-814cbd923d0b771afb4468edd956b64b37aff6602890bfb34cfcf0a5743cec8f
+e4a1a5415ed3183589ec5a0811268fee211521ff530139016afcb646b59e6c76

obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17080675174043013
+17096220315131492

obj/rider.project.restore.info

@@ -1 +1 @@
-17096220315131492
+17097933902392626

wwwroot/reports/durable_articles_three.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="12/22/2023 16:18:24" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="03/07/2024 13:09:22" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="durable_articles_three" ReferenceName="durable_articles_three" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -34,8 +34,8 @@
       <Column Name="description_included" DataType="System.String"/>
       <Column Name="specification" DataType="System.String"/>
       <Column Name="quantity_specification" DataType="System.String"/>
-      <Column Name="unit_price_specification" DataType="System.Decimal"/>
-      <Column Name="amount_specification" DataType="System.Decimal"/>
+      <Column Name="unit_price_specification" DataType="System.String"/>
+      <Column Name="amount_specification" DataType="System.String"/>
       <Column Name="procurement_process" DataType="System.String"/>
       <Column Name="incurring_debt" DataType="System.String"/>
       <Column Name="quarter" DataType="System.String"/>
@@ -135,8 +135,8 @@
         </TableRow>
       </TableObject>
     </ReportTitleBand>
-    <DataBand Name="Data1" Top="202.94" Width="831.6">
-      <DataBand Name="Data2" Top="207.44" Width="831.6" Height="47.25" DataSource="data">
+    <DataBand Name="Data1" Top="203.16" Width="831.6">
+      <DataBand Name="Data2" Top="207.86" Width="831.6" Height="47.25" DataSource="data">
         <TableObject Name="Table2" Width="831.6" Height="47.25">
           <TableColumn Name="Column5" Width="406.35"/>
           <TableColumn Name="Column6" Width="132.3"/>
@@ -149,7 +149,7 @@
             <TableCell Name="Cell8" Border.Lines="All" Text="[durable_articles_three.data.amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" Font="TH Sarabun New, 14pt"/>
           </TableRow>
         </TableObject>
-        <DataFooterBand Name="DataFooter1" Top="259.18" Width="831.6" Height="28.35">
+        <DataFooterBand Name="DataFooter1" Top="259.82" Width="831.6" Height="28.35">
           <TableObject Name="Table3" Width="831.6" Height="28.35">
             <TableColumn Name="Column9" Width="406.35"/>
             <TableColumn Name="Column10" Width="132.3"/>
@@ -165,7 +165,7 @@
         </DataFooterBand>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="292.03" Width="831.6" Height="689.85">
+    <ReportSummaryBand Name="ReportSummary1" Top="292.87" Width="831.6" Height="689.85">
       <TextObject Name="Text65" Top="340.2" Width="510.3" Height="28.35" Text="6. เหตุผลความจำเป็น" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text66" Top="368.55" Width="831.6" Height="321.3" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.necessity_reason]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="11" Font="TH Sarabun New, 16pt"/>
       <TextObject Name="Text64" Left="28.35" Top="311.85" Width="831.6" Height="28.35" Text="[durable_articles_three.strategy]" Font="TH Sarabun New, 16pt"/>
@@ -184,11 +184,11 @@
   <ReportPage Name="Page2" PaperWidth="260" LeftMargin="25" TopMargin="20" RightMargin="15" Watermark.Font="Arial, 60pt">
     <DataBand Name="Data4" Width="831.6" Height="28.35">
       <TextObject Name="Text67" Width="292.95" Height="28.35" Text="7. วัตถุประสงค์" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data5" Top="32.84" Width="831.6" Height="28.35" DataSource="objective">
+      <DataBand Name="Data5" Top="33.06" Width="831.6" Height="28.35" DataSource="objective">
         <TextObject Name="Text68" Left="28.35" Width="831.6" Height="28.35" Text="[durable_articles_three.objective.detail]" Font="TH Sarabun New, 16pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data6" Top="65.69" Width="831.6" Height="633.15">
+    <DataBand Name="Data6" Top="66.11" Width="831.6" Height="633.15">
       <TextObject Name="Text69" Width="292.95" Height="28.35" Text="8. มาตรฐานขั้นต่ำที่ควรมี" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text70" Left="28.35" Top="28.35" Width="756" Height="37.8" Text="มีอยู่แล้วจำนวน [durable_articles_three.already_exist] ชุด/ชิ้น/ตัว/อื่นๆ " Font="TH Sarabun New, 16pt"/>
       <TextObject Name="Text72" Left="28.35" Top="66.15" Width="756" Height="37.8" Text="ใช้การได้  จำนวน [durable_articles_three.workable] ชุด/ชิ้น/ตัว/อื่นๆ " Font="TH Sarabun New, 16pt"/>
@@ -210,14 +210,14 @@
     </DataBand>
   </ReportPage>
   <ReportPage Name="Page3" PaperWidth="260" LeftMargin="25" TopMargin="20" RightMargin="15" Watermark.Font="Arial, 60pt">
-    <PageHeaderBand Name="PageHeader1" Width="831.6" Height="28.35">
+    <ReportTitleBand Name="ReportTitle2" Width="831.6" Height="170.1">
       <TextObject Name="Text1" Width="812.7" Height="28.35" Text="9. อธิบายหลักการทำงานของครุภัณฑ์พร้อมรูปภาพประกอบ" Font="TH Sarabun New, 16pt, style=Bold"/>
-    </PageHeaderBand>
-    <DataBand Name="Data7" Top="32.84" Width="831.6" Height="141.75">
-      <TextObject Name="Text100" Left="28.35" Width="812.7" Height="28.35" Text="คำอธิบายรวม" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <TextObject Name="Text101" Left="28.35" Top="28.35" Width="812.7" Height="85.05" Text="[durable_articles_three.description_included]" Font="TH Sarabun New, 16pt"/>
-      <TextObject Name="Text102" Left="28.35" Top="113.4" Width="812.7" Height="28.35" Text="คำอธิบายเพิ่มเติม" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data9" Top="179.09" Width="831.6" Height="311.85" DataSource="descript_more">
+      <TextObject Name="Text100" Top="28.35" Width="812.7" Height="28.35" Text="คำอธิบายรวม" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text101" Top="56.7" Width="812.7" Height="85.05" Text="[durable_articles_three.description_included]" Font="TH Sarabun New, 16pt"/>
+      <TextObject Name="Text102" Top="141.75" Width="812.7" Height="28.35" Text="คำอธิบายเพิ่มเติม" Font="TH Sarabun New, 16pt, style=Bold"/>
+    </ReportTitleBand>
+    <DataBand Name="Data7" Top="174.81" Width="831.6">
+      <DataBand Name="Data9" Top="179.51" Width="831.6" Height="311.85" DataSource="descript_more">
         <PictureObject Name="Picture1" Top="37.8" Width="831.6" Height="179.55" Anchor="Top, Bottom, Left, Right" CanGrow="true" CanShrink="true" DataColumn="durable_articles_three.descript_more.image_description"/>
         <TextObject Name="Text103" Left="28.35" Top="226.8" Width="831.6" Height="85.05" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.descript_more.remark]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="14" WordWrap="false" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text134" Left="28.35" Width="831.6" Height="37.8" Text="[durable_articles_three.descript_more.descript]" AutoShrink="FontSize" AutoShrinkMinSize="14" Font="TH Sarabun New, 16pt"/>
@@ -235,7 +235,7 @@
         </Formats>
       </TextObject>
     </ReportTitleBand>
-    <DataBand Name="Data3" Top="32.84" Width="869.4" Height="28.35" DataSource="specification_data">
+    <DataBand Name="Data3" Top="33.06" Width="869.4" Height="28.35" DataSource="specification_data">
       <TextObject Name="Text3" Left="18.9" Width="926.1" Height="28.35" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.specification_data.list]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH Sarabun New, 16pt, style=Bold">
         <Formats>
           <NumberFormat/>
@@ -244,9 +244,9 @@
           <GeneralFormat/>
         </Formats>
       </TextObject>
-      <DataBand Name="Data8" Top="65.69" Width="869.4" Height="37.8" CanGrow="true" CanShrink="true" DataSource="data_detail">
+      <DataBand Name="Data8" Top="66.11" Width="869.4" Height="37.8" CanGrow="true" CanShrink="true" DataSource="data_detail">
         <TextObject Name="Text7" Left="37.8" Width="907.2" Height="37.8" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.specification_data.data_detail.list]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH Sarabun New, 16pt"/>
-        <DataBand Name="Data21" Top="107.98" Width="869.4" Height="37.8" CanGrow="true" CanShrink="true" DataSource="data_detail2">
+        <DataBand Name="Data21" Top="108.62" Width="869.4" Height="37.8" CanGrow="true" CanShrink="true" DataSource="data_detail2">
           <TextObject Name="Text8" Left="75.6" Width="1030.05" Height="37.8" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.specification_data.data_detail.data_detail2.attribute]" Font="TH Sarabun New, 16pt"/>
         </DataBand>
       </DataBand>