fixed

Controllers/Budget.Controller.cs

@@ -88,21 +88,65 @@ namespace rmutr_report.Controllers
             var s3 = budget_summary_reports.summary.Sum(d => d.budget_3);
             var s4 = budget_summary_reports.summary.Sum(d => d.budget_4);
             var s5 = budget_summary_reports.summary.Sum(d => d.budget_5);
-            var s6 = s1+s2+s3+s4+s5;
+            if (s1 != null || s2 != null || s3 != null || s4 != null || s5 != null)
-            budget_summary_reports.budget_1 = s1;
+            {
-            budget_summary_reports.budget_2 = s2;
+                var s6 = s1 + s2 + s3 + s4 + s5;
-            budget_summary_reports.budget_3 = s3;
+                budget_summary_reports.total_budget = s6;  
-            budget_summary_reports.budget_4 = s4;
+
-            budget_summary_reports.budget_5 = s5;
+            }
-            budget_summary_reports.total_budget = s6;
+
+            if (s1!=null || s2!=null||s3 !=null|| s4!= null|| s5!=null)
+            {
+                budget_summary_reports.budget_1 = s1;
+                budget_summary_reports.budget_2 = s2;
+                budget_summary_reports.budget_3 = s3;
+                budget_summary_reports.budget_4 = s4;
+                budget_summary_reports.budget_5 = s5;
+                //budget_summary_reports.total_budget = s6;  
+            }
+            if (s1==null)
+            {
+                budget_summary_reports.budget_1 = null;
+              
+            }
+            if (s2==null)
+            {
+                budget_summary_reports.budget_2 = null;
+              
+            }
+            if (s3==null)
+            {
+                budget_summary_reports.budget_3 = null;
+              
+            }
+            if (s4==null)
+            {
+                budget_summary_reports.budget_4 = null;
+              
+            }
+            if (s5==null)
+            {
+                budget_summary_reports.budget_5 = null;
+              
+            }
             foreach (var budget in budget_summary_reports.summary)
             {
-                budget.total_budget = budget.budget_1 + budget.budget_2 + budget.budget_3 + budget.budget_4 +
+                if (budget.budget_1 != null || budget.budget_2 != null || budget.budget_3 != null ||
-                                      budget.budget_5;
+                    budget.budget_4 != null || budget.budget_5 != null)
+                {
+
+
+                    budget.total_budget = budget.budget_1 + budget.budget_2 + budget.budget_3 + budget.budget_4 +
+                                          budget.budget_5;
+                }
+                else
+                {
+                    return null;
+                }
                 
             }
             Report report = new Report();
-            report.Load(_setting.report_path + "budget_summary_report.frx");
+            report.Load(_setting.report_path + "budget_summary_report_moc.frx");
             report.RegisterData(_budget_summary_report, "budget_summary_report");
             report.Prepare();
 

Models/budget/budget_summary_report.cs

@@ -17,17 +17,17 @@ namespace rmutr_report.Models
         public string set_request_year { get; set; }
         public List<operating_expenses_details>operating_expenses{ get; set; }
         public string durable_articles_year { get; set; }
-        public string durable_articles_product { get; set; }
+        //public string durable_articles_product { get; set; }
         public List<durable_articles_headers> durable_articles_header { get; set; }
         public string building_year { get; set; }
-        public string building_product { get; set; }
+        //public string building_product { get; set; }
         public List<building_headers1> building_header_1 { get; set; }
         public List<building_headers2> building_header_2 { get; set; }
         public string research_support_year { get; set; }
-        public string  research_support_product { get; set; }
+        //public string  research_support_product { get; set; }
         public List<operating_expenses_details>research_support{ get; set; }
         public string subsidy_service_year  { get; set; }
-        public string subsidy_service_product   { get; set; }
+        //public string subsidy_service_product   { get; set; }
         public List<subsidy_service_headers> subsidy_service_header { get; set; }
         public string subsidy_science_year  { get; set; }
         public List<subsidy_science_headers> subsidy_science_header { get; set; }

wwwroot/reports/budget_summary_report.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="04/19/2023 19:10:00" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="04/20/2023 16:57:12" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="budget_summary_report" ReferenceName="budget_summary_report" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -28,7 +28,6 @@
         <Column Name="remark" DataType="System.String"/>
       </BusinessObjectDataSource>
       <Column Name="durable_articles_year" DataType="System.String"/>
-      <Column Name="durable_articles_product" DataType="System.String"/>
       <BusinessObjectDataSource Name="durable_articles_header" DataType="null" Enabled="true">
         <Column Name="header_name" DataType="System.String"/>
         <BusinessObjectDataSource Name="durable_articles" DataType="null" Enabled="true">
@@ -48,7 +47,6 @@
         </BusinessObjectDataSource>
       </BusinessObjectDataSource>
       <Column Name="building_year" DataType="System.String"/>
-      <Column Name="building_product" DataType="System.String"/>
       <BusinessObjectDataSource Name="building_header_1" DataType="null" Enabled="true">
         <Column Name="header_name" DataType="System.String"/>
         <BusinessObjectDataSource Name="building_1" DataType="null" Enabled="true">
@@ -70,7 +68,6 @@
         </BusinessObjectDataSource>
       </BusinessObjectDataSource>
       <Column Name="research_support_year" DataType="System.String"/>
-      <Column Name="research_support_product" DataType="System.String"/>
       <BusinessObjectDataSource Name="research_support" DataType="null" Enabled="true">
         <Column Name="rowno" DataType="System.String"/>
         <Column Name="list" DataType="System.String"/>
@@ -78,7 +75,6 @@
         <Column Name="remark" DataType="System.String"/>
       </BusinessObjectDataSource>
       <Column Name="subsidy_service_year" DataType="System.String"/>
-      <Column Name="subsidy_service_product" DataType="System.String"/>
       <BusinessObjectDataSource Name="subsidy_service_header" DataType="null" Enabled="true">
         <Column Name="header_name" DataType="System.String"/>
         <BusinessObjectDataSource Name="subsidy_service" DataType="null" Enabled="true">
@@ -298,7 +294,7 @@
   </ReportPage>
   <ReportPage Name="ครุภัณฑ์" PaperWidth="350" Watermark.Font="Arial, 60pt">
     <PageHeaderBand Name="PageHeader2" Width="1247.4" Height="264.6">
-      <TextObject Name="Text1" Top="37.8" Width="1247.4" Height="28.35" Text="ผลผลิต [budget_summary_report.durable_articles_product]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+      <TextObject Name="Text1" Top="37.8" Width="1247.4" Height="28.35" Text="ผลผลิต [budget_summary_report.product]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text2" Left="425.25" Top="75.6" Width="822.15" Height="28.35" Text="หน่วย : บาท" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text3" Top="75.6" Width="415.8" Height="28.35" Text="(1 ชุด ต่อ 1 ผลผลิต)" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text58" Width="1247.4" Height="28.35" Text="สรุปรายการครุภัณฑ์ที่เสนอขอ ประจำปีงบประมาณ พ.ศ. [budget_summary_report.durable_articles_year]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
@@ -442,7 +438,7 @@
   </ReportPage>
   <ReportPage Name="สิ่งก่อสร้าง" PaperWidth="350" Watermark.Font="Arial, 60pt">
     <PageHeaderBand Name="PageHeader3" Width="1247.4" Height="264.6">
-      <TextObject Name="Text4" Top="37.8" Width="1247.4" Height="28.35" Text="ผลผลิต [budget_summary_report.building_product]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+      <TextObject Name="Text4" Top="37.8" Width="1247.4" Height="28.35" Text="ผลผลิต [budget_summary_report.product]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text5" Left="425.25" Top="75.6" Width="822.15" Height="28.35" Text="หน่วย : บาท" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text6" Top="75.6" Width="415.8" Height="28.35" Text="(1 ชุด ต่อ 1 ผลผลิต)" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text7" Width="1247.4" Height="28.35" Text="สรุปรายการสิ่งก่อสร้างที่เสนอขอ ประจำปีงบประมาณ พ.ศ. [budget_summary_report.building_year]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
@@ -602,7 +598,7 @@
   </ReportPage>
   <ReportPage Name="อุดหนุนวิจัย" PaperWidth="350" Watermark.Font="Arial, 60pt">
     <PageHeaderBand Name="PageHeader4" Width="1247.4" Height="198.45">
-      <TextObject Name="Text8" Top="28.35" Width="1247.4" Height="28.35" Text="ผลผลิต [budget_summary_report.research_support_product]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+      <TextObject Name="Text8" Top="28.35" Width="1247.4" Height="28.35" Text="ผลผลิต [budget_summary_report.product]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text9" Left="425.25" Top="66.15" Width="822.15" Height="28.35" Text="หน่วย : บาท" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text10" Top="66.15" Width="415.8" Height="28.35" Text="(1 ชุด ต่อ 1 ผลผลิต)" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TableObject Name="Table17" Top="94.5" Width="1247.4" Height="66.15">