From a34adce6085e2a9638901b17cf3136a48a22ebd4 Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Thu, 25 Aug 2022 11:19:09 +0700 Subject: [PATCH] update total --- Controllers/Budget.Controller.cs | 15 +++++++++++ Models/budget_report.cs | 6 +++++ .../net5.0/rmutr-report.StaticWebAssets.xml | 1 - .../rmutr-report.csproj.FileListAbsolute.txt | 1 - wwwroot/reports/budget_report.frx | 27 ++++++++++++++++++- 5 files changed, 47 insertions(+), 3 deletions(-) delete mode 100644 bin/Debug/net5.0/rmutr-report.StaticWebAssets.xml diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 6e9a8c1..552c95e 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -27,6 +28,20 @@ namespace rmutr_report.Controllers [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetSum1Report([FromRoute] string type, [FromBody] List budget_reports) { + foreach (var x in budget_reports) + { + int sum1 = budget_reports.Sum(g => int.Parse(g.salaya)); + x.sum1 = sum1; + int sum2 = budget_reports.Sum(g => int.Parse(g.bophitphimuk)); + x.sum2 = sum2; + int sum3 = budget_reports.Sum(g => int.Parse(g.pohchang)); + x.sum3 = sum3; + int sum4 = budget_reports.Sum(g => int.Parse(g.klai_kangwon)); + x.sum4 = sum4; + int sum5 = budget_reports.Sum(g => int.Parse(g.total)); + x.sum5 = sum5; + + } Report report = new Report(); report.Load(_setting.report_path + "budget_report.frx"); report.RegisterData(budget_reports, "budget_report"); diff --git a/Models/budget_report.cs b/Models/budget_report.cs index 1218611..1d62148 100644 --- a/Models/budget_report.cs +++ b/Models/budget_report.cs @@ -8,5 +8,11 @@ namespace rmutr_report.Models public string pohchang { get; set; } public string klai_kangwon { get; set; } public string total { get; set; } + public int? sum1 { get; set; } + public int? sum2 { get; set; } + public int? sum3 { get; set; } + public int? sum4 { get; set; } + public int? sum5 { get; set; } + } } \ No newline at end of file diff --git a/bin/Debug/net5.0/rmutr-report.StaticWebAssets.xml b/bin/Debug/net5.0/rmutr-report.StaticWebAssets.xml deleted file mode 100644 index 7b21d22..0000000 --- a/bin/Debug/net5.0/rmutr-report.StaticWebAssets.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt b/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt index 173c5de..0f848e0 100644 --- a/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt +++ b/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt @@ -163,5 +163,4 @@ C:\Users\Mercedes Benz\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.xml C:\Users\Mercedes Benz\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.pdb C:\Users\Mercedes Benz\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.genruntimeconfig.cache C:\Users\Mercedes Benz\Documents\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.Annotations.dll -C:\Users\Mercedes Benz\Documents\rmutr_report\bin\Debug\net5.0\rmutr-report.StaticWebAssets.xml C:\Users\Mercedes Benz\Documents\rmutr_report\obj\Debug\net5.0\refint\rmutr-report.dll diff --git a/wwwroot/reports/budget_report.frx b/wwwroot/reports/budget_report.frx index b022753..043881c 100644 --- a/wwwroot/reports/budget_report.frx +++ b/wwwroot/reports/budget_report.frx @@ -1,5 +1,5 @@  - + @@ -8,6 +8,11 @@ + + + + + @@ -61,5 +66,25 @@ + + + + + + + + + + + + + + + + + + + +