update

Controllers/Personnel.Controller.cs

@@ -10,10 +10,11 @@ using FastReport.Export.Pdf;
 using Microsoft.AspNetCore.Mvc;
 using rmutr_report.Models;
 using rmutr_report.Models.Hr;
+using Swashbuckle.AspNetCore.Annotations;
 
 namespace rmutr_report.Controllers
 {
-
+    [SwaggerTag("สำหรับรายงาน HR")]
     public class PersonnelController : Controller
     {
         readonly Setting _setting;

Controllers/Summary.Controller.cs

@@ -0,0 +1,113 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using FastReport;
+using FastReport.Export.Csv;
+using FastReport.Export.Mht;
+using FastReport.Export.OoXML;
+using FastReport.Export.Pdf;
+using Microsoft.AspNetCore.Mvc;
+using rmutr_report.Models;
+using rmutr_report.Models.Hr;
+using Swashbuckle.AspNetCore.Annotations;
+
+namespace rmutr_report.Controllers
+{
+    [SwaggerTag("สำหรับรายงานสรุปแผนความต้องการ")]
+    public class SummaryController: Controller
+    {
+         readonly Setting _setting;
+
+        public SummaryController(Setting setting)
+        {
+            this._setting = setting;
+        }
+
+        [HttpPost, Route("reports/summary_of_equipment/{type}")]
+        [ApiExplorerSettings(GroupName = "reports")]
+        public IActionResult GetSum1Report([FromRoute] string type, [FromBody] summary_of_equipment summary_of_equipments)
+        {
+          
+           var _summary_of_equipment = new List<summary_of_equipment>() { summary_of_equipments };
+
+            Report report = new Report();
+            report.Load(_setting.report_path + "summary_of_equipment.frx");
+            report.RegisterData(_summary_of_equipment, "summary_of_equipment");
+            report.Prepare();
+
+            MemoryStream stream = new MemoryStream();
+            switch (type)
+            {
+                case "pdf":
+                    PDFExport pdf = new PDFExport();
+                    report.Export(pdf, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "application/pdf");
+
+                case "xls":
+                    Excel2007Export excel = new Excel2007Export();
+                    report.Export(excel, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "application/vnd.ms-excel");
+                    break;
+                case "mht":
+                    MHTExport mht = new MHTExport();
+                    report.Export(mht, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "multipart/related");
+                    break;
+                case "csv":
+                    CSVExport csv = new CSVExport();
+                    report.Export(csv, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "text/csv");
+                    break;
+            }
+
+            return Ok();
+        }
+        [HttpPost, Route("reports/summary_building_construction/{type}")]
+        [ApiExplorerSettings(GroupName = "reports")]
+        public IActionResult GetSum2Report([FromRoute] string type, [FromBody] summary_building_construction summary_building_constructions)
+        {
+          
+            var _summary_building_constructions = new List<summary_building_construction>() { summary_building_constructions };
+
+            Report report = new Report();
+            report.Load(_setting.report_path + "summary_building_construction.frx");
+            report.RegisterData(_summary_building_constructions, "summary_building_construction");
+            report.Prepare();
+
+            MemoryStream stream = new MemoryStream();
+            switch (type)
+            {
+                case "pdf":
+                    PDFExport pdf = new PDFExport();
+                    report.Export(pdf, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "application/pdf");
+
+                case "xls":
+                    Excel2007Export excel = new Excel2007Export();
+                    report.Export(excel, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "application/vnd.ms-excel");
+                    break;
+                case "mht":
+                    MHTExport mht = new MHTExport();
+                    report.Export(mht, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "multipart/related");
+                    break;
+                case "csv":
+                    CSVExport csv = new CSVExport();
+                    report.Export(csv, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "text/csv");
+                    break;
+            }
+
+            return Ok();
+        }
+    }
+}

Models/summary_building_construction.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+
+namespace rmutr_report.Models
+{
+    public class summary_building_construction
+    {
+        public string academic_year { get; set; }
+        public string budget_year_1 { get; set; }
+        public string budget_year_2 { get; set; }
+        public string budget_year_3 { get; set; }
+        public string budget_year_4 { get; set; }
+        public string budget_year_5 { get; set; }
+        public List<summary_building_construction_detail> data { get; set; }
+    }
+
+    public class summary_building_construction_detail
+    {
+        public int? no { get; set; }
+        public string list { get; set; }
+        public decimal? total { get; set; }
+        public int? lesser { get; set; }
+        public int? between { get; set; }
+        public int? over { get; set; }
+        public string problem { get; set; }
+        public string type_1 { get; set; }
+        public string type_2 { get; set; }
+        public string renovated { get; set; }
+        public decimal? budget { get; set; }
+        public decimal? price_1 { get; set; }
+        public decimal? price_2 { get; set; }
+        public decimal? price_3 { get; set; }
+        public decimal? price_4 { get; set; }
+        public decimal? price_5 { get; set; }
+        public string boq { get; set; }
+        public string image { get; set; }
+        public string description { get; set; }  
+    }
+}

Models/summary_of_equipment.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+namespace rmutr_report.Models
+{
+    public class summary_of_equipment
+    {
+        public string academic_year_name_th { get; set; }
+        public string header_name { get; set; }
+        public string agency_name_th { get; set; }
+        public string location { get; set; }
+        public string academic_year { get; set; }
+        public string budget_year_1 { get; set; }
+        public string budget_year_2 { get; set; }
+        public string budget_year_3 { get; set; }
+        public string budget_year_4 { get; set; }
+        public string budget_year_5 { get; set; }
+        public List<summary_of_equipment_detail> data { get; set; }
+    }
+    public class summary_of_equipment_detail
+    {
+        public int? no { get; set; }
+        public string list { get; set; }
+        public string type_1 { get; set; }
+        public string type_2 { get; set; }
+        public string type_3 { get; set; }
+        public string unit { get; set; }
+        public decimal? unit_price { get; set; }
+        public decimal? price_1 { get; set; }
+        public decimal? price_2 { get; set; }
+        public decimal? price_3 { get; set; }
+        public decimal? price_4 { get; set; }
+        public decimal? price_5 { get; set; }
+        public string description { get; set; }
+        
+    }
+}

bin/Debug/net5.0/rmutr-report.deps.json

@@ -35,6 +35,7 @@
         "dependencies": {
           "FastReport.Core": "2021.3.0",
           "Swashbuckle.AspNetCore": "5.6.3",
+          "Swashbuckle.AspNetCore.Annotations": "6.0.7",
           "Microsoft.AspNetCore.Antiforgery": "5.0.0.0",
           "Microsoft.AspNetCore.Authentication.Abstractions": "5.0.0.0",
           "Microsoft.AspNetCore.Authentication.Cookies": "5.0.0.0",
@@ -610,37 +611,51 @@
       "Swashbuckle.AspNetCore/5.6.3": {
         "dependencies": {
           "Microsoft.Extensions.ApiDescription.Server": "3.0.0",
-          "Swashbuckle.AspNetCore.Swagger": "5.6.3",
+          "Swashbuckle.AspNetCore.Swagger": "6.0.7",
-          "Swashbuckle.AspNetCore.SwaggerGen": "5.6.3",
+          "Swashbuckle.AspNetCore.SwaggerGen": "6.0.7",
           "Swashbuckle.AspNetCore.SwaggerUI": "5.6.3"
         }
       },
-      "Swashbuckle.AspNetCore.Swagger/5.6.3": {
+      "Swashbuckle.AspNetCore.Annotations/6.0.7": {
+        "dependencies": {
+          "Swashbuckle.AspNetCore.SwaggerGen": "6.0.7"
+        },
+        "runtime": {
+          "lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": {
+            "assemblyVersion": "6.0.7.0",
+            "fileVersion": "6.0.7.0"
+          }
+        },
+        "compile": {
+          "lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": {}
+        }
+      },
+      "Swashbuckle.AspNetCore.Swagger/6.0.7": {
         "dependencies": {
           "Microsoft.OpenApi": "1.2.3"
         },
         "runtime": {
-          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {
+          "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": {
-            "assemblyVersion": "5.6.3.0",
+            "assemblyVersion": "6.0.7.0",
-            "fileVersion": "5.6.3.0"
+            "fileVersion": "6.0.7.0"
           }
         },
         "compile": {
-          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {}
+          "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": {}
         }
       },
-      "Swashbuckle.AspNetCore.SwaggerGen/5.6.3": {
+      "Swashbuckle.AspNetCore.SwaggerGen/6.0.7": {
         "dependencies": {
-          "Swashbuckle.AspNetCore.Swagger": "5.6.3"
+          "Swashbuckle.AspNetCore.Swagger": "6.0.7"
         },
         "runtime": {
-          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
+          "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
-            "assemblyVersion": "5.6.3.0",
+            "assemblyVersion": "6.0.7.0",
-            "fileVersion": "5.6.3.0"
+            "fileVersion": "6.0.7.0"
           }
         },
         "compile": {
-          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {}
+          "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {}
         }
       },
       "Swashbuckle.AspNetCore.SwaggerUI/5.6.3": {
@@ -2560,19 +2575,26 @@
       "path": "swashbuckle.aspnetcore/5.6.3",
       "hashPath": "swashbuckle.aspnetcore.5.6.3.nupkg.sha512"
     },
-    "Swashbuckle.AspNetCore.Swagger/5.6.3": {
+    "Swashbuckle.AspNetCore.Annotations/6.0.7": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-rn/MmLscjg6WSnTZabojx5DQYle2GjPanSPbCU3Kw8Hy72KyQR3uy8R1Aew5vpNALjfUFm2M/vwUtqdOlzw+GA==",
+      "sha512": "sha512-bLFjlpTWehZqjofbKnTwHQP9+Wylv26BzvQ7J9UziXImAwacqari8gt+xQQEV31Mj5PcPw2naB0Z1oTOlt5Mjg==",
-      "path": "swashbuckle.aspnetcore.swagger/5.6.3",
+      "path": "swashbuckle.aspnetcore.annotations/6.0.7",
-      "hashPath": "swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512"
+      "hashPath": "swashbuckle.aspnetcore.annotations.6.0.7.nupkg.sha512"
     },
-    "Swashbuckle.AspNetCore.SwaggerGen/5.6.3": {
+    "Swashbuckle.AspNetCore.Swagger/6.0.7": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-CkhVeod/iLd3ikVTDOwG5sym8BE5xbqGJ15iF3cC7ZPg2kEwDQL4a88xjkzsvC9oOB2ax6B0rK0EgRK+eOBX+w==",
+      "sha512": "sha512-gNSfl9GezGQF6lVrQik4WRMR1cOfLDk58+7Dq1UcFx3llLmIxOhzfCszH9lpiuxGDd+e3efBTOocpR/OYO9z0w==",
-      "path": "swashbuckle.aspnetcore.swaggergen/5.6.3",
+      "path": "swashbuckle.aspnetcore.swagger/6.0.7",
-      "hashPath": "swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512"
+      "hashPath": "swashbuckle.aspnetcore.swagger.6.0.7.nupkg.sha512"
+    },
+    "Swashbuckle.AspNetCore.SwaggerGen/6.0.7": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-J6TM1oj01pAHsIu0fNEMuUjBZoEvxt9+m9bRXZZM+u5Hnxb+aVYviclhhVIgbORy3SCr3n4++M47uc8TVSubbw==",
+      "path": "swashbuckle.aspnetcore.swaggergen/6.0.7",
+      "hashPath": "swashbuckle.aspnetcore.swaggergen.6.0.7.nupkg.sha512"
     },
     "Swashbuckle.AspNetCore.SwaggerUI/5.6.3": {
       "type": "package",

obj/Debug/net5.0/rmutr-report.MvcApplicationPartsAssemblyInfo.cs

@@ -10,6 +10,7 @@
 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.csproj.FileListAbsolute.txt

@@ -164,3 +164,4 @@ C:\Users\Mercedes Benz\Documents\rmutr_report\obj\Debug\net5.0\ref\rmutr-report.
 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

obj/project.assets.json

@@ -361,35 +361,44 @@
           "build/Swashbuckle.AspNetCore.props": {}
         }
       },
-      "Swashbuckle.AspNetCore.Swagger/5.6.3": {
+      "Swashbuckle.AspNetCore.Annotations/6.0.7": {
+        "type": "package",
+        "dependencies": {
+          "Swashbuckle.AspNetCore.SwaggerGen": "6.0.7"
+        },
+        "compile": {
+          "lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": {}
+        },
+        "runtime": {
+          "lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": {}
+        }
+      },
+      "Swashbuckle.AspNetCore.Swagger/6.0.7": {
         "type": "package",
         "dependencies": {
           "Microsoft.OpenApi": "1.2.3"
         },
         "compile": {
-          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {}
+          "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": {}
         },
         "runtime": {
-          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {}
+          "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": {}
         },
         "frameworkReferences": [
           "Microsoft.AspNetCore.App"
         ]
       },
-      "Swashbuckle.AspNetCore.SwaggerGen/5.6.3": {
+      "Swashbuckle.AspNetCore.SwaggerGen/6.0.7": {
         "type": "package",
         "dependencies": {
-          "Swashbuckle.AspNetCore.Swagger": "5.6.3"
+          "Swashbuckle.AspNetCore.Swagger": "6.0.7"
         },
         "compile": {
-          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {}
+          "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {}
         },
         "runtime": {
-          "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {}
+          "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {}
-        },
+        }
-        "frameworkReferences": [
-          "Microsoft.AspNetCore.App"
-        ]
       },
       "Swashbuckle.AspNetCore.SwaggerUI/5.6.3": {
         "type": "package",
@@ -1046,37 +1055,63 @@
         "swashbuckle.aspnetcore.nuspec"
       ]
     },
-    "Swashbuckle.AspNetCore.Swagger/5.6.3": {
+    "Swashbuckle.AspNetCore.Annotations/6.0.7": {
-      "sha512": "rn/MmLscjg6WSnTZabojx5DQYle2GjPanSPbCU3Kw8Hy72KyQR3uy8R1Aew5vpNALjfUFm2M/vwUtqdOlzw+GA==",
+      "sha512": "bLFjlpTWehZqjofbKnTwHQP9+Wylv26BzvQ7J9UziXImAwacqari8gt+xQQEV31Mj5PcPw2naB0Z1oTOlt5Mjg==",
       "type": "package",
-      "path": "swashbuckle.aspnetcore.swagger/5.6.3",
+      "path": "swashbuckle.aspnetcore.annotations/6.0.7",
       "files": [
         ".nupkg.metadata",
         ".signature.p7s",
+        "lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll",
+        "lib/net5.0/Swashbuckle.AspNetCore.Annotations.pdb",
+        "lib/net5.0/Swashbuckle.AspNetCore.Annotations.xml",
+        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Annotations.dll",
+        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Annotations.pdb",
+        "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Annotations.xml",
+        "lib/netstandard2.0/Swashbuckle.AspNetCore.Annotations.dll",
+        "lib/netstandard2.0/Swashbuckle.AspNetCore.Annotations.pdb",
+        "lib/netstandard2.0/Swashbuckle.AspNetCore.Annotations.xml",
+        "swashbuckle.aspnetcore.annotations.6.0.7.nupkg.sha512",
+        "swashbuckle.aspnetcore.annotations.nuspec"
+      ]
+    },
+    "Swashbuckle.AspNetCore.Swagger/6.0.7": {
+      "sha512": "gNSfl9GezGQF6lVrQik4WRMR1cOfLDk58+7Dq1UcFx3llLmIxOhzfCszH9lpiuxGDd+e3efBTOocpR/OYO9z0w==",
+      "type": "package",
+      "path": "swashbuckle.aspnetcore.swagger/6.0.7",
+      "files": [
+        ".nupkg.metadata",
+        ".signature.p7s",
+        "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll",
+        "lib/net5.0/Swashbuckle.AspNetCore.Swagger.pdb",
+        "lib/net5.0/Swashbuckle.AspNetCore.Swagger.xml",
         "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll",
         "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.pdb",
         "lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.xml",
         "lib/netstandard2.0/Swashbuckle.AspNetCore.Swagger.dll",
         "lib/netstandard2.0/Swashbuckle.AspNetCore.Swagger.pdb",
         "lib/netstandard2.0/Swashbuckle.AspNetCore.Swagger.xml",
-        "swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512",
+        "swashbuckle.aspnetcore.swagger.6.0.7.nupkg.sha512",
         "swashbuckle.aspnetcore.swagger.nuspec"
       ]
     },
-    "Swashbuckle.AspNetCore.SwaggerGen/5.6.3": {
+    "Swashbuckle.AspNetCore.SwaggerGen/6.0.7": {
-      "sha512": "CkhVeod/iLd3ikVTDOwG5sym8BE5xbqGJ15iF3cC7ZPg2kEwDQL4a88xjkzsvC9oOB2ax6B0rK0EgRK+eOBX+w==",
+      "sha512": "J6TM1oj01pAHsIu0fNEMuUjBZoEvxt9+m9bRXZZM+u5Hnxb+aVYviclhhVIgbORy3SCr3n4++M47uc8TVSubbw==",
       "type": "package",
-      "path": "swashbuckle.aspnetcore.swaggergen/5.6.3",
+      "path": "swashbuckle.aspnetcore.swaggergen/6.0.7",
       "files": [
         ".nupkg.metadata",
         ".signature.p7s",
+        "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll",
+        "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.pdb",
+        "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.xml",
         "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll",
         "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.pdb",
         "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.xml",
         "lib/netstandard2.0/Swashbuckle.AspNetCore.SwaggerGen.dll",
         "lib/netstandard2.0/Swashbuckle.AspNetCore.SwaggerGen.pdb",
         "lib/netstandard2.0/Swashbuckle.AspNetCore.SwaggerGen.xml",
-        "swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512",
+        "swashbuckle.aspnetcore.swaggergen.6.0.7.nupkg.sha512",
         "swashbuckle.aspnetcore.swaggergen.nuspec"
       ]
     },
@@ -1585,7 +1620,8 @@
   "projectFileDependencyGroups": {
     "net5.0": [
       "FastReport.Core >= 2021.3.0",
-      "Swashbuckle.AspNetCore >= 5.6.3"
+      "Swashbuckle.AspNetCore >= 5.6.3",
+      "Swashbuckle.AspNetCore.Annotations >= 6.0.7"
     ]
   },
   "packageFolders": {
@@ -1636,6 +1672,10 @@
           "Swashbuckle.AspNetCore": {
             "target": "Package",
             "version": "[5.6.3, )"
+          },
+          "Swashbuckle.AspNetCore.Annotations": {
+            "target": "Package",
+            "version": "[6.0.7, )"
           }
         },
         "imports": [

obj/project.packagespec.json

@@ -1 +1 @@
-"restore":{"projectUniqueName":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\rmutr-report.csproj","projectName":"rmutr-report","projectPath":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\rmutr-report.csproj","outputPath":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[5.6.3, )"}},"imports":["net461","net462","net47","net471","net472","net48"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\5.0.403\\RuntimeIdentifierGraph.json"}}
+"restore":{"projectUniqueName":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\rmutr-report.csproj","projectName":"rmutr-report","projectPath":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\rmutr-report.csproj","outputPath":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[5.6.3, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.0.7, )"}},"imports":["net461","net462","net47","net471","net472","net48"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\5.0.403\\RuntimeIdentifierGraph.json"}}

obj/rider.project.restore.info

@@ -1 +1 @@
-16537372830755350
+16584898792009463

obj/rmutr-report.csproj.nuget.dgspec.json

@@ -49,6 +49,10 @@
             "Swashbuckle.AspNetCore": {
               "target": "Package",
               "version": "[5.6.3, )"
+            },
+            "Swashbuckle.AspNetCore.Annotations": {
+              "target": "Package",
+              "version": "[6.0.7, )"
             }
           },
           "imports": [

rmutr-report.csproj

@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="FastReport.Core" Version="2021.3.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.0.7" />
   </ItemGroup>
 
 </Project>

wwwroot/reports/academic_position.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="05/30/2022 17:00:23" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="05/30/2022 18:48:12" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="academic_position" ReferenceName="academic_position" DataType="null" Enabled="true">
       <Column Name="data_date" DataType="System.String"/>
@@ -185,7 +185,7 @@
           <TableColumn Name="Column205" Width="47.25"/>
           <TableColumn Name="Column206" Width="47.25"/>
           <TableRow Name="Row14" Height="47.25">
-            <TableCell Name="Cell110" Text="[academic_position.data.no]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
+            <TableCell Name="Cell110" Text="[academic_position.data.no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell111" Border.Lines="All" Text="[academic_position.data.agency_name]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell112" Border.Lines="All" Text="[academic_position.data.government_officer_professor]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell113" Border.Lines="All" Text="[academic_position.data.government_officer_associate_professor]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>

wwwroot/reports/data_line_academic.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="05/30/2022 17:00:35" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="05/30/2022 18:48:16" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="data_line_academic" ReferenceName="data_line_academic" DataType="null" Enabled="true">
       <Column Name="data_date" DataType="System.String"/>
@@ -153,7 +153,7 @@
           <TableColumn Name="Column89" Width="47.25"/>
           <TableColumn Name="Column132" Width="103.95"/>
           <TableRow Name="Row14" Height="47.25">
-            <TableCell Name="Cell110" Text="[data_line_academic.data.no]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
+            <TableCell Name="Cell110" Text="[data_line_academic.data.no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell111" Border.Lines="All" Text="[data_line_academic.data.agency_name]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell112" Border.Lines="All" Text="[data_line_academic.data.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell113" Border.Lines="All" Text="[data_line_academic.data.government_officer_totalrate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>

wwwroot/reports/data_line_support.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="05/30/2022 17:00:44" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="05/30/2022 18:48:21" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="data_line_support" ReferenceName="data_line_support" DataType="null" Enabled="true">
       <Column Name="data_date" DataType="System.String"/>
@@ -212,7 +212,7 @@
           <TableColumn Name="Column96" Width="47.25"/>
           <TableColumn Name="Column97" Width="85.05"/>
           <TableRow Name="Row14" Height="47.25">
-            <TableCell Name="Cell110" Text="[data_line_support.data.no]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
+            <TableCell Name="Cell110" Text="[data_line_support.data.no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell111" Border.Lines="All" Text="[data_line_support.data.agency_name]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell112" Border.Lines="All" Text="[data_line_support.data.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell113" Border.Lines="All" Text="[data_line_support.data.government_officer_totalrate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>

wwwroot/reports/man_power.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="05/30/2022 17:00:52" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="05/30/2022 18:48:27" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="man_power" ReferenceName="man_power" DataType="null" Enabled="true">
       <Column Name="no" DataType="System.String"/>
@@ -229,7 +229,7 @@
           <TableColumn Name="Column99" Width="47.25"/>
           <TableColumn Name="Column100" Width="75.6"/>
           <TableRow Name="Row14" Height="47.25">
-            <TableCell Name="Cell110" Text="[man_power.no]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
+            <TableCell Name="Cell110" Text="[man_power.no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell111" Border.Lines="All" Text="[man_power.agency_name]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell112" Border.Lines="All" Text="[man_power.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell113" Border.Lines="All" Text="[man_power.government_officer_totalrate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>

wwwroot/reports/personnel_summary.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="05/28/2022 18:19:34" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="05/30/2022 18:16:15" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="personnel_summary" ReferenceName="personnel_summary" DataType="null" Enabled="true">
       <Column Name="data_date" DataType="System.String"/>
@@ -28,11 +28,11 @@
   </Dictionary>
   <ReportPage Name="Page1" RawPaperSize="9" Watermark.Font="Arial, 60pt">
     <PageHeaderBand Name="PageHeader1" Width="718.2" Height="94.5">
-      <TextObject Name="Text1" Left="75.6" Top="9.45" Width="548.1" Height="28.35" Text="ข้อมูลจำนวนบุคลากร" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 17pt, style=Bold"/>
+      <TextObject Name="Text1" Left="75.6" Width="548.1" Height="37.8" Text="ข้อมูลจำนวนบุคลากร" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 17pt, style=Bold"/>
       <TextObject Name="Text29" Left="75.6" Top="37.8" Width="548.1" Height="28.35" Text="ในมหาวิทยาลัยเทคโนโลยีราชมงคลรัตนโกสินทร์" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 17pt, style=Bold"/>
       <TextObject Name="Text30" Left="75.6" Top="66.15" Width="548.1" Height="28.35" Text="ข้อมูล ณ วันที่ [personnel_summary.data_date]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 17pt, style=Underline"/>
     </PageHeaderBand>
-    <DataBand Name="Data2" Top="98.71" Width="718.2" Height="37.8">
+    <DataBand Name="Data2" Top="98.9" Width="718.2" Height="37.8">
       <TableObject Name="Table1" Left="75.6" Width="548.1" Height="37.8">
         <TableColumn Name="Column1" Width="302.4"/>
         <TableColumn Name="Column2" Width="122.85"/>
@@ -43,7 +43,7 @@
           <TableCell Name="Cell3" Border.Lines="All" Text="ราย" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data1" Top="140.72" Width="718.2" Height="37.8" DataSource="personnel_types">
+      <DataBand Name="Data1" Top="141.09" Width="718.2" Height="37.8" DataSource="personnel_types">
         <TableObject Name="Table2" Left="75.6" Width="548.1" Height="37.8">
           <TableColumn Name="Column4" Width="302.4"/>
           <TableColumn Name="Column5" Width="122.85"/>
@@ -56,7 +56,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data3" Top="182.73" Width="718.2" Height="37.8">
+    <DataBand Name="Data3" Top="183.29" Width="718.2" Height="37.8">
       <TableObject Name="Table3" Left="75.6" Width="548.1" Height="37.8">
         <TableColumn Name="Column7" Width="302.4"/>
         <TableColumn Name="Column8" Width="122.85"/>
@@ -67,7 +67,7 @@
           <TableCell Name="Cell9" Border.Lines="All" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data4" Top="224.74" Width="718.2" Height="37.8" DataSource="lineofworks">
+      <DataBand Name="Data4" Top="225.48" Width="718.2" Height="37.8" DataSource="lineofworks">
         <TableObject Name="Table4" Left="75.6" Width="548.1" Height="37.8">
           <TableColumn Name="Column10" Width="302.4"/>
           <TableColumn Name="Column11" Width="122.85"/>
@@ -80,7 +80,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data5" Top="266.75" Width="718.2" Height="37.8">
+    <DataBand Name="Data5" Top="267.68" Width="718.2" Height="37.8">
       <TableObject Name="Table5" Left="75.6" Width="548.1" Height="37.8">
         <TableColumn Name="Column13" Width="302.4"/>
         <TableColumn Name="Column14" Width="122.85"/>
@@ -91,7 +91,7 @@
           <TableCell Name="Cell15" Border.Lines="All" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data6" Top="308.76" Width="718.2" Height="37.8" DataSource="positions">
+      <DataBand Name="Data6" Top="309.87" Width="718.2" Height="37.8" DataSource="positions">
         <TableObject Name="Table6" Left="75.6" Width="548.1" Height="37.8">
           <TableColumn Name="Column16" Width="302.4"/>
           <TableColumn Name="Column17" Width="122.85"/>
@@ -104,7 +104,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data7" Top="350.77" Width="718.2" Height="37.8">
+    <DataBand Name="Data7" Top="352.07" Width="718.2" Height="37.8">
       <TableObject Name="Table9" Left="75.6" Width="548.1" Height="37.8">
         <TableColumn Name="Column25" Width="302.4"/>
         <TableColumn Name="Column26" Width="122.85"/>
@@ -115,7 +115,7 @@
           <TableCell Name="Cell27" Border.Lines="All" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data8" Top="392.78" Width="718.2" Height="37.8" DataSource="areas">
+      <DataBand Name="Data8" Top="394.26" Width="718.2" Height="37.8" DataSource="areas">
         <TableObject Name="Table7" Left="75.6" Width="548.1" Height="37.8">
           <TableColumn Name="Column19" Width="302.4"/>
           <TableColumn Name="Column20" Width="122.85"/>
@@ -128,7 +128,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data9" Top="434.79" Width="718.2" Height="37.8">
+    <DataBand Name="Data9" Top="436.46" Width="718.2" Height="37.8">
       <TableObject Name="Table10" Left="75.6" Width="548.1" Height="37.8">
         <TableColumn Name="Column28" Width="302.4"/>
         <TableColumn Name="Column29" Width="122.85"/>
@@ -139,7 +139,7 @@
           <TableCell Name="Cell30" Border.Lines="All" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data10" Top="476.81" Width="718.2" Height="37.8" DataSource="qualifications">
+      <DataBand Name="Data10" Top="478.66" Width="718.2" Height="37.8" DataSource="qualifications">
         <TableObject Name="Table8" Left="75.6" Width="548.1" Height="37.8">
           <TableColumn Name="Column22" Width="302.4"/>
           <TableColumn Name="Column23" Width="122.85"/>
@@ -152,7 +152,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="518.82" Width="718.2" Height="75.6">
+    <ReportSummaryBand Name="ReportSummary1" Top="520.85" Width="718.2" Height="75.6">
       <TextObject Name="Text31" Left="75.6" Width="548.1" Height="75.6" Text="ไม่รวมจำนวนนักเรียนทุนที่อยู่ระหว่างการศึกษา จำนวน 18 อัตรา&#13;&#10;ไม่นับรวมบุคลากรหน่วยงานในกำกับ" VertAlign="Center" Font="TH Sarabun New, 17pt, style=Bold"/>
     </ReportSummaryBand>
   </ReportPage>

wwwroot/reports/qualifications_teacher.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="05/30/2022 17:01:06" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="05/30/2022 18:48:35" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="qualifications_teacher" ReferenceName="qualifications_teacher" DataType="null" Enabled="true">
       <Column Name="data_date" DataType="System.String"/>
@@ -153,7 +153,7 @@
           <TableColumn Name="Column86" Width="47.25"/>
           <TableColumn Name="Column87" Width="47.25"/>
           <TableRow Name="Row14" Height="47.25">
-            <TableCell Name="Cell110" Text="[qualifications_teacher.data.no]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
+            <TableCell Name="Cell110" Text="[qualifications_teacher.data.no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell111" Border.Lines="All" Text="[qualifications_teacher.data.agency_name]" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell112" Border.Lines="All" Text="[qualifications_teacher.data.government_officer_dr]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>
             <TableCell Name="Cell113" Border.Lines="All" Text="[qualifications_teacher.data.government_officer_master]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 10pt"/>