diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 59e8105..4efab3a 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -525,7 +525,7 @@ namespace rmutr_report.Controllers ws.Cell("C4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; ws.Cell("C4").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell("C4").Style.Font.FontName = "TH SarabunPSK"; - ws.Cell("C4").Style.Font.SetBold().Font.FontSize = 14; + ws.Cell("C4").Style.Font.SetBold().Font.FontSize = 10; ws.Cell("C4").Style.Alignment.WrapText = true; ws.Cell("C4").Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204); ws.Cell("C4").Style.Border.OutsideBorder = XLBorderStyleValues.Thin; diff --git a/Controllers/SummaryInvest.Controller.cs b/Controllers/SummaryInvest.Controller.cs index 0c87d27..e0a1059 100644 --- a/Controllers/SummaryInvest.Controller.cs +++ b/Controllers/SummaryInvest.Controller.cs @@ -27,7 +27,39 @@ namespace rmutr_report.Controllers public IActionResult GetEBudgetingReport([FromRoute] string type, [FromBody] summary_invest summaryInvest) { var summaryInvests = new List() { summaryInvest }; + foreach (var summaryInvestYear in summaryInvest.years) + { + foreach (var plan in summaryInvestYear.plans) + { + if (plan.total_budget<=10) + { + plan.total_budget = plan.unit_price; + } + foreach (var project in plan.projects) + { + if (project.total_budget<=10) + { + project.total_budget = project.unit_price; + } + foreach (var faculty in project.facultys) + { + if (faculty.total_budget<=10) + { + faculty.total_budget = faculty.unit_price; + } + foreach (var assetList in faculty.asset_lists) + { + if (assetList.total<=10) + { + assetList.total = assetList.unit_price; + } + } + } + } + } + } + Report report = new Report(); report.Load(_setting.report_path + "summary_invest.frx"); report.RegisterData(summaryInvests, "summary_invest"); diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 1938084..a1ee9be 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 6f66ec9..a1a2207 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 9be466d..5c0283a 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+f3c022b8fb694a8360a82cf22c620225d843bd25")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+47d014527237639d50ad47bc17dc933e03809ad5")] [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 56068c6..fc9d417 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -ff7be9677549d82fdcc27d57c81b9a729f2d70f2cdcdc711094707d50c0f6bc1 +9f7598482af7790741aff2df04c132e6b38192646beed507b30d1d426c516070 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index 6ae0fc3..5c0283a 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+62e9bfb30a3bed3a981fe95309ce278814246723")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+47d014527237639d50ad47bc17dc933e03809ad5")] [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 d2e3815..fc9d417 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -1bb41e6f4b06ecaa87f57dc005b3418170b56de7020a3a6f92c599064fe85d3a +9f7598482af7790741aff2df04c132e6b38192646beed507b30d1d426c516070 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index c9d882a..8dd6377 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -192b703773404149b4c61b2bb384b9eed1f398f96db14013a8f9abceeb6da1cb +5f2b0dcb1b034ff61a7013a0737967c9254fa3a1be0e24ad23d0ec21c2196f67 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 1938084..a1ee9be 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 6f66ec9..a1a2207 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.restore.info b/obj/rider.project.restore.info index be5b2dd..3627f5f 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17249193125237173 \ No newline at end of file +17249914374724023 \ No newline at end of file