remark - รายการ

Controllers/Budget.Controller.cs

@@ -2719,11 +2719,11 @@ namespace rmutr_report.Controllers
             int row = 1;
             foreach (var detail2 in budget.data)
             {
-                var a = "- ";
+                // var a = "- ";
-                if (detail2.topic_type == 2)
+                // if (detail2.topic_type == 2)
-                {
+                // {
-                    detail2.list = a + detail2.list;
+                //     detail2.list = a + detail2.list;
-                }
+                // }
 
                 if (detail2.topic_type == 5)
                 {

wwwroot/reports/summary_government_budget_plan.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="08/03/2023 11:48:10" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="08/07/2023 11:16:02" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="summary_government_budget_plan" ReferenceName="summary_government_budget_plan" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -60,7 +60,7 @@
       </BusinessObjectDataSource>
     </BusinessObjectDataSource>
   </Dictionary>
-  <ReportPage Name="Page1" Landscape="true" PaperWidth="540" PaperHeight="210" Watermark.Font="Arial, 60pt">
+  <ReportPage Name="Page1" Landscape="true" PaperWidth="540" PaperHeight="250" Watermark.Font="Arial, 60pt">
     <PageHeaderBand Name="PageHeader5" Width="1965.6" Height="132.3">
       <TableObject Name="Table10" Top="56.7" Width="1965.6" Height="75.6">
         <TableColumn Name="Column83" Width="47.25"/>
@@ -100,8 +100,8 @@
       <TextObject Name="Text132" Width="1965.6" Height="28.35" Text="สรุปงบประมาณแผนปฏิบัติราชการประจำปี พ.ศ. [summary_government_budget_plan.budget_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
       <TextObject Name="Text133" Top="28.35" Width="1965.6" Height="28.35" Text="มหาวิทยาลัยเทคโนโลยีราชมงคลรัตนโกสินทร์" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
     </PageHeaderBand>
-    <DataBand Name="Data9" Top="137.71" Width="1965.6">
+    <DataBand Name="Data9" Top="139.71" Width="1965.6">
-      <DataBand Name="Data10" Top="143.11" Width="1965.6" Height="37.8" DataSource="data">
+      <DataBand Name="Data10" Top="147.11" Width="1965.6" Height="37.8" DataSource="data">
         <TableObject Name="Table11" Width="1965.6" Height="37.8" Border.Lines="All">
           <TableColumn Name="Column170" Width="47.25"/>
           <TableColumn Name="Column171" Width="359.1"/>
@@ -130,7 +130,7 @@
                 <Condition Expression="[summary_government_budget_plan.data.topic_type]== 2" Border.Lines="All" Font="TH Sarabun New, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
               </Highlight>
             </TableCell>
-            <TableCell Name="Cell90" Border.Lines="Top, Bottom" Text="[summary_government_budget_plan.data.product]" VertAlign="Center" Font="TH Sarabun New, 14pt">
+            <TableCell Name="Cell90" Border.Lines="Top, Bottom" Text="[summary_government_budget_plan.data.product]" AutoShrink="FontSize" AutoShrinkMinSize="12" VertAlign="Center" Font="TH Sarabun New, 14pt">
               <Highlight>
                 <Condition Expression="[summary_government_budget_plan.data.topic_type]== 1" Fill.Color="242, 220, 219" Font="TH Sarabun New, 15pt, style=Bold" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
                 <Condition Expression="[summary_government_budget_plan.data.topic_type]== 2" Border.Lines="All" Font="TH Sarabun New, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
@@ -246,7 +246,7 @@
             </TableCell>
           </TableRow>
         </TableObject>
-        <DataFooterBand Name="DataFooter1" Top="186.32" Width="1965.6" Height="37.8">
+        <DataFooterBand Name="DataFooter1" Top="192.32" Width="1965.6" Height="37.8">
           <TableObject Name="Table12" Width="1965.6" Height="37.8" Border.Lines="All">
             <TableColumn Name="Column213" Width="47.25"/>
             <TableColumn Name="Column214" Width="359.1"/>
@@ -293,7 +293,7 @@
           </TableObject>
         </DataFooterBand>
       </DataBand>
-      <DataBand Name="Data1" Top="229.52" Width="1965.6" Height="37.8" DataSource="notations">
+      <DataBand Name="Data1" Top="237.53" Width="1965.6" Height="37.8" DataSource="notations">
         <TextObject Name="Text158" Left="94.5" Top="9.45" Width="1861.65" Height="28.35" Text="[summary_government_budget_plan.notations.row_no] [summary_government_budget_plan.notations.list] [summary_government_budget_plan.notations.date_range] [Format(&quot;{0:#,##0;(##0);}&quot;,[summary_government_budget_plan.notations.amount])][summary_government_budget_plan.notations.amounts] [summary_government_budget_plan.notations.free_text]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold">
           <Formats>
             <NumberFormat DecimalDigits="0"/>
@@ -303,7 +303,7 @@
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <DataBand Name="Data2" Top="272.73" Width="1965.6" Height="28.35" DataSource="notations_detail">
+        <DataBand Name="Data2" Top="282.74" Width="1965.6" Height="28.35" DataSource="notations_detail">
           <TextObject Name="Text160" Left="94.5" Width="1861.65" Height="28.35" Text="[summary_government_budget_plan.notations.notations_detail.sub_row_no] [summary_government_budget_plan.notations.notations_detail.list]     [Format(&quot;{0:#,##0;(##0);}&quot;,[summary_government_budget_plan.notations.notations_detail.amount])]     [summary_government_budget_plan.notations.notations_detail.free_text]" VertAlign="Center" Font="TH Sarabun New, 16pt">
             <Formats>
               <NumberFormat DecimalDigits="0"/>

wwwroot/reports/total_budget.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="07/31/2023 12:13:34" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="08/07/2023 10:58:14" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="total_budget" ReferenceName="total_budget" DataType="null" Enabled="true">
       <Column Name="government_budget" DataType="System.Decimal"/>
@@ -20,7 +20,7 @@
   </Dictionary>
   <ReportPage Name="Page1" Landscape="true" PaperWidth="380" PaperHeight="210" Watermark.Font="Arial, 60pt">
     <DataBand Name="Data10" Width="1360.8">
-      <DataFooterBand Name="DataFooter1" Top="7.02" Width="1360.8" Height="94.5">
+      <DataFooterBand Name="DataFooter1" Top="7.41" Width="1360.8" Height="94.5">
         <TableObject Name="Table10" Width="1360.8" Height="75.6">
           <TableColumn Name="Column83" Width="302.4"/>
           <TableColumn Name="Column84" Width="245.7"/>
@@ -46,7 +46,7 @@
         <SubreportObject Name="Subreport1" Top="75.6" Width="94.5" Height="18.9" ReportPage="Page2"/>
       </DataFooterBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="108.54" Width="1360.8" Height="151.2">
+    <ReportSummaryBand Name="ReportSummary1" Top="109.31" Width="1360.8" Height="151.2">
       <TextObject Name="Text145" Top="94.5" Width="1275.75" Height="56.7" Text="หมายเหตุ : 1. ข้อมูลงบประมาณเงินแผ่นดิน งบประมาณเงินรายได้ รายการครุภัณฑ์ ที่ดินและสิ่งปลูกสร้าง นำเข้าข้อมูลจากระบบจัดสรรงบประมาณ &#13;&#10;               2. ข้อมูลโครงการ นำเข้าข้อมูลจากระบบแผนงานและโครงการ" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TableObject Name="Table12" Width="1360.8" Height="75.6" Border.Lines="Left, Right">
         <TableColumn Name="Column105" Width="548.1"/>
@@ -75,7 +75,7 @@
   </ReportPage>
   <ReportPage Name="Page2" PaperWidth="380" Watermark.Font="Arial, 60pt">
     <DataBand Name="Data1" Width="1360.8">
-      <DataBand Name="Data2" Top="7.02" Width="1360.8" Height="37.8" DataSource="data">
+      <DataBand Name="Data2" Top="7.41" Width="1360.8" Height="37.8" DataSource="data">
         <TableObject Name="Table11" Width="1360.8" Height="37.8" Border.Lines="Left, Right">
           <TableColumn Name="Column90" Width="302.4"/>
           <TableColumn Name="Column98" Width="245.7"/>
@@ -86,8 +86,8 @@
           <TableColumn Name="Column103" Width="141.75"/>
           <TableColumn Name="Column104" Width="122.85"/>
           <TableRow Name="Row11" Height="37.8">
-            <TableCell Name="Cell83" Border.Lines="Left, Right" Text="[total_budget.data.budget_plan]" AutoShrink="FontSize" AutoShrinkMinSize="10" Font="TH Sarabun New, 16pt, style=Bold"/>
+            <TableCell Name="Cell83" Border.Lines="Left, Right" Text="[total_budget.data.budget_plan]" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH Sarabun New, 16pt, style=Bold"/>
-            <TableCell Name="Cell91" Border.Lines="Right" Text="[total_budget.data.budget_project]" AutoShrink="FontSize" AutoShrinkMinSize="10" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+            <TableCell Name="Cell91" Border.Lines="Right" Text="[total_budget.data.budget_project]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
             <TableCell Name="Cell92" Text="[total_budget.data.row_no] [total_budget.data.list]" AutoShrink="FontSize" AutoShrinkMinSize="12" VertAlign="Center" Font="TH Sarabun New, 16pt">
               <Highlight>
                 <Condition Expression="[total_budget.data.topic_type]== 1" Border.Lines="Top" Fill.Color="183, 222, 232" Font="TH Sarabun New, 15.75pt, style=Bold" ApplyBorder="true" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>