diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index 12ad5dc..5785918 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -59,18 +59,20 @@ namespace rmutr_report.Controllers } - // project.count_activity = total2; - foreach (var v in project.eighteenth) + if (project.eighteenth != null) { - foreach (var vv in v.eighteenths) + foreach (var v in project.eighteenth) { - string na = "ครั้งที่ "; - vv.the_time = na + vv.the_time; - string na2 = " จำนวน "; - vv.count_day = na2 + vv.count_day + " วัน"; - if (project.count_day != null) + foreach (var vv in v.eighteenths) { - project.text3 = "จำนวน " + project.count_day + " วัน"; + string na = "ครั้งที่ "; + vv.the_time = na + vv.the_time; + string na2 = " จำนวน "; + vv.count_day = na2 + vv.count_day + " วัน"; + if (project.count_day != null) + { + project.text3 = "จำนวน " + project.count_day + " วัน"; + } } } } @@ -234,18 +236,20 @@ namespace rmutr_report.Controllers } - // project.count_activity = total2; - foreach (var v in project.eighteenth) + if (project.eighteenth != null) { - foreach (var vv in v.eighteenths) + foreach (var v in project.eighteenth) { - string na = "ครั้งที่ "; - vv.the_time = na + vv.the_time; - string na2 = " จำนวน "; - vv.count_day = na2 + vv.count_day + " วัน"; - if (project.count_day != null) + foreach (var vv in v.eighteenths) { - project.text3 = "จำนวน " + project.count_day + " วัน"; + string na = "ครั้งที่ "; + vv.the_time = na + vv.the_time; + string na2 = " จำนวน "; + vv.count_day = na2 + vv.count_day + " วัน"; + if (project.count_day != null) + { + project.text3 = "จำนวน " + project.count_day + " วัน"; + } } } } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 52bd5a8..bbf1cf1 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 2850124..4bdcd2a 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 52bd5a8..bbf1cf1 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 2850124..4bdcd2a 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.restore.info b/obj/rider.project.restore.info index 181859f..c6ca5de 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16927797904985249 \ No newline at end of file +16932047384453843 \ No newline at end of file diff --git a/wwwroot/reports/project_principle_rationale.frx b/wwwroot/reports/project_principle_rationale.frx index 2e15651..12f0b48 100644 --- a/wwwroot/reports/project_principle_rationale.frx +++ b/wwwroot/reports/project_principle_rationale.frx @@ -1,5 +1,5 @@  - + @@ -329,40 +329,40 @@ - - + + - + - + - - - - - - - - + + + + + + + + - - - + + + - + - + @@ -373,84 +373,84 @@ - + - + - + - - - - + + + + - + - - + + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + @@ -466,7 +466,7 @@ - + @@ -555,13 +555,13 @@ - + - + - + - + @@ -572,11 +572,11 @@ - + - + - + @@ -585,11 +585,11 @@ - + - + @@ -597,14 +597,14 @@ - - + + - + - + @@ -628,7 +628,7 @@ - + @@ -643,14 +643,14 @@ - + - + - + @@ -674,7 +674,7 @@ - + @@ -691,9 +691,9 @@ - + - + @@ -715,7 +715,7 @@ - + @@ -732,9 +732,9 @@ - + - + @@ -756,7 +756,7 @@ - + @@ -773,7 +773,7 @@ - + @@ -788,7 +788,7 @@ - + diff --git a/wwwroot/reports/project_principle_rationale_no_activity.frx b/wwwroot/reports/project_principle_rationale_no_activity.frx index 3d6b106..5eb6387 100644 --- a/wwwroot/reports/project_principle_rationale_no_activity.frx +++ b/wwwroot/reports/project_principle_rationale_no_activity.frx @@ -1,5 +1,5 @@  - + @@ -307,12 +307,12 @@ - - + + - + @@ -323,24 +323,24 @@ - - - - - - - - + + + + + + + + - - - + + + - + - + @@ -351,79 +351,79 @@ - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + @@ -438,7 +438,7 @@ - + @@ -527,13 +527,13 @@ - + - + - + - + @@ -544,10 +544,10 @@ - + - - + + @@ -556,15 +556,15 @@ - + - - - + + + - + @@ -588,7 +588,7 @@ - + @@ -603,14 +603,14 @@ - + - + - + @@ -634,7 +634,7 @@ - + @@ -651,9 +651,9 @@ - + - + @@ -675,7 +675,7 @@ - + @@ -692,9 +692,9 @@ - + - + @@ -716,7 +716,7 @@ - + @@ -733,7 +733,7 @@ - + @@ -748,7 +748,7 @@ - +