From 7c6d165bc61ca1bd9403aa5e1f326eeb9ba2d17d Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Tue, 28 Mar 2023 11:29:14 +0700
Subject: [PATCH] bug fixed

---
 Models/budget/durable_articles_three.cs    | 38 ++++-----
 wwwroot/reports/durable_articles_three.frx | 93 ++++++++++------------
 2 files changed, 59 insertions(+), 72 deletions(-)

diff --git a/Models/budget/durable_articles_three.cs b/Models/budget/durable_articles_three.cs
index dba4065..2d6270b 100644
--- a/Models/budget/durable_articles_three.cs
+++ b/Models/budget/durable_articles_three.cs
@@ -41,11 +41,11 @@ namespace rmutr_report.Models
         // public string image_description1 { get; set; }
         // public string image_description2 { get; set; }
         public List<descript_more> descript_more { get; set; }
-        public List<specification_datas> specification_data { get; set; }
+        //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 quantity_specification { get; set; }
+        // public decimal? unit_price_specification { get; set; }
+        // public decimal? 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; }
@@ -98,21 +98,21 @@ namespace rmutr_report.Models
         public string remark { get; set; }
 
     }
-    public class specification_datas
-    {
-        public string specification { get; set; }
-        public string quantity { get; set; }
-        public decimal? unit_price { get; set; }
-        public decimal? amount { get; set; }
-        public List<specification_data_details> data_detail { get; set; }
-    }
-
-    public class specification_data_details
-    {
-        public string list { get; set;}
-        public string quantity { get; set;}
-        public string attribute { get; set;}
-    }
+    // public class specification_datas
+    // {
+    //     public string specification { get; set; }
+    //     public string quantity { get; set; }
+    //     public decimal? unit_price { get; set; }
+    //     public decimal? amount { get; set; }
+    //     public List<specification_data_details> data_detail { get; set; }
+    // }
+    //
+    // public class specification_data_details
+    // {
+    //     public string list { get; set;}
+    //     public string quantity { get; set;}
+    //     public string attribute { get; set;}
+    // }
 
     public class budget_spending_plans
     {
diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx
index c627b6d..bc5661d 100644
--- a/wwwroot/reports/durable_articles_three.frx
+++ b/wwwroot/reports/durable_articles_three.frx
@@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="03/27/2023 18:05:56" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="03/28/2023 11:29:00" ReportInfo.CreatorVersion="2021.1.0.0">
+  <ScriptText>ing System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+  public class ReportScript
+  {
+  }
+}
+</ScriptText>
   <Dictionary>
     <BusinessObjectDataSource Name="durable_articles_three" ReferenceName="durable_articles_three" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -32,11 +53,8 @@
       <Column Name="quantity_user_teaching" DataType="System.String"/>
       <Column Name="quantity_user_training" DataType="System.String"/>
       <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="procurement_process" DataType="System.String"/>
+      <Column Name="specification" DataType="System.String"/>
+      <Column Name="procurement_process" DataType="System.String"/>
       <Column Name="incurring_debt" DataType="System.String"/>
       <Column Name="quarter" DataType="System.String"/>
       <Column Name="disbursement_durable" DataType="System.String"/>
@@ -56,17 +74,6 @@
         <Column Name="image_description" DataType="System.String"/>
         <Column Name="remark" DataType="System.String"/>
       </BusinessObjectDataSource>
-       <BusinessObjectDataSource Name="specification_data" DataType="null" Enabled="true">
-              <Column Name="specification" DataType="System.String"/>
-              <Column Name="quantity" DataType="System.String"/>
-              <Column Name="unit_price" DataType="System.Decimal"/>
-              <Column Name="amount" DataType="System.Decimal"/>
-              <BusinessObjectDataSource Name="data_detail" DataType="null" Enabled="true">
-                <Column Name="list" DataType="System.String"/>
-                <Column Name="quantity" DataType="System.String"/>
-                <Column Name="attribute" DataType="System.String"/>
-              </BusinessObjectDataSource>
-            </BusinessObjectDataSource>
       <BusinessObjectDataSource Name="budget_spending_plan" DataType="null" Enabled="true">
         <Column Name="list" DataType="System.String"/>
         <Column Name="month_1" DataType="System.String"/>
@@ -137,8 +144,8 @@
         </TableRow>
       </TableObject>
     </ReportTitleBand>
-    <DataBand Name="Data1" Top="202.45" Width="831.6">
-      <DataBand Name="Data2" Top="206.45" Width="831.6" Height="47.25" DataSource="data">
+    <DataBand Name="Data1" Top="203.39" Width="831.6">
+      <DataBand Name="Data2" Top="208.33" 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"/>
@@ -152,7 +159,7 @@
           </TableRow>
         </TableObject>
       </DataBand>
-      <DataFooterBand Name="DataFooter1" Top="257.7" Width="831.6" Height="28.35">
+      <DataFooterBand Name="DataFooter1" Top="260.51" 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"/>
@@ -167,7 +174,7 @@
         </TableObject>
       </DataFooterBand>
     </DataBand>
-    <DataBand Name="Data3" Top="290.05" Width="831.6" Height="737.1">
+    <DataBand Name="Data3" Top="293.8" Width="831.6" Height="737.1">
       <TextObject Name="Text54" Width="292.95" Height="28.35" Text="2. ประเภทครุภัณฑ์" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text55" Top="28.35" Width="217.35" Height="28.35" Text="[durable_articles_three.durable_type]" Font="TH SarabunPSK, 16pt"/>
       <TextObject Name="Text56" Left="217.35" Top="28.35" Width="567" Height="28.35" Text="ระบุชื่ออาคาร [durable_articles_three.building_name] ห้อง [durable_articles_three.room_name]" Font="TH SarabunPSK, 16pt"/>
@@ -225,38 +232,18 @@
     </DataBand>
   </ReportPage>
   <ReportPage Name="Page4" PaperWidth="240" Watermark.Font="Arial, 60pt">
-      <DataBand Name="Data8" Width="831.6" Height="113.4">
-        <TextObject Name="Text2" Width="812.7" Height="28.35" Text="10. คุณลักษณะเฉพาะ (Specification)" Font="TH SarabunPSK, 16pt, style=Bold"/>
-        <TextObject Name="Text3" Top="28.35" Width="812.7" Height="56.7" Text="[durable_articles_three.specification] จำนวน  [durable_articles_three.quantity_specification] ห้อง ราคาต่อหน่วย  [durable_articles_three.unit_price_specification] บาท รวมทั้งสิ้น  [durable_articles_three.amount_specification] บาท " Font="TH SarabunPSK, 16pt, style=Bold">
-          <Formats>
-            <NumberFormat/>
-            <GeneralFormat/>
-            <GeneralFormat/>
-            <GeneralFormat/>
-          </Formats>
-        </TextObject>
-        <TextObject Name="Text105" Top="85.05" Width="812.7" Height="28.35" Text="ประกอบด้วย" Font="TH SarabunPSK, 16pt, style=Bold"/>
-        <DataBand Name="Data9" Top="117.89" Width="831.6" Height="85.05" DataSource="specification_data">
-          <TextObject Name="Text106" Width="812.7" Height="56.7" Text="[durable_articles_three.specification_data.specification] จำนวน  [durable_articles_three.specification_data.quantity] ห้อง ราคาต่อหน่วย  [durable_articles_three.specification_data.unit_price] บาท รวมทั้งสิ้น  [durable_articles_three.specification_data.amount] บาท " Font="TH SarabunPSK, 16pt, style=Bold">
-            <Formats>
-              <NumberFormat/>
-              <GeneralFormat/>
-              <GeneralFormat/>
-              <GeneralFormat/>
-            </Formats>
-          </TextObject>
-          <TextObject Name="Text107" Top="56.7" Width="812.7" Height="28.35" Text="ประกอบด้วย" Font="TH SarabunPSK, 16pt, style=Bold"/>
-          <DataBand Name="Data10" Top="207.44" Width="831.6" Height="85.05" DataSource="specification_data">
-            <TextObject Name="Text108" Width="812.7" Height="28.35" Text="[durable_articles_three.specification_data.data_detail.list]" Font="TH SarabunPSK, 16pt"/>
-            <TextObject Name="Text109" Left="18.9" Top="56.7" Width="812.7" Height="28.35" Text="คุณลักษณะ" Font="TH SarabunPSK, 16pt"/>
-            <TextObject Name="Text110" Top="28.35" Width="812.7" Height="28.35" Text="[durable_articles_three.specification_data.data_detail.quantity]" Font="TH SarabunPSK, 16pt"/>
-            <DataBand Name="Data23" Top="296.98" Width="831.6" Height="47.25" DataSource="data_detail">
-              <TextObject Name="Text111" Left="18.9" Width="812.7" Height="47.25" Text="[durable_articles_three.specification_data.data_detail.attribute]" Font="TH SarabunPSK, 14pt"/>
-            </DataBand>
-          </DataBand>
-        </DataBand>
-      </DataBand>
-    </ReportPage>
+    <DataBand Name="Data8" Width="831.6" Height="207.9">
+      <TextObject Name="Text2" Width="812.7" Height="28.35" Text="10. คุณลักษณะเฉพาะ (Specification)" Font="TH SarabunPSK, 16pt, style=Bold"/>
+      <TextObject Name="Text3" Top="28.35" Width="831.6" Height="179.55" Text="[durable_articles_three.specification]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="11" Font="TH SarabunPSK, 14pt">
+        <Formats>
+          <NumberFormat/>
+          <GeneralFormat/>
+          <GeneralFormat/>
+          <GeneralFormat/>
+        </Formats>
+      </TextObject>
+    </DataBand>
+  </ReportPage>
   <ReportPage Name="Page5" PaperWidth="240" Watermark.Font="Arial, 60pt">
     <DataBand Name="Data11" Width="831.6" Height="75.6">
       <TextObject Name="Text4" Width="812.7" Height="28.35" Text="11. แผนการใช้จ่ายงบประมาณ  (ระบุจำนวนเงินงบประมาณ)" Font="TH SarabunPSK, 16pt, style=Bold"/>