kamonwantaengsuk/rmutr_report
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

edit type of string

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-08-02 18:06:03 +07:00
parent a58f7ec1f8
commit d4c05e088f
14 changed files with 142 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
Controllers/RoFive.Controller.cs
View File

@@ -1532,7 +1532,6 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(5, 5), ws.Cell(6, 29)).Style.Border.RightBorder = XLBorderStyleValues.Thin; 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; XLBorderStyleValues.Thin;
} }
} }
if (a == 11) if (a == 11)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
@@ -2921,7 +2921,8 @@ namespace rmutr_report.Controllers
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
if (a == 12)
if (a == 12)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
{ {
@@ -3045,7 +3046,8 @@ namespace rmutr_report.Controllers
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
if (a == 13)
if (a == 13)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
{ {
@@ -3168,7 +3170,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 22).Style.Border.OutsideBorder = ws.Cell(row, 22).Style.Border.OutsideBorder =
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
if (a == 14) if (a == 14)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
@@ -3292,8 +3295,9 @@ namespace rmutr_report.Controllers
ws.Cell(row, 23).Style.Border.OutsideBorder = ws.Cell(row, 23).Style.Border.OutsideBorder =
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
if (a == 15)
if (a == 15)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
{ {
@@ -3416,8 +3420,9 @@ namespace rmutr_report.Controllers
ws.Cell(row, 24).Style.Border.OutsideBorder = ws.Cell(row, 24).Style.Border.OutsideBorder =
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
if (a == 16)
if (a == 16)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
{ {
@@ -3540,8 +3545,9 @@ namespace rmutr_report.Controllers
ws.Cell(row, 25).Style.Border.OutsideBorder = ws.Cell(row, 25).Style.Border.OutsideBorder =
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
if (a == 17)
if (a == 17)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
{ {
@@ -3664,7 +3670,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 26).Style.Border.OutsideBorder = ws.Cell(row, 26).Style.Border.OutsideBorder =
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
if (a == 18) if (a == 18)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
@@ -3788,8 +3795,9 @@ namespace rmutr_report.Controllers
ws.Cell(row, 27).Style.Border.OutsideBorder = ws.Cell(row, 27).Style.Border.OutsideBorder =
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
if (a == 19)
if (a == 19)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
{ {
@@ -3912,8 +3920,9 @@ namespace rmutr_report.Controllers
ws.Cell(row, 28).Style.Border.OutsideBorder = ws.Cell(row, 28).Style.Border.OutsideBorder =
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
if (a == 20)
if (a == 20)
{ {
if (header.topic_type == 1) if (header.topic_type == 1)
{ {
@@ -4036,7 +4045,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, 29).Style.Border.OutsideBorder = ws.Cell(row, 29).Style.Border.OutsideBorder =
XLBorderStyleValues.Thin; XLBorderStyleValues.Thin;
} }
} }
} }
using (var stream = new MemoryStream()) using (var stream = new MemoryStream())
@@ -4049,15 +4058,19 @@ namespace rmutr_report.Controllers
"revenueEstimate_register" + ".xlsx"); "revenueEstimate_register" + ".xlsx");
} }
} }
[HttpPost, Route("reports/form_1_2/{type}")] [HttpPost, Route("reports/form_1_2/{type}")]
[ApiExplorerSettings(GroupName = "reports")] [ApiExplorerSettings(GroupName = "reports")]
public IActionResult GetForm2Report([FromRoute] string type, public IActionResult GetForm2Report([FromRoute] string type,
[FromBody] form_1_2 form1) [FromBody] form_1_2 form1)
{ {
form1.dates = form1.date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH")); 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.day_start_workings =
form1.month_start_workings = form1.start_working.Value.ToString("MMMM", CultureInfo.CreateSpecificCulture("th-TH")); form1.start_working.Value.ToString("dd", CultureInfo.CreateSpecificCulture("th-TH"));
form1.year_start_workings = form1.start_working.Value.ToString("yyyy", 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<form_1_2>() { form1 }; var form_1 = new List<form_1_2>() { form1 };
Report report = new Report(); Report report = new Report();
@@ -4083,7 +4096,7 @@ namespace rmutr_report.Controllers
report.Export(word1, stream); report.Export(word1, stream);
stream.Seek(0, SeekOrigin.Begin); stream.Seek(0, SeekOrigin.Begin);
return File(stream, "appllication/vnd.ms-word"); return File(stream, "appllication/vnd.ms-word");
case "xlsx": case "xlsx":
Excel2007Export excel = new Excel2007Export(); Excel2007Export excel = new Excel2007Export();
report.Export(excel, stream); report.Export(excel, stream);
stream.Seek(0, SeekOrigin.Begin); stream.Seek(0, SeekOrigin.Begin);
@@ -4096,130 +4109,142 @@ namespace rmutr_report.Controllers
return Ok(); return Ok();
} }
[HttpPost, Route("reports/form_1_3/{type}")] [HttpPost, Route("reports/form_1_3/{type}")]
[ApiExplorerSettings(GroupName = "reports")] [ApiExplorerSettings(GroupName = "reports")]
public IActionResult GetForm3Report([FromRoute] string type, public IActionResult GetForm3Report([FromRoute] string type,
[FromBody] form_1_3 form3) [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) if (form3.checkbox_1 == true)
{ {
form3.checkbox1 = "/"; form3.checkbox1 = "/";
form3.checkbox2 = null; // form3.checkbox2 = null;
form3.checkbox3 = null; // form3.checkbox3 = null;
form3.checkbox4 = null; // form3.checkbox4 = null;
form3.checkbox5 = null; // form3.checkbox5 = null;
} }
if (form3.checkbox_1 ==false ) if (form3.checkbox_1 == false)
{ {
form3.checkbox1 = null; form3.checkbox1 = null;
} }
if (form3.checkbox_2 == true) if (form3.checkbox_2 == true)
{ {
form3.checkbox2 = "/"; form3.checkbox2 = "/";
form3.checkbox1 = null; // form3.checkbox1 = null;
form3.checkbox3 = null; // form3.checkbox3 = null;
form3.checkbox4 = null; // form3.checkbox4 = null;
form3.checkbox5 = null; // form3.checkbox5 = null;
} }
if (form3.checkbox_2 ==false ) if (form3.checkbox_2 == false)
{ {
form3.checkbox2 = null; form3.checkbox2 = null;
} }
if (form3.checkbox_3 == true) if (form3.checkbox_3 == true)
{ {
form3.checkbox3 = "/"; form3.checkbox3 = "/";
form3.checkbox2 = null; // form3.checkbox2 = null;
form3.checkbox1 = null; // form3.checkbox1 = null;
form3.checkbox4 = null; // form3.checkbox4 = null;
form3.checkbox5 = null; // form3.checkbox5 = null;
} }
if (form3.checkbox_3 ==false ) if (form3.checkbox_3 == false)
{ {
form3.checkbox3 = null; form3.checkbox3 = null;
} }
if (form3.checkbox_4 == true) if (form3.checkbox_4 == true)
{ {
form3.checkbox4 = "/"; form3.checkbox4 = "/";
form3.checkbox2 = null; // form3.checkbox2 = null;
form3.checkbox3 = null; // form3.checkbox3 = null;
form3.checkbox1 = null; // form3.checkbox1 = null;
form3.checkbox5 = null; // form3.checkbox5 = null;
} }
if (form3.checkbox_4 ==false ) if (form3.checkbox_4 == false)
{ {
form3.checkbox4 = null; form3.checkbox4 = null;
} }
if (form3.checkbox_5 == true) if (form3.checkbox_5 == true)
{ {
form3.checkbox5 = "/"; form3.checkbox5 = "/";
form3.checkbox2 = null; // form3.checkbox2 = null;
form3.checkbox3 = null; // form3.checkbox3 = null;
form3.checkbox4 = null; // form3.checkbox4 = null;
form3.checkbox1 = null; // form3.checkbox1 = null;
} }
if (form3.checkbox_5 ==false ) if (form3.checkbox_5 == false)
{ {
form3.checkbox5 = null; form3.checkbox5 = null;
} }
if (form3.other_remark!=null||form3.other_remark!="") if (form3.other_remark != null || form3.other_remark != "")
{ {
form3.checkbox6 = "/"; form3.checkbox6 = "/";
} }
if (form3.other_remark==null||form3.other_remark=="")
if (form3.other_remark == null || form3.other_remark == "")
{ {
form3.checkbox6 = null; 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.checkbox1 = "/";
detail.order_date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH")); detail.checkbox2 = null;
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;
}
if (detail.checkbox_1 ==false ) if (detail.checkbox_1 == false)
{ {
detail.checkbox1 = null; detail.checkbox1 = null;
} }
if (detail.checkbox_2 == true)
{
detail.checkbox2 = "/";
detail.checkbox1 = null;
}
if (detail.checkbox_2 ==false ) if (detail.checkbox_2 == true)
{ {
detail.checkbox2 = null; detail.checkbox2 = "/";
} detail.checkbox1 = null;
var a = detail.effects_if; }
var b = detail.workload;
foreach (var aa in a) if (detail.checkbox_2 == false)
{ {
detail.effects_if1 = aa; detail.checkbox2 = null;
} }
foreach (var bb in b)
{ var a = detail.effects_if;
detail.workloads = bb; 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<form_1_3>() { form3 }; var form_3 = new List<form_1_3>() { form3 };
@@ -4246,7 +4271,7 @@ namespace rmutr_report.Controllers
report.Export(word1, stream); report.Export(word1, stream);
stream.Seek(0, SeekOrigin.Begin); stream.Seek(0, SeekOrigin.Begin);
return File(stream, "appllication/vnd.ms-word"); return File(stream, "appllication/vnd.ms-word");
case "xlsx": case "xlsx":
Excel2007Export excel = new Excel2007Export(); Excel2007Export excel = new Excel2007Export();
report.Export(excel, stream); report.Export(excel, stream);
stream.Seek(0, SeekOrigin.Begin); stream.Seek(0, SeekOrigin.Begin);

6
Models/RoReport/form_1_3.cs
View File

@@ -75,13 +75,13 @@ namespace rmutr_report.Models.RoThree
public string offer_qualification { get; set; } 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; } public bool? checkbox_1 { get; set; }

BIN
bin/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
bin/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

1
obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
View File

@@ -1,6 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 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 // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

30
obj/project.assets.json
View File

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

2
obj/project.nuget.cache
View File

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

2
obj/project.packagespec.json
View File

@@ -1 +1 @@
"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\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"}}

2
obj/rider.project.restore.info
View File

@@ -1 +1 @@
16909628354926351 16909729614022267

10
obj/rmutr_report.csproj.nuget.dgspec.json
View File

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

2
rmutr_report.csproj
View File

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

6
wwwroot/reports/new_rate_offer_request_form.frx
View File

@@ -27,9 +27,9 @@
<Column Name="no" DataType="System.String"/> <Column Name="no" DataType="System.String"/>
<Column Name="offer_position" DataType="System.String"/> <Column Name="offer_position" DataType="System.String"/>
<Column Name="offer_qualification" DataType="System.String"/> <Column Name="offer_qualification" DataType="System.String"/>
<Column Name="retirement" DataType="System.Decimal"/> <Column Name="retirement" DataType="System.String"/>
<Column Name="position_retirement" DataType="System.Decimal"/> <Column Name="position_retirement" DataType="System.String"/>
<Column Name="year_retirement" DataType="System.Decimal"/> <Column Name="year_retirement" DataType="System.String"/>
<Column Name="checkbox1" DataType="System.String"/> <Column Name="checkbox1" DataType="System.String"/>
<Column Name="checkbox2" DataType="System.String"/> <Column Name="checkbox2" DataType="System.String"/>
<Column Name="hire_retirees_no" DataType="System.String"/> <Column Name="hire_retirees_no" DataType="System.String"/>