diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index 0a0cf4d..27ab1c8 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -26,7 +26,7 @@ namespace rmutr_report.Controllers public IActionResult GetProjectReport([FromRoute] string type, [FromBody] project_principle_rationale project) { var total = project.activity.Count; - var total2 = project.sixteenth.Count; + //var total2 = project.sixteenth.Count; foreach (var v in project.activity) { if (v.activity != null) @@ -53,7 +53,7 @@ namespace rmutr_report.Controllers string na2 = "ตัวบ่งชี้ที่ " ; v.indicator = na2 + v.indicator; } - project.count_activity = total2; + // project.count_activity = total2; foreach (var v in project.eighteenth) { foreach (var vv in v.eighteenths) @@ -63,9 +63,21 @@ namespace rmutr_report.Controllers 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 + " วัน"; + } } } + if (project.total_target != null) + { + project.text1 = "ผลรวมกลุ่มเป้าหมาย " + project.total_target; + } + if (project.total_board != null) + { + project.text2 = "ผลรวมคณะกรรมการ " + project.total_board; + } if (project.twenty_one != null) { diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index c832ecb..a4f079b 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -37,12 +37,15 @@ namespace rmutr_report.Models public List fourteenth { get; set; } //ข้อ 14 public List fifteenth { get; set; } //ข้อ 15 public int? count_activity { get; set; } //ข้อ 16 + public string text1 { get; set; } //ข้อ 16 + public string text2 { get; set; } //ข้อ 16 public int? total_target { get; set; } //ข้อ 16 ผลรวมกลุ่มเป้าหมาย public int? total_board { get; set; } //ข้อ 16 ผลรวมคณะกรรมการ public List sixteenth { get; set; } //ข้อ 16 public List sixteenths { get; set; } //ข้อ 16 detail ตาราง public List seventeenth { get; set; } //ข้อ 17 public int? count_day { get; set; } //ข้อ 18 + public string text3 { get; set; } //ข้อ 18 public List eighteenth { get; set; } //ข้อ 18 public List nineteenth { get; set; } //ข้อ 19 public List nineteenth1 { get; set; } //ข้อ 19 diff --git a/wwwroot/reports/project_principle_rationale.frx b/wwwroot/reports/project_principle_rationale.frx index 53b2c48..73ed462 100644 --- a/wwwroot/reports/project_principle_rationale.frx +++ b/wwwroot/reports/project_principle_rationale.frx @@ -1,5 +1,5 @@  - + @@ -61,6 +61,8 @@ + + @@ -96,6 +98,7 @@ + @@ -385,14 +388,14 @@ - + - - - + + + - + @@ -408,7 +411,7 @@ - + @@ -497,13 +500,13 @@ - + - + - + - + @@ -514,11 +517,11 @@ - - - - - + + + + + @@ -527,11 +530,11 @@ - + - + @@ -539,14 +542,14 @@ - - + + - + - + @@ -570,7 +573,7 @@ - + @@ -585,14 +588,14 @@ - + - + - + @@ -616,7 +619,7 @@ - + @@ -633,9 +636,9 @@ - + - + @@ -657,7 +660,7 @@ - + @@ -674,9 +677,9 @@ - + - + @@ -698,7 +701,7 @@ - + @@ -715,7 +718,7 @@ - + @@ -730,7 +733,7 @@ - +