diff --git a/Controllers/PlantGeneticConservationProject.Controller.cs b/Controllers/PlantGeneticConservationProject.Controller.cs index 722092b..3d35f57 100644 --- a/Controllers/PlantGeneticConservationProject.Controller.cs +++ b/Controllers/PlantGeneticConservationProject.Controller.cs @@ -83,9 +83,10 @@ namespace rmutr_report.Controllers if (project.sixteenths != null) { int t = 1; - string a = "กิจกรรมที่ "; + foreach (var sixteenthData in project.sixteenths) { + string a = "กิจกรรมที่ " + t + " "; var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk); var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang); @@ -97,26 +98,27 @@ namespace rmutr_report.Controllers if (sixteenthData.activity_table != null) { sixteenthData.activity_table = a + sixteenthData.activity_table; - t++; } if (sixteenthData.activity_table == null) { sixteenthData.activity_table = null; } + + t++; } } if (project.seventeenth != null) { + int t = 1; + int ti= 1; foreach (var v in project.seventeenth) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) @@ -124,11 +126,12 @@ namespace rmutr_report.Controllers v.activity = null; } + t++; foreach (var vv in v.seventeenths) { string na = "ครั้งที่ "; - vv.the_time = na + t; - t++; + vv.the_time = na + ti; + ti++; foreach (var detail in vv.seventeenths2) { string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) "; @@ -155,14 +158,14 @@ namespace rmutr_report.Controllers if (project.eighteenth != null) { + int t = 1; + int ti = 1; foreach (var v in project.eighteenth) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) @@ -170,10 +173,12 @@ namespace rmutr_report.Controllers v.activity = null; } + t++; foreach (var vv in v.eighteenths) { string na = "ครั้งที่ "; - vv.the_time = na + vv.the_time; + vv.the_time = na + ti; + ti++; string na2 = " จำนวน "; vv.count_day = na2 + vv.count_day + " วัน"; if (project.count_day != null) @@ -186,22 +191,24 @@ namespace rmutr_report.Controllers if (project.nineteenth != null) { + int t = 1; foreach (var v in project.nineteenth) { foreach (var vv in v.nineteenth_data_header) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; + if (vv.activity != null) { vv.activity = a + vv.activity; - t++; } if (vv.activity == null) { vv.activity = null; } + + t++; } } } @@ -228,20 +235,21 @@ namespace rmutr_report.Controllers if (project.twenty_one != null) { + int t = 1; foreach (var v in project.twenty_one) { - int t = 1; - string a = "กิจกรรมที่ "; - if (v.activity != null) + string a = "กิจกรรมที่ " + t + " "; + if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) { v.activity = null; } + + t++; foreach (var vv in v.twenty_ones) { // if (vv.clause1 != null || vv.clause1 != "") @@ -340,20 +348,21 @@ namespace rmutr_report.Controllers if (project.twenty_four != null) { + int t = 1; foreach (var v in project.twenty_four) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) { v.activity = null; } + + t++; } } diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index 8e7c1c8..1ba505b 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -56,9 +56,10 @@ namespace rmutr_report.Controllers if (project.sixteenths != null) { int t = 1; - string a = "กิจกรรมที่ "; + foreach (var sixteenthData in project.sixteenths) { + string a = "กิจกรรมที่ " + t + " "; var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk); var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang); @@ -70,26 +71,27 @@ namespace rmutr_report.Controllers if (sixteenthData.activity_table != null) { sixteenthData.activity_table = a + sixteenthData.activity_table; - t++; } if (sixteenthData.activity_table == null) { sixteenthData.activity_table = null; } + + t++; } } if (project.seventeenth != null) { + int t = 1; + int ti= 1; foreach (var v in project.seventeenth) { - int t = 1; - string a = "กิจกรรมที่ "; - if (v.activity != null) + string a = "กิจกรรมที่ " + t + " "; + if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) @@ -97,11 +99,12 @@ namespace rmutr_report.Controllers v.activity = null; } + t++; foreach (var vv in v.seventeenths) { string na = "ครั้งที่ "; - vv.the_time = na + t; - t++; + vv.the_time = na + ti; + ti++; foreach (var detail in vv.seventeenths2) { string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) "; @@ -128,15 +131,14 @@ namespace rmutr_report.Controllers if (project.eighteenth != null) { + int t = 1; + int ti = 1; foreach (var v in project.eighteenth) { - int t = 1; - string a = "กิจกรรมที่ "; - + string a = "กิจกรรมที่ " + t + " "; if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) @@ -144,10 +146,12 @@ namespace rmutr_report.Controllers v.activity = null; } + t++; foreach (var vv in v.eighteenths) { string na = "ครั้งที่ "; - vv.the_time = na + vv.the_time; + vv.the_time = na + ti; + ti++; string na2 = " จำนวน "; vv.count_day = na2 + vv.count_day + " วัน"; if (project.count_day != null) @@ -160,22 +164,24 @@ namespace rmutr_report.Controllers if (project.nineteenth != null) { + int t = 1; foreach (var v in project.nineteenth) { foreach (var vv in v.nineteenth_data_header) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; + if (vv.activity != null) { vv.activity = a + vv.activity; - t++; } if (vv.activity == null) { vv.activity = null; } + + t++; } } } @@ -328,20 +334,21 @@ namespace rmutr_report.Controllers { int no = 1; + int t = 1; foreach (var v in project.twenty_four) { - int t = 1; - string aa = "กิจกรรมที่ "; + string aa = "กิจกรรมที่ " + t + " "; if (v.activity != null) { v.activity = aa + v.activity; - t++; + } if (v.activity == null) { v.activity = null; } + t++; foreach (var dataDetail in v.twenty_fours) { string a = "ชื่อผู้รับผิดชอบ กิจกรรมที่ " + no; diff --git a/Controllers/project_request_thailand.Controller.cs b/Controllers/project_request_thailand.Controller.cs index 0b2ba10..d52c2ec 100644 --- a/Controllers/project_request_thailand.Controller.cs +++ b/Controllers/project_request_thailand.Controller.cs @@ -101,9 +101,10 @@ namespace rmutr_report.Controllers if (project.sixteenths != null) { int t = 1; - string a = "กิจกรรมที่ "; + foreach (var sixteenthData in project.sixteenths) { + string a = "กิจกรรมที่ " + t + " "; var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk); var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang); @@ -115,26 +116,27 @@ namespace rmutr_report.Controllers if (sixteenthData.activity_table != null) { sixteenthData.activity_table = a + sixteenthData.activity_table; - t++; } if (sixteenthData.activity_table == null) { sixteenthData.activity_table = null; } + + t++; } } if (project.seventeenth != null) { + int t = 1; + int ti= 1; foreach (var v in project.seventeenth) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) @@ -142,11 +144,12 @@ namespace rmutr_report.Controllers v.activity = null; } + t++; foreach (var vv in v.seventeenths) { string na = "ครั้งที่ "; - vv.the_time = na + t; - t++; + vv.the_time = na + ti; + ti++; foreach (var detail in vv.seventeenths2) { string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) "; @@ -173,14 +176,14 @@ namespace rmutr_report.Controllers if (project.eighteenth != null) { + int t = 1; + int ti = 1; foreach (var v in project.eighteenth) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) @@ -188,10 +191,12 @@ namespace rmutr_report.Controllers v.activity = null; } + t++; foreach (var vv in v.eighteenths) { string na = "ครั้งที่ "; - vv.the_time = na + vv.the_time; + vv.the_time = na + ti; + ti++; string na2 = " จำนวน "; vv.count_day = na2 + vv.count_day + " วัน"; if (project.count_day != null) @@ -204,22 +209,24 @@ namespace rmutr_report.Controllers if (project.nineteenth != null) { + int t = 1; foreach (var v in project.nineteenth) { foreach (var vv in v.nineteenth_data_header) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; + if (vv.activity != null) { vv.activity = a + vv.activity; - t++; } if (vv.activity == null) { vv.activity = null; } + + t++; } } } @@ -246,14 +253,13 @@ namespace rmutr_report.Controllers if (project.twenty_one != null) { + int t = 1; foreach (var v in project.twenty_one) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) @@ -261,6 +267,8 @@ namespace rmutr_report.Controllers v.activity = null; } + t++; + foreach (var vv in v.twenty_ones) { if (vv.count_quantitative != null) @@ -339,20 +347,21 @@ namespace rmutr_report.Controllers } if (project.twenty_four != null) { + int t = 1; foreach (var v in project.twenty_four) { - int t = 1; - string a = "กิจกรรมที่ "; + string a = "กิจกรรมที่ " + t + " "; if (v.activity != null) { v.activity = a + v.activity; - t++; } if (v.activity == null) { v.activity = null; } + + t++; } } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 2532341..0ad0f9a 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 96f3dfd..ac703c8 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 2532341..0ad0f9a 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 96f3dfd..ac703c8 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 89f8d64..e1bba0a 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17012513807166799 \ No newline at end of file +17018549799613370 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index e1bba0a..5a0f6c4 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17018549799613370 \ No newline at end of file +17018574056737534 \ No newline at end of file