diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index 59c9ed1..101718f 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -65,34 +65,74 @@ namespace rmutr_report.Controllers vv.count_day = na2 + vv.count_day + " วัน"; } } - // foreach (var a in project.seventeenth) - // { - // foreach (var aa in a.seventeenths) - // { - // foreach (var a2 in aa.seventeenths2) - // { - // if (aa.type == "1") - // { - // a2.internal_external = "ภายในมหาวิทยาลัย"; - // a2.area_province = "พื้นที่" + a2.area_province; - // a2.location = "ระบุสถานที่" + a2.location; - // } - // if (aa.type == "2") - // { - // a2.internal_external = "ภายนอกมหาวิทยาลัย"; - // a2.area_province = "จังหวัด" + a2.area_province; - // a2.location = "ระบุสถานที่" + a2.location; - // } - // if (aa.type == "3") - // { - // a2.internal_external = "ภายนอกมหาวิทยาลัย"; - // a2.area_province = "จังหวัด" + a2.area_province; - // a2.location = "ระบุสถานที่" + a2.location; - // } - // } - // } - - // } + + 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) + { + project.twenty_one = null; + } + } + var _project = new List() {project}; Report report = new Report(); diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index 4bb95d7..18a4569 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -21,7 +21,7 @@ namespace rmutr_report.Models public string target_fourth { get; set; } public string pin_fourth { get; set; } public string principles_reasons { get; set; } //ข้อ 5 - public string objective { get; set; } //ข้อ 6 + public List sixth { get; set; } //ข้อ 6 public List seventh { get; set; } //ข้อ 7 public List eighth { get; set; } //ข้อ 8 public List ninth { get; set; } //ข้อ 9 @@ -42,6 +42,14 @@ namespace rmutr_report.Models public List seventeenth { get; set; } //ข้อ 17 public List eighteenth { get; set; } //ข้อ 18 public List nineteenth { get; set; } //ข้อ 19 + public decimal? budget_amount { get; set; } //ข้อ 20 + public List twentieth { get; set; } //ข้อ 20 + public List twenty_one { get; set; } //ข้อ 21 + public List twenty_two { get; set; } //ข้อ 22 + public List twenty_three { get; set; } //ข้อ 23 + public List twenty_four { get; set; } //ข้อ 24 + public List twenty_fifth { get; set; } //ข้อ 25 + } @@ -49,6 +57,11 @@ namespace rmutr_report.Models { public string activity { get; set; } } + + public class sixth_data + { + public string objective{ get; set; } + } public class seventh_data { public string identity { get; set; } @@ -283,5 +296,103 @@ namespace rmutr_report.Models public decimal? total_amount { get; set; } } - -} \ No newline at end of file + public class twentieth_data + { + public string action_plan { get; set; } + public string month_1 { get; set; } + public string month_2 { get; set; } + public string month_3 { get; set; } + public string month_4 { get; set; } + public string month_5 { get; set; } + public string month_6 { get; set; } + public string month_7 { get; set; } + public string month_8 { get; set; } + public string month_9 { get; set; } + public string month_10 { get; set; } + public string month_11 { get; set; } + public string month_12 { get; set; } + } + + public class twenty_one_data + { + public string text1 { get; set; } + public string text2 { get; set; } + public string text3 { get; set; } + public string text4 { get; set; } + public string text5 { get; set; } + public string text6 { get; set; } + public string text7 { get; set; } + public string text8 { get; set; } + public string text9 { get; set; } + public string text10 { get; set; } + public string bath { get; set; } + public string nuai_nap { get; set; } + public string khrang1 { get; set; } + public string khrang2 { get; set; } + public string rueang { get; set; } + public string activity { get; set; } + public string clause1 { get; set; } + public string count_unit { get; set; } + public string count_project { get; set; } + public string count_training { get; set; } + public string count_knowledge { get; set; } + public string clause2 { get; set; } + public string project_start_date { get; set; } + public string project_end_date { 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 detail { get; set; } + public string clause4 { get; set; } + public decimal? expenses { get; set; } + } + + public class twenty_two_data + { + public string list { get; set; } + + } + + public class twenty_three_data + { + public string list { get; set; } + } + + public class twenty_four_data + { + public string text1 { get; set; } + public string text2 { get; set; } + public string text3 { get; set; } + public string text4 { get; set; } + public string text5 { get; set; } + public string text6 { get; set; } + public string responsible_person { get; set; } + public string agency { get; set; } + public string area { get; set; } + public string telephone_number { get; set; } + public string mobile_number { get; set; } + public string email { get; set; } + } + + public class twenty_fifth_data + { + public string activity { get; set; } + public string activity_display_name { get; set; } + public string dates { get; set; } + public string location { get; set; } + public List twenty_fifth_data_detail { get; set; } + + } + + public class twenty_fifth_data_details + { + public string dates { get; set; } + public string times { get; set; } + public string detail { get; set; } + public string lecturer { get; set; } + + } + + } \ No newline at end of file diff --git a/wwwroot/reports/project_principle_rationale.frx b/wwwroot/reports/project_principle_rationale.frx index d2da9f2..f4c957f 100644 --- a/wwwroot/reports/project_principle_rationale.frx +++ b/wwwroot/reports/project_principle_rationale.frx @@ -1,5 +1,5 @@  - + @@ -20,7 +20,9 @@ - + + + @@ -152,6 +154,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -170,7 +254,7 @@ - + @@ -194,93 +278,95 @@ - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -296,7 +382,7 @@ - + @@ -385,13 +471,13 @@ - + - + - + - + @@ -402,11 +488,11 @@ - + - + - + @@ -415,7 +501,7 @@ - + @@ -443,9 +529,9 @@ - - - + + + @@ -460,12 +546,12 @@ - + - + @@ -488,9 +574,9 @@ - + - + @@ -508,7 +594,7 @@ - + @@ -529,9 +615,9 @@ - + - + @@ -549,7 +635,7 @@ - + @@ -570,9 +656,9 @@ - + - + @@ -590,7 +676,7 @@ - + @@ -607,7 +693,7 @@ - + @@ -626,4 +712,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +