From da8805020d3aac23490c9d2a0b621d651ee44921 Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Thu, 29 Aug 2024 09:50:31 +0700 Subject: [PATCH] Bug Fixed --- Controllers/Budget.Controller.cs | 15 ++++++++------- obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs | 2 +- .../net5.0/rmutr_report.AssemblyInfoInputs.cache | 2 +- obj/rider.project.model.nuget.info | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index b859874..6c9f27f 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -3682,7 +3682,7 @@ namespace rmutr_report.Controllers foreach (var detail in requestSummary.data_1) { - ws.Cell(row, 1).Value = detail.rowno + "." + detail.list; + ws.Cell(row, 1).Value = detail.rowno + detail.list; foreach (var budgetPlan in detail.plans) { ws.Cell(row, 2).Value = budgetPlan.value; @@ -3742,7 +3742,7 @@ namespace rmutr_report.Controllers } if (detail2.color=="3" && detail2.is_bold==null) { - ws.Cell(row, 1).Value = detail2.rowno + "." + detail2.list; + ws.Cell(row, 1).Value = detail2.rowno + detail2.list; foreach (var budgetPlan in detail2.plans) { ws.Cell(row, 2).Value = budgetPlan.value; @@ -3850,7 +3850,7 @@ namespace rmutr_report.Controllers foreach (var detail in requestSummary.data_1) { int col2 = 2; - ws.Cell(row, 1).Value = detail.rowno + "." + detail.list; + ws.Cell(row, 1).Value = detail.rowno + detail.list; // int col2 = 2; ws.Cell(row, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; ws.Cell(row, 2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; @@ -3941,7 +3941,7 @@ namespace rmutr_report.Controllers } if (detail2.color=="3" && detail2.is_bold==null) { - ws.Cell(row, 1).Value = detail2.rowno + "." + detail2.list; + ws.Cell(row, 1).Value = detail2.rowno + detail2.list; ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; @@ -4114,7 +4114,7 @@ namespace rmutr_report.Controllers foreach (var detail in requestSummary.data_1) { - ws.Cell(row, 1).Value = detail.rowno + "." + detail.list; + ws.Cell(row, 1).Value = detail.rowno + detail.list; foreach (var budgetPlan in detail.plans) { ws.Cell(row, 2).Value = budgetPlan.value; @@ -4227,7 +4227,7 @@ namespace rmutr_report.Controllers foreach (var detail in requestSummary.data_1) { int col2 = 2; - ws.Cell(row, 1).Value = detail.rowno + "." + detail.list; + ws.Cell(row, 1).Value = detail.rowno + detail.list; // int col2 = 2; ws.Cell(row, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; ws.Cell(row, 2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; @@ -4316,7 +4316,8 @@ namespace rmutr_report.Controllers } - } + + } using (var stream = new MemoryStream()) { workbook.SaveAs(stream); diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index 8692b04..c7fa1f2 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+e3335ae91ef9baabb47da357b8b7aab82d9a6379")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e2a3977734a6c0e63d669a0800cfaf4bca52db1a")] [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 8d16d8b..628d4ea 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -a7b7d5b2aff46867fbc8b661104f49364ba3a3101b36bc40e3ec970d1c88ff22 +83b7c8eaf06473c917649059b491b34a25238c6d940329abfd68e57bff3c4984 diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index f7d692c..5e9e084 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17248180168527223 \ No newline at end of file +17248395490624370 \ No newline at end of file