diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index 224704a..12ad5dc 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -49,15 +49,14 @@ namespace rmutr_report.Controllers v.measure = na2 + v.measure; } - foreach (var v in project.fourteenth) + foreach (var vv in project.fourteenth) { - foreach (var vv in v.fourteenths) - { - // string na = "องค์ประกอบที่ " ; - // vv.component = na + vv.component; - string na2 = "ตัวบ่งชี้ที่ "; - vv.indicator = na2 + vv.indicator; - } + + // string na = "องค์ประกอบที่ " ; + // vv.component = na + vv.component; + string na2 = "ตัวบ่งชี้ที่ "; + vv.indicator = na2 + vv.indicator; + } // project.count_activity = total2; @@ -225,15 +224,14 @@ namespace rmutr_report.Controllers v.measure = na2 + v.measure; } - foreach (var v in project.fourteenth) + foreach (var vv in project.fourteenth) { - foreach (var vv in v.fourteenths) - { + // string na = "องค์ประกอบที่ " ; // vv.component = na + vv.component; string na2 = "ตัวบ่งชี้ที่ "; vv.indicator = na2 + vv.indicator; - } + } // project.count_activity = total2; diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index a4a7a8e..eaa5cc8 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -106,14 +106,9 @@ namespace rmutr_report.Models public class fourteenth_data { public string level { get; set; } //ข้อ 14 - public List fourteenths { get; set; } - - } - - public class fourteenth_data_detail - { public string component { get; set; } public string indicator { get; set; } + } public class fifteenth_data diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 725af9f..3e858b3 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 62bc5d4..e0842ea 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 725af9f..3e858b3 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 62bc5d4..e0842ea 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/wwwroot/reports/project_principle_rationale.frx b/wwwroot/reports/project_principle_rationale.frx index 82d6b15..2e15651 100644 --- a/wwwroot/reports/project_principle_rationale.frx +++ b/wwwroot/reports/project_principle_rationale.frx @@ -1,5 +1,5 @@  - + @@ -49,10 +49,8 @@ - - - - + + @@ -429,32 +427,30 @@ - - + + - - - - + + - + - + - + - + - + - + @@ -470,7 +466,7 @@ - + @@ -559,13 +555,13 @@ - + - + - + - + @@ -576,11 +572,11 @@ - + - + - + @@ -589,11 +585,11 @@ - + - + @@ -601,14 +597,14 @@ - - + + - + - + @@ -632,7 +628,7 @@ - + @@ -647,14 +643,14 @@ - + - + - + @@ -678,7 +674,7 @@ - + @@ -695,9 +691,9 @@ - + - + @@ -719,7 +715,7 @@ - + @@ -736,9 +732,9 @@ - + - + @@ -760,7 +756,7 @@ - + @@ -777,7 +773,7 @@ - + @@ -792,7 +788,7 @@ - + diff --git a/wwwroot/reports/project_principle_rationale_no_activity.frx b/wwwroot/reports/project_principle_rationale_no_activity.frx index 5e42651..3d6b106 100644 --- a/wwwroot/reports/project_principle_rationale_no_activity.frx +++ b/wwwroot/reports/project_principle_rationale_no_activity.frx @@ -1,5 +1,5 @@  - + @@ -49,10 +49,8 @@ - - - - + + @@ -407,27 +405,25 @@ - + - - - - - + + + - + - + - + - + - + @@ -442,7 +438,7 @@ - + @@ -531,13 +527,13 @@ - + - + - + - + @@ -548,10 +544,10 @@ - + - - + + @@ -560,15 +556,15 @@ - + - - - + + + - + @@ -592,7 +588,7 @@ - + @@ -607,14 +603,14 @@ - + - + - + @@ -638,7 +634,7 @@ - + @@ -655,9 +651,9 @@ - + - + @@ -679,7 +675,7 @@ - + @@ -696,9 +692,9 @@ - + - + @@ -720,7 +716,7 @@ - + @@ -737,7 +733,7 @@ - + @@ -752,7 +748,7 @@ - +