diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index 5709640..6f8bffe 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -217,11 +217,33 @@ namespace rmutr_report.Controllers vv.text5 = na3; string na5 = "โครงการแล้วเสร็จตามเวลาที่กำหนด (ร้อยละ) "; vv.text6 = na5; + } + + if (vv.project_start_date == " - " || vv.project_end_date == " - ") + { + vv.text5 = null; + vv.range = null; + vv.project_start_date = null; + vv.project_end_date = null; + } + + if (vv.day != null && vv.day != "90.00") + { string na6 = "จำนวนวัน "; vv.day = na6 + vv.day; } - if (vv.percentage1 != null || vv.percentage2 != null|| vv.percentage3 != null) + if (vv.day == null) + { + vv.day = null; + } + + if (vv.day == "90.00") + { + vv.day = null; + } + + if (vv.percentage1 != null || vv.percentage2 != null || vv.percentage3 != null) { vv.clause3 = "21.3 เชิงคุณภาพ"; string na = "ผู้เข้าร่วมโครงการมีความรู้ความเข้าใจเพิ่มขึ้น (ร้อยละ) "; diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 83dd89e..70f46ce 100644 Binary files a/bin/Debug/net5.0/rmutr_report.dll and b/bin/Debug/net5.0/rmutr_report.dll differ diff --git a/bin/Debug/net5.0/rmutr_report.pdb b/bin/Debug/net5.0/rmutr_report.pdb index e816734..d9d3aa5 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 271b973..aba6dee 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 47e3e42..a11cd4b 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/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 83dd89e..70f46ce 100644 Binary files a/obj/Debug/net5.0/rmutr_report.dll and b/obj/Debug/net5.0/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index e816734..d9d3aa5 100644 Binary files a/obj/Debug/net5.0/rmutr_report.pdb and b/obj/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 271b973..aba6dee 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 47e3e42..a11cd4b 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 4fd88d9..5ee8d5e 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17005579264145440 \ No newline at end of file +17006386956318685 \ No newline at end of file diff --git a/wwwroot/reports/operating_budget_ro_three.frx b/wwwroot/reports/operating_budget_ro_three.frx index 3e0381c..5073a60 100644 --- a/wwwroot/reports/operating_budget_ro_three.frx +++ b/wwwroot/reports/operating_budget_ro_three.frx @@ -1,5 +1,5 @@  - + @@ -54,8 +54,8 @@ - - + + @@ -71,12 +71,7 @@ - - - - - - + @@ -88,31 +83,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -130,12 +106,12 @@ - + - + @@ -153,12 +129,12 @@ - + - + @@ -176,12 +152,12 @@ - + - + diff --git a/wwwroot/reports/project_principle_rationale_1.frx b/wwwroot/reports/project_principle_rationale_1.frx index 1798d5d..5187dc1 100644 --- a/wwwroot/reports/project_principle_rationale_1.frx +++ b/wwwroot/reports/project_principle_rationale_1.frx @@ -1,5 +1,5 @@  - + @@ -318,7 +318,7 @@ - + @@ -331,11 +331,11 @@ - - + + - + @@ -346,83 +346,83 @@ - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -438,7 +438,7 @@ - + @@ -453,7 +453,7 @@ - + @@ -473,13 +473,13 @@ - + - + - + - + @@ -490,11 +490,11 @@ - + - + - + @@ -503,11 +503,11 @@ - + - + @@ -515,14 +515,14 @@ - - + + - + - + @@ -546,7 +546,7 @@ - + @@ -561,14 +561,14 @@ - + - + - + @@ -592,7 +592,7 @@ - + @@ -609,9 +609,9 @@ - + - + @@ -633,7 +633,7 @@ - + @@ -650,9 +650,9 @@ - + - + @@ -674,7 +674,7 @@ - + @@ -691,9 +691,9 @@ - + - + @@ -715,7 +715,7 @@ - + @@ -732,7 +732,7 @@ - + @@ -747,7 +747,7 @@ - + @@ -773,7 +773,7 @@ - + @@ -808,7 +808,7 @@ - + @@ -841,12 +841,12 @@ - + - + - + @@ -873,9 +873,9 @@ - + - + @@ -884,9 +884,9 @@ - + - + @@ -895,11 +895,11 @@ - + - + - + @@ -938,13 +938,13 @@ - - + + - + - - + + @@ -957,7 +957,7 @@ - +