diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index bea2c13..2b88a99 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -114,68 +114,104 @@ namespace rmutr_report.Controllers if (project.twenty_one != null) { - // foreach (var vv in project.twenty_one) - // { - // if (vv.activity != null || vv.activity!= "") - // { - // vv.activity = vv.activity; - // } - // if (vv.clause1 != null || vv.clause1!= "") - // { - // vv.clause1 = vv.clause1; - // } - // if (vv.clause2 != null || vv.clause2!= "") - // { - // vv.clause2 = vv.clause2; - // } - // if (vv.clause3 != null || vv.clause3!= "") - // { - // vv.clause3 = vv.clause3; - // } - // if (vv.clause4 != null || vv.clause4!= "") - // { - // vv.clause4 = vv.clause4; - // } - // if (vv.count_unit != null || vv.count_unit != "") - // { - // string na = "ผู้เข้าร่วมโครงการ จำนวน "; - // string na2 = " หน่วยนับ"; - // project.text1 = na + vv.count_unit + na2; - // } - // - // if (vv.count_project != null || vv.count_project != "") - // { - // string na = "จำนวนครั้งที่ดำเนินโครงการ "; - // string na2 = " ครั้ง"; - // project.text2 = na + vv.count_project + na2; - // } - // - // if (vv.count_training != null || vv.count_training != "") - // { - // string na = "จำนวนการจัดอบรมและสัมมนา "; - // string na2 = " เรื่อง"; - // project.text3 = na + vv.count_training + na2; - // } - // - // if (vv.count_knowledge != null || vv.count_knowledge != "") - // { - // string na = "จำนวนเผยแพร่ความรู้บริการวิชาการ "; - // string na2 = " ครั้ง"; - // project.text4 = na + vv.count_knowledge + na2; - // } - // string na3 = "วัน/เดือน/ปี ที่จะดำเนินโครงการ "; - // string na4 = " ถึง "; - // project.text5 = na3 + vv.project_start_date + na4 + vv.project_end_date; - // string na5 = "โครงการแล้วเสร็จตามเวลาที่กำหนด (ร้อยละ) "; - // project.text6 = na5 + vv.percentage_finish; - // - // } - - if (project.twenty_one == null) + foreach (var v in project.twenty_one) { - project.twenty_one = null; + if (v.activity != null || v.activity != "") + { + v.activity = v.activity; + } + + foreach (var vv in v.twenty_ones) + { + // if (vv.clause1 != null || vv.clause1 != "") + // { + // vv.clause1 = vv.clause1; + // } + // + // if (vv.clause2 != null || vv.clause2 != "") + // { + // vv.clause2 = vv.clause2; + // } + // + // if (vv.clause3 != null || vv.clause3 != "") + // { + // vv.clause3 = vv.clause3; + // } + // + // if (vv.clause4 != null || vv.clause4 != "") + // { + // vv.clause4 = vv.clause4; + // } + if (vv.count_quantitative != null ) + { + + string na = " หน่วยนับ"; + vv.khrang1 = na; + } + if (vv.count_unit != null ) + { + string na = "ผู้เข้าร่วมโครงการ จำนวน "; + string na2 = " หน่วยนับ"; + vv.text1 = na; + vv.nuai_nap = na2; + } + + if (vv.count_project != null ) + { + vv.clause1 = "21.1 เชิงปริมาณ"; + string na = "จำนวนครั้งที่ดำเนินโครงการ "; + string na2 = " ครั้ง"; + vv.text2 = na ; + vv.khrang2 = na2 ; + } + + if (vv.count_training != null ) + { + string na = "จำนวนการจัดอบรมและสัมมนา "; + string na2 = " เรื่อง"; + vv.text3 = na; + vv.rueang = na2; + } + + if (vv.count_knowledge != null) + { + string na = "จำนวนเผยแพร่ความรู้บริการวิชาการ "; + string na2 = " ครั้ง"; + vv.text4 = na; + vv.khrang3 = na2; + } + + if (vv.project_start_date!=null ) + { + vv.clause2 = "21.2 เชิงเวลา"; + string na3 = "วัน/เดือน/ปี ที่จะดำเนินโครงการ "; + string na4 = " ถึง "; + vv.range = na4 ; + vv.text5 = na3 ; + string na5 = "โครงการแล้วเสร็จตามเวลาที่กำหนด (ร้อยละ) "; + vv.text6 = na5 ; + } + + if (vv.percentage1!=null || vv.percentage2!=null) + { + vv.clause3 = "21.3 เชิงคุณภาพ"; + string na = "ผู้เข้าร่วมโครงการมีความรู้ความเข้าใจเพิ่มขึ้น (ร้อยละ) "; + string na1 = "ความพึงพอใจของผู้เข้ารับบริการในกระบวนการให้บริการ (ร้อยละ) "; + vv.text7 = na; + vv.text8 = na1; + vv.text9 = "ผู้เข้าร่วมโครงการสามารถนำความรู้ที่ได้รับไปบูรณาการอย่างไรบ้าง"; + vv.text10 = "รายละเอียด"; + } + if (vv.expenses!=null) + { + vv.clause4 = "21.4 เชิงค่าใช้จ่าย"; + vv.bath = " บาท"; + } + } } - } + + + } if (project.twenty_four != null) { @@ -244,7 +280,7 @@ namespace rmutr_report.Controllers var _project = new List() { project }; Report report = new Report(); - report.Load(_setting.report_path + "project_principle_rationale.frx"); + report.Load(_setting.report_path + "project_principle_rationale_1.frx"); report.RegisterData(_project, "project_principle_rationale"); report.Prepare(); diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index f65bb1d..b6b2a5c 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -56,9 +56,12 @@ namespace rmutr_report.Models public decimal? budget_amount { get; set; } //ข้อ 20 public List twentieth { get; set; } //ข้อ 20 public List twenty_one { get; set; } //ข้อ 21 - public List twenty_one_activity1 { get; set; } //ข้อ 21 มีหลายกิจกรรม - public List twenty_one_activity2 { get; set; } //ข้อ 21 มีหลายกิจกรรม - public List twenty_one_activity3 { get; set; } //ข้อ 21 มีหลายกิจกรรม + // public List twenty_one_activity1 { get; set; } //ข้อ 21 มีหลายกิจกรรม + // public List twenty_one_activity2 { get; set; } //ข้อ 21 มีหลายกิจกรรม + // public List twenty_one_activity3 { get; set; } //ข้อ 21 มีหลายกิจกรรม + public string text4 { get; set; } //ข้อ 21 + public string text5 { get; set; } //ข้อ 21 + public string text6 { get; set; } //ข้อ 21 public List twenty_two { get; set; } //ข้อ 22 public List twenty_three { get; set; } //ข้อ 23 public List twenty_four { get; set; } //ข้อ 24 @@ -368,6 +371,12 @@ namespace rmutr_report.Models } public class twenty_one_data + { + public string activity { get; set; } + public List twenty_ones { get; set; } + } + + public class twenty_one_data_detail { public string text1 { get; set; } public string text2 { get; set; } @@ -394,84 +403,85 @@ namespace rmutr_report.Models public string clause2 { get; set; } public string project_start_date { get; set; } public string project_end_date { get; set; } + public string range { get; set; } public string percentage_finish { get; set; } public string clause3 { get; set; } public string percentage1 { get; set; } public string percentage2 { get; set; } public string acquired_knowledge { get; set; } - public string detail1 { get; set; } - public string detail2 { get; set; } - public string clause4 { get; set; } - public decimal? expenses { get; set; } - } - - public class twenty_one_data_activity1 - { - public string clause1 { get; set; } - public string count_quantitative { get; set; } - public string khrang1 { get; set; } - public string text1 { get; set; } - public string count_unit { get; set; } - public string nuai_nap { get; set; } - public string text2 { get; set; } - public string count_project { get; set; } - public string khrang2 { get; set; } - public string text3 { get; set; } - public string count_training { get; set; } - public string rueang { get; set; } - public string text4 { get; set; } - public string count_knowledge { get; set; } - public string khrang3 { get; set; } - public List twenty_one_data_activity1_detail { get; set; } - - } - - public class twenty_one_data_activity1_detail - { - public string activity_clause1 { get; set; } - public string text1 { get; set; } - public string count_unit { get; set; } - public string nuai_nap { get; set; } - public string text2 { get; set; } - public string count_project { get; set; } - public string khrang2 { get; set; } - public string text3 { get; set; } - public string count_training { get; set; } - public string rueang { get; set; } - public string text4 { get; set; } - public string count_knowledge { get; set; } - public string khrang3 { get; set; } - } - public class twenty_one_data_activity2 - { - public string clause2 { get; set; } - public string activity_clause2 { get; set; } - - public string text5 { get; set; } - public string project_start_date { get; set; } - public string project_end_date { get; set; } - - public string text6 { get; set; } - public string percentage_finish { get; set; } - - } - public class twenty_one_data_activity3 - { - - public string text7 { get; set; } - public string text8 { get; set; } - public string text9 { get; set; } - public string text10 { get; set; } - public string clause3 { get; set; } - public string percentage1 { get; set; } - public string percentage2 { get; set; } - public string acquired_knowledge { get; set; } - public string detail1 { get; set; } - public string detail2 { get; set; } + public string detail { get; set; } + //public string detail2 { get; set; } public string clause4 { get; set; } public decimal? expenses { get; set; } - public string bath { get; set; } } + + // public class twenty_one_data_activity1 + // { + // public string clause1 { get; set; } + // public string count_quantitative { get; set; } + // public string khrang1 { get; set; } + // public string text1 { get; set; } + // public string count_unit { get; set; } + // public string nuai_nap { get; set; } + // public string text2 { get; set; } + // public string count_project { get; set; } + // public string khrang2 { get; set; } + // public string text3 { get; set; } + // public string count_training { get; set; } + // public string rueang { get; set; } + // public string text4 { get; set; } + // public string count_knowledge { get; set; } + // public string khrang3 { get; set; } + // public List twenty_one_data_activity1_detail { get; set; } + // + // } + // + // public class twenty_one_data_activity1_detail + // { + // public string activity_clause1 { get; set; } + // public string text1 { get; set; } + // public string count_unit { get; set; } + // public string nuai_nap { get; set; } + // public string text2 { get; set; } + // public string count_project { get; set; } + // public string khrang2 { get; set; } + // public string text3 { get; set; } + // public string count_training { get; set; } + // public string rueang { get; set; } + // public string text4 { get; set; } + // public string count_knowledge { get; set; } + // public string khrang3 { get; set; } + // } + // public class twenty_one_data_activity2 + // { + // public string clause2 { get; set; } + // public string activity_clause2 { get; set; } + // + // public string text5 { get; set; } + // public string project_start_date { get; set; } + // public string project_end_date { get; set; } + // + // public string text6 { get; set; } + // public string percentage_finish { get; set; } + // + // } + // public class twenty_one_data_activity3 + // { + // + // public string text7 { get; set; } + // public string text8 { get; set; } + // public string text9 { get; set; } + // public string text10 { get; set; } + // public string clause3 { get; set; } + // public string percentage1 { get; set; } + // public string percentage2 { get; set; } + // public string acquired_knowledge { get; set; } + // public string detail1 { get; set; } + // public string detail2 { get; set; } + // public string clause4 { get; set; } + // public decimal? expenses { get; set; } + // public string bath { get; set; } + // } public class twenty_two_data { public string list { get; set; } diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 75a1690..da1fa74 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 bb695d6..40c4f5f 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 303acdf..302e430 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 df11acb..4606ac1 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/ref/rmutr_report.dll b/obj/Debug/net5.0/ref/rmutr_report.dll index 8dc65d9..8b87946 100644 Binary files a/obj/Debug/net5.0/ref/rmutr_report.dll and b/obj/Debug/net5.0/ref/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/refint/rmutr_report.dll b/obj/Debug/net5.0/refint/rmutr_report.dll index 8dc65d9..8b87946 100644 Binary files a/obj/Debug/net5.0/refint/rmutr_report.dll and b/obj/Debug/net5.0/refint/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 75a1690..da1fa74 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 bb695d6..40c4f5f 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 303acdf..302e430 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 df11acb..4606ac1 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 936e6f7..37c3a68 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16935604775337552 \ No newline at end of file +16938065948543652 \ No newline at end of file diff --git a/wwwroot/reports/project_principle_rationale_1.frx b/wwwroot/reports/project_principle_rationale_1.frx new file mode 100644 index 0000000..b88dfad --- /dev/null +++ b/wwwroot/reports/project_principle_rationale_1.frx @@ -0,0 +1,908 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +