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

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

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-12-07 15:15:17 +07:00
parent 351d61ac8c
commit 54ecb6cf9c
21 changed files with 252 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Controllers/project_request_thailand.Controller.cs
View File

@@ -125,6 +125,25 @@ namespace rmutr_report.Controllers
{
sixteenthData.activity_table = null;
}
if (sixteenthData.total_target != null)
{
project.text1 = "ผลรวมกลุ่มเป้าหมาย " + sixteenthData.total_target;
}
if (sixteenthData.total_target == null)
{
project.text1 = "ผลรวมกลุ่มเป้าหมาย -";
}
if (sixteenthData.total_board != null)
{
project.text2 = "ผลรวมคณะกรรมการ " + sixteenthData.total_board;
}
if (sixteenthData.total_board == null)
{
project.text2 = "ผลรวมคณะกรรมการ -";
}
t++;
}
@@ -151,7 +170,7 @@ namespace rmutr_report.Controllers
foreach (var vv in v.seventeenths)
{
string na = "ครั้งที่ ";
vv.the_time = na + vv.the_time;
vv.the_time = na + "1";
//ti++;
foreach (var detail in vv.seventeenths2)
{
@@ -234,26 +253,6 @@ namespace rmutr_report.Controllers
}
}
if (project.total_target != null)
{
project.text1 = "ผลรวมกลุ่มเป้าหมาย " + project.total_target;
}
if (project.total_target == null)
{
project.text1 = "ผลรวมกลุ่มเป้าหมาย -";
}
if (project.total_board != null)
{
project.text2 = "ผลรวมคณะกรรมการ " + project.total_board;
}
if (project.total_board == null)
{
project.text2 = "ผลรวมคณะกรรมการ -";
}
if (project.twenty_one != null)
{
int t = 1;
@@ -367,6 +366,34 @@ namespace rmutr_report.Controllers
t++;
}
}
if (project.twenty_fifth != null)
{
int t = 1;
foreach (var v in project.twenty_fifth)
{
foreach (var acti in v.activity)
{
v.activitys = acti;
}
foreach (var locat in v.location)
{
v.locations = locat;
}
string a = "กิจกรรมที่ " + t + " ";
if (v.activity_display_name != null)
{
v.activity_display_name = a + v.activity_display_name;
}
if (v.activity_display_name == null)
{
v.activity_display_name = null;
}
t++;
}
}
var _project = new List<project_principle_rationale>() { project };