bug fixed
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
kamonwan taengsuk
2023-08-22 11:09:35 +07:00
parent 48f918060d
commit 80bbf8ca17
10 changed files with 38 additions and 33 deletions

View File

@@ -2503,12 +2503,12 @@ namespace rmutr_report.Controllers
detail2.text1 = "อัตรา";
}
// var cperson = detail.budget_personnel_lists.Count();
//
// if (cperson ==1)
// {
// detail.budget_personnel_lists[0].topic = "งบบุคลากร";
// }
var cperson = detail.budget_personnel_lists.Count();
if (cperson ==1)
{
detail.budget_personnel_lists[0].topic = "งบบุคลากร";
}
foreach (var detail3 in detail2.budget_personnel_lists_2)
{
@@ -2553,30 +2553,35 @@ namespace rmutr_report.Controllers
no3++;
}
// if (cperson == 2)
// {
// detail.budget_personnel_lists[0].topic = "งบบุคลากร";
// detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
// detail.budget_personnel_lists[1].text1 = null;
// detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null;
// detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null;
// detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
// .row_no = null;
// detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
// .text1 = null;
// detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
// .details[0].text1 = null;
//}
if (cperson == 2)
{
detail.budget_personnel_lists[0].topic = "งบบุคลากร";
detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
detail.budget_personnel_lists[1].text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.row_no = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.details[0].text1 = null;
}
foreach (var detail6 in detail5.details2)
if (detail5.details2 != null)
{
if (detail6.topic != null)
foreach (var detail6 in detail5.details2)
{
detail6.row_no = no4;
no4++;
detail6.text1 = "บาท";
if (detail6.topic != null)
{
detail6.row_no = no4;
no4++;
detail6.text1 = "บาท";
}
}
}
}
}
}