Resize A4

2024-08-27 13:30:20 +07:00
parent 3334b4cb0b
commit 7e05f00fd3
16 changed files with 14 additions and 30 deletions
--- a/Controllers/Budget.Controller.cs
+++ b/Controllers/Budget.Controller.cs
@@ -2880,11 +2880,11 @@ namespace rmutr_report.Controllers
            Report report = new Report();
            foreach (var d in detail)
            {
-                if (d.row<=110)
+                if (d.row<=120)
                {
                    report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx");
                }
-                if (d.row>110)
+                if (d.row>120)
                {
                    report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v3.frx");
                }
--- a/bin/Debug/netcoreapp3.1/rmutr_report.dll
+++ b/bin/Debug/netcoreapp3.1/rmutr_report.dll
--- a/bin/Debug/netcoreapp3.1/rmutr_report.pdb
+++ b/bin/Debug/netcoreapp3.1/rmutr_report.pdb
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8e90a5c766b33cdcf3981c372f01427aaa5d3406")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3334b4cb0bef998976d0ff9b81e859de6a5d0173")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-e37de4c61d17f22f08c2b24c318ca3d8a5a1773c972482481d0c902920608456
+c543fca5e8af01a04f5bd480808850c09fc6b72e2aa871ee0e5bd67db67afa87
--- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8e90a5c766b33cdcf3981c372f01427aaa5d3406")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3334b4cb0bef998976d0ff9b81e859de6a5d0173")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-e37de4c61d17f22f08c2b24c318ca3d8a5a1773c972482481d0c902920608456
+c543fca5e8af01a04f5bd480808850c09fc6b72e2aa871ee0e5bd67db67afa87
--- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
@@ -1 +1 @@
-dd01d0f6621f13fc6c7fdcdb9dd7e1054e3bb54fde4920b3b953636d89a59d30
+e7d05b2e8e841ba91368833603be5e6447b2221d926b59fbe1f2f511b41fed99
--- a/obj/Debug/netcoreapp3.1/rmutr_report.dll
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.dll
--- a/obj/Debug/netcoreapp3.1/rmutr_report.pdb
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.pdb
--- a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
+++ b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
@@ -64,22 +64,6 @@
      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\all_plans.frx))</OriginalItemSpec>
    </StaticWebAsset>
-    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\all_plans2.frx))">
-      <SourceType>Package</SourceType>
-      <SourceId>rmutr_report</SourceId>
-      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
-      <BasePath>_content/rmutr_report</BasePath>
-      <RelativePath>reports\all_plans2.frx</RelativePath>
-      <AssetKind></AssetKind>
-      <AssetMode></AssetMode>
-      <AssetRole></AssetRole>
-      <RelatedAsset></RelatedAsset>
-      <AssetTraitName></AssetTraitName>
-      <AssetTraitValue></AssetTraitValue>
-      <CopyToOutputDirectory></CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\all_plans2.frx))</OriginalItemSpec>
-    </StaticWebAsset>
    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\appoint_higher_position.frx))">
      <SourceType>Package</SourceType>
      <SourceId>rmutr_report</SourceId>
--- a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
+++ b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
@@ -1 +1 @@
-5e2b0a0b0aae1729058a1b869c574d0d8376900c6cb993c5031e219c517c5065
+f897b4952cd5268294905ba9623c4e220b69b02b431d5352f3f0a6591fa71fa2
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17246648982055188
+17246762284769178
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-17246762284769178
+17247401489493512
--- a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
+++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/26/2024 12:00:34" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/27/2024 13:28:11" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="budget_expenditure_report_from_revenue_v2" ReferenceName="budget_expenditure_report_from_revenue_v2" DataType="null" Enabled="true">
      <Column Name="academic_year_name_th" DataType="System.String"/>
@@ -90,7 +90,7 @@
      </BusinessObjectDataSource>
    </BusinessObjectDataSource>
  </Dictionary>
-  <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="900" Watermark.Font="Arial, 60pt">
+  <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="1000" Watermark.Font="Arial, 60pt">
    <DataBand Name="Data2" Width="945" Height="207.9" StartNewPage="true">
      <TextObject Name="Text8" Left="85.05" Top="170.1" Width="680.4" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.sector]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
      <TextObject Name="Text6" Left="85.05" Top="94.5" Width="859.95" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.parent_agency_name]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
--- a/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx
+++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/26/2024 12:01:43" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/27/2024 13:18:42" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="budget_expenditure_report_from_revenue_v2" ReferenceName="budget_expenditure_report_from_revenue_v2" DataType="null" Enabled="true">
      <Column Name="academic_year_name_th" DataType="System.String"/>
@@ -90,7 +90,7 @@
      </BusinessObjectDataSource>
    </BusinessObjectDataSource>
  </Dictionary>
-  <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="1100" Watermark.Font="Arial, 60pt">
+  <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="1150" Watermark.Font="Arial, 60pt">
    <DataBand Name="Data2" Width="945" Height="207.9" StartNewPage="true">
      <TextObject Name="Text8" Left="85.05" Top="170.1" Width="680.4" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.sector]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
      <TextObject Name="Text6" Left="85.05" Top="94.5" Width="859.95" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.parent_agency_name]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>