From 7e05f00fd365c536d3ee467c1f9eb3399596a61b Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Tue, 27 Aug 2024 13:30:20 +0700 Subject: [PATCH] Resize A4 --- Controllers/Budget.Controller.cs | 4 ++-- bin/Debug/netcoreapp3.1/rmutr_report.dll | Bin 2231296 -> 2231296 bytes bin/Debug/netcoreapp3.1/rmutr_report.pdb | Bin 613380 -> 613380 bytes obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs | 2 +- .../rmutr_report.AssemblyInfoInputs.cache | 2 +- .../rmutr_report.AssemblyInfo.cs | 2 +- .../rmutr_report.AssemblyInfoInputs.cache | 2 +- ...rmutr_report.RazorTargetAssemblyInfo.cache | 2 +- obj/Debug/netcoreapp3.1/rmutr_report.dll | Bin 2231296 -> 2231296 bytes obj/Debug/netcoreapp3.1/rmutr_report.pdb | Bin 613380 -> 613380 bytes ...Microsoft.AspNetCore.StaticWebAssets.props | 16 ---------------- .../rmutr_report.StaticWebAssets.Pack.cache | 2 +- obj/rider.project.model.nuget.info | 2 +- obj/rider.project.restore.info | 2 +- ...get_expenditure_report_from_revenue_v2.frx | 4 ++-- ...get_expenditure_report_from_revenue_v3.frx | 4 ++-- 16 files changed, 14 insertions(+), 30 deletions(-) diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index be86f6a..618c1e9 100644 --- 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"); } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 84ee3015c7225c834a144774e6e9fc6aab14c058..e2b33f8757812e3fc278b58fe727e94c4fdcb740 100644 GIT binary patch delta 386 zcmXZSyGz4h6b10_tEu%-ZM0TXUu^@TphH65Ag-w>=;kDtG|BEF1(!Og6+#t6Bj`Wi zAQV)Bb}mjTZe3iQ936@vcJNfn<#)N9drB8&T7r`@Q+ZA__WXUH-usc+fEI(hAY#(u zVJnD07cdZoZiqn-^gLmUQR5E8(`5DY^SMj!>FFa{i?VH_r45~g4pGGQyo#x3@@ zxn%BER`W+QPjz?x?Iq-XvbpMnY5J>^w(AQIAC3HXja#{SJPqF| zUx=@Q#uCaN&SKF`AdQF*a}B{9)7Ooh>2S`i0?X-k zz;Cjb8|v4U@_SCT)#&=k{qs`#bU{9urL|9`E_bN5ooTl}$##qN;?}LvY|PFaCSFB3 z_@{Z^lI~auh%oAP{EBgLNlV-Vd%PaR$8gH42?05w?%CQ<~1N-zHw!Vav+#X s84>w!qnO_;zJ$e%kRZ1=g$wu>Ck)92y_W slQ5Nicz>z{6La=B#r9e8prhdiRjG=HOQQvcOQQydOQQ$3OQQ(6xM({(#{d8T diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index be330f1..ecd43eb 100644 --- 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")] diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache index d9da499..a0c0600 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -e37de4c61d17f22f08c2b24c318ca3d8a5a1773c972482481d0c902920608456 +c543fca5e8af01a04f5bd480808850c09fc6b72e2aa871ee0e5bd67db67afa87 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index be330f1..ecd43eb 100644 --- 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")] diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache index d9da499..a0c0600 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -e37de4c61d17f22f08c2b24c318ca3d8a5a1773c972482481d0c902920608456 +c543fca5e8af01a04f5bd480808850c09fc6b72e2aa871ee0e5bd67db67afa87 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index 6b0a0db..fd013c2 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -dd01d0f6621f13fc6c7fdcdb9dd7e1054e3bb54fde4920b3b953636d89a59d30 +e7d05b2e8e841ba91368833603be5e6447b2221d926b59fbe1f2f511b41fed99 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 84ee3015c7225c834a144774e6e9fc6aab14c058..e2b33f8757812e3fc278b58fe727e94c4fdcb740 100644 GIT binary patch delta 386 zcmXZSyGz4h6b10_tEu%-ZM0TXUu^@TphH65Ag-w>=;kDtG|BEF1(!Og6+#t6Bj`Wi zAQV)Bb}mjTZe3iQ936@vcJNfn<#)N9drB8&T7r`@Q+ZA__WXUH-usc+fEI(hAY#(u zVJnD07cdZoZiqn-^gLmUQR5E8(`5DY^SMj!>FFa{i?VH_r45~g4pGGQyo#x3@@ zxn%BER`W+QPjz?x?Iq-XvbpMnY5J>^w(AQIAC3HXja#{SJPqF| zUx=@Q#uCaN&SKF`AdQF*a}B{9)7Ooh>2S`i0?X-k zz;Cjb8|v4U@_SCT)#&=k{qs`#bU{9urL|9`E_bN5ooTl}$##qN;?}LvY|PFaCSFB3 z_@{Z^lI~auh%oAP{EBgLNlV-Vd%PaR$8gH42?05w?%CQ<~1N-zHw!Vav+#X s84>w!qnO_;zJ$e%kRZ1=g$wu>Ck)92y_W slQ5Nicz>z{6La=B#r9e8prhdiRjG=HOQQvcOQQydOQQ$3OQQ(6xM({(#{d8T diff --git 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 index 3ba72c9..5dd9d7b 100644 --- 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 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\all_plans.frx)) - - Package - rmutr_report - $(MSBuildThisFileDirectory)..\staticwebassets\ - _content/rmutr_report - reports\all_plans2.frx - - - - - - - - PreserveNewest - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\all_plans2.frx)) - Package rmutr_report diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index 36f4c70..c12641e 100644 --- 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 diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index e08e49c..346ea57 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17246648982055188 \ No newline at end of file +17246762284769178 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 346ea57..cd6f24c 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17246762284769178 \ No newline at end of file +17247401489493512 \ No newline at end of file diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx index db41f68..9983470 100644 --- a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx +++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx @@ -1,5 +1,5 @@  - + @@ -90,7 +90,7 @@ - + diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx b/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx index b90f816..8fea2db 100644 --- a/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx +++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx @@ -1,5 +1,5 @@  - + @@ -90,7 +90,7 @@ - +