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

67
Controllers/PlantGeneticConservationProject.Controller.cs
View File

@@ -105,7 +105,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++;
}
}
@@ -131,7 +149,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)
{
@@ -214,25 +232,7 @@ 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)
{
@@ -366,7 +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 };
Report report = new Report();

62
Controllers/project_principle_rationale.Controller.cs
View File

@@ -46,6 +46,7 @@ namespace rmutr_report.Controllers
activity = ""
});
}
if (project.ninth != null)
{
foreach (var vv in project.ninth)
@@ -73,7 +74,7 @@ namespace rmutr_report.Controllers
if (project.sixteenths != null)
{
int t = 1;
foreach (var sixteenthData in project.sixteenths)
{
string a = "กิจกรรมที่ " + t + " ";
@@ -95,6 +96,26 @@ 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++;
}
}
@@ -120,7 +141,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)
{
@@ -203,25 +224,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)
{
@@ -349,7 +351,6 @@ namespace rmutr_report.Controllers
if (project.twenty_four != null)
{
int no = 1;
int t = 1;
foreach (var v in project.twenty_four)
@@ -358,13 +359,13 @@ namespace rmutr_report.Controllers
if (v.activity != null)
{
v.activity = aa + v.activity;
}
if (v.activity == null)
{
v.activity = null;
}
t++;
foreach (var dataDetail in v.twenty_fours)
{
@@ -410,9 +411,10 @@ namespace rmutr_report.Controllers
if (project.twenty_fifth != null)
{
int t = 1;
foreach (var fifthData in project.twenty_fifth)
{
foreach (var acti in fifthData.activity)
foreach (var acti in fifthData.activity)
{
fifthData.activitys = acti;
}
@@ -421,6 +423,18 @@ namespace rmutr_report.Controllers
{
fifthData.locations = locat;
}
string a = "กิจกรรมที่ " + t + " ";
if (fifthData.activity_display_name != null)
{
fifthData.activity_display_name = a + fifthData.activity_display_name;
}
if (fifthData.activity_display_name == null)
{
fifthData.activity_display_name = null;
}
t++;
}
}
}

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 };