Bug Fixed
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
kamonwan taengsuk
2024-09-04 15:27:55 +07:00
parent fe5bea66d7
commit 438286ba8b
14 changed files with 58 additions and 41 deletions

View File

@@ -3921,7 +3921,7 @@ namespace rmutr_report.Controllers
foreach (var detail2 in detail.data_2)
{
if (detail2.color=="1" && detail2.is_bold==true)
if (detail2.color=="1" && detail2.is_bold==true)//ฟ้า
{
ws.Cell(row, 1).Value = detail2.list;
@@ -3952,7 +3952,7 @@ namespace rmutr_report.Controllers
row++;
}
if (detail2.color=="2" && detail2.is_bold==null)
if (detail2.color=="2" && detail2.is_bold==null)//ส้ม
{
ws.Cell(row, 1).Value = detail2.list;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
@@ -3982,36 +3982,36 @@ namespace rmutr_report.Controllers
row++;
}
// if (detail2.color=="3" && detail2.is_bold==null)
// {
// 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;
// ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontName = "TH SarabunPSK";
// ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
// ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 255, 204);
// ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
// ws.Cell(row, 1).Style.Alignment.WrapText =true;
// col2 = 2;
// foreach (var budgetPlan in detail2.plans)
// {
// ws.Cell(row, col2).Value = budgetPlan.value??0;
// ws.Cell(row, col2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
// ws.Cell(row, col2).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 255, 204);
// ws.Cell(row, col2).Style.Font.FontName = "TH SarabunPSK";
// ws.Cell(row, col2).Style.Font.FontSize = 10;
// ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
// ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
// ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
// ws.Cell(row, col2).Style.Alignment.WrapText = true;
// col2++;
//
// }
// // col2++;
// row++;
//
// }
if (detail2.color=="3" && detail2.is_bold==null)//เหลือง
{
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;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 255, 204);
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 1).Style.Alignment.WrapText =true;
col2 = 2;
foreach (var budgetPlan in detail2.plans)
{
ws.Cell(row, col2).Value = budgetPlan.value??0;
ws.Cell(row, col2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, col2).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 255, 204);
ws.Cell(row, col2).Style.Font.FontName = "TH SarabunPSK";
ws.Cell(row, col2).Style.Font.FontSize = 10;
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
// col2++;
row++;
}
if (detail2.color==null && detail2.is_bold==null)
{
ws.Cell(row, 1).Value = detail2.rowno + detail2.list;
@@ -4020,7 +4020,7 @@ namespace rmutr_report.Controllers
ws.Cell(row,2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.SetBold().Font.FontSize = 10;
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, 1).Style.Alignment.WrapText = true;
@@ -4030,7 +4030,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Value = budgetPlan.value??0;
ws.Cell(row, col2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, col2).Style.Font.FontName = "TH SarabunPSK";
ws.Cell(row, col2).Style.Font.FontSize = 10;
ws.Cell(row, col2).Style.Font.SetBold().Font.FontSize = 10;
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(row, col2).Style.Alignment.WrapText = true;
@@ -4050,7 +4050,7 @@ namespace rmutr_report.Controllers
ws.Cell(row,2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
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;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 1).Style.Alignment.WrapText = true;
@@ -4060,7 +4060,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Value = budgetPlan.value??0;
ws.Cell(row, col2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, col2).Style.Font.FontName = "TH SarabunPSK";
ws.Cell(row, col2).Style.Font.SetBold().Font.FontSize = 10;
ws.Cell(row, col2).Style.Font.FontSize = 10;
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");