From 76d3658e60f9fc462a9b4526ad97cd55e3116fdc Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Wed, 14 Jun 2023 13:22:23 +0700
Subject: [PATCH] bug fixed

---
 Models/budget/operating_expenses.cs    | 58 +++++++++++-----------
 wwwroot/reports/operating_expenses.frx | 68 +++-----------------------
 2 files changed, 35 insertions(+), 91 deletions(-)

diff --git a/Models/budget/operating_expenses.cs b/Models/budget/operating_expenses.cs
index 3c10221..3265971 100644
--- a/Models/budget/operating_expenses.cs
+++ b/Models/budget/operating_expenses.cs
@@ -19,35 +19,35 @@ namespace rmutr_report.Models
         public string no { get; set; }
         public string expenditure_budget { get; set; }
         public decimal? amount { get; set; }
-        //public string clarification_summary { get; set; }
-        public List<operating_expenses_detail2> data_2 { get; set; }
-
-    }
-
-    public class operating_expenses_detail2
-    {
-        public string no { get; set; }
-        public string expenditure_budget { get; set; }
-        public decimal? amount { get; set; }
-        //public string clarification_summary { get; set; }
-        public List<operating_expenses_detail3> data_3 { get; set; }
-
-    }
-
-    public class operating_expenses_detail3
-    {
-        public string no { get; set; }
-        public string expenditure_budget { get; set; }
-        public decimal? amount { get; set; }
-        //public string clarification_summary { get; set; }
-        public List<operating_expenses_detail4> data_4 { get; set; }
-    }
-
-    public class operating_expenses_detail4
-    {
-        //public string no { get; set; }
-        public string expenditure_budget { get; set; }
-        public decimal? amount { get; set; }
         public string clarification_summary { get; set; }
+       // public List<operating_expenses_detail2> data_2 { get; set; }
+
     }
+
+    // public class operating_expenses_detail2
+    // {
+    //     public string no { get; set; }
+    //     public string expenditure_budget { get; set; }
+    //     public decimal? amount { get; set; }
+    //     //public string clarification_summary { get; set; }
+    //     public List<operating_expenses_detail3> data_3 { get; set; }
+    //
+    // }
+    //
+    // public class operating_expenses_detail3
+    // {
+    //     public string no { get; set; }
+    //     public string expenditure_budget { get; set; }
+    //     public decimal? amount { get; set; }
+    //     //public string clarification_summary { get; set; }
+    //     public List<operating_expenses_detail4> data_4 { get; set; }
+    // }
+    //
+    // public class operating_expenses_detail4
+    // {
+    //     //public string no { get; set; }
+    //     public string expenditure_budget { get; set; }
+    //     public decimal? amount { get; set; }
+    //     public string clarification_summary { get; set; }
+    // }
 }
\ No newline at end of file
diff --git a/wwwroot/reports/operating_expenses.frx b/wwwroot/reports/operating_expenses.frx
index 6167647..37078e3 100644
--- a/wwwroot/reports/operating_expenses.frx
+++ b/wwwroot/reports/operating_expenses.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="06/13/2023 17:48:40" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="06/14/2023 13:21:27" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="operating_expenses" ReferenceName="operating_expenses" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -13,21 +13,7 @@
         <Column Name="no" DataType="System.String"/>
         <Column Name="expenditure_budget" DataType="System.String"/>
         <Column Name="amount" DataType="System.Decimal"/>
-        <BusinessObjectDataSource Name="data_2" DataType="null" Enabled="true">
-          <Column Name="no" DataType="System.String"/>
-          <Column Name="expenditure_budget" DataType="System.String"/>
-          <Column Name="amount" DataType="System.Decimal"/>
-          <BusinessObjectDataSource Name="data_3" DataType="null" Enabled="true">
-            <Column Name="no" DataType="System.String"/>
-            <Column Name="expenditure_budget" DataType="System.String"/>
-            <Column Name="amount" DataType="System.Decimal"/>
-            <BusinessObjectDataSource Name="data_4" DataType="null" Enabled="true">
-              <Column Name="expenditure_budget" DataType="System.String"/>
-              <Column Name="amount" DataType="System.Decimal"/>
-              <Column Name="clarification_summary" DataType="System.String"/>
-            </BusinessObjectDataSource>
-          </BusinessObjectDataSource>
-        </BusinessObjectDataSource>
+        <Column Name="clarification_summary" DataType="System.String"/>
       </BusinessObjectDataSource>
     </BusinessObjectDataSource>
   </Dictionary>
@@ -57,54 +43,12 @@
           <TableColumn Name="Column17" Width="160.65"/>
           <TableColumn Name="Column18" Width="368.55"/>
           <TableRow Name="Row2" Height="37.8">
-            <TableCell Name="Cell15" Border.Lines="All" Text="[operating_expenses.data.no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell16" Border.Lines="All" Text="[operating_expenses.data.expenditure_budget]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell17" Border.Lines="All" Text="[operating_expenses.data.amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell18" Border.Lines="All" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+            <TableCell Name="Cell15" Border.Lines="All" Text="[operating_expenses.data.no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell16" Border.Lines="All" Text="[operating_expenses.data.expenditure_budget]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell17" Border.Lines="All" Text="[operating_expenses.data.amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell18" Border.Lines="All" Text="[operating_expenses.data.clarification_summary]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
           </TableRow>
         </TableObject>
-        <DataBand Name="Data3" Top="226.36" Width="1096.2" Height="37.8" DataSource="data_2">
-          <TableObject Name="Table3" Width="1096.24" Height="37.8">
-            <TableColumn Name="Column19" Width="66.17"/>
-            <TableColumn Name="Column20" Width="500.87"/>
-            <TableColumn Name="Column21" Width="160.65"/>
-            <TableColumn Name="Column22" Width="368.55"/>
-            <TableRow Name="Row3" Height="37.8">
-              <TableCell Name="Cell19" Border.Lines="All" Text="[operating_expenses.data.data_2.no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-              <TableCell Name="Cell20" Border.Lines="All" Text="[operating_expenses.data.data_2.expenditure_budget]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-              <TableCell Name="Cell21" Border.Lines="All" Text="[operating_expenses.data.data_2.amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-              <TableCell Name="Cell22" Border.Lines="All" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            </TableRow>
-          </TableObject>
-          <DataBand Name="Data4" Top="270.32" Width="1096.2" Height="37.8" DataSource="data_3">
-            <TableObject Name="Table4" Width="1096.24" Height="37.8">
-              <TableColumn Name="Column23" Width="66.17"/>
-              <TableColumn Name="Column24" Width="500.87"/>
-              <TableColumn Name="Column25" Width="160.65"/>
-              <TableColumn Name="Column26" Width="368.55"/>
-              <TableRow Name="Row4" Height="37.8">
-                <TableCell Name="Cell23" Border.Lines="All" Text="[operating_expenses.data.data_2.data_3.no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                <TableCell Name="Cell24" Border.Lines="All" Text="[operating_expenses.data.data_2.data_3.expenditure_budget]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                <TableCell Name="Cell25" Border.Lines="All" Text="[operating_expenses.data.data_2.data_3.amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                <TableCell Name="Cell26" Border.Lines="All" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-              </TableRow>
-            </TableObject>
-            <DataBand Name="Data5" Top="314.27" Width="1096.2" Height="37.8" DataSource="data_4">
-              <TableObject Name="Table5" Width="1096.24" Height="37.8">
-                <TableColumn Name="Column27" Width="66.17"/>
-                <TableColumn Name="Column28" Width="500.87"/>
-                <TableColumn Name="Column29" Width="160.65"/>
-                <TableColumn Name="Column30" Width="368.55"/>
-                <TableRow Name="Row5" Height="37.8">
-                  <TableCell Name="Cell27" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                  <TableCell Name="Cell28" Border.Lines="All" Text="[operating_expenses.data.data_2.data_3.data_4.expenditure_budget]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                  <TableCell Name="Cell29" Border.Lines="All" Text="[operating_expenses.data.data_2.data_3.data_4.amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                  <TableCell Name="Cell30" Border.Lines="All" Text="[operating_expenses.data.data_2.data_3.data_4.clarification_summary]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                </TableRow>
-              </TableObject>
-            </DataBand>
-          </DataBand>
-        </DataBand>
       </DataBand>
     </DataBand>
   </ReportPage>