Bug Fixed
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
kamonwan taengsuk
2024-08-14 16:49:07 +07:00
parent a1f853b870
commit 6d258f2639
23 changed files with 61 additions and 23 deletions

View File

@@ -2699,7 +2699,8 @@ namespace rmutr_report.Controllers
int no6 = 1; int no6 = 1;
int no7 = 1; int no7 = 1;
int no8 = 1; int no8 = 1;
budget.total = budget.details.Where(d=>d.topic == "รายการบุคลากร")
.Sum(f => f.amount2);
var detail = budget.details.ToArray(); var detail = budget.details.ToArray();
foreach (var indetail in detail) foreach (var indetail in detail)
{ {

Binary file not shown.

Binary file not shown.

View File

@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("rmutr_report")]
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@@ -1 +1 @@
c0641e23d30d896b8be212b2d5ae3dffa0ed63bf190ef1a7c17199b0b460852b 1d98769a98328782d5db2d54c788c448681c4d1e2717e0b33fbbe233c0bfb512

View File

@@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = rmutr_report 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.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EnableGeneratedComInterfaceComImportInterop =

View File

@@ -1 +1 @@
9450eacabdd79216d219abffdf398731c57fe782d38e6036fcfe155ad2cb53f7 6ee9796c5824910980c762d4d7b9824a4977ddd4803d6def601f665c9309e28f

View File

@@ -1 +1 @@
e2b740473ce2922e386ca29207bf0ddd8d311b9fa433e7d972dee6de2a5bd678 c81af41a9295edacc0b0b98a065abf98cbd4813501de03ef2da5eb8042cde125

View File

@@ -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.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.buildMultiTargeting.rmutr_report.props
C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildTransitive.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

Binary file not shown.

View File

@@ -1 +1 @@
7fbffe610e4933d17629d872cd661838bac95725f539e92f735cab904b788195 b53af117bc6e2e15061848adb65c45cc5174e593ca5f771fbddcaf20798432a3

Binary file not shown.

View File

@@ -528,6 +528,22 @@
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\durable_articles_three_old.frx))</OriginalItemSpec> <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\durable_articles_three_old.frx))</OriginalItemSpec>
</StaticWebAsset> </StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\estimate_income_expenses.frx))">
<SourceType>Package</SourceType>
<SourceId>rmutr_report</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/rmutr_report</BasePath>
<RelativePath>reports\estimate_income_expenses.frx</RelativePath>
<AssetKind></AssetKind>
<AssetMode></AssetMode>
<AssetRole></AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory></CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\estimate_income_expenses.frx))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\expenditure_budget_proposal.frx))"> <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\expenditure_budget_proposal.frx))">
<SourceType>Package</SourceType> <SourceType>Package</SourceType>
<SourceId>rmutr_report</SourceId> <SourceId>rmutr_report</SourceId>
@@ -2928,6 +2944,22 @@
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_graduation_notification.frx))</OriginalItemSpec> <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_graduation_notification.frx))</OriginalItemSpec>
</StaticWebAsset> </StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_income_allocation.frx))">
<SourceType>Package</SourceType>
<SourceId>rmutr_report</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/rmutr_report</BasePath>
<RelativePath>reports\summary_income_allocation.frx</RelativePath>
<AssetKind></AssetKind>
<AssetMode></AssetMode>
<AssetRole></AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory></CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_income_allocation.frx))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_income_cooperative.frx))"> <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_income_cooperative.frx))">
<SourceType>Package</SourceType> <SourceType>Package</SourceType>
<SourceId>rmutr_report</SourceId> <SourceId>rmutr_report</SourceId>

View File

@@ -1 +1 @@
3a5ed6e019ac50427c04c5dcc311649c0287e5ab2253e898c63f505c41bfa92f 497e62b116d18f9e5f36ee3a8f6205605f9f7df06995f84109ae96cb21bffb27

View File

@@ -2152,14 +2152,14 @@
"project": { "project": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
"projectName": "rmutr_report", "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\\", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\",
"outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\", "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"configFilePaths": [ "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:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
], ],

View File

@@ -1,8 +1,8 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "ecUEebjPEI0T4ZiE/eT9VQfatBN61E54at5joXAPU/RxAePNTRydDk2hezwZlgDTtke2ZS6C7JRPPi1knoESbw==", "dgSpecHash": "90lLYt8yKxE7koLXyuEm7ZVoNsiOMlBjJw0Ed8xo+EmxBiSstDrpH3/y85dkZWY9BFh0AwPC8sESb1Q+Q+Ak1Q==",
"success": true, "success": true,
"projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", "projectFilePath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
"expectedPackageFiles": [ "expectedPackageFiles": [
"C:\\Users\\USER\\.nuget\\packages\\closedxml\\0.96.0\\closedxml.0.96.0.nupkg.sha512", "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", "C:\\Users\\USER\\.nuget\\packages\\documentformat.openxml\\2.16.0\\documentformat.openxml.2.16.0.nupkg.sha512",

View File

@@ -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"}} "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"}}

View File

@@ -1 +1 @@
17181666863627362 17235282175005895

View File

@@ -1 +1 @@
17181666863627362 17235282175005895

View File

@@ -1,20 +1,20 @@
{ {
"format": 1, "format": 1,
"restore": { "restore": {
"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": {} "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": {}
}, },
"projects": { "projects": {
"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": { "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj", "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
"projectName": "rmutr_report", "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\\", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\",
"outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\", "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"configFilePaths": [ "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:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
], ],