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-06 17:10:48 +07:00
parent f4b732087a
commit de4f5a0e7b
9 changed files with 87 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Controllers/PlantGeneticConservationProject.Controller.cs
View File

@@ -83,9 +83,10 @@ namespace rmutr_report.Controllers
if (project.sixteenths != null) if (project.sixteenths != null)
{ {
int t = 1; int t = 1;
string a = "กิจกรรมที่ ";
foreach (var sixteenthData in project.sixteenths) foreach (var sixteenthData in project.sixteenths)
{ {
string a = "กิจกรรมที่ " + t + " ";
var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya);
var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk); var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk);
var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang); var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang);
@@ -97,26 +98,27 @@ namespace rmutr_report.Controllers
if (sixteenthData.activity_table != null) if (sixteenthData.activity_table != null)
{ {
sixteenthData.activity_table = a + sixteenthData.activity_table; sixteenthData.activity_table = a + sixteenthData.activity_table;
t++;
} }
if (sixteenthData.activity_table == null) if (sixteenthData.activity_table == null)
{ {
sixteenthData.activity_table = null; sixteenthData.activity_table = null;
} }
t++;
} }
} }
if (project.seventeenth != null) if (project.seventeenth != null)
{ {
int t = 1;
int ti= 1;
foreach (var v in project.seventeenth) foreach (var v in project.seventeenth)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
@@ -124,11 +126,12 @@ namespace rmutr_report.Controllers
v.activity = null; v.activity = null;
} }
t++;
foreach (var vv in v.seventeenths) foreach (var vv in v.seventeenths)
{ {
string na = "ครั้งที่ "; string na = "ครั้งที่ ";
vv.the_time = na + t; vv.the_time = na + ti;
t++; ti++;
foreach (var detail in vv.seventeenths2) foreach (var detail in vv.seventeenths2)
{ {
string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) "; string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) ";
@@ -155,14 +158,14 @@ namespace rmutr_report.Controllers
if (project.eighteenth != null) if (project.eighteenth != null)
{ {
int t = 1;
int ti = 1;
foreach (var v in project.eighteenth) foreach (var v in project.eighteenth)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
@@ -170,10 +173,12 @@ namespace rmutr_report.Controllers
v.activity = null; v.activity = null;
} }
t++;
foreach (var vv in v.eighteenths) foreach (var vv in v.eighteenths)
{ {
string na = "ครั้งที่ "; string na = "ครั้งที่ ";
vv.the_time = na + vv.the_time; vv.the_time = na + ti;
ti++;
string na2 = " จำนวน "; string na2 = " จำนวน ";
vv.count_day = na2 + vv.count_day + " วัน"; vv.count_day = na2 + vv.count_day + " วัน";
if (project.count_day != null) if (project.count_day != null)
@@ -186,22 +191,24 @@ namespace rmutr_report.Controllers
if (project.nineteenth != null) if (project.nineteenth != null)
{ {
int t = 1;
foreach (var v in project.nineteenth) foreach (var v in project.nineteenth)
{ {
foreach (var vv in v.nineteenth_data_header) foreach (var vv in v.nineteenth_data_header)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (vv.activity != null) if (vv.activity != null)
{ {
vv.activity = a + vv.activity; vv.activity = a + vv.activity;
t++;
} }
if (vv.activity == null) if (vv.activity == null)
{ {
vv.activity = null; vv.activity = null;
} }
t++;
} }
} }
} }
@@ -228,20 +235,21 @@ namespace rmutr_report.Controllers
if (project.twenty_one != null) if (project.twenty_one != null)
{ {
int t = 1;
foreach (var v in project.twenty_one) foreach (var v in project.twenty_one)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
{ {
v.activity = null; v.activity = null;
} }
t++;
foreach (var vv in v.twenty_ones) foreach (var vv in v.twenty_ones)
{ {
// if (vv.clause1 != null || vv.clause1 != "") // if (vv.clause1 != null || vv.clause1 != "")
@@ -340,20 +348,21 @@ namespace rmutr_report.Controllers
if (project.twenty_four != null) if (project.twenty_four != null)
{ {
int t = 1;
foreach (var v in project.twenty_four) foreach (var v in project.twenty_four)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
{ {
v.activity = null; v.activity = null;
} }
t++;
} }
} }

43
Controllers/project_principle_rationale.Controller.cs
View File

@@ -56,9 +56,10 @@ namespace rmutr_report.Controllers
if (project.sixteenths != null) if (project.sixteenths != null)
{ {
int t = 1; int t = 1;
string a = "กิจกรรมที่ ";
foreach (var sixteenthData in project.sixteenths) foreach (var sixteenthData in project.sixteenths)
{ {
string a = "กิจกรรมที่ " + t + " ";
var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya);
var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk); var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk);
var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang); var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang);
@@ -70,26 +71,27 @@ namespace rmutr_report.Controllers
if (sixteenthData.activity_table != null) if (sixteenthData.activity_table != null)
{ {
sixteenthData.activity_table = a + sixteenthData.activity_table; sixteenthData.activity_table = a + sixteenthData.activity_table;
t++;
} }
if (sixteenthData.activity_table == null) if (sixteenthData.activity_table == null)
{ {
sixteenthData.activity_table = null; sixteenthData.activity_table = null;
} }
t++;
} }
} }
if (project.seventeenth != null) if (project.seventeenth != null)
{ {
int t = 1;
int ti= 1;
foreach (var v in project.seventeenth) foreach (var v in project.seventeenth)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
@@ -97,11 +99,12 @@ namespace rmutr_report.Controllers
v.activity = null; v.activity = null;
} }
t++;
foreach (var vv in v.seventeenths) foreach (var vv in v.seventeenths)
{ {
string na = "ครั้งที่ "; string na = "ครั้งที่ ";
vv.the_time = na + t; vv.the_time = na + ti;
t++; ti++;
foreach (var detail in vv.seventeenths2) foreach (var detail in vv.seventeenths2)
{ {
string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) "; string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) ";
@@ -128,15 +131,14 @@ namespace rmutr_report.Controllers
if (project.eighteenth != null) if (project.eighteenth != null)
{ {
int t = 1;
int ti = 1;
foreach (var v in project.eighteenth) foreach (var v in project.eighteenth)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
@@ -144,10 +146,12 @@ namespace rmutr_report.Controllers
v.activity = null; v.activity = null;
} }
t++;
foreach (var vv in v.eighteenths) foreach (var vv in v.eighteenths)
{ {
string na = "ครั้งที่ "; string na = "ครั้งที่ ";
vv.the_time = na + vv.the_time; vv.the_time = na + ti;
ti++;
string na2 = " จำนวน "; string na2 = " จำนวน ";
vv.count_day = na2 + vv.count_day + " วัน"; vv.count_day = na2 + vv.count_day + " วัน";
if (project.count_day != null) if (project.count_day != null)
@@ -160,22 +164,24 @@ namespace rmutr_report.Controllers
if (project.nineteenth != null) if (project.nineteenth != null)
{ {
int t = 1;
foreach (var v in project.nineteenth) foreach (var v in project.nineteenth)
{ {
foreach (var vv in v.nineteenth_data_header) foreach (var vv in v.nineteenth_data_header)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (vv.activity != null) if (vv.activity != null)
{ {
vv.activity = a + vv.activity; vv.activity = a + vv.activity;
t++;
} }
if (vv.activity == null) if (vv.activity == null)
{ {
vv.activity = null; vv.activity = null;
} }
t++;
} }
} }
} }
@@ -328,20 +334,21 @@ namespace rmutr_report.Controllers
{ {
int no = 1; int no = 1;
int t = 1;
foreach (var v in project.twenty_four) foreach (var v in project.twenty_four)
{ {
int t = 1; string aa = "กิจกรรมที่ " + t + " ";
string aa = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = aa + v.activity; v.activity = aa + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
{ {
v.activity = null; v.activity = null;
} }
t++;
foreach (var dataDetail in v.twenty_fours) foreach (var dataDetail in v.twenty_fours)
{ {
string a = "ชื่อผู้รับผิดชอบ กิจกรรมที่ " + no; string a = "ชื่อผู้รับผิดชอบ กิจกรรมที่ " + no;

49
Controllers/project_request_thailand.Controller.cs
View File

@@ -101,9 +101,10 @@ namespace rmutr_report.Controllers
if (project.sixteenths != null) if (project.sixteenths != null)
{ {
int t = 1; int t = 1;
string a = "กิจกรรมที่ ";
foreach (var sixteenthData in project.sixteenths) foreach (var sixteenthData in project.sixteenths)
{ {
string a = "กิจกรรมที่ " + t + " ";
var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya);
var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk); var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk);
var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang); var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang);
@@ -115,26 +116,27 @@ namespace rmutr_report.Controllers
if (sixteenthData.activity_table != null) if (sixteenthData.activity_table != null)
{ {
sixteenthData.activity_table = a + sixteenthData.activity_table; sixteenthData.activity_table = a + sixteenthData.activity_table;
t++;
} }
if (sixteenthData.activity_table == null) if (sixteenthData.activity_table == null)
{ {
sixteenthData.activity_table = null; sixteenthData.activity_table = null;
} }
t++;
} }
} }
if (project.seventeenth != null) if (project.seventeenth != null)
{ {
int t = 1;
int ti= 1;
foreach (var v in project.seventeenth) foreach (var v in project.seventeenth)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
@@ -142,11 +144,12 @@ namespace rmutr_report.Controllers
v.activity = null; v.activity = null;
} }
t++;
foreach (var vv in v.seventeenths) foreach (var vv in v.seventeenths)
{ {
string na = "ครั้งที่ "; string na = "ครั้งที่ ";
vv.the_time = na + t; vv.the_time = na + ti;
t++; ti++;
foreach (var detail in vv.seventeenths2) foreach (var detail in vv.seventeenths2)
{ {
string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) "; string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) ";
@@ -173,14 +176,14 @@ namespace rmutr_report.Controllers
if (project.eighteenth != null) if (project.eighteenth != null)
{ {
int t = 1;
int ti = 1;
foreach (var v in project.eighteenth) foreach (var v in project.eighteenth)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
@@ -188,10 +191,12 @@ namespace rmutr_report.Controllers
v.activity = null; v.activity = null;
} }
t++;
foreach (var vv in v.eighteenths) foreach (var vv in v.eighteenths)
{ {
string na = "ครั้งที่ "; string na = "ครั้งที่ ";
vv.the_time = na + vv.the_time; vv.the_time = na + ti;
ti++;
string na2 = " จำนวน "; string na2 = " จำนวน ";
vv.count_day = na2 + vv.count_day + " วัน"; vv.count_day = na2 + vv.count_day + " วัน";
if (project.count_day != null) if (project.count_day != null)
@@ -204,22 +209,24 @@ namespace rmutr_report.Controllers
if (project.nineteenth != null) if (project.nineteenth != null)
{ {
int t = 1;
foreach (var v in project.nineteenth) foreach (var v in project.nineteenth)
{ {
foreach (var vv in v.nineteenth_data_header) foreach (var vv in v.nineteenth_data_header)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (vv.activity != null) if (vv.activity != null)
{ {
vv.activity = a + vv.activity; vv.activity = a + vv.activity;
t++;
} }
if (vv.activity == null) if (vv.activity == null)
{ {
vv.activity = null; vv.activity = null;
} }
t++;
} }
} }
} }
@@ -246,14 +253,13 @@ namespace rmutr_report.Controllers
if (project.twenty_one != null) if (project.twenty_one != null)
{ {
int t = 1;
foreach (var v in project.twenty_one) foreach (var v in project.twenty_one)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
@@ -261,6 +267,8 @@ namespace rmutr_report.Controllers
v.activity = null; v.activity = null;
} }
t++;
foreach (var vv in v.twenty_ones) foreach (var vv in v.twenty_ones)
{ {
if (vv.count_quantitative != null) if (vv.count_quantitative != null)
@@ -339,20 +347,21 @@ namespace rmutr_report.Controllers
} }
if (project.twenty_four != null) if (project.twenty_four != null)
{ {
int t = 1;
foreach (var v in project.twenty_four) foreach (var v in project.twenty_four)
{ {
int t = 1; string a = "กิจกรรมที่ " + t + " ";
string a = "กิจกรรมที่ ";
if (v.activity != null) if (v.activity != null)
{ {
v.activity = a + v.activity; v.activity = a + v.activity;
t++;
} }
if (v.activity == null) if (v.activity == null)
{ {
v.activity = null; v.activity = null;
} }
t++;
} }
} }

BIN
bin/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
bin/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

2
obj/rider.project.model.nuget.info
View File

@@ -1 +1 @@
17012513807166799 17018549799613370

2
obj/rider.project.restore.info
View File

@@ -1 +1 @@
17018549799613370 17018574056737534