fixed zero to 0

Controllers/Budget.Controller.cs

@@ -2581,13 +2581,21 @@ namespace rmutr_report.Controllers
 
             foreach (var notation in government_budget.notations)
             {
+                string bath = " บาท";
                 int subrow = 1;
                 notation.row_no = row.ToString();
                 if (notation.row_no == "1")
                 {
                     notation.row_no = "หมายเหตุ : " + "1";
                 }
-
+                if (notation.amount != null)
+                {
+                   notation.amounts =   bath;
+                }
+                if (notation.amount == null)
+                {
+                    notation.amounts =   null;
+                }
                 foreach (var notation2 in notation.notations_detail)
                 {
                     if (notation2.list != null && notation2.amount != null)

Dockerfile.dev

@@ -1,11 +1,11 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 as build-env
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as build-env
 WORKDIR /source
 COPY . .
 RUN dotnet restore --configfile nuget.config --disable-parallel
 RUN dotnet build
 RUN dotnet publish -o /publish --configuration Release;
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0
+FROM mcr.microsoft.com/dotnet/aspnet:3.1
 COPY . .
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends apt-utils
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y fontconfig

Models/budget/summary_government_budget_plan.cs

@@ -58,6 +58,7 @@ namespace rmutr_report.Models
         public string list { get; set; }
         public string date_range { get; set; }
         public decimal? amount { get; set; }
+        public string amounts { get; set; }
         public string free_text { get; set; }
         public List<notation2> notations_detail { get; set; }
 

bin/Debug/net5.0/appsettings.Development.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

bin/Debug/net5.0/appsettings.json

@@ -0,0 +1,14 @@
+{
+  "Settings":{
+    "ReportPath":"wwwroot/reports/"
+
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}

bin/Debug/net5.0/nuget.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="71dev" value="https://nuget.71dev.com/v3/index.json" />
+  </packageSources>
+</configuration>

bin/Debug/net5.0/rmutr_report.runtimeconfig.dev.json

@@ -0,0 +1,8 @@
+{
+  "runtimeOptions": {
+    "additionalProbingPaths": [
+      "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\USER\\.nuget\\packages"
+    ]
+  }
+}

bin/Debug/net5.0/rmutr_report.runtimeconfig.json

@@ -0,0 +1,13 @@
+{
+  "runtimeOptions": {
+    "tfm": "net5.0",
+    "framework": {
+      "name": "Microsoft.AspNetCore.App",
+      "version": "5.0.0"
+    },
+    "configProperties": {
+      "System.GC.Server": true,
+      "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
+    }
+  }
+}

bin/Debug/net5.0/rmutr_report.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>rmutr_report</name>
+    </assembly>
+    <members>
+    </members>
+</doc>

obj/Debug/net5.0/rmutr_report.MvcApplicationPartsAssemblyInfo.cs

@@ -0,0 +1,18 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.Annotations")]
+[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.SwaggerGen")]
+
+// Generated by the MSBuild WriteCodeFragment class.
+

obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache

@@ -0,0 +1 @@
+b75da1d35a4ca649b17d81186a0cb0b6010aa3ac

obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+46314eaf8986a1d57ba3dc517059d914c26f9b2b

obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt

@@ -0,0 +1,87 @@
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\nuget.config
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\appsettings.Development.json
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\appsettings.json
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr_report.exe
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr_report.deps.json
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr_report.runtimeconfig.json
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr_report.runtimeconfig.dev.json
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr_report.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr_report.pdb
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr_report.xml
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ClosedXML.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\DocumentFormat.OpenXml.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ExcelNumberFormat.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\FastReport.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.CSharp.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.VisualBasic.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.OpenApi.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.Annotations.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.Swagger.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.SwaggerGen.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.SwaggerUI.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\System.Data.SqlClient.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\System.IO.Packaging.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\any\lib\netcoreapp3.0\FastReport.Compat.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\any\lib\netcoreapp3.0\FastReport.DataVisualization.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\win-arm64\native\sni.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\win-x64\native\sni.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\win-x86\native\sni.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\unix\lib\netstandard2.0\System.Data.SqlClient.dll
+C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\win\lib\netstandard2.0\System.Data.SqlClient.dll
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.csproj.AssemblyReference.cache
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.AssemblyInfoInputs.cache
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.AssemblyInfo.cs
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.csproj.CoreCompileInputs.cache
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.MvcApplicationPartsAssemblyInfo.cs
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.MvcApplicationPartsAssemblyInfo.cache
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\scopedcss\bundle\rmutr_report.styles.css
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\rmutr_report.StaticWebAssets.Manifest.cache
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.RazorTargetAssemblyInfo.cache
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.csproj.CopyComplete
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.dll
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\refint\rmutr_report.dll
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.xml
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.pdb
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.genruntimeconfig.cache
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\ref\rmutr_report.dll

obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache

@@ -0,0 +1 @@
+1d39a36735b2d72fa7731390686302bd2991a9b8

obj/Debug/net5.0/rmutr_report.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>rmutr_report</name>
+    </assembly>
+    <members>
+    </members>
+</doc>

obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-11e4fd5a843528ee9b0393d7bdaae5e631b873db
+dafcd97c1154f7c231cb7691293bbd8d24fedfcf

obj/project.assets.json

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "targets": {
-    "net5.0": {
+    ".NETCoreApp,Version=v3.1": {
       "ClosedXML/0.96.0": {
         "type": "package",
         "dependencies": {
@@ -446,12 +446,12 @@
           "Swashbuckle.AspNetCore.SwaggerGen": "6.5.0"
         },
         "compile": {
-          "lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": {
+          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Annotations.dll": {
             "related": ".pdb;.xml"
           }
         },
         "runtime": {
-          "lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": {
+          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Annotations.dll": {
             "related": ".pdb;.xml"
           }
         }
@@ -462,12 +462,12 @@
           "Microsoft.OpenApi": "1.2.3"
         },
         "compile": {
-          "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": {
+          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {
             "related": ".pdb;.xml"
           }
         },
         "runtime": {
-          "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": {
+          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {
             "related": ".pdb;.xml"
           }
         },
@@ -481,12 +481,12 @@
           "Swashbuckle.AspNetCore.Swagger": "6.5.0"
         },
         "compile": {
-          "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
+          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
             "related": ".pdb;.xml"
           }
         },
         "runtime": {
-          "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
+          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
             "related": ".pdb;.xml"
           }
         }
@@ -494,12 +494,12 @@
       "Swashbuckle.AspNetCore.SwaggerUI/6.5.0": {
         "type": "package",
         "compile": {
-          "lib/net5.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
+          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
             "related": ".pdb;.xml"
           }
         },
         "runtime": {
-          "lib/net5.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
+          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
             "related": ".pdb;.xml"
           }
         },
@@ -2136,7 +2136,7 @@
     }
   },
   "projectFileDependencyGroups": {
-    "net5.0": [
+    ".NETCoreApp,Version=v3.1": [
       "ClosedXML >= 0.96.0",
       "FastReport.Core >= 2021.3.0",
       "Swashbuckle.AspNetCore >= 6.5.0",
@@ -2161,15 +2161,15 @@
         "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
       ],
       "originalTargetFrameworks": [
-        "net5.0"
+        "netcoreapp3.1"
       ],
       "sources": {
         "https://api.nuget.org/v3/index.json": {},
         "https://nuget.71dev.com/v3/index.json": {}
       },
       "frameworks": {
-        "net5.0": {
+        "netcoreapp3.1": {
-          "targetAlias": "net5.0",
+          "targetAlias": "netcoreapp3.1",
           "projectReferences": {}
         }
       },
@@ -2180,8 +2180,8 @@
       }
     },
     "frameworks": {
-      "net5.0": {
+      "netcoreapp3.1": {
-        "targetAlias": "net5.0",
+        "targetAlias": "netcoreapp3.1",
         "dependencies": {
           "ClosedXML": {
             "target": "Package",

obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "TgdSlhcNLrmoGcymKBKtBNUewM9z9QdY0FESfevGdFzEBUl5TotP+ysyCZqFpczcvGDJdBKPRCtfqngiN8LZRQ==",
+  "dgSpecHash": "AcjdXi5x9A0nxsTWB+2PnbaIBtEgf/xXjiH70whPTOKfE3hLR7xlfQsZ/JREuaGE/sSzaWLOjWThFS4rkZ0mog==",
   "success": true,
   "projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
   "expectedPackageFiles": [

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\\6.0.407\\RuntimeIdentifierGraph.json"}}
+"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":["netcoreapp3.1"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"netcoreapp3.1":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"netcoreapp3.1":{"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\\6.0.407\\RuntimeIdentifierGraph.json"}}

obj/rider.project.restore.info

@@ -1 +1 @@
-16909758902259703
+16910345832467615

obj/rmutr_report.csproj.nuget.dgspec.json

@@ -19,15 +19,15 @@
           "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
         ],
         "originalTargetFrameworks": [
-          "net5.0"
+          "netcoreapp3.1"
         ],
         "sources": {
           "https://api.nuget.org/v3/index.json": {},
           "https://nuget.71dev.com/v3/index.json": {}
         },
         "frameworks": {
-          "net5.0": {
+          "netcoreapp3.1": {
-            "targetAlias": "net5.0",
+            "targetAlias": "netcoreapp3.1",
             "projectReferences": {}
           }
         },
@@ -38,8 +38,8 @@
         }
       },
       "frameworks": {
-        "net5.0": {
+        "netcoreapp3.1": {
-          "targetAlias": "net5.0",
+          "targetAlias": "netcoreapp3.1",
           "dependencies": {
             "ClosedXML": {
               "target": "Package",

rmutr_report.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

wwwroot/reports/qualifications_offer_request_form.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="04/15/2021 16:43:09" ReportInfo.Modified="08/02/2023 18:30:54" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="04/15/2021 16:43:09" ReportInfo.Modified="08/03/2023 11:11:48" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="form_1_1" ReferenceName="form_1_1" DataType="null" Enabled="true">
       <Column Name="budget_income_qualification_no" DataType="System.Int32"/>
@@ -97,8 +97,8 @@
       <TextObject Name="Text392" Left="274.05" Top="406.35" Width="66.15" Height="28.35" Text="คุณวุฒิ" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text393" Left="321.3" Top="396.9" Width="226.8" Height="28.35" Border.Lines="Bottom" Border.Style="Dot" Font="TH Sarabun New, 16pt"/>
       <TextObject Name="Text394" Left="321.3" Top="406.35" Width="226.8" Height="28.35" Text="[form_1_1.current_qualification]" Font="TH Sarabun New, 16pt"/>
-      <TextObject Name="Text395" Left="103.95" Top="396.9" Width="170.1" Height="28.35" Border.Lines="Bottom" Border.Style="Dot" Font="TH Sarabun New, 16pt"/>
+      <TextObject Name="Text395" Left="113.4" Top="396.9" Width="160.65" Height="28.35" Border.Lines="Bottom" Border.Style="Dot" Font="TH Sarabun New, 16pt"/>
-      <TextObject Name="Text396" Left="103.95" Top="406.35" Width="170.1" Height="28.35" Text="[form_1_1.current_position]" Font="TH Sarabun New, 16pt"/>
+      <TextObject Name="Text396" Left="113.4" Top="406.35" Width="160.65" Height="28.35" Text="[form_1_1.current_position]" Font="TH Sarabun New, 16pt"/>
       <TextObject Name="Text397" Top="425.25" Width="122.85" Height="28.35" Border.Lines="Bottom" Border.Style="Dot" Font="TH Sarabun New, 16pt"/>
       <TextObject Name="Text398" Top="434.7" Width="122.85" Height="28.35" Text="[form_1_1.current_salary]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" Font="TH Sarabun New, 16pt"/>
       <TextObject Name="Text399" Left="122.85" Top="434.7" Width="75.6" Height="28.35" Text="บาท/เดือน" Font="TH Sarabun New, 16pt"/>

wwwroot/reports/summary_government_budget_plan.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="07/30/2023 12:31:06" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="08/03/2023 11:48:10" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="summary_government_budget_plan" ReferenceName="summary_government_budget_plan" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -49,6 +49,7 @@
         <Column Name="list" DataType="System.String"/>
         <Column Name="date_range" DataType="System.String"/>
         <Column Name="amount" DataType="System.Decimal"/>
+        <Column Name="amounts" DataType="System.String"/>
         <Column Name="free_text" DataType="System.String"/>
         <BusinessObjectDataSource Name="notations_detail" DataType="null" Enabled="true">
           <Column Name="sub_row_no" DataType="System.String"/>
@@ -99,8 +100,8 @@
       <TextObject Name="Text132" Width="1965.6" Height="28.35" Text="สรุปงบประมาณแผนปฏิบัติราชการประจำปี พ.ศ. [summary_government_budget_plan.budget_year]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
       <TextObject Name="Text133" Top="28.35" Width="1965.6" Height="28.35" Text="มหาวิทยาลัยเทคโนโลยีราชมงคลรัตนโกสินทร์" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/>
     </PageHeaderBand>
-    <DataBand Name="Data9" Top="139.32" Width="1965.6">
+    <DataBand Name="Data9" Top="137.71" Width="1965.6">
-      <DataBand Name="Data10" Top="146.34" Width="1965.6" Height="37.8" DataSource="data">
+      <DataBand Name="Data10" Top="143.11" Width="1965.6" Height="37.8" DataSource="data">
         <TableObject Name="Table11" Width="1965.6" Height="37.8" Border.Lines="All">
           <TableColumn Name="Column170" Width="47.25"/>
           <TableColumn Name="Column171" Width="359.1"/>
@@ -245,7 +246,7 @@
             </TableCell>
           </TableRow>
         </TableObject>
-        <DataFooterBand Name="DataFooter1" Top="191.15" Width="1965.6" Height="37.8">
+        <DataFooterBand Name="DataFooter1" Top="186.32" Width="1965.6" Height="37.8">
           <TableObject Name="Table12" Width="1965.6" Height="37.8" Border.Lines="All">
             <TableColumn Name="Column213" Width="47.25"/>
             <TableColumn Name="Column214" Width="359.1"/>
@@ -292,8 +293,8 @@
           </TableObject>
         </DataFooterBand>
       </DataBand>
-      <DataBand Name="Data1" Top="235.97" Width="1965.6" Height="37.8" DataSource="notations">
+      <DataBand Name="Data1" Top="229.52" Width="1965.6" Height="37.8" DataSource="notations">
-        <TextObject Name="Text158" Left="94.5" Top="9.45" Width="1861.65" Height="28.35" Text="[summary_government_budget_plan.notations.row_no] [summary_government_budget_plan.notations.list] [summary_government_budget_plan.notations.date_range] [Format(&quot;{0:#,##0;(##0);Zero}&quot;,[summary_government_budget_plan.notations.amount])] [summary_government_budget_plan.notations.free_text]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold">
+        <TextObject Name="Text158" Left="94.5" Top="9.45" Width="1861.65" Height="28.35" Text="[summary_government_budget_plan.notations.row_no] [summary_government_budget_plan.notations.list] [summary_government_budget_plan.notations.date_range] [Format(&quot;{0:#,##0;(##0);}&quot;,[summary_government_budget_plan.notations.amount])][summary_government_budget_plan.notations.amounts] [summary_government_budget_plan.notations.free_text]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold">
           <Formats>
             <NumberFormat DecimalDigits="0"/>
             <GeneralFormat/>
@@ -302,8 +303,8 @@
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <DataBand Name="Data2" Top="280.79" Width="1965.6" Height="28.35" DataSource="notations_detail">
+        <DataBand Name="Data2" Top="272.73" Width="1965.6" Height="28.35" DataSource="notations_detail">
-          <TextObject Name="Text160" Left="94.5" Width="1861.65" Height="28.35" Text="[summary_government_budget_plan.notations.notations_detail.sub_row_no] [summary_government_budget_plan.notations.notations_detail.list]     [Format(&quot;{0:#,##0;(##0);Zero}&quot;,[summary_government_budget_plan.notations.notations_detail.amount])]     [summary_government_budget_plan.notations.notations_detail.free_text]" VertAlign="Center" Font="TH Sarabun New, 16pt">
+          <TextObject Name="Text160" Left="94.5" Width="1861.65" Height="28.35" Text="[summary_government_budget_plan.notations.notations_detail.sub_row_no] [summary_government_budget_plan.notations.notations_detail.list]     [Format(&quot;{0:#,##0;(##0);}&quot;,[summary_government_budget_plan.notations.notations_detail.amount])]     [summary_government_budget_plan.notations.notations_detail.free_text]" VertAlign="Center" Font="TH Sarabun New, 16pt">
             <Formats>
               <NumberFormat DecimalDigits="0"/>
               <GeneralFormat/>