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-11-23 17:12:25 +07:00
parent 3a2f956d02
commit 5ba7919b29
16 changed files with 836 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
Controllers/project_request_thailand.Controller.cs
View File

@@ -112,8 +112,16 @@ namespace rmutr_report.Controllers
sixteenthData.bophitphimuk_total = sum2;
sixteenthData.pohchang_total = sum3;
sixteenthData.klai_kangwon_total = sum4;
sixteenthData.activity_table = a + sixteenthData.activity_table;
t++;
if (sixteenthData.activity_table != null)
{
sixteenthData.activity_table = a + sixteenthData.activity_table;
t++;
}
if (sixteenthData.activity_table == null)
{
sixteenthData.activity_table = null;
}
}
}
@@ -123,7 +131,17 @@ namespace rmutr_report.Controllers
{
int t = 1;
string a = "กิจกรรมที่ ";
v.activity = a + v.activity;
if (v.activity != null)
{
v.activity = a + v.activity;
t++;
}
if (v.activity == null)
{
v.activity = null;
}
foreach (var vv in v.seventeenths)
{
string na = "ครั้งที่ ";
@@ -157,6 +175,19 @@ namespace rmutr_report.Controllers
{
foreach (var v in project.eighteenth)
{
int t = 1;
string a = "กิจกรรมที่ ";
if (v.activity != null)
{
v.activity = a + v.activity;
t++;
}
if (v.activity == null)
{
v.activity = null;
}
foreach (var vv in v.eighteenths)
{
string na = "ครั้งที่ ";
@@ -171,23 +202,63 @@ namespace rmutr_report.Controllers
}
}
if (project.nineteenth != null)
{
foreach (var v in project.nineteenth)
{
foreach (var vv in v.nineteenth_data_header)
{
int t = 1;
string a = "กิจกรรมที่ ";
if (vv.activity != null)
{
vv.activity = a + vv.activity;
t++;
}
if (vv.activity == null)
{
vv.activity = null;
}
}
}
}
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)
{
foreach (var v in project.twenty_one)
{
if (v.activity != null || v.activity != "")
int t = 1;
string a = "กิจกรรมที่ ";
if (v.activity != null)
{
v.activity = v.activity;
v.activity = a + v.activity;
t++;
}
if (v.activity == null)
{
v.activity = null;
}
foreach (var vv in v.twenty_ones)
@@ -266,7 +337,24 @@ namespace rmutr_report.Controllers
}
}
}
if (project.twenty_four != null)
{
foreach (var v in project.twenty_four)
{
int t = 1;
string a = "กิจกรรมที่ ";
if (v.activity != null)
{
v.activity = a + v.activity;
t++;
}
if (v.activity == null)
{
v.activity = null;
}
}
}
var _project = new List<project_principle_rationale>() { project };