From 3666713748dcf4442d852da3f701587ca143f7d0 Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Wed, 22 Nov 2023 14:57:37 +0700
Subject: [PATCH] bug fixed

---
 Controllers/project_principle_rationale.Controller.cs |  6 +-----
 wwwroot/reports/operating_budget_ro_three.frx         | 10 +++++-----
 wwwroot/reports/project_principle_rationale_1.frx     |  6 +++---
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs
index 6f8bffe..e2fc8c1 100644
--- a/Controllers/project_principle_rationale.Controller.cs
+++ b/Controllers/project_principle_rationale.Controller.cs
@@ -227,7 +227,7 @@ namespace rmutr_report.Controllers
                                 vv.project_end_date = null;
                             }
 
-                            if (vv.day != null && vv.day != "90.00")
+                            if (vv.day != null)
                             {
                                 string na6 = "จำนวนวัน ";
                                 vv.day = na6 + vv.day;
@@ -238,10 +238,6 @@ namespace rmutr_report.Controllers
                                 vv.day = null;
                             }
 
-                            if (vv.day == "90.00")
-                            {
-                                vv.day = null;
-                            }
 
                             if (vv.percentage1 != null || vv.percentage2 != null || vv.percentage3 != null)
                             {
diff --git a/wwwroot/reports/operating_budget_ro_three.frx b/wwwroot/reports/operating_budget_ro_three.frx
index 5073a60..d96cdcc 100644
--- a/wwwroot/reports/operating_budget_ro_three.frx
+++ b/wwwroot/reports/operating_budget_ro_three.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="11/22/2023 14:37:14" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/22/2023 14:52:38" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="operating_budget_ro_three" ReferenceName="operating_budget_ro_three" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -108,7 +108,7 @@
             <TableCell Name="Cell30" Border.Lines="All" Fill.Color="255, 230, 153" Text="[operating_budget_ro_three.data_1.quantity_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
             <TableCell Name="Cell31" Border.Lines="All" Fill.Color="255, 230, 153" Text="[operating_budget_ro_three.data_1.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
             <TableCell Name="Cell32" Border.Lines="All" Fill.Color="255, 230, 153" Text="[operating_budget_ro_three.data_1.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell33" Border.Lines="All" Fill.Color="255, 230, 153" Text="[operating_budget_ro_three.data_1.remark]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+            <TableCell Name="Cell33" Border.Lines="All" Fill.Color="255, 230, 153" Text="[operating_budget_ro_three.data_1.remark]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
           </TableRow>
         </TableObject>
         <DataBand Name="Data3" Top="283.46" Width="1360.8" Height="37.8" DataSource="data_2">
@@ -131,7 +131,7 @@
               <TableCell Name="Cell39" Border.Lines="All" Fill.Color="255, 242, 204" Text="[operating_budget_ro_three.data_1.data_2.quantity_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
               <TableCell Name="Cell40" Border.Lines="All" Fill.Color="255, 242, 204" Text="[operating_budget_ro_three.data_1.data_2.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
               <TableCell Name="Cell41" Border.Lines="All" Fill.Color="255, 242, 204" Text="[operating_budget_ro_three.data_1.data_2.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-              <TableCell Name="Cell42" Border.Lines="All" Fill.Color="255, 242, 204" Text="[operating_budget_ro_three.data_1.data_2.remark]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+              <TableCell Name="Cell42" Border.Lines="All" Fill.Color="255, 242, 204" Text="[operating_budget_ro_three.data_1.data_2.remark]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
             </TableRow>
           </TableObject>
           <DataBand Name="Data4" Top="325.97" Width="1360.8" Height="37.8" DataSource="data_3">
@@ -154,7 +154,7 @@
                 <TableCell Name="Cell48" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.quantity_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
                 <TableCell Name="Cell49" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
                 <TableCell Name="Cell50" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                <TableCell Name="Cell51" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.remark]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+                <TableCell Name="Cell51" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.remark]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
               </TableRow>
             </TableObject>
             <DataBand Name="Data5" Top="368.47" Width="1360.8" Height="37.8" DataSource="data_4">
@@ -177,7 +177,7 @@
                   <TableCell Name="Cell66" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.data_4.quantity_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
                   <TableCell Name="Cell67" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.data_4.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
                   <TableCell Name="Cell68" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.data_4.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                  <TableCell Name="Cell69" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.data_4.remark]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+                  <TableCell Name="Cell69" Border.Lines="All" Fill.Color="White" Text="[operating_budget_ro_three.data_1.data_2.data_3.data_4.remark]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
                 </TableRow>
               </TableObject>
             </DataBand>
diff --git a/wwwroot/reports/project_principle_rationale_1.frx b/wwwroot/reports/project_principle_rationale_1.frx
index 5187dc1..7fb2e03 100644
--- a/wwwroot/reports/project_principle_rationale_1.frx
+++ b/wwwroot/reports/project_principle_rationale_1.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="11/22/2023 14:30:48" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="11/22/2023 14:50:49" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
       <Column Name="budget_year_name_th" DataType="System.String"/>
@@ -769,7 +769,7 @@
       </DataBand>
     </DataBand>
   </ReportPage>
-  <ReportPage Name="Page2" PaperWidth="225" PaperHeight="367" Watermark.Font="Arial, 60pt">
+  <ReportPage Name="Page2" PaperWidth="225" PaperHeight="500" Watermark.Font="Arial, 60pt">
     <PageHeaderBand Name="PageHeader2" Width="774.9" Height="28.35">
       <TextObject Name="Text1" Width="774.9" Height="28.35" Text="20. แผนการดำเนินงานและการใช้จ่ายงบประมาณ (ระบุจำนวนเงินงบประมาณ)" Font="TH SarabunPSK, 14pt, style=Bold"/>
     </PageHeaderBand>
@@ -934,7 +934,7 @@
       </DataBand>
     </DataBand>
   </ReportPage>
-  <ReportPage Name="Page3" PaperWidth="350" Watermark.Font="Arial, 60pt">
+  <ReportPage Name="Page3" PaperWidth="350" PaperHeight="1000" Watermark.Font="Arial, 60pt">
     <PageHeaderBand Name="PageHeader1" Width="1247.4" Height="28.35">
       <TextObject Name="Text166" Width="1058.4" Height="28.35" Text="25. ตารางกำหนดการดำเนินโครงการ" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
     </PageHeaderBand>