From 99c97bf4a534769f95bad156994f1d31e6434ebb Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Fri, 22 Jul 2022 20:22:02 +0700 Subject: [PATCH] update --- Controllers/Personnel.Controller.cs | 3 +- Controllers/Summary.Controller.cs | 113 +++++++++++ Models/summary_building_construction.cs | 38 ++++ Models/summary_of_equipment.cs | 36 ++++ bin/Debug/net5.0/rmutr-report.deps.json | 64 ++++-- ...-report.MvcApplicationPartsAssemblyInfo.cs | 1 + .../rmutr-report.csproj.FileListAbsolute.txt | 1 + obj/project.assets.json | 80 ++++++-- obj/project.packagespec.json | 2 +- obj/rider.project.restore.info | 2 +- obj/rmutr-report.csproj.nuget.dgspec.json | 4 + rmutr-report.csproj | 1 + wwwroot/reports/academic_position.frx | 4 +- wwwroot/reports/data_line_academic.frx | 4 +- wwwroot/reports/data_line_support.frx | 4 +- wwwroot/reports/man_power.frx | 4 +- wwwroot/reports/personnel_summary.frx | 26 +-- wwwroot/reports/qualifications_teacher.frx | 4 +- .../reports/summary_building_construction.frx | 187 ++++++++++++++++++ wwwroot/reports/summary_of_equipment.frx | 171 ++++++++++++++++ 20 files changed, 682 insertions(+), 67 deletions(-) create mode 100644 Controllers/Summary.Controller.cs create mode 100644 Models/summary_building_construction.cs create mode 100644 Models/summary_of_equipment.cs create mode 100644 wwwroot/reports/summary_building_construction.frx create mode 100644 wwwroot/reports/summary_of_equipment.frx diff --git a/Controllers/Personnel.Controller.cs b/Controllers/Personnel.Controller.cs index 885cc2f..bae84b2 100644 --- a/Controllers/Personnel.Controller.cs +++ b/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; diff --git a/Controllers/Summary.Controller.cs b/Controllers/Summary.Controller.cs new file mode 100644 index 0000000..ef51199 --- /dev/null +++ b/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_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_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(); + } + } +} \ No newline at end of file diff --git a/Models/summary_building_construction.cs b/Models/summary_building_construction.cs new file mode 100644 index 0000000..495db29 --- /dev/null +++ b/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 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; } + } +} \ No newline at end of file diff --git a/Models/summary_of_equipment.cs b/Models/summary_of_equipment.cs new file mode 100644 index 0000000..0f7fa01 --- /dev/null +++ b/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 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; } + + } +} \ No newline at end of file diff --git a/bin/Debug/net5.0/rmutr-report.deps.json b/bin/Debug/net5.0/rmutr-report.deps.json index 03aaa52..988c87a 100644 --- a/bin/Debug/net5.0/rmutr-report.deps.json +++ b/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.SwaggerGen": "5.6.3", + "Swashbuckle.AspNetCore.Swagger": "6.0.7", + "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": { - "assemblyVersion": "5.6.3.0", - "fileVersion": "5.6.3.0" + "lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": { + "assemblyVersion": "6.0.7.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": { - "assemblyVersion": "5.6.3.0", - "fileVersion": "5.6.3.0" + "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": { + "assemblyVersion": "6.0.7.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==", - "path": "swashbuckle.aspnetcore.swagger/5.6.3", - "hashPath": "swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512" + "sha512": "sha512-bLFjlpTWehZqjofbKnTwHQP9+Wylv26BzvQ7J9UziXImAwacqari8gt+xQQEV31Mj5PcPw2naB0Z1oTOlt5Mjg==", + "path": "swashbuckle.aspnetcore.annotations/6.0.7", + "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==", - "path": "swashbuckle.aspnetcore.swaggergen/5.6.3", - "hashPath": "swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512" + "sha512": "sha512-gNSfl9GezGQF6lVrQik4WRMR1cOfLDk58+7Dq1UcFx3llLmIxOhzfCszH9lpiuxGDd+e3efBTOocpR/OYO9z0w==", + "path": "swashbuckle.aspnetcore.swagger/6.0.7", + "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", diff --git a/obj/Debug/net5.0/rmutr-report.MvcApplicationPartsAssemblyInfo.cs b/obj/Debug/net5.0/rmutr-report.MvcApplicationPartsAssemblyInfo.cs index 5c337f8..9550db0 100644 --- a/obj/Debug/net5.0/rmutr-report.MvcApplicationPartsAssemblyInfo.cs +++ b/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. diff --git a/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt b/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt index 63e83d4..490d2bb 100644 --- a/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt +++ b/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 diff --git a/obj/project.assets.json b/obj/project.assets.json index 09e5ece..b116ff4 100644 --- a/obj/project.assets.json +++ b/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": {} - }, - "frameworkReferences": [ - "Microsoft.AspNetCore.App" - ] + "lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {} + } }, "Swashbuckle.AspNetCore.SwaggerUI/5.6.3": { "type": "package", @@ -1046,37 +1055,63 @@ "swashbuckle.aspnetcore.nuspec" ] }, - "Swashbuckle.AspNetCore.Swagger/5.6.3": { - "sha512": "rn/MmLscjg6WSnTZabojx5DQYle2GjPanSPbCU3Kw8Hy72KyQR3uy8R1Aew5vpNALjfUFm2M/vwUtqdOlzw+GA==", + "Swashbuckle.AspNetCore.Annotations/6.0.7": { + "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": { - "sha512": "CkhVeod/iLd3ikVTDOwG5sym8BE5xbqGJ15iF3cC7ZPg2kEwDQL4a88xjkzsvC9oOB2ax6B0rK0EgRK+eOBX+w==", + "Swashbuckle.AspNetCore.SwaggerGen/6.0.7": { + "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": [ diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json index 6cfac77..c7d0e65 100644 --- a/obj/project.packagespec.json +++ b/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"}} \ No newline at end of file +"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"}} \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index e827981..cda5d3d 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16537372830755350 \ No newline at end of file +16584898792009463 \ 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 cf7f761..ead19ac 100644 --- a/obj/rmutr-report.csproj.nuget.dgspec.json +++ b/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": [ diff --git a/rmutr-report.csproj b/rmutr-report.csproj index c6cdef0..cfee403 100644 --- a/rmutr-report.csproj +++ b/rmutr-report.csproj @@ -11,6 +11,7 @@ + diff --git a/wwwroot/reports/academic_position.frx b/wwwroot/reports/academic_position.frx index c499331..5168e39 100644 --- a/wwwroot/reports/academic_position.frx +++ b/wwwroot/reports/academic_position.frx @@ -1,5 +1,5 @@  - + @@ -185,7 +185,7 @@ - + diff --git a/wwwroot/reports/data_line_academic.frx b/wwwroot/reports/data_line_academic.frx index c687875..27c785d 100644 --- a/wwwroot/reports/data_line_academic.frx +++ b/wwwroot/reports/data_line_academic.frx @@ -1,5 +1,5 @@  - + @@ -153,7 +153,7 @@ - + diff --git a/wwwroot/reports/data_line_support.frx b/wwwroot/reports/data_line_support.frx index e9f823f..5da9b81 100644 --- a/wwwroot/reports/data_line_support.frx +++ b/wwwroot/reports/data_line_support.frx @@ -1,5 +1,5 @@  - + @@ -212,7 +212,7 @@ - + diff --git a/wwwroot/reports/man_power.frx b/wwwroot/reports/man_power.frx index 430d342..5ccab43 100644 --- a/wwwroot/reports/man_power.frx +++ b/wwwroot/reports/man_power.frx @@ -1,5 +1,5 @@  - + @@ -229,7 +229,7 @@ - + diff --git a/wwwroot/reports/personnel_summary.frx b/wwwroot/reports/personnel_summary.frx index 1b72691..e33c8f7 100644 --- a/wwwroot/reports/personnel_summary.frx +++ b/wwwroot/reports/personnel_summary.frx @@ -1,5 +1,5 @@  - + @@ -28,11 +28,11 @@ - + - + @@ -43,7 +43,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -152,7 +152,7 @@ - + diff --git a/wwwroot/reports/qualifications_teacher.frx b/wwwroot/reports/qualifications_teacher.frx index fed8d64..cc92833 100644 --- a/wwwroot/reports/qualifications_teacher.frx +++ b/wwwroot/reports/qualifications_teacher.frx @@ -1,5 +1,5 @@  - + @@ -153,7 +153,7 @@ - + diff --git a/wwwroot/reports/summary_building_construction.frx b/wwwroot/reports/summary_building_construction.frx new file mode 100644 index 0000000..de61215 --- /dev/null +++ b/wwwroot/reports/summary_building_construction.frx @@ -0,0 +1,187 @@ + + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + private void Data2_BeforePrint(object sender, EventArgs e) + { + if (((String)Report.GetColumnValue("summary_building_construction.data.list"))== "รวมก่อสร้างอาคารและปรับปรุงซ่อมแซมต่อเติม" ) + + Data2.FillColor = Color.Gainsboro; + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/summary_of_equipment.frx b/wwwroot/reports/summary_of_equipment.frx new file mode 100644 index 0000000..1b95605 --- /dev/null +++ b/wwwroot/reports/summary_of_equipment.frx @@ -0,0 +1,171 @@ + + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + private void Data2_BeforePrint(object sender, EventArgs e) + { + if (((String)Report.GetColumnValue("summary_of_equipment.data.list"))== "รวมครุภัณฑ์วงเงินทั้งสิ้น" ) + + Data2.FillColor = Color.Gainsboro; + + + if (((String)Report.GetColumnValue("summary_of_equipment.data.list"))== "ผลผลิตผู้สำเร็จการศึกษาด้านสังคมศาสตร์" ) + + Data2.FillColor = Color.Gainsboro; + if (((String)Report.GetColumnValue("summary_of_equipment.data.list"))== "คณะบริหารธุรกิจ พื้นที่บพิตรพิมุข จักรวรรดิ" ) + + Data2.FillColor = Color.Gainsboro; + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +