diff --git a/Controllers/RepairCost.Controller.cs b/Controllers/RepairCost.Controller.cs index f87422a..f30a6f2 100644 --- a/Controllers/RepairCost.Controller.cs +++ b/Controllers/RepairCost.Controller.cs @@ -84,21 +84,21 @@ namespace rmutr_report.Controllers ws.Cell("D6").Style.Font.FontSize = 16; ws.Cell("D6").Style.Font.Bold = true; ws.Cell("D6").Style.Alignment.WrapText = true; - // ws.Cell("E5").Value = "ค่าซ่อมแซม"; - // ws.Cell("E5").Style.Font.FontName = "TH SarabunPSK"; - // ws.Cell("E5").Style.Font.FontSize = 16; - // ws.Cell("E5").Style.Font.Bold = true; - // ws.Cell("E5").Style.Alignment.WrapText = true; - // ws.Cell("E6").Value = "บาท/ปี"; - // ws.Cell("E6").Style.Font.FontName = "TH SarabunPSK"; - // ws.Cell("E6").Style.Font.FontSize = 16; - // ws.Cell("E6").Style.Font.Bold = true; - // ws.Cell("E6").Style.Alignment.WrapText = true; + ws.Cell("E5").Value = "ค่าซ่อมแซม"; + ws.Cell("E5").Style.Font.FontName = "TH SarabunPSK"; + ws.Cell("E5").Style.Font.FontSize = 16; + ws.Cell("E5").Style.Font.Bold = true; + ws.Cell("E5").Style.Alignment.WrapText = true; + ws.Cell("E6").Value = "บาท/ปี"; + ws.Cell("E6").Style.Font.FontName = "TH SarabunPSK"; + ws.Cell("E6").Style.Font.FontSize = 16; + ws.Cell("E6").Style.Font.Bold = true; + ws.Cell("E6").Style.Alignment.WrapText = true; - ws.Range("A5:D6").Style.Fill.BackgroundColor = XLColor.Gainsboro; - ws.Range("A5:D6").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; - ws.Range("A5:D6").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; - ws.Range("A5:D6").Style.Border.OutsideBorder = + ws.Range("A5:E6").Style.Fill.BackgroundColor = XLColor.Gainsboro; + ws.Range("A5:E6").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range("A5:E6").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; + ws.Range("A5:E6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range("A5:A6").Style.Border.RightBorder = XLBorderStyleValues.Thin; @@ -108,12 +108,13 @@ namespace rmutr_report.Controllers XLBorderStyleValues.Thin; ws.Range("D5:D6").Style.Border.RightBorder = XLBorderStyleValues.Thin; - + ws.Range("E5:E6").Style.Border.RightBorder = + XLBorderStyleValues.Thin; ws.Column(1).Width = 10; ws.Column(2).Width = 40; ws.Column(3).Width = 10; ws.Column(4).Width = 15; - //ws.Column(5).Width = 15; + ws.Column(5).Width = 15; int row = 7; //int row2 = 9; @@ -128,27 +129,27 @@ namespace rmutr_report.Controllers ws.Cell(row, 2).Value = house.type_vehicle_transport; ws.Cell(row, 3).Value = house.quantity; ws.Cell(row, 4).Value = house.repair_rate; - //ws.Cell(row, 5).Value = house.amount; + ws.Cell(row, 5).Value = house.amount; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Font.FontName = + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Font.FontName = "TH SarabunPSK"; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Font.FontSize = 16; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Alignment.WrapText = true; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Alignment.Vertical = + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Font.FontSize = 16; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Alignment.WrapText = true; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Border.OutsideBorder = + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Border.RightBorder = + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Border.RightBorder = XLBorderStyleValues.Thin; ws.Cell(row, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; ws.Cell(row, 2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; ws.Cell(row, 3).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; ws.Cell(row, 4).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; - //ws.Cell(row, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; - ws.Cell(row, 4).SetDataType(XLDataType.Number); - ws.Cell(row, 4).Style.NumberFormat.SetFormat("#,#"); + ws.Cell(row, 5).SetDataType(XLDataType.Number); + ws.Cell(row, 5).Style.NumberFormat.SetFormat("#,#"); row++; } @@ -158,31 +159,31 @@ namespace rmutr_report.Controllers ws.Cell(row, 2).Value = house.type_vehicle_transport; ws.Cell(row, 3).Value = house.quantity; ws.Cell(row, 4).Value = house.repair_rate; - //ws.Cell(row, 5).Value = house.amount; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Font.FontName = + ws.Cell(row, 5).Value = house.amount; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Font.FontName = "TH SarabunPSK"; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Font.FontSize = 16; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Alignment.WrapText = true; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Font.FontSize = 16; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Alignment.WrapText = true; ws.Cell(row, 2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; ws.Cell(row, 1).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell(row, 2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell(row, 3).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell(row, 4).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; - //ws.Cell(row, 5).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; + ws.Cell(row, 5).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell(row, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; ws.Cell(row, 3).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; ws.Cell(row, 4).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; - //ws.Cell(row, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Border.LeftBorder = XLBorderStyleValues.None; - ws.Range(ws.Cell(row, 2), ws.Cell(row, 4)).Style.Border.RightBorder = + ws.Range(ws.Cell(row, 2), ws.Cell(row, 5)).Style.Border.RightBorder = XLBorderStyleValues.Thin; ws.Cell(row, 1).Style.Border.RightBorder = XLBorderStyleValues.None; - ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Border.OutsideBorder = + ws.Range(ws.Cell(row, 1), ws.Cell(row, 5)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; - ws.Cell(row, 4).SetDataType(XLDataType.Number); - ws.Cell(row, 4).Style.NumberFormat.SetFormat("#,#"); + ws.Cell(row, 5).SetDataType(XLDataType.Number); + ws.Cell(row, 5).Style.NumberFormat.SetFormat("#,#"); row++; } } diff --git a/Models/budget/repair_cost.cs b/Models/budget/repair_cost.cs index dc30cf4..3eae4ea 100644 --- a/Models/budget/repair_cost.cs +++ b/Models/budget/repair_cost.cs @@ -18,6 +18,6 @@ namespace rmutr_report.Models public string type_vehicle_transport { get; set; } public decimal? quantity { get; set; } public decimal? repair_rate { get; set; } - //public decimal? amount { get; set; } + public decimal? amount { get; set; } } } \ No newline at end of file diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 76bf211..1a44bc8 100644 Binary files a/bin/Debug/net5.0/rmutr_report.dll and b/bin/Debug/net5.0/rmutr_report.dll differ diff --git a/bin/Debug/net5.0/rmutr_report.pdb b/bin/Debug/net5.0/rmutr_report.pdb index 2bd4788..3fa6711 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/ref/rmutr_report.dll b/obj/Debug/net5.0/ref/rmutr_report.dll index 299edd2..ea8a314 100644 Binary files a/obj/Debug/net5.0/ref/rmutr_report.dll and b/obj/Debug/net5.0/ref/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/refint/rmutr_report.dll b/obj/Debug/net5.0/refint/rmutr_report.dll index 299edd2..ea8a314 100644 Binary files a/obj/Debug/net5.0/refint/rmutr_report.dll and b/obj/Debug/net5.0/refint/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index 51f9a3c..401a217 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+989c7f9035e001978030d7dd34783caff202acc6")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3094fae4b712eca121cc30b04c1ccf45a9636912")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache index 8b08a13..01638d9 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -fc05b4afb733e7d0e870753cbfb7dbdf3bfc36383a60cb7d88378fede06ec8d6 +ed2783f80d214d6bb90290841cf7165830baa6719ee399db3ba9c4a2b9791914 diff --git a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache index 9ff0118..4e88368 100644 --- a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -a40407391d18b2a6d279653d7ec163bb87aa57c154c5935881bd5a997b3724b2 +9450eacabdd79216d219abffdf398731c57fe782d38e6036fcfe155ad2cb53f7 diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 76bf211..1a44bc8 100644 Binary files a/obj/Debug/net5.0/rmutr_report.dll and b/obj/Debug/net5.0/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index 2bd4788..3fa6711 100644 Binary files a/obj/Debug/net5.0/rmutr_report.pdb and b/obj/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/project.assets.json b/obj/project.assets.json index 9c73dfa..4051d3f 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -2222,7 +2222,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.203\\RuntimeIdentifierGraph.json" } } } diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index bbe65aa..acea569 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "RQ5O5n77TryvfG95GwkUPq1UwuUDsDeB030wtL1QeihD59d4O2jO1wg2BEZ9G0jbvnZbkdAgIpRU3sXSdr9rvQ==", + "dgSpecHash": "ecUEebjPEI0T4ZiE/eT9VQfatBN61E54at5joXAPU/RxAePNTRydDk2hezwZlgDTtke2ZS6C7JRPPi1knoESbw==", "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 156c15c..5a685ff 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\\8.0.201\\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":["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\\8.0.203\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 9c82eed..2a35be6 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17102170300370763 \ No newline at end of file +17181666863627362 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 9c82eed..2a35be6 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17102170300370763 \ No newline at end of file +17181666863627362 \ 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 69be354..2dc3752 100644 --- a/obj/rmutr_report.csproj.nuget.dgspec.json +++ b/obj/rmutr_report.csproj.nuget.dgspec.json @@ -77,7 +77,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.203\\RuntimeIdentifierGraph.json" } } }