diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index b85b777..dc8ffb1 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2699,7 +2699,8 @@ namespace rmutr_report.Controllers int no6 = 1; int no7 = 1; int no8 = 1; - + budget.total = budget.details.Where(d=>d.topic == "รายการบุคลากร") + .Sum(f => f.amount2); var detail = budget.details.ToArray(); foreach (var indetail in detail) { diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 1a44bc8..2c1e9c5 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 3fa6711..0045438 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 ea8a314..3cd68cf 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 ea8a314..3cd68cf 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 be7e8cc..064ab94 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+0a4fd17b6527db143382165c7dd7e34d579f7df9")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a1f853b870cf793fdddc51a308f6926db5c5bbbe")] [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 68cadaf..0854dd3 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -c0641e23d30d896b8be212b2d5ae3dffa0ed63bf190ef1a7c17199b0b460852b +1d98769a98328782d5db2d54c788c448681c4d1e2717e0b33fbbe233c0bfb512 diff --git a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig index 7bc55a8..08ca6e4 100644 --- a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = rmutr_report -build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\ +build_property.ProjectDir = C:\Users\USER\RiderProjects\rmutr_report\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache index 4e88368..f878fd0 100644 --- a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -9450eacabdd79216d219abffdf398731c57fe782d38e6036fcfe155ad2cb53f7 +6ee9796c5824910980c762d4d7b9824a4977ddd4803d6def601f665c9309e28f diff --git a/obj/Debug/net5.0/rmutr_report.assets.cache b/obj/Debug/net5.0/rmutr_report.assets.cache index f8e124f..be6c43b 100644 Binary files a/obj/Debug/net5.0/rmutr_report.assets.cache and b/obj/Debug/net5.0/rmutr_report.assets.cache differ diff --git a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache index 8405e1a..40d4e3f 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e2b740473ce2922e386ca29207bf0ddd8d311b9fa433e7d972dee6de2a5bd678 +c81af41a9295edacc0b0b98a065abf98cbd4813501de03ef2da5eb8042cde125 diff --git a/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt b/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt index 415ba45..3c5d832 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt +++ b/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt @@ -177,3 +177,8 @@ C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.rm C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.build.rmutr_report.props C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildMultiTargeting.rmutr_report.props C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildTransitive.rmutr_report.props +C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\rmutr_report.StaticWebAssets.Pack.cache +C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.build.rmutr_report.props +C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildMultiTargeting.rmutr_report.props +C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildTransitive.rmutr_report.props diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 1a44bc8..2c1e9c5 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.genruntimeconfig.cache b/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache index aec23d8..7efd1b7 100644 --- a/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache +++ b/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache @@ -1 +1 @@ -7fbffe610e4933d17629d872cd661838bac95725f539e92f735cab904b788195 +b53af117bc6e2e15061848adb65c45cc5174e593ca5f771fbddcaf20798432a3 diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index 3fa6711..0045438 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 e931b1f..237907d 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 @@ -528,6 +528,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\durable_articles_three_old.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\estimate_income_expenses.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\estimate_income_expenses.frx)) + Package rmutr_report @@ -2928,6 +2944,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_graduation_notification.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\summary_income_allocation.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_income_allocation.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 23efb3e..9e18180 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 @@ -3a5ed6e019ac50427c04c5dcc311649c0287e5ab2253e898c63f505c41bfa92f +497e62b116d18f9e5f36ee3a8f6205605f9f7df06995f84109ae96cb21bffb27 diff --git a/obj/project.assets.json b/obj/project.assets.json index 4051d3f..e5f4522 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -2152,14 +2152,14 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", + "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "projectName": "rmutr_report", - "projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", + "projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\", + "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ - "C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config", + "C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config", "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ], diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index acea569..0f555a6 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "ecUEebjPEI0T4ZiE/eT9VQfatBN61E54at5joXAPU/RxAePNTRydDk2hezwZlgDTtke2ZS6C7JRPPi1knoESbw==", + "dgSpecHash": "90lLYt8yKxE7koLXyuEm7ZVoNsiOMlBjJw0Ed8xo+EmxBiSstDrpH3/y85dkZWY9BFh0AwPC8sESb1Q+Q+Ak1Q==", "success": true, - "projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", + "projectFilePath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "expectedPackageFiles": [ "C:\\Users\\USER\\.nuget\\packages\\closedxml\\0.96.0\\closedxml.0.96.0.nupkg.sha512", "C:\\Users\\USER\\.nuget\\packages\\documentformat.openxml\\2.16.0\\documentformat.openxml.2.16.0.nupkg.sha512", diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json index 5a685ff..449e2ce 100644 --- a/obj/project.packagespec.json +++ b/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.203\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.203\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 2a35be6..4b187a0 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17181666863627362 \ No newline at end of file +17235282175005895 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 2a35be6..4b187a0 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17181666863627362 \ No newline at end of file +17235282175005895 \ No newline at end of file diff --git a/obj/rmutr_report.csproj.nuget.dgspec.json b/obj/rmutr_report.csproj.nuget.dgspec.json index 2dc3752..4b7ce3c 100644 --- a/obj/rmutr_report.csproj.nuget.dgspec.json +++ b/obj/rmutr_report.csproj.nuget.dgspec.json @@ -1,20 +1,20 @@ { "format": 1, "restore": { - "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": {} + "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": {} }, "projects": { - "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": { + "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", + "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "projectName": "rmutr_report", - "projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", + "projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\", + "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ - "C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config", + "C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config", "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ],