diff --git a/Controllers/PlantGeneticConservationProject.Controller.cs b/Controllers/PlantGeneticConservationProject.Controller.cs index 7b3abdb..2a23df3 100644 --- a/Controllers/PlantGeneticConservationProject.Controller.cs +++ b/Controllers/PlantGeneticConservationProject.Controller.cs @@ -44,30 +44,21 @@ namespace rmutr_report.Controllers // } // } // } - - if (project.eighth != null) + if (project.ninth!=null) { - foreach (var v in project.eighth) + foreach (var vv in project.ninth) { - string na = "ประเด็นยุทธศาสตร์ที่ "; - v.strategic_issues = na + v.strategic_issues; - string na2 = "กลยุทธ์ที่ "; - v.measure = na2 + v.measure; + if (vv.clause == "9.1 ตัวชี้วัดผลสัมฤทธิ์") + { + vv.clause = "12.1 ตัวชี้วัดผลสัมฤทธิ์"; + } + if (vv.clause == "9.2 ตัวชี้วัดเชิงนโยบาย") + { + vv.clause = "12.2 ตัวชี้วัดเชิงนโยบาย"; + } } } - if (project.fourteenth != null) - { - foreach (var vv in project.fourteenth) - { - // string na = "องค์ประกอบที่ " ; - // vv.component = na + vv.component; - string na2 = "ตัวบ่งชี้ที่ "; - vv.indicator = na2 + vv.indicator; - } - } - - if (project.sixteenths != null) { foreach (var sixteenthData in project.sixteenths) @@ -165,6 +156,7 @@ namespace rmutr_report.Controllers string na2 = " ครั้ง"; vv.text2 = na; vv.khrang2 = na2; + vv.text12 = "หน่วยนับ"; } if (vv.count_training != null) @@ -202,7 +194,7 @@ namespace rmutr_report.Controllers vv.text7 = na; vv.text8 = na1; vv.text9 = "ผู้เข้าร่วมโครงการสามารถนำความรู้ที่ได้รับไปบูรณาการอย่างไรบ้าง"; - vv.text10 = "รายละเอียด"; + //vv.text10 = "รายละเอียด"; } if (vv.expenses != null) diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index 8fd5d96..5536481 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -46,27 +46,9 @@ namespace rmutr_report.Controllers // } // } - if (project.eighth != null) - { - foreach (var v in project.eighth) - { - string na = "ประเด็นยุทธศาสตร์ที่ "; - v.strategic_issues = na + v.strategic_issues; - string na2 = "กลยุทธ์ที่ "; - v.measure = na2 + v.measure; - } - } + - if (project.fourteenth != null) - { - foreach (var vv in project.fourteenth) - { - // string na = "องค์ประกอบที่ " ; - // vv.component = na + vv.component; - string na2 = "ตัวบ่งชี้ที่ "; - vv.indicator = na2 + vv.indicator; - } - } + if (project.sixteenths != null) @@ -165,6 +147,7 @@ namespace rmutr_report.Controllers string na2 = " ครั้ง"; vv.text2 = na ; vv.khrang2 = na2 ; + vv.text12 = "หน่วยนับ"; } if (vv.count_training != null ) @@ -202,7 +185,7 @@ namespace rmutr_report.Controllers vv.text7 = na; vv.text8 = na1; vv.text9 = "ผู้เข้าร่วมโครงการสามารถนำความรู้ที่ได้รับไปบูรณาการอย่างไรบ้าง"; - vv.text10 = "รายละเอียด"; + //vv.text10 = "รายละเอียด"; } if (vv.expenses!=null) { diff --git a/Controllers/project_request_thailand.Controller.cs b/Controllers/project_request_thailand.Controller.cs index 51e44ce..9a13605 100644 --- a/Controllers/project_request_thailand.Controller.cs +++ b/Controllers/project_request_thailand.Controller.cs @@ -64,27 +64,32 @@ namespace rmutr_report.Controllers // } // } - if (project.eighth != null) + if (project.ninth!=null) { - foreach (var v in project.eighth) + foreach (var vv in project.ninth) { - string na = "ประเด็นยุทธศาสตร์ที่ "; - v.strategic_issues = na + v.strategic_issues; - string na2 = "กลยุทธ์ที่ "; - v.measure = na2 + v.measure; + if (vv.clause == "9.1 ตัวชี้วัดผลสัมฤทธิ์") + { + vv.clause = "11.1 ตัวชี้วัดผลสัมฤทธิ์"; + } + if (vv.clause == "9.2 ตัวชี้วัดเชิงนโยบาย") + { + vv.clause = "11.2 ตัวชี้วัดเชิงนโยบาย"; + } + if (vv.ninths==null) + { + vv.ninths.Add(new ninth_data_detail() + { + detail = "" + }); + + } + + } } - if (project.fourteenth != null) - { - foreach (var vv in project.fourteenth) - { - // string na = "องค์ประกอบที่ " ; - // vv.component = na + vv.component; - string na2 = "ตัวบ่งชี้ที่ "; - vv.indicator = na2 + vv.indicator; - } - } + if (project.sixteenths != null) @@ -101,7 +106,38 @@ namespace rmutr_report.Controllers sixteenthData.klai_kangwon_total = sum4; } } + if (project.seventeenth != null) + { + foreach (var v in project.seventeenth) + { + string a = "กิจกรรมที่ "; + v.activity = a + v.activity; + foreach (var vv in v.seventeenths) + { + string na = "ครั้งที่ "; + vv.the_time = na + vv.the_time; + foreach (var detail in vv.seventeenths2) + { + string in1 = "พื้นที่ (ภายในมหาวิทยาลัย) "; + string in2 = "ระบุสถานที่ "; + string out1 = "จังหวัด (ภายนอกมหาวิทยาลัย) "; + if (detail.internal_external1 == "ภายในมหาวิทยาลัย") + { + detail.text1 = "ภายในมหาวิทยาลัย"; + detail.area_province1 = in1 + detail.area_province1; + detail.location1 = in2 + detail.location1; + } + if (detail.internal_external2 == "ภายนอกมหาวิทยาลัย") + { + detail.text2 = "ภายนอกมหาวิทยาลัย"; + detail.area_province2 = out1 + detail.area_province2; + detail.location2 = in2 + detail.location2; + } + } + } + } + } if (project.eighteenth != null) { foreach (var v in project.eighteenth) @@ -141,25 +177,6 @@ namespace rmutr_report.Controllers 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) { @@ -184,6 +201,7 @@ namespace rmutr_report.Controllers string na2 = " ครั้ง"; vv.text2 = na; vv.khrang2 = na2; + vv.text12 = "หน่วยนับ"; } if (vv.count_training != null) @@ -221,7 +239,7 @@ namespace rmutr_report.Controllers vv.text7 = na; vv.text8 = na1; vv.text9 = "ผู้เข้าร่วมโครงการสามารถนำความรู้ที่ได้รับไปบูรณาการอย่างไรบ้าง"; - vv.text10 = "รายละเอียด"; + //vv.text10 = "รายละเอียด"; } if (vv.expenses != null) diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index 73b4f97..f56bd7d 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -65,7 +65,7 @@ namespace rmutr_report.Models public List seventeenth_thai { get; set; } //ข้อ 17 public List eighteenth_thai { get; set; } //ข้อ 18 public List nineteenth_thai { get; set; } //ข้อ 19 - + public List nineteenth_style { get; set; } //ข้อ 19 ลักษณะโครงการ public decimal? budget_amount { get; set; } //ข้อ 20 public List twentieth { get; set; } //ข้อ 20 public List twenty_one { get; set; } //ข้อ 21 @@ -90,10 +90,9 @@ namespace rmutr_report.Models public string activity { get; set; } } - public class project_activity_styles + public class project_activity_styles { public string style { get; set; } - } public class sixth_data { @@ -155,6 +154,7 @@ namespace rmutr_report.Models public class sixteenth_data_detail { public string activity_table { get; set; } + public string unit { get; set; } public List sixteenths2 { get; set; } public decimal? salaya_total { get; set; } public decimal? bophitphimuk_total { get; set; } @@ -238,7 +238,8 @@ namespace rmutr_report.Models public string internal_external2 { get; set; } public string area_province2 { get; set; } public string location2 { get; set; } - // public string external_university { get; set; } + public string text1 { get; set; } + public string text2 { get; set; } // public string province { get; set; } // public string province_location { get; set; } @@ -395,6 +396,7 @@ namespace rmutr_report.Models public class twenty_one_data { public string activity { get; set; } + public string remark { get; set; } public List twenty_ones { get; set; } } @@ -411,6 +413,7 @@ namespace rmutr_report.Models public string text9 { get; set; } public string text10 { get; set; } public string text11 { get; set; } + public string text12 { get; set; } public string bath { get; set; } public string nuai_nap { get; set; } public string khrang1 { get; set; } @@ -433,10 +436,17 @@ namespace rmutr_report.Models public string percentage1 { get; set; } public string percentage2 { get; set; } public string acquired_knowledge { get; set; } - public string detail { get; set; } - //public string detail2 { get; set; } + public string clause4 { get; set; } public decimal? expenses { get; set; } + public string target_1 { get; set; } + public string target_2 { get; set; } + public string target_3 { get; set; } + public string target_4 { get; set; } + public string results_1 { get; set; } + public string results_2 { get; set; } + public string results_3 { get; set; } + public string results_4 { get; set; } } // public class twenty_one_data_activity1 @@ -557,6 +567,7 @@ namespace rmutr_report.Models public string times { get; set; } public string detail { get; set; } public string lecturer { get; set; } + public string in_out { get; set; } } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index ba39003..9e18704 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 3e410d6..87e75a6 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 ba39003..9e18704 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 3e410d6..87e75a6 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 7f98dd1..0c5c185 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -16999523559176324 \ No newline at end of file +17001217270031729 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 0b4ada4..0c5c185 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17000447865139285 \ No newline at end of file +17001217270031729 \ No newline at end of file diff --git a/wwwroot/reports/plant_genetic_conservation_project.frx b/wwwroot/reports/plant_genetic_conservation_project.frx index 5a835f2..03a2669 100644 --- a/wwwroot/reports/plant_genetic_conservation_project.frx +++ b/wwwroot/reports/plant_genetic_conservation_project.frx @@ -1,5 +1,5 @@  - + @@ -207,6 +207,9 @@ + + + @@ -225,6 +228,7 @@ + @@ -243,6 +247,7 @@ + @@ -259,10 +264,16 @@ - - + + + + + + + + @@ -298,6 +309,7 @@ + @@ -360,8 +372,8 @@ - - + + @@ -396,9 +408,9 @@ - - - + + + @@ -540,7 +552,7 @@ - + @@ -555,29 +567,29 @@ - - - + + + - + - + - - - + + + - + @@ -593,7 +605,7 @@ - + @@ -610,14 +622,14 @@ - + - + @@ -625,28 +637,28 @@ - - + + - + - + - + - + - + @@ -662,24 +674,24 @@ - + - - + + - - + + - + @@ -694,29 +706,29 @@ - + - + - + - - - + + + - + @@ -724,8 +736,8 @@ - - + + @@ -733,7 +745,7 @@ - + @@ -748,29 +760,29 @@ - + - + - + - - - + + + - + @@ -778,58 +790,112 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - + + + - + - + - - - - + + + + - - + + - + - + - - - + + + @@ -850,8 +916,8 @@ - - + + @@ -936,37 +1002,45 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + + @@ -1036,37 +1110,39 @@ - - - - - + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + + - - + + - + diff --git a/wwwroot/reports/project_principle_rationale_1.frx b/wwwroot/reports/project_principle_rationale_1.frx index b76ed9d..18a4482 100644 --- a/wwwroot/reports/project_principle_rationale_1.frx +++ b/wwwroot/reports/project_principle_rationale_1.frx @@ -1,5 +1,5 @@  - + @@ -199,6 +199,8 @@ + + @@ -217,6 +219,7 @@ + @@ -233,10 +236,16 @@ - - + + + + + + + + @@ -272,6 +281,7 @@ + @@ -287,12 +297,12 @@ - - + + - + @@ -316,11 +326,11 @@ - + - + @@ -331,84 +341,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -424,7 +434,7 @@ - + @@ -439,7 +449,7 @@ - + @@ -459,13 +469,13 @@ - + - + - + - + @@ -476,11 +486,11 @@ - + - + - + @@ -489,11 +499,11 @@ - + - + @@ -501,14 +511,14 @@ - - + + - + - + @@ -532,7 +542,7 @@ - + @@ -547,14 +557,14 @@ - + - + - + @@ -578,7 +588,7 @@ - + @@ -595,9 +605,9 @@ - + - + @@ -619,7 +629,7 @@ - + @@ -636,9 +646,9 @@ - + - + @@ -660,7 +670,7 @@ - + @@ -677,9 +687,9 @@ - + - + @@ -701,7 +711,7 @@ - + @@ -718,7 +728,7 @@ - + @@ -733,7 +743,7 @@ - + @@ -759,7 +769,7 @@ - + @@ -794,7 +804,7 @@ - + @@ -827,38 +837,45 @@ - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -867,9 +884,9 @@ - + - + @@ -878,11 +895,11 @@ - + - + - + @@ -917,35 +934,37 @@ - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - + + diff --git a/wwwroot/reports/project_request_thailands.frx b/wwwroot/reports/project_request_thailands.frx index 9fe0e96..da33310 100644 --- a/wwwroot/reports/project_request_thailands.frx +++ b/wwwroot/reports/project_request_thailands.frx @@ -1,5 +1,5 @@  - + @@ -81,6 +81,7 @@ + @@ -98,10 +99,10 @@ - + - + @@ -207,6 +208,9 @@ + + + @@ -225,6 +229,7 @@ + @@ -243,6 +248,7 @@ + @@ -259,10 +265,16 @@ - - + + + + + + + + @@ -298,6 +310,7 @@ + @@ -355,11 +368,11 @@ - - + + - + @@ -368,19 +381,17 @@ - + + - - - - - - - + + + + - + @@ -388,17 +399,17 @@ - - - - + + + + - + - + - + @@ -443,12 +454,12 @@ - - - - - - + + + + + + @@ -467,10 +478,10 @@ - - - - + + + + @@ -484,7 +495,9 @@ - + + + @@ -499,7 +512,7 @@ - + @@ -556,7 +569,7 @@ - + @@ -564,9 +577,9 @@ - - - + + + @@ -609,7 +622,7 @@ - + @@ -625,7 +638,7 @@ - + @@ -633,9 +646,9 @@ - + - + @@ -661,11 +674,11 @@ - - + + - - + + @@ -693,7 +706,7 @@ - + @@ -701,9 +714,9 @@ - - - + + + @@ -716,8 +729,8 @@ - - + + @@ -747,7 +760,7 @@ - + @@ -755,9 +768,9 @@ - - - + + + @@ -770,58 +783,112 @@ - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - + + + + - + - + - + - - - + + + @@ -842,8 +909,8 @@ - - + + @@ -853,7 +920,7 @@ - + @@ -928,30 +995,38 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + + + + + + + + + @@ -1031,38 +1106,42 @@ - + - - - - + + + + - + + + - + + - + +