diff --git a/Controllers/RoFive.Controller.cs b/Controllers/RoFive.Controller.cs index 5dfc963..05ce28b 100644 --- a/Controllers/RoFive.Controller.cs +++ b/Controllers/RoFive.Controller.cs @@ -1532,7 +1532,6 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(5, 5), ws.Cell(6, 29)).Style.Border.RightBorder = XLBorderStyleValues.Thin; } - } } @@ -2797,6 +2796,7 @@ namespace rmutr_report.Controllers XLBorderStyleValues.Thin; } } + if (a == 11) { if (header.topic_type == 1) @@ -2921,7 +2921,8 @@ namespace rmutr_report.Controllers XLBorderStyleValues.Thin; } } - if (a == 12) + + if (a == 12) { if (header.topic_type == 1) { @@ -3045,7 +3046,8 @@ namespace rmutr_report.Controllers XLBorderStyleValues.Thin; } } - if (a == 13) + + if (a == 13) { if (header.topic_type == 1) { @@ -3168,7 +3170,8 @@ namespace rmutr_report.Controllers ws.Cell(row, 22).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; } - } + } + if (a == 14) { if (header.topic_type == 1) @@ -3292,8 +3295,9 @@ namespace rmutr_report.Controllers ws.Cell(row, 23).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; } - } - if (a == 15) + } + + if (a == 15) { if (header.topic_type == 1) { @@ -3416,8 +3420,9 @@ namespace rmutr_report.Controllers ws.Cell(row, 24).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; } - } - if (a == 16) + } + + if (a == 16) { if (header.topic_type == 1) { @@ -3540,8 +3545,9 @@ namespace rmutr_report.Controllers ws.Cell(row, 25).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; } - } - if (a == 17) + } + + if (a == 17) { if (header.topic_type == 1) { @@ -3664,7 +3670,8 @@ namespace rmutr_report.Controllers ws.Cell(row, 26).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; } - } + } + if (a == 18) { if (header.topic_type == 1) @@ -3788,8 +3795,9 @@ namespace rmutr_report.Controllers ws.Cell(row, 27).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; } - } - if (a == 19) + } + + if (a == 19) { if (header.topic_type == 1) { @@ -3912,8 +3920,9 @@ namespace rmutr_report.Controllers ws.Cell(row, 28).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; } - } - if (a == 20) + } + + if (a == 20) { if (header.topic_type == 1) { @@ -4036,7 +4045,7 @@ namespace rmutr_report.Controllers ws.Cell(row, 29).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; } - } + } } using (var stream = new MemoryStream()) @@ -4049,15 +4058,19 @@ namespace rmutr_report.Controllers "revenueEstimate_register" + ".xlsx"); } } + [HttpPost, Route("reports/form_1_2/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetForm2Report([FromRoute] string type, [FromBody] form_1_2 form1) { form1.dates = form1.date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH")); - form1.day_start_workings = form1.start_working.Value.ToString("dd", CultureInfo.CreateSpecificCulture("th-TH")); - form1.month_start_workings = form1.start_working.Value.ToString("MMMM", CultureInfo.CreateSpecificCulture("th-TH")); - form1.year_start_workings = form1.start_working.Value.ToString("yyyy", CultureInfo.CreateSpecificCulture("th-TH")); + form1.day_start_workings = + form1.start_working.Value.ToString("dd", CultureInfo.CreateSpecificCulture("th-TH")); + form1.month_start_workings = + form1.start_working.Value.ToString("MMMM", CultureInfo.CreateSpecificCulture("th-TH")); + form1.year_start_workings = + form1.start_working.Value.ToString("yyyy", CultureInfo.CreateSpecificCulture("th-TH")); var form_1 = new List() { form1 }; Report report = new Report(); @@ -4083,7 +4096,7 @@ namespace rmutr_report.Controllers report.Export(word1, stream); stream.Seek(0, SeekOrigin.Begin); return File(stream, "appllication/vnd.ms-word"); - case "xlsx": + case "xlsx": Excel2007Export excel = new Excel2007Export(); report.Export(excel, stream); stream.Seek(0, SeekOrigin.Begin); @@ -4096,130 +4109,142 @@ namespace rmutr_report.Controllers return Ok(); } + [HttpPost, Route("reports/form_1_3/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetForm3Report([FromRoute] string type, [FromBody] form_1_3 form3) { - form3.dates = form3.date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH")); + // if (form3 != null) + // { + if (form3.date != null) + { + form3.dates = form3.date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH")); + } + if (form3.checkbox_1 == true) { form3.checkbox1 = "/"; - form3.checkbox2 = null; - form3.checkbox3 = null; - form3.checkbox4 = null; - form3.checkbox5 = null; + // form3.checkbox2 = null; + // form3.checkbox3 = null; + // form3.checkbox4 = null; + // form3.checkbox5 = null; } - if (form3.checkbox_1 ==false ) + if (form3.checkbox_1 == false) { form3.checkbox1 = null; } + if (form3.checkbox_2 == true) { form3.checkbox2 = "/"; - form3.checkbox1 = null; - form3.checkbox3 = null; - form3.checkbox4 = null; - form3.checkbox5 = null; + // form3.checkbox1 = null; + // form3.checkbox3 = null; + // form3.checkbox4 = null; + // form3.checkbox5 = null; } - if (form3.checkbox_2 ==false ) + if (form3.checkbox_2 == false) { form3.checkbox2 = null; } + if (form3.checkbox_3 == true) { form3.checkbox3 = "/"; - form3.checkbox2 = null; - form3.checkbox1 = null; - form3.checkbox4 = null; - form3.checkbox5 = null; + // form3.checkbox2 = null; + // form3.checkbox1 = null; + // form3.checkbox4 = null; + // form3.checkbox5 = null; } - if (form3.checkbox_3 ==false ) + if (form3.checkbox_3 == false) { form3.checkbox3 = null; } + if (form3.checkbox_4 == true) { form3.checkbox4 = "/"; - form3.checkbox2 = null; - form3.checkbox3 = null; - form3.checkbox1 = null; - form3.checkbox5 = null; + // form3.checkbox2 = null; + // form3.checkbox3 = null; + // form3.checkbox1 = null; + // form3.checkbox5 = null; } - if (form3.checkbox_4 ==false ) + if (form3.checkbox_4 == false) { form3.checkbox4 = null; } + if (form3.checkbox_5 == true) { form3.checkbox5 = "/"; - form3.checkbox2 = null; - form3.checkbox3 = null; - form3.checkbox4 = null; - form3.checkbox1 = null; + // form3.checkbox2 = null; + // form3.checkbox3 = null; + // form3.checkbox4 = null; + // form3.checkbox1 = null; } - if (form3.checkbox_5 ==false ) + if (form3.checkbox_5 == false) { form3.checkbox5 = null; } - if (form3.other_remark!=null||form3.other_remark!="") + if (form3.other_remark != null || form3.other_remark != "") { form3.checkbox6 = "/"; } - if (form3.other_remark==null||form3.other_remark=="") + + if (form3.other_remark == null || form3.other_remark == "") { form3.checkbox6 = null; } - if (form3.form_1_3_details != null) + + foreach (var detail in form3.form_1_3_details) { - foreach (var detail in form3.form_1_3_details) + detail.order_dates = + detail.order_date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH")); + detail.Informations_as_of = + detail.Information_as_of.Value.ToString("dd MMMM yyyy", + CultureInfo.CreateSpecificCulture("th-TH")); + if (detail.checkbox_1 == true) { - detail.order_dates = - detail.order_date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH")); - detail.Informations_as_of = - detail.Information_as_of.Value.ToString("dd MMMM yyyy", - CultureInfo.CreateSpecificCulture("th-TH")); - if (detail.checkbox_1 == true) - { - detail.checkbox1 = "/"; - detail.checkbox2 = null; - - } + detail.checkbox1 = "/"; + detail.checkbox2 = null; + } - if (detail.checkbox_1 ==false ) - { - detail.checkbox1 = null; - } - if (detail.checkbox_2 == true) - { - detail.checkbox2 = "/"; - detail.checkbox1 = null; - - } + if (detail.checkbox_1 == false) + { + detail.checkbox1 = null; + } - if (detail.checkbox_2 ==false ) - { - detail.checkbox2 = null; - } - var a = detail.effects_if; - var b = detail.workload; - foreach (var aa in a) - { - detail.effects_if1 = aa; - } - foreach (var bb in b) - { - detail.workloads = bb; - } + if (detail.checkbox_2 == true) + { + detail.checkbox2 = "/"; + detail.checkbox1 = null; + } + + if (detail.checkbox_2 == false) + { + detail.checkbox2 = null; + } + + var a = detail.effects_if; + var b = detail.workload; + foreach (var aa in a) + { + detail.effects_if1 = aa; + } + + foreach (var bb in b) + { + detail.workloads = bb; } } + //} var form_3 = new List() { form3 }; @@ -4246,7 +4271,7 @@ namespace rmutr_report.Controllers report.Export(word1, stream); stream.Seek(0, SeekOrigin.Begin); return File(stream, "appllication/vnd.ms-word"); - case "xlsx": + case "xlsx": Excel2007Export excel = new Excel2007Export(); report.Export(excel, stream); stream.Seek(0, SeekOrigin.Begin); diff --git a/Models/RoReport/form_1_3.cs b/Models/RoReport/form_1_3.cs index 2ccd248..dc7fc1f 100644 --- a/Models/RoReport/form_1_3.cs +++ b/Models/RoReport/form_1_3.cs @@ -75,13 +75,13 @@ namespace rmutr_report.Models.RoThree public string offer_qualification { get; set; } // - public decimal? retirement { get; set; } + public string retirement { get; set; } // - public decimal? position_retirement { get; set; } + public string position_retirement { get; set; } // - public decimal? year_retirement { get; set; } + public string year_retirement { get; set; } // public bool? checkbox_1 { get; set; } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index d2c8860..309d706 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 90936ed..f8f115d 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index 002a2e9..39daae7 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs @@ -1,6 +1,7 @@ //------------------------------------------------------------------------------ // // 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. diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index d2c8860..309d706 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 90936ed..f8f115d 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/project.assets.json b/obj/project.assets.json index 13c8c8c..1c2e072 100644 --- a/obj/project.assets.json +++ b/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": { - "targetAlias": "net5.0", + "netcoreapp3.1": { + "targetAlias": "netcoreapp3.1", "projectReferences": {} } }, @@ -2180,8 +2180,8 @@ } }, "frameworks": { - "net5.0": { - "targetAlias": "net5.0", + "netcoreapp3.1": { + "targetAlias": "netcoreapp3.1", "dependencies": { "ClosedXML": { "target": "Package", diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index fe8f515..aca2bc6 100644 --- a/obj/project.nuget.cache +++ b/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": [ diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json index daed5e1..b78619f 100644 --- a/obj/project.packagespec.json +++ b/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"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"}} \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 38d39de..d4e1c0f 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16909628354926351 \ No newline at end of file +16909729614022267 \ 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 6a65beb..0d1d259 100644 --- a/obj/rmutr_report.csproj.nuget.dgspec.json +++ b/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": { - "targetAlias": "net5.0", + "netcoreapp3.1": { + "targetAlias": "netcoreapp3.1", "projectReferences": {} } }, @@ -38,8 +38,8 @@ } }, "frameworks": { - "net5.0": { - "targetAlias": "net5.0", + "netcoreapp3.1": { + "targetAlias": "netcoreapp3.1", "dependencies": { "ClosedXML": { "target": "Package", diff --git a/rmutr_report.csproj b/rmutr_report.csproj index 1d2b290..79cd0c4 100644 --- a/rmutr_report.csproj +++ b/rmutr_report.csproj @@ -1,7 +1,7 @@ - net5.0 + netcoreapp3.1 true diff --git a/wwwroot/reports/new_rate_offer_request_form.frx b/wwwroot/reports/new_rate_offer_request_form.frx index 63e9a54..43cffdc 100644 --- a/wwwroot/reports/new_rate_offer_request_form.frx +++ b/wwwroot/reports/new_rate_offer_request_form.frx @@ -27,9 +27,9 @@ - - - + + +