From 1bd56d2269d4f745234cf00d92a1dc8891c65e18 Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Tue, 23 May 2023 14:00:21 +0700
Subject: [PATCH] fixed

---
 wwwroot/reports/budget_summary_report.frx | 38 +++++++++++------------
 wwwroot/reports/ro_eleven.frx             |  8 ++---
 wwwroot/reports/ro_ten.frx                |  6 ++--
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/wwwroot/reports/budget_summary_report.frx b/wwwroot/reports/budget_summary_report.frx
index 32bfe11..4cfa06c 100644
--- a/wwwroot/reports/budget_summary_report.frx
+++ b/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="05/19/2023 14:18:07" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="05/19/2023 14:43:21" 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"/>
@@ -525,7 +525,7 @@
                 <TableCell Name="Cell428" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.target_group_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell429" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.time_count]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell430" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.time_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
-                <TableCell Name="Cell431" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.budget_count]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
+                <TableCell Name="Cell431" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.budget_count]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell432" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.budget_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell433" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.quantity]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
                 <TableCell Name="Cell434" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.quantity_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold" TextFill.Color="Red"/>
@@ -552,7 +552,7 @@
                   <TableCell Name="Cell439" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.target_group_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell440" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.time_count]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell441" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.time_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-                  <TableCell Name="Cell442" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.budget_count]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+                  <TableCell Name="Cell442" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.budget_count]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell443" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.budget_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell444" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.quantity]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
                   <TableCell Name="Cell445" Border.Lines="All" Text="[budget_summary_report.group_header.header.data_proposals.data_sub_proposals.quantity_unit]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
@@ -742,7 +742,7 @@
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data41" Top="308.2" Width="1625.4" Height="37.8" CanShrink="true" DataSource="durable_articles_1">
+    <DataBand Name="Data41" Top="308.96" Width="1625.4" Height="37.8" CanShrink="true" DataSource="durable_articles_1">
       <TableObject Name="Table15" Width="1625.4" Height="37.8">
         <TableColumn Name="Column76" Width="75.6"/>
         <TableColumn Name="Column77" Width="264.6"/>
@@ -847,7 +847,7 @@
           </TableCell>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data6" Top="351.79" Width="1625.4" Height="37.8" CanShrink="true" DataSource="durable_articles_2">
+      <DataBand Name="Data6" Top="353.31" Width="1625.4" Height="37.8" CanShrink="true" DataSource="durable_articles_2">
         <TableObject Name="Table69" Width="1625.4" Height="37.8">
           <TableColumn Name="Column439" Width="75.6"/>
           <TableColumn Name="Column440" Width="264.6"/>
@@ -952,7 +952,7 @@
             </TableCell>
           </TableRow>
         </TableObject>
-        <DataBand Name="Data7" Top="395.39" Width="1625.4" Height="37.8" CanShrink="true" DataSource="durable_articles_3">
+        <DataBand Name="Data7" Top="397.67" Width="1625.4" Height="37.8" CanShrink="true" DataSource="durable_articles_3">
           <TableObject Name="Table70" Width="1625.4" Height="37.8">
             <TableColumn Name="Column453" Width="75.6"/>
             <TableColumn Name="Column454" Width="264.6"/>
@@ -1057,7 +1057,7 @@
               </TableCell>
             </TableRow>
           </TableObject>
-          <DataBand Name="Data9" Top="438.99" Width="1625.4" Height="37.8" CanShrink="true" DataSource="durable_articles_4">
+          <DataBand Name="Data9" Top="442.03" Width="1625.4" Height="37.8" CanShrink="true" DataSource="durable_articles_4">
             <TableObject Name="Table71" Width="1625.4" Height="37.8">
               <TableColumn Name="Column467" Width="75.6"/>
               <TableColumn Name="Column468" Width="264.6"/>
@@ -1162,7 +1162,7 @@
                 </TableCell>
               </TableRow>
             </TableObject>
-            <DataBand Name="Data11" Top="482.59" Width="1625.4" Height="56.7" CanShrink="true" DataSource="durable_articles_detail">
+            <DataBand Name="Data11" Top="486.39" Width="1625.4" Height="56.7" CanShrink="true" DataSource="durable_articles_detail">
               <TableObject Name="Table68" Width="1625.4" Height="56.7">
                 <TableColumn Name="Column425" Width="75.6"/>
                 <TableColumn Name="Column426" Width="264.6"/>
@@ -1345,7 +1345,7 @@
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data8" Top="308.2" Width="1436.4" Height="37.8" DataSource="building_1">
+    <DataBand Name="Data8" Top="308.96" Width="1436.4" Height="37.8" DataSource="building_1">
       <TableObject Name="Table74" Width="1436.4" Height="37.8">
         <TableColumn Name="Column504" Width="75.6"/>
         <TableColumn Name="Column505" Width="567"/>
@@ -1411,7 +1411,7 @@
           </TableCell>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data10" Top="351.79" Width="1436.4" Height="37.8" DataSource="building_2">
+      <DataBand Name="Data10" Top="353.31" Width="1436.4" Height="37.8" DataSource="building_2">
         <TableObject Name="Table75" Width="1436.4" Height="37.8">
           <TableColumn Name="Column513" Width="75.6"/>
           <TableColumn Name="Column514" Width="567"/>
@@ -1477,7 +1477,7 @@
             </TableCell>
           </TableRow>
         </TableObject>
-        <DataBand Name="Data12" Top="395.39" Width="1436.4" Height="37.8" DataSource="building_3">
+        <DataBand Name="Data12" Top="397.67" Width="1436.4" Height="37.8" DataSource="building_3">
           <TableObject Name="Table76" Width="1436.4" Height="37.8">
             <TableColumn Name="Column522" Width="75.6"/>
             <TableColumn Name="Column523" Width="567"/>
@@ -1543,7 +1543,7 @@
               </TableCell>
             </TableRow>
           </TableObject>
-          <DataBand Name="Data16" Top="438.99" Width="1436.4" Height="37.8" DataSource="data_1">
+          <DataBand Name="Data16" Top="442.03" Width="1436.4" Height="37.8" DataSource="data_1">
             <TableObject Name="Table77" Width="1436.4" Height="37.8">
               <TableColumn Name="Column531" Width="75.6"/>
               <TableColumn Name="Column532" Width="567"/>
@@ -1574,7 +1574,7 @@
                 <TableCell Name="Cell561" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
               </TableRow>
             </TableObject>
-            <DataBand Name="Data19" Top="482.59" Width="1436.4" Height="37.8" DataSource="data_1_detail">
+            <DataBand Name="Data19" Top="486.39" Width="1436.4" Height="37.8" DataSource="data_1_detail">
               <TableObject Name="Table22" Width="1436.4" Height="37.8">
                 <TableColumn Name="Column121" Width="75.6"/>
                 <TableColumn Name="Column122" Width="567"/>
@@ -1607,7 +1607,7 @@
               </TableObject>
             </DataBand>
           </DataBand>
-          <DataBand Name="Data22" Top="526.18" Width="1436.4" Height="37.8" DataSource="data_2">
+          <DataBand Name="Data22" Top="530.74" Width="1436.4" Height="37.8" DataSource="data_2">
             <TableObject Name="Table79" Width="1436.4" Height="37.8">
               <TableColumn Name="Column549" Width="75.6"/>
               <TableColumn Name="Column550" Width="567"/>
@@ -1638,7 +1638,7 @@
                 <TableCell Name="Cell579" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
               </TableRow>
             </TableObject>
-            <DataBand Name="Data25" Top="569.78" Width="1436.4" Height="37.8" DataSource="data_2_detail">
+            <DataBand Name="Data25" Top="575.1" Width="1436.4" Height="37.8" DataSource="data_2_detail">
               <TableObject Name="Table81" Width="1436.4" Height="37.8">
                 <TableColumn Name="Column567" Width="75.6"/>
                 <TableColumn Name="Column568" Width="567"/>
@@ -1671,7 +1671,7 @@
               </TableObject>
             </DataBand>
           </DataBand>
-          <DataBand Name="Data28" Top="613.38" Width="1436.4" Height="37.8" DataSource="data_3">
+          <DataBand Name="Data28" Top="619.46" Width="1436.4" Height="37.8" DataSource="data_3">
             <TableObject Name="Table80" Width="1436.4" Height="37.8">
               <TableColumn Name="Column558" Width="75.6"/>
               <TableColumn Name="Column559" Width="567"/>
@@ -1702,7 +1702,7 @@
                 <TableCell Name="Cell588" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
               </TableRow>
             </TableObject>
-            <DataBand Name="Data31" Top="656.97" Width="1436.4" Height="56.7" DataSource="data_3_detail">
+            <DataBand Name="Data31" Top="663.82" Width="1436.4" Height="56.7" DataSource="data_3_detail">
               <TableObject Name="Table78" Width="1436.4" Height="56.7">
                 <TableColumn Name="Column540" Width="75.6"/>
                 <TableColumn Name="Column541" Width="567"/>
@@ -1805,8 +1805,8 @@
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data13" Top="204.25" Width="1247.4">
-      <DataBand Name="Data14" Top="210.04" Width="1247.4" Height="37.8" DataSource="research_support">
+    <DataBand Name="Data13" Top="205.01" Width="1247.4">
+      <DataBand Name="Data14" Top="211.56" Width="1247.4" Height="37.8" DataSource="research_support">
         <TableObject Name="Table18" Width="1247.4" Height="37.8">
           <TableColumn Name="Column100"/>
           <TableColumn Name="Column101" Width="652.05"/>
diff --git a/wwwroot/reports/ro_eleven.frx b/wwwroot/reports/ro_eleven.frx
index ec443f5..f0ecc42 100644
--- a/wwwroot/reports/ro_eleven.frx
+++ b/wwwroot/reports/ro_eleven.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="05/17/2023 16:11:10" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="05/23/2023 11:48:43" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="ro_eleven" ReferenceName="ro_eleven" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -27,8 +27,8 @@
   <ReportPage Name="Page1" PaperWidth="290" Watermark.Font="Arial, 60pt">
     <PageHeaderBand Name="PageHeader1" Width="1020.6" Height="245.7">
       <TextObject Name="Text22" Top="9.45" Width="1020.6" Height="94.5" Border.Lines="All" Border.Color="Highlight" Border.Style="Dash" Fill.Color="225, 244, 255" VertAlign="Center" Font="TH SarabunPSK, 20pt, style=Bold"/>
-      <TextObject Name="Text1" Top="9.45" Width="1020.6" Height="47.25" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [ro_eleven.budget_year] ( [ro_eleven.date_range] )" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 22pt, style=Bold"/>
-      <TextObject Name="Text2" Top="56.7" Width="1020.6" Height="47.25" Text="ประมาณการรายรับจากรายได้ประเภทอื่น ๆ" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 22pt, style=Bold, Underline"/>
+      <TextObject Name="Text1" Top="9.45" Width="1020.6" Height="47.25" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [ro_eleven.budget_year] ( [ro_eleven.date_range] )" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 18pt, style=Bold"/>
+      <TextObject Name="Text2" Top="56.7" Width="1020.6" Height="47.25" Text="ประมาณการรายรับจากรายได้ประเภทอื่น ๆ" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 18pt, style=Bold, Underline"/>
       <TableObject Name="Table1" Top="189" Width="1020.64" Height="56.7">
         <TableColumn Name="Column1" Width="56.72"/>
         <TableColumn Name="Column2" Width="491.42"/>
@@ -45,7 +45,7 @@
           <TableCell Name="Cell17" Border.Lines="All" Border.Color="Highlight" Fill.Color="White" Text="รายรับจริง ปี [ro_eleven.revenue_year]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TextObject Name="Text3" Left="85.05" Top="122.85" Width="859.95" Height="47.25" Border.Lines="All" Border.Color="Highlight" Border.Style="Dash" Fill.Color="225, 244, 255" Text="หน่วยงานที่รับผิดชอบ : [ro_eleven.agency_name_th]" VertAlign="Center" Font="TH SarabunPSK, 20pt, style=Bold"/>
+      <TextObject Name="Text3" Left="85.05" Top="122.85" Width="859.95" Height="47.25" Border.Lines="All" Border.Color="Highlight" Border.Style="Dash" Fill.Color="225, 244, 255" Text="หน่วยงานที่รับผิดชอบ : [ro_eleven.agency_name_th]" VertAlign="Center" Font="TH SarabunPSK, 18pt, style=Bold"/>
     </PageHeaderBand>
     <DataBand Name="Data1" Top="252.26" Width="1020.6">
       <DataBand Name="Data3" Top="258.81" Width="1020.6" Height="47.25" DataSource="data">
diff --git a/wwwroot/reports/ro_ten.frx b/wwwroot/reports/ro_ten.frx
index 191a88f..ee39abe 100644
--- a/wwwroot/reports/ro_ten.frx
+++ b/wwwroot/reports/ro_ten.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="05/17/2023 16:07:50" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="05/23/2023 11:49:06" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="ro_ten" ReferenceName="ro_ten" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -33,7 +33,7 @@
   <ReportPage Name="Page1" PaperWidth="290" Watermark.Font="Arial, 60pt">
     <PageHeaderBand Name="PageHeader1" Width="1020.6" Height="245.7">
       <TextObject Name="Text22" Top="9.45" Width="1020.6" Height="94.5" Border.Lines="All" Border.Color="DarkGoldenrod" Border.Style="Dash" Fill.Color="255, 242, 204" VertAlign="Center" Font="TH SarabunPSK, 20pt, style=Bold"/>
-      <TextObject Name="Text2" Top="56.7" Width="1020.6" Height="47.25" Text="ประมาณการรายรับจากการบริหารสินทรัพย์ที่ก่อให้เกิดรายได้" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 22pt, style=Bold, Underline"/>
+      <TextObject Name="Text2" Top="56.7" Width="1020.6" Height="47.25" Text="ประมาณการรายรับจากการบริหารสินทรัพย์ที่ก่อให้เกิดรายได้" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 20pt, style=Bold, Underline"/>
       <TableObject Name="Table1" Top="189" Width="1020.64" Height="56.7">
         <TableColumn Name="Column1" Width="56.72"/>
         <TableColumn Name="Column2" Width="491.42"/>
@@ -50,7 +50,7 @@
           <TableCell Name="Cell17" Border.Lines="All" Border.Color="DarkGoldenrod" Fill.Color="White" Text="รายรับจริง ปี [ro_ten.revenue_year]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TextObject Name="Text1" Top="9.45" Width="1020.6" Height="47.25" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [ro_ten.budget_year] ( [ro_ten.date_range] )" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 22pt, style=Bold"/>
+      <TextObject Name="Text1" Top="9.45" Width="1020.6" Height="47.25" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [ro_ten.budget_year] ( [ro_ten.date_range] )" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 20pt, style=Bold"/>
       <TextObject Name="Text3" Left="85.05" Top="122.85" Width="859.95" Height="47.25" Border.Lines="All" Border.Color="DarkGoldenrod" Border.Style="Dash" Fill.Color="255, 242, 204" Text="หน่วยงานที่รับผิดชอบ : [ro_ten.agency_name_th]" VertAlign="Center" Font="TH SarabunPSK, 20pt, style=Bold"/>
     </PageHeaderBand>
     <DataBand Name="Data1" Top="252.26" Width="1020.6">