diff --git a/Models/budget/estimate_income_expenses.cs b/Models/budget/estimate_income_expenses.cs index 1142f6b..0bbcbda 100644 --- a/Models/budget/estimate_income_expenses.cs +++ b/Models/budget/estimate_income_expenses.cs @@ -7,6 +7,7 @@ namespace rmutr_report.Models public string budget_year { get; set; } public string date_range { get; set; } public string faculty { get; set; } + public string branch_name { get; set; } public List data_1 { get; set; } } diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 2c1e9c5..c141a6b 100644 Binary files a/bin/Debug/net5.0/rmutr_report.dll and b/bin/Debug/net5.0/rmutr_report.dll differ diff --git a/bin/Debug/net5.0/rmutr_report.pdb b/bin/Debug/net5.0/rmutr_report.pdb index 0045438..8a6d6fa 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/ref/rmutr_report.dll b/obj/Debug/net5.0/ref/rmutr_report.dll index 3cd68cf..de2ace1 100644 Binary files a/obj/Debug/net5.0/ref/rmutr_report.dll and b/obj/Debug/net5.0/ref/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/refint/rmutr_report.dll b/obj/Debug/net5.0/refint/rmutr_report.dll index 3cd68cf..de2ace1 100644 Binary files a/obj/Debug/net5.0/refint/rmutr_report.dll and b/obj/Debug/net5.0/refint/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index 064ab94..de39104 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+a1f853b870cf793fdddc51a308f6926db5c5bbbe")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+db320cf03d4d72931861399f2d13f32a80844240")] [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 0854dd3..b71e3c0 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -1d98769a98328782d5db2d54c788c448681c4d1e2717e0b33fbbe233c0bfb512 +54fd7583ae611b85ef963cca44a9ecff65d3f6ab7eb6bd063a6fb984149a2d5a diff --git a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache index f878fd0..f838890 100644 --- a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -6ee9796c5824910980c762d4d7b9824a4977ddd4803d6def601f665c9309e28f +5209e9a391e50710c07ef593fa84f1095f37445ac4e9138522140847a8c036ae diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 2c1e9c5..c141a6b 100644 Binary files a/obj/Debug/net5.0/rmutr_report.dll and b/obj/Debug/net5.0/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index 0045438..8a6d6fa 100644 Binary files a/obj/Debug/net5.0/rmutr_report.pdb and b/obj/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props index 237907d..bf5e9e1 100644 --- a/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +++ b/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props @@ -112,6 +112,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v2.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\budget_expenditure_report_from_revenue_v3.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v3.frx)) + Package rmutr_report diff --git a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index 9e18180..f7c5d6b 100644 --- a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -497e62b116d18f9e5f36ee3a8f6205605f9f7df06995f84109ae96cb21bffb27 +33814906f52e0f8cfd7bb5360baea6c562ab42de0f2574d78acf3490ba1b4515 diff --git a/wwwroot/reports/estimate_income_expenses.frx b/wwwroot/reports/estimate_income_expenses.frx index 207a12d..6a9474e 100644 --- a/wwwroot/reports/estimate_income_expenses.frx +++ b/wwwroot/reports/estimate_income_expenses.frx @@ -1,10 +1,11 @@  - + + @@ -57,10 +58,10 @@ - + - - + + @@ -87,7 +88,7 @@ - + diff --git a/wwwroot/reports/summary_income_allocation.frx b/wwwroot/reports/summary_income_allocation.frx index 9a7c59c..1ec2ffa 100644 --- a/wwwroot/reports/summary_income_allocation.frx +++ b/wwwroot/reports/summary_income_allocation.frx @@ -1,10 +1,11 @@  - + + @@ -27,7 +28,7 @@ - + @@ -55,10 +56,10 @@ - + - - + + @@ -85,7 +86,7 @@ - +