diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 0482106..5d69502 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2708,6 +2708,7 @@ namespace rmutr_report.Controllers bool startNumbering3 = false; bool startNumbering4 = false; bool startNumbering5 = false; + var detail = budget.details; foreach (var indetail in budget.details) { @@ -2876,7 +2877,18 @@ namespace rmutr_report.Controllers var budgetExpenditure = new List() { budget }; Report report = new Report(); - report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx"); + foreach (var d in detail) + { + if (d.row<=110) + { + report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx"); + } + if (d.row>110) + { + report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v3.frx"); + } + } + // report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx"); report.RegisterData(budgetExpenditure, "budget_expenditure_report_from_revenue_v2"); report.Prepare(); diff --git a/Models/budget/budget_expenditure_report_from_revenue_v2.cs b/Models/budget/budget_expenditure_report_from_revenue_v2.cs index b7d36a1..6af67ee 100644 --- a/Models/budget/budget_expenditure_report_from_revenue_v2.cs +++ b/Models/budget/budget_expenditure_report_from_revenue_v2.cs @@ -18,6 +18,7 @@ namespace rmutr_report.Models { public int? topic_type { get; set; } public bool? is_other { get; set; } + public int? row { get; set; } public int? row_no1 { get; set; } public int? row_no2 { get; set; } public int? row_no3 { get; set; } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 3f9abfd..d6ee498 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 0c04f71..ecd9910 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index 2401af1..a5afe2e 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+3680fa2e1f607fdef74c29e379d6d3392681f505")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8f6a0b8c14684a10aba8a1bca94dac283d2e20ac")] [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 d517d43..2230109 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -0f26a0f837e265dc92140ec86b9db2debc37b188849c82369eeba2621211901d +bfe575db8eb0a6ce7878fd59debeaf9f2f023ec0e656b8f34fd9a877f6d9582f diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index 2401af1..a5afe2e 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+3680fa2e1f607fdef74c29e379d6d3392681f505")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8f6a0b8c14684a10aba8a1bca94dac283d2e20ac")] [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 d517d43..2230109 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -0f26a0f837e265dc92140ec86b9db2debc37b188849c82369eeba2621211901d +bfe575db8eb0a6ce7878fd59debeaf9f2f023ec0e656b8f34fd9a877f6d9582f diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index 7f91b2a..b15da3e 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -283e57889e2c0f1beb9bf4f38aeb418423cfb053bba0314b0adf81e4376e535d +377111b3d1b7031d608d1278d8658e8b6f6ca9b2350700b1322226a3d0c15520 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 3f9abfd..d6ee498 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 0c04f71..ecd9910 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 9fb68d4..4c7c633 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17246377264487259 \ No newline at end of file +17246480032464415 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 831230b..8858570 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17246469657689552 \ No newline at end of file +17246485221009095 \ 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 89553a0..db41f68 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 new file mode 100644 index 0000000..b90f816 --- /dev/null +++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v3.frx @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +