diff --git a/Controllers/PlantGeneticConservationProject.Controller.cs b/Controllers/PlantGeneticConservationProject.Controller.cs index 03f27a3..c304bc7 100644 --- a/Controllers/PlantGeneticConservationProject.Controller.cs +++ b/Controllers/PlantGeneticConservationProject.Controller.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.IO; +using System.Linq; using ClosedXML.Excel; using FastReport; using FastReport.Export.Csv; @@ -23,37 +24,201 @@ namespace rmutr_report.Controllers } [HttpPost, Route("reports/plant_genetic_conservation_project/{type}")] [ApiExplorerSettings(GroupName = "reports")] - public IActionResult GetConservationProjectReport([FromRoute] string type, [FromBody] conservation_project project) + public IActionResult GetConservationProjectReport([FromRoute] string type, [FromBody] project_principle_rationale project) { - - foreach (var v in project.five) + if (project != null) { - string na = "ประเด็นยุทธศาสตร์ที่ " ; - v.strategic_issues = na + v.strategic_issues; - string na2 = "กลยุทธ์ที่ " ; - v.measure = na2 + v.measure; - } - foreach (var v in project.eleventh) - { - foreach (var vv in v.elevenths) + var total = project.activity.Count; + if (project.activity != null) { + foreach (var v in project.activity) + { + if (v.activity != null) + { + //var total = project.activity.Select(r => r.count).Sum(t => t.Value); + project.together_with = "ประกอบด้วยกิจกรรมหรือโครงการย่อย " + total + " โครงการดังนี้คือ"; + } + else + { + project.together_with = null; + } + } + } - string na = "ครั้งที่ "; - 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.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) + { + foreach (var sixteenthData in project.sixteenths) + { + var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); + var sum2 = sixteenthData.sixteenths2.Sum(d => d.bophitphimuk); + var sum3 = sixteenthData.sixteenths2.Sum(d => d.pohchang); + var sum4 = sixteenthData.sixteenths2.Sum(d => d.klai_kangwon); + sixteenthData.salaya_total = sum1; + sixteenthData.bophitphimuk_total = sum2; + sixteenthData.pohchang_total = sum3; + sixteenthData.klai_kangwon_total = sum4; + } + } + + if (project.eighteenth != null) + { + foreach (var v in project.eighteenth) + { + foreach (var vv in v.eighteenths) + { + string na = "ครั้งที่ "; + 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) + { + foreach (var v in project.twenty_one) + { + if (v.activity != null || v.activity != "") + { + v.activity = v.activity; + } + + 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) + { + + string na = " หน่วยนับ"; + vv.khrang1 = na; + } + + if (vv.count_unit != null) + { + string na = "ผู้เข้าร่วมโครงการ "; + string na1 = " จำนวน "; + string na2 = " คน"; + vv.text1 = na; + vv.text11 = na1; + vv.nuai_nap = na2; + } + + if (vv.count_project != null) + { + vv.clause1 = "16.1 เชิงปริมาณ"; + string na = "จำนวนครั้งที่ดำเนินโครงการ "; + string na2 = " ครั้ง"; + vv.text2 = na; + vv.khrang2 = na2; + } + + if (vv.count_training != null) + { + string na = "จำนวนการจัดอบรมและสัมมนา "; + string na2 = " เรื่อง"; + vv.text3 = na; + vv.rueang = na2; + } + + if (vv.count_knowledge != null) + { + string na = "จำนวนเผยแพร่ความรู้บริการวิชาการ "; + string na2 = " ครั้ง"; + vv.text4 = na; + vv.khrang3 = na2; + } + + if (vv.project_start_date != null) + { + vv.clause2 = "16.2 เชิงเวลา"; + string na3 = "วัน/เดือน/ปี ที่จะดำเนินโครงการ "; + string na4 = " ถึง "; + vv.range = na4; + vv.text5 = na3; + string na5 = "โครงการแล้วเสร็จตามเวลาที่กำหนด (ร้อยละ) "; + vv.text6 = na5; + } + + if (vv.percentage1 != null || vv.percentage2 != null) + { + vv.clause3 = "16.3 เชิงคุณภาพ"; + string na = "ผู้เข้าร่วมโครงการมีความรู้ความเข้าใจเพิ่มขึ้น (ร้อยละ) "; + string na1 = "ความพึงพอใจของผู้เข้ารับบริการในกระบวนการให้บริการ (ร้อยละ) "; + vv.text7 = na; + vv.text8 = na1; + vv.text9 = "ผู้เข้าร่วมโครงการสามารถนำความรู้ที่ได้รับไปบูรณาการอย่างไรบ้าง"; + vv.text10 = "รายละเอียด"; + } + + if (vv.expenses != null) + { + vv.clause4 = "16.4 เชิงค่าใช้จ่าย"; + vv.bath = " บาท"; + } + } + } } } - - var _project = new List() {project}; + var _project = new List() {project}; Report report = new Report(); report.Load(_setting.report_path + "plant_genetic_conservation_project.frx"); - report.RegisterData(_project, "conservation_project"); + report.RegisterData(_project, "project_principle_rationale"); report.Prepare(); MemoryStream stream = new MemoryStream(); diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index aa906b3..073605f 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -44,6 +44,8 @@ namespace rmutr_report.Models public int? count_activity { get; set; } //ข้อ 16 public string text1 { get; set; } //ข้อ 16 public string text2 { get; set; } //ข้อ 16 + public string operational_activitie { get; set; }//ข้อ 15 ง.5-3 + public string evaluation { get; set; }//ข้อ 16 ง.5-3 public int? total_target { get; set; } //ข้อ 16 ผลรวมกลุ่มเป้าหมาย public int? total_board { get; set; } //ข้อ 16 ผลรวมคณะกรรมการ public List sixteenth { get; set; } //ข้อ 16 @@ -72,7 +74,9 @@ namespace rmutr_report.Models public List twenty_three { get; set; } //ข้อ 23 public List twenty_four { get; set; } //ข้อ 24 public List twenty_fifth { get; set; } //ข้อ 25 - + public string url_file1 { get; set; } //ง.5-3 + public string url_file2 { get; set; } //ง.5-3 + public string url_file3 { get; set; } //ข้อ 23 ง.5-3 } diff --git a/Models/budget/project_under_integrated.cs b/Models/budget/project_under_integrated.cs index 3e65083..09cc2f7 100644 --- a/Models/budget/project_under_integrated.cs +++ b/Models/budget/project_under_integrated.cs @@ -85,60 +85,69 @@ namespace rmutr_report.Models { public string activity_table { get; set; } public List tenths2 { get; set; } - } - - public class tenth2_datas_details - { - public decimal? salaya_executive { get; set; } - public decimal? bophitphimuk_executive { get; set; } - public decimal? pohchang_executive { get; set; } - public decimal? klai_kangwon_executive { get; set; } - public decimal? salaya_teacher { get; set; } - public decimal? bophitphimuk_teacher { get; set; } - public decimal? pohchang_teacher { get; set; } - public decimal? klai_kangwon_teacher { get; set; } - public decimal? salaya_officer { get; set; } - public decimal? bophitphimuk_officer { get; set; } - public decimal? pohchang_officer { get; set; } - public decimal? klai_kangwon_officer { get; set; } - public decimal? salaya_internal_student { get; set; } - public decimal? bophitphimuk_internal_student { get; set; } - public decimal? pohchang_internal_student { get; set; } - public decimal? klai_kangwon_internal_student { get; set; } - public decimal? salaya_external_student { get; set; } - public decimal? bophitphimuk_external_student { get; set; } - public decimal? pohchang_external_student { get; set; } - public decimal? klai_kangwon_external_student { get; set; } - public decimal? salaya_person { get; set; } - public decimal? bophitphimuk_person { get; set; } - public decimal? pohchang_person { get; set; } - public decimal? klai_kangwon_person { get; set; } - public decimal? salaya_lecturer { get; set; } - public decimal? bophitphimuk_lecturer { get; set; } - public decimal? pohchang_lecturer { get; set; } - public decimal? klai_kangwon_lecturer { get; set; } - - public decimal? salaya_board { get; set; } - public decimal? bophitphimuk_board { get; set; } - public decimal? pohchang_board { get; set; } - public decimal? klai_kangwon_board { get; set; } - - public decimal? salaya_driver { get; set; } - public decimal? bophitphimuk_driver { get; set; } - public decimal? pohchang_driver { get; set; } - public decimal? klai_kangwon_driver { get; set; } - - public decimal? salaya_other { get; set; } - public decimal? bophitphimuk_other { get; set; } - public decimal? pohchang_other { get; set; } - public decimal? klai_kangwon_other { get; set; } - public decimal? salaya_total { get; set; } public decimal? bophitphimuk_total { get; set; } public decimal? pohchang_total { get; set; } public decimal? klai_kangwon_total { get; set; } } + public class tenth2_datas_details + { + public string target_group { get; set; } + public decimal? salaya { get; set; } + public decimal? bophitphimuk{ get; set; } + public decimal? pohchang{ get; set; } + public decimal? klai_kangwon{ get; set; } + // public decimal? salaya_executive { get; set; } + // public decimal? bophitphimuk_executive { get; set; } + // public decimal? pohchang_executive { get; set; } + // public decimal? klai_kangwon_executive { get; set; } + // public decimal? salaya_teacher { get; set; } + // public decimal? bophitphimuk_teacher { get; set; } + // public decimal? pohchang_teacher { get; set; } + // public decimal? klai_kangwon_teacher { get; set; } + // public decimal? salaya_officer { get; set; } + // public decimal? bophitphimuk_officer { get; set; } + // public decimal? pohchang_officer { get; set; } + // public decimal? klai_kangwon_officer { get; set; } + // public decimal? salaya_internal_student { get; set; } + // public decimal? bophitphimuk_internal_student { get; set; } + // public decimal? pohchang_internal_student { get; set; } + // public decimal? klai_kangwon_internal_student { get; set; } + // public decimal? salaya_external_student { get; set; } + // public decimal? bophitphimuk_external_student { get; set; } + // public decimal? pohchang_external_student { get; set; } + // public decimal? klai_kangwon_external_student { get; set; } + // public decimal? salaya_person { get; set; } + // public decimal? bophitphimuk_person { get; set; } + // public decimal? pohchang_person { get; set; } + // public decimal? klai_kangwon_person { get; set; } + // public decimal? salaya_lecturer { get; set; } + // public decimal? bophitphimuk_lecturer { get; set; } + // public decimal? pohchang_lecturer { get; set; } + // public decimal? klai_kangwon_lecturer { get; set; } + // + // public decimal? salaya_board { get; set; } + // public decimal? bophitphimuk_board { get; set; } + // public decimal? pohchang_board { get; set; } + // public decimal? klai_kangwon_board { get; set; } + // + // public decimal? salaya_driver { get; set; } + // public decimal? bophitphimuk_driver { get; set; } + // public decimal? pohchang_driver { get; set; } + // public decimal? klai_kangwon_driver { get; set; } + // + // public decimal? salaya_other { get; set; } + // public decimal? bophitphimuk_other { get; set; } + // public decimal? pohchang_other { get; set; } + // public decimal? klai_kangwon_other { get; set; } + // + // public decimal? salaya_total { get; set; } + // public decimal? bophitphimuk_total { get; set; } + // public decimal? pohchang_total { get; set; } + // public decimal? klai_kangwon_total { get; set; } + } + public class operating_activities { public string activity { get; set; } @@ -146,18 +155,19 @@ namespace rmutr_report.Models public class output_datas { + public string kpi_name { get; set; } public string quantity_kpi { get; set; } public string quantity_target { get; set; } public string quantity_measure { get; set; } - public string quality_kpi { get; set; } - public string quality_target { get; set; } - public string quality_measure { get; set; } - public string time_kpi { get; set; } - public string time_target { get; set; } - public string time_measure { get; set; } - public string cost_kpi { get; set; } - public string cost_target { get; set; } - public string cost_measure { get; set; } + // public string quality_kpi { get; set; } + // public string quality_target { get; set; } + // public string quality_measure { get; set; } + // public string time_kpi { get; set; } + // public string time_target { get; set; } + // public string time_measure { get; set; } + // public string cost_kpi { get; set; } + // public string cost_target { get; set; } + // public string cost_measure { get; set; } } public class thirteen_data diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 0139712..d85186e 100644 Binary files a/bin/Debug/net5.0/rmutr_report.dll and b/bin/Debug/net5.0/rmutr_report.dll differ diff --git a/bin/Debug/net5.0/rmutr_report.pdb b/bin/Debug/net5.0/rmutr_report.pdb index 6c85335..c5cd8c0 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index d0fe52e..518e147 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 8830f01..0bce0b8 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/net5.0/ref/rmutr_report.dll b/obj/Debug/net5.0/ref/rmutr_report.dll index 6b27844..f238b41 100644 Binary files a/obj/Debug/net5.0/ref/rmutr_report.dll and b/obj/Debug/net5.0/ref/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/refint/rmutr_report.dll b/obj/Debug/net5.0/refint/rmutr_report.dll index 6b27844..f238b41 100644 Binary files a/obj/Debug/net5.0/refint/rmutr_report.dll and b/obj/Debug/net5.0/refint/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 0139712..d85186e 100644 Binary files a/obj/Debug/net5.0/rmutr_report.dll and b/obj/Debug/net5.0/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index 6c85335..c5cd8c0 100644 Binary files a/obj/Debug/net5.0/rmutr_report.pdb and b/obj/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index d0fe52e..518e147 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 8830f01..0bce0b8 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.restore.info b/obj/rider.project.restore.info index 7c0d446..b2de6c4 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16964958954067386 \ No newline at end of file +16965661167366202 \ 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 00f51d7..ae18204 100644 --- a/wwwroot/reports/plant_genetic_conservation_project.frx +++ b/wwwroot/reports/plant_genetic_conservation_project.frx @@ -1,46 +1,97 @@  - + - + + - - + + + + + + + + + + - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -50,69 +101,18 @@ - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -124,14 +124,13 @@ - + - + - - + @@ -139,57 +138,71 @@ - + - - + + + - + - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + @@ -204,144 +217,154 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - - - - - - - - - - + @@ -352,45 +375,41 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + @@ -398,114 +417,62 @@ - - - - - + + + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - + + + + + + @@ -513,24 +480,24 @@ - - - - - + + + + + - - - + + + - - - + + + @@ -538,9 +505,9 @@ - - - + + + @@ -550,32 +517,32 @@ - - - - - + + + + + - - + + - - - - - + + + + + - + @@ -583,23 +550,23 @@ - - - - - + + + + + - - + + - - - + + + @@ -607,9 +574,9 @@ - - - + + + @@ -619,15 +586,15 @@ - - - - - + + + + + - + @@ -635,16 +602,16 @@ - - - - - + + + + + - + @@ -652,22 +619,22 @@ - - - - - + + + + + - + - - - + + + @@ -675,13 +642,13 @@ - - - + + + - + @@ -689,16 +656,16 @@ - - - - - + + + + + - + @@ -706,22 +673,22 @@ - - - - - + + + + + - + - - - + + + @@ -729,13 +696,13 @@ - - - + + + - + @@ -743,16 +710,16 @@ - - - - - + + + + + - + @@ -760,15 +727,15 @@ - - - - - + + + + + - - + + @@ -776,15 +743,15 @@ - - - - - + + + + + - + @@ -792,11 +759,11 @@ - - - - - + + + + + @@ -806,31 +773,30 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - + @@ -846,157 +812,158 @@ - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - + + + + + + + + + @@ -1004,48 +971,48 @@ - - - - - - - - - + + + + + + + + + - - - - + + + + - + - - - - + + + + - - - - + + + + diff --git a/wwwroot/reports/project_request_thailands.frx b/wwwroot/reports/project_request_thailands.frx index 73b4005..29d2c4d 100644 --- a/wwwroot/reports/project_request_thailands.frx +++ b/wwwroot/reports/project_request_thailands.frx @@ -1,5 +1,5 @@  - + @@ -24,8 +24,11 @@ - - + + + + + @@ -293,51 +296,47 @@ - - - - - - - + + + + + + + - + - - - + + + - + - - - + + + - - - + - - - - - + + + - - - + + + @@ -373,9 +372,9 @@ - - - + + + @@ -392,7 +391,7 @@ - + @@ -405,9 +404,9 @@ - + - + @@ -415,11 +414,11 @@ - - - - - + + + + + @@ -438,7 +437,7 @@ - + @@ -460,9 +459,9 @@ - - - + + + @@ -477,24 +476,24 @@ - - - - - + + + + + - - + + - - - + + + @@ -502,9 +501,9 @@ - - - + + + @@ -514,11 +513,11 @@ - - - - - + + + + + @@ -530,11 +529,11 @@ - - - - - + + + + + @@ -547,23 +546,23 @@ - - - - - + + + + + - + - - - + + + @@ -571,9 +570,9 @@ - - - + + + @@ -583,11 +582,11 @@ - - - - - + + + + + @@ -599,11 +598,11 @@ - - - - - + + + + + @@ -616,11 +615,11 @@ - - - - - + + + + + @@ -629,9 +628,9 @@ - - - + + + @@ -639,9 +638,9 @@ - - - + + + @@ -653,11 +652,11 @@ - - - - - + + + + + @@ -670,11 +669,11 @@ - - - - - + + + + + @@ -683,9 +682,9 @@ - - - + + + @@ -693,9 +692,9 @@ - - - + + + @@ -707,11 +706,11 @@ - - - - - + + + + + @@ -724,15 +723,15 @@ - - - - - + + + + + - + @@ -740,11 +739,11 @@ - - - - - + + + + + @@ -756,11 +755,11 @@ - - - - - + + + + + @@ -770,21 +769,23 @@ - - - - - - - - + + + + + + + + + + - + - - + + @@ -800,22 +801,22 @@ - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -834,25 +835,25 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + @@ -883,29 +884,29 @@ - - - + + + - + - + - - + + - - + + @@ -914,29 +915,29 @@ - - - + + + - + - - + + - - + + @@ -945,9 +946,9 @@ - - - + + + @@ -955,14 +956,14 @@ - - - + + + - - - - + + + + @@ -970,10 +971,10 @@ - - - - + + + + @@ -983,10 +984,10 @@ - - - - + + + + @@ -994,8 +995,9 @@ - - + + + diff --git a/wwwroot/reports/project_under_integrated_plan.frx b/wwwroot/reports/project_under_integrated_plan.frx index 2f0ebaf..acbe0b4 100644 --- a/wwwroot/reports/project_under_integrated_plan.frx +++ b/wwwroot/reports/project_under_integrated_plan.frx @@ -1,5 +1,5 @@  - + @@ -40,51 +40,16 @@ + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -92,18 +57,10 @@ + - - - - - - - - - @@ -235,45 +192,45 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + @@ -281,62 +238,62 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - + + @@ -344,201 +301,129 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - - + + @@ -546,11 +431,11 @@ - - - - - + + + + + @@ -559,10 +444,10 @@ - - - - + + + + @@ -571,10 +456,10 @@ - - - - + + + + @@ -591,17 +476,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -620,17 +505,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -646,27 +531,27 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + @@ -678,24 +563,24 @@ - - - - - + + + + + - - + + - - - + + + @@ -703,9 +588,9 @@ - - - + + + @@ -715,11 +600,11 @@ - - - - - + + + + + @@ -731,11 +616,11 @@ - - - - - + + + + + @@ -748,23 +633,23 @@ - - - - - + + + + + - + - - - + + + @@ -772,9 +657,9 @@ - - - + + + @@ -784,11 +669,11 @@ - - - - - + + + + + @@ -800,11 +685,11 @@ - - - - - + + + + + @@ -817,11 +702,11 @@ - - - - - + + + + + @@ -830,9 +715,9 @@ - - - + + + @@ -840,9 +725,9 @@ - - - + + + @@ -854,11 +739,11 @@ - - - - - + + + + + @@ -871,11 +756,11 @@ - - - - - + + + + + @@ -884,9 +769,9 @@ - - - + + + @@ -894,9 +779,9 @@ - - - + + + @@ -908,11 +793,11 @@ - - - - - + + + + + @@ -925,15 +810,15 @@ - - - - - + + + + + - + @@ -941,11 +826,11 @@ - - - - - + + + + + @@ -957,11 +842,11 @@ - - - - - + + + + + @@ -971,29 +856,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +