diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index 101718f..0a0cf4d 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -43,7 +43,7 @@ namespace rmutr_report.Controllers { string na = "ประเด็นยุทธศาสตร์ที่ " ; v.strategic_issues = na + v.strategic_issues; - string na2 = "มาตรการที่ " ; + string na2 = "กลยุทธ์ที่ " ; v.measure = na2 + v.measure; } foreach (var v in project.fourteenth) diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index 18a4569..c832ecb 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -37,11 +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 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 List eighteenth { get; set; } //ข้อ 18 public List nineteenth { get; set; } //ข้อ 19 + public List nineteenth1 { get; set; } //ข้อ 19 public decimal? budget_amount { get; set; } //ข้อ 20 public List twentieth { get; set; } //ข้อ 20 public List twenty_one { get; set; } //ข้อ 21 @@ -214,14 +218,47 @@ namespace rmutr_report.Models public string end_date { get; set; } } + public class nineteenth_data1 + { + public string text1 { get; set; } + public string text2 { get; set; } + public string text3 { get; set; } + public decimal? total_compensation { get; set; } + public decimal? total_expenses { get; set; } + public decimal? total_material { get; set; } + } + public class nineteenth_data { - public string activity { get; set; } + public decimal? budget_total_amount { get; set; } - public decimal? budget_amount { get; set; } + //public string text { get; set; } + //public decimal? total { get; set; } + //public decimal? total_expenses { get; set; } + //public decimal? total_material { get; set; } + //public string activity { get; set; } + //public decimal? budget_amount { get; set; } public decimal? compensation { get; set; } public decimal? expenses { get; set; } public decimal? material { get; set; } + public string text1 { get; set; } + public string text2 { get; set; } + public string text3 { get; set; } + public decimal? total_compensation { get; set; } + public decimal? total_expenses { get; set; } + public decimal? total_material { get; set; } + public List nineteenth_data_header { get; set; } + + // public List nineteenths_compensation { get; set; } + // public List nineteenths_expenses { get; set; } + // public List nineteenths_material { get; set; } + } + + public class nineteenth_data_headers + { + public string text4 { get; set; } + public decimal? budget_amount { get; set; } + public string activity { get; set; } public List nineteenths_compensation { get; set; } public List nineteenths_expenses { get; set; } public List nineteenths_material { get; set; } @@ -329,9 +366,11 @@ namespace rmutr_report.Models public string nuai_nap { get; set; } public string khrang1 { get; set; } public string khrang2 { get; set; } + public string khrang3 { get; set; } public string rueang { get; set; } public string activity { get; set; } public string clause1 { get; set; } + public string count_quantitative { get; set; } public string count_unit { get; set; } public string count_project { get; set; } public string count_training { get; set; } @@ -344,7 +383,8 @@ 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 detail1 { get; set; } + public string detail2 { get; set; } public string clause4 { get; set; } public decimal? expenses { get; set; } } diff --git a/wwwroot/reports/project_principle_rationale.frx b/wwwroot/reports/project_principle_rationale.frx index f4c957f..53b2c48 100644 --- a/wwwroot/reports/project_principle_rationale.frx +++ b/wwwroot/reports/project_principle_rationale.frx @@ -1,5 +1,5 @@  - + @@ -58,7 +58,9 @@ - + + + @@ -93,6 +95,7 @@ + @@ -103,56 +106,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + @@ -174,6 +195,7 @@ + @@ -188,6 +210,7 @@ + @@ -200,7 +223,8 @@ - + + @@ -249,12 +273,12 @@ - - + + - + @@ -278,95 +302,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + - + @@ -382,7 +408,7 @@ - + @@ -471,13 +497,13 @@ - + - + - + - + @@ -488,11 +514,11 @@ - - - + + + - + @@ -501,82 +527,96 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -584,40 +624,40 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -625,40 +665,40 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -666,34 +706,16 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + @@ -701,18 +723,36 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + @@ -749,7 +789,7 @@ - + @@ -782,14 +822,13 @@ - + - + - - + @@ -798,19 +837,21 @@ - - + + + + - + - + - + @@ -819,9 +860,9 @@ - + - + @@ -830,9 +871,9 @@ - + - + @@ -869,12 +910,12 @@ - + - + @@ -887,7 +928,7 @@ - +