diff --git a/Controllers/Summary.Controller.cs b/Controllers/Summary.Controller.cs index 349221a..1541aca 100644 --- a/Controllers/Summary.Controller.cs +++ b/Controllers/Summary.Controller.cs @@ -484,6 +484,67 @@ namespace rmutr_report.Controllers foreach (var equipments in summary_of_equipments.header_data) { if (equipments.color == 1) + { + ws.Cell(row, 1).Value = null; + ws.Cell(row, 2).Value = equipments.list; + ws.Cell(row, 3).Value = null; + ws.Cell(row, 4).Value = null; + ws.Cell(row, 5).Value = null; + ws.Cell(row, 6).Value = null; + ws.Cell(row, 7).Value = null; + ws.Cell(row, 8).Value = equipments.unit_price; + ws.Cell(row, 9).Value = equipments.price_1; + ws.Cell(row, 10).Value = equipments.price_2; + ws.Cell(row, 11).Value = equipments.price_3; + ws.Cell(row, 12).Value = equipments.price_4; + ws.Cell(row, 13).Value = equipments.price_5; + ws.Cell(row, 14).Value = null; + ws.Cell(row, 15).Value = null; + ws.Cell(row, 16).Value = null; + ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 3).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 4).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 5).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 6).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 7).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 8).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 9).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 10).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 11).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 12).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 13).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 14).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 15).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 16).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 16)).Style.Font.FontName = + "TH Sarabun New"; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 16)).Style.Font.FontSize = 12; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 16)).Style.Alignment.WrapText = true; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 16)).Style.Alignment.Vertical = + XLAlignmentVerticalValues.Center; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 16)).Style.Fill.BackgroundColor = XLColor.OrangeColorWheel; + + ws.Cell(row, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; + ws.Cell(row, 3).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 4).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 6).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 7).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 8).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 9).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 10).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 11).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 12).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 13).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 14).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 15).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; + ws.Cell(row, 16).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; + ws.Range(ws.Cell(row, 8), ws.Cell(row, 14)).Style.NumberFormat.SetFormat("#,#"); + row++; + } + if (equipments.color == 2) { ws.Cell(row, 1).Value = null; ws.Cell(row, 2).Value = equipments.list; @@ -547,7 +608,7 @@ namespace rmutr_report.Controllers foreach (var equipments1 in equipments.data) { - if (equipments1.color == 2) + if (equipments1.color == 3) { ws.Cell(row, 1).Value = null; ws.Cell(row, 2).Value = equipments1.faculty_name; @@ -611,7 +672,7 @@ namespace rmutr_report.Controllers foreach (var equipments2 in equipments1.data) { - if (equipments2.color == 3) + if (equipments2.color == 4) { ws.Cell(row, 1).Value = null; ws.Cell(row, 2).Value = equipments2.list; @@ -1132,7 +1193,77 @@ namespace rmutr_report.Controllers ws.Range("H4:S4").Style.Fill.BackgroundColor = XLColor.Gainsboro; foreach (var buildings in summary_building_constructions.header_data) { - if (buildings.color == 1) + if (buildings.color == 1) + { + ws.Cell(row, 1).Value = null; + ws.Cell(row, 2).Value = buildings.list; + ws.Cell(row, 3).Value = null; + ws.Cell(row, 4).Value = null; + ws.Cell(row, 5).Value = null; + ws.Cell(row, 6).Value = null; + ws.Cell(row, 7).Value = null; + ws.Cell(row, 8).Value = null; + ws.Cell(row, 9).Value = null; + ws.Cell(row, 10).Value = null; + ws.Cell(row, 11).Value = buildings.budget; + ws.Cell(row, 12).Value = buildings.price_1; + ws.Cell(row, 13).Value = buildings.price_2; + ws.Cell(row, 14).Value = buildings.price_3; + ws.Cell(row, 15).Value = buildings.price_4; + ws.Cell(row, 16).Value = buildings.price_5; + ws.Cell(row, 17).Value = null; + ws.Cell(row, 18).Value = null; + ws.Cell(row, 19).Value = null; + ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 3).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 4).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 5).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 6).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 7).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 8).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 9).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 10).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 11).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 12).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 13).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 14).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 15).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 16).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 17).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 18).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Cell(row, 19).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 19)).Style.Font.FontName = + "TH Sarabun New"; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 19)).Style.Font.FontSize = 11; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 19)).Style.Alignment.WrapText = true; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 19)).Style.Alignment.Vertical = + XLAlignmentVerticalValues.Center; + ws.Range(ws.Cell(row, 1), ws.Cell(row, 19)).Style.Fill.BackgroundColor = + XLColor.OrangeColorWheel; + ws.Cell(row, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; + ws.Cell(row, 3).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 4).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 6).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 7).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; + ws.Cell(row, 8).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 9).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 10).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 11).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 12).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 13).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 14).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 15).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 16).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; + ws.Cell(row, 17).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 18).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Cell(row, 19).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; + ws.Range(ws.Cell(row, 11), ws.Cell(row, 16)).Style.NumberFormat.SetFormat("#,#"); + row++; + } + if (buildings.color == 2) { ws.Cell(row, 1).Value = null; ws.Cell(row, 2).Value = buildings.list; @@ -1206,7 +1337,7 @@ namespace rmutr_report.Controllers foreach (var buildings1 in buildings.data) { - if (buildings1.color == 2) + if (buildings1.color == 3) { ws.Cell(row, 1).Value = null; ws.Cell(row, 2).Value = buildings1.faculty_name; @@ -1284,7 +1415,7 @@ namespace rmutr_report.Controllers foreach (var buildings2 in buildings1.data) { - if (buildings2.color == 3) + if (buildings2.color == 4) { ws.Cell(row, 1).Value = null; ws.Cell(row, 2).Value = buildings2.list; diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index e5288b4..4bdff59 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -190,6 +190,176 @@ namespace rmutr_report.Controllers return Ok(); } +[HttpPost, Route("reports/project_principle_rationale_no_activity/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetProject2Report([FromRoute] string type, [FromBody] project_principle_rationale project) + { + var total = project.activity.Count; + //var total2 = project.sixteenth.Count; + 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; + } + } + foreach (var v in project.eighth) + { + string na = "ประเด็นยุทธศาสตร์ที่ " ; + v.strategic_issues = na + v.strategic_issues; + string na2 = "กลยุทธ์ที่ " ; + v.measure = na2 + v.measure; + } + foreach (var v in project.fourteenth) + { + string na = "องค์ประกอบที่ " ; + v.component = na + v.component; + string na2 = "ตัวบ่งชี้ที่ " ; + v.indicator = na2 + v.indicator; + } + // project.count_activity = total2; + 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 vv in project.twenty_one) + // { + // if (vv.activity != null || vv.activity!= "") + // { + // vv.activity = vv.activity; + // } + // 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_unit != null || vv.count_unit != "") + // { + // string na = "ผู้เข้าร่วมโครงการ จำนวน "; + // string na2 = " หน่วยนับ"; + // project.text1 = na + vv.count_unit + na2; + // } + // + // if (vv.count_project != null || vv.count_project != "") + // { + // string na = "จำนวนครั้งที่ดำเนินโครงการ "; + // string na2 = " ครั้ง"; + // project.text2 = na + vv.count_project + na2; + // } + // + // if (vv.count_training != null || vv.count_training != "") + // { + // string na = "จำนวนการจัดอบรมและสัมมนา "; + // string na2 = " เรื่อง"; + // project.text3 = na + vv.count_training + na2; + // } + // + // if (vv.count_knowledge != null || vv.count_knowledge != "") + // { + // string na = "จำนวนเผยแพร่ความรู้บริการวิชาการ "; + // string na2 = " ครั้ง"; + // project.text4 = na + vv.count_knowledge + na2; + // } + // string na3 = "วัน/เดือน/ปี ที่จะดำเนินโครงการ "; + // string na4 = " ถึง "; + // project.text5 = na3 + vv.project_start_date + na4 + vv.project_end_date; + // string na5 = "โครงการแล้วเสร็จตามเวลาที่กำหนด (ร้อยละ) "; + // project.text6 = na5 + vv.percentage_finish; + // + // } + + if (project.twenty_one == null) + { + project.twenty_one = null; + } + } + + var _project = new List() {project}; + + Report report = new Report(); + report.Load(_setting.report_path + "project_principle_rationale_no_activity.frx"); + report.RegisterData(_project, "project_principle_rationale"); + report.Prepare(); + + MemoryStream stream = new MemoryStream(); + switch (type) + { + case "pdf": + PDFExport pdf = new PDFExport(); + report.Export(pdf, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/pdf"); + + case "xls": + case "xlsx": + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/vnd.ms-excel"); + break; + case "mht": + MHTExport mht = new MHTExport(); + report.Export(mht, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "multipart/related"); + break; + case "csv": + CSVExport csv = new CSVExport(); + report.Export(csv, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "text/csv"); + break; + case "doc": case "docx": + Word2007Export word = new Word2007Export(); + report.Export(word, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "appllication/vnd.ms-word"); + break; + } + + return Ok(); + } + + } } \ No newline at end of file diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index c82dae2..f50ba70 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -56,6 +56,9 @@ namespace rmutr_report.Models public decimal? budget_amount { get; set; } //ข้อ 20 public List twentieth { get; set; } //ข้อ 20 public List twenty_one { get; set; } //ข้อ 21 + public List twenty_one_activity1 { get; set; } //ข้อ 21 มีหลายกิจกรรม + public List twenty_one_activity2 { get; set; } //ข้อ 21 มีหลายกิจกรรม + public List twenty_one_activity3 { get; set; } //ข้อ 21 มีหลายกิจกรรม public List twenty_two { get; set; } //ข้อ 22 public List twenty_three { get; set; } //ข้อ 23 public List twenty_four { get; set; } //ข้อ 24 @@ -375,7 +378,6 @@ namespace rmutr_report.Models 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; } @@ -396,6 +398,73 @@ namespace rmutr_report.Models public decimal? expenses { get; set; } } + public class twenty_one_data_activity1 + { + public string clause1 { get; set; } + public string count_quantitative { get; set; } + public string khrang1 { get; set; } + public string text1 { get; set; } + public string count_unit { get; set; } + public string nuai_nap { get; set; } + public string text2 { get; set; } + public string count_project { get; set; } + public string khrang2 { get; set; } + public string text3 { get; set; } + public string count_training { get; set; } + public string rueang { get; set; } + public string text4 { get; set; } + public string count_knowledge { get; set; } + public string khrang3 { get; set; } + public List twenty_one_data_activity1_detail { get; set; } + + } + + public class twenty_one_data_activity1_detail + { + public string activity_clause1 { get; set; } + public string text1 { get; set; } + public string count_unit { get; set; } + public string nuai_nap { get; set; } + public string text2 { get; set; } + public string count_project { get; set; } + public string khrang2 { get; set; } + public string text3 { get; set; } + public string count_training { get; set; } + public string rueang { get; set; } + public string text4 { get; set; } + public string count_knowledge { get; set; } + public string khrang3 { get; set; } + } + public class twenty_one_data_activity2 + { + public string clause2 { get; set; } + public string activity_clause2 { get; set; } + + public string text5 { get; set; } + public string project_start_date { get; set; } + public string project_end_date { get; set; } + + public string text6 { get; set; } + public string percentage_finish { get; set; } + + } + public class twenty_one_data_activity3 + { + + public string text7 { get; set; } + public string text8 { get; set; } + public string text9 { get; set; } + public string text10 { get; set; } + public string clause3 { get; set; } + public string percentage1 { get; set; } + public string percentage2 { get; set; } + public string acquired_knowledge { get; set; } + public string detail1 { get; set; } + public string detail2 { get; set; } + public string clause4 { get; set; } + public decimal? expenses { get; set; } + public string bath { get; set; } + } public class twenty_two_data { public string list { get; set; } diff --git a/wwwroot/reports/building_fours.frx b/wwwroot/reports/building_fours.frx index e0aff05..a89e312 100644 --- a/wwwroot/reports/building_fours.frx +++ b/wwwroot/reports/building_fours.frx @@ -142,50 +142,50 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - + - - + + - - - + + + - + - + @@ -196,12 +196,12 @@ - - - - - - + + + + + + @@ -213,15 +213,15 @@ - - - - - - + + + + + + - + @@ -235,14 +235,14 @@ - - - - - - - - + + + + + + + + @@ -251,9 +251,9 @@ - - - + + + @@ -263,14 +263,14 @@ - - - - - + + + + + - + @@ -283,62 +283,62 @@ - - - - - - - - + + + + + + + + - + - + - + - - - + + + - + - - + + - - - + + + - + - - + + - - - - + + + + @@ -348,10 +348,10 @@ - - - - + + + + @@ -361,44 +361,44 @@ - - - - + + + + - - + + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - + @@ -406,22 +406,22 @@ - - - - - + + + + + - + - - - + + + @@ -429,9 +429,9 @@ - - - + + + @@ -439,9 +439,9 @@ - - - + + + @@ -449,9 +449,9 @@ - - - + + + @@ -470,19 +470,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -490,7 +490,7 @@ - + @@ -501,30 +501,30 @@ - - - - - - - - + + + + + + + + - - + + - - + + @@ -540,16 +540,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -567,28 +567,28 @@ - - - - - - - - - - + + + + + + + + + + - - - - + + + + - + @@ -600,12 +600,12 @@ - - - - - - + + + + + + @@ -617,23 +617,23 @@ - - - - - - + + + + + + - - - - - - + + + + + + diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index 08503a4..992eb78 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -1,5 +1,5 @@  - + @@ -96,30 +96,30 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + @@ -131,10 +131,10 @@ - - - - + + + + @@ -145,81 +145,81 @@ - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - + + + - + @@ -235,19 +235,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -266,37 +266,37 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + @@ -306,13 +306,13 @@ - - - - - - - + + + + + + + @@ -325,34 +325,34 @@ - - - - - - - + + + + + + + - - - + + + - - - + + + - - + + - - - + + + diff --git a/wwwroot/reports/plant_genetic_conservation_project.frx b/wwwroot/reports/plant_genetic_conservation_project.frx index 9ed3f65..00f51d7 100644 --- a/wwwroot/reports/plant_genetic_conservation_project.frx +++ b/wwwroot/reports/plant_genetic_conservation_project.frx @@ -272,76 +272,76 @@ - - - - - - - - + + + + + + + + - + - - - - + + + + - - + + - - - - - - - - - + + + + + + + + + - + - + - + - + - + - + - + @@ -352,45 +352,45 @@ - - - + + + - + - + - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + - + - + @@ -398,11 +398,11 @@ - - - - - + + + + + @@ -413,81 +413,81 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + @@ -496,15 +496,15 @@ - - - + + + - - - + + + @@ -513,24 +513,24 @@ - - - - - + + + + + - - + + - - - + + + @@ -538,9 +538,9 @@ - - - + + + @@ -550,11 +550,11 @@ - - - - - + + + + + @@ -566,11 +566,11 @@ - - - - - + + + + + @@ -583,23 +583,23 @@ - - - - - + + + + + - + - - - + + + @@ -607,9 +607,9 @@ - - - + + + @@ -619,11 +619,11 @@ - - - - - + + + + + @@ -635,11 +635,11 @@ - - - - - + + + + + @@ -652,11 +652,11 @@ - - - - - + + + + + @@ -665,9 +665,9 @@ - - - + + + @@ -675,9 +675,9 @@ - - - + + + @@ -689,11 +689,11 @@ - - - - - + + + + + @@ -706,11 +706,11 @@ - - - - - + + + + + @@ -719,9 +719,9 @@ - - - + + + @@ -729,9 +729,9 @@ - - - + + + @@ -743,11 +743,11 @@ - - - - - + + + + + @@ -760,15 +760,15 @@ - - - - - + + + + + - + @@ -776,11 +776,11 @@ - - - - - + + + + + @@ -792,11 +792,11 @@ - - - - - + + + + + @@ -806,31 +806,31 @@ - - - - - - - - - - + + + + + + + + + + - + - - - - + + + + - - + + @@ -846,26 +846,26 @@ - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + @@ -882,46 +882,46 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -930,62 +930,62 @@ - + - + - + - - + + - - + + - - + + - - - + + + - + - - + + - - + + @@ -994,9 +994,9 @@ - - - + + + @@ -1004,14 +1004,14 @@ - - - + + + - - - - + + + + @@ -1019,10 +1019,10 @@ - - - - + + + + @@ -1032,10 +1032,10 @@ - - - - + + + + @@ -1043,9 +1043,9 @@ - - - + + + diff --git a/wwwroot/reports/project_principle_rationale.frx b/wwwroot/reports/project_principle_rationale.frx index d51fbfd..1363b40 100644 --- a/wwwroot/reports/project_principle_rationale.frx +++ b/wwwroot/reports/project_principle_rationale.frx @@ -1,5 +1,5 @@  - + @@ -226,7 +226,7 @@ - + @@ -237,23 +237,43 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -262,6 +282,7 @@ + @@ -299,138 +320,138 @@ - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + @@ -438,15 +459,15 @@ - - - - - + + + + + - - + + @@ -454,146 +475,146 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + @@ -601,13 +622,13 @@ - - - + + + - + @@ -615,31 +636,31 @@ - - - - - + + + + + - - + + - - - - - + + + + + - - - + + + @@ -647,13 +668,13 @@ - - - + + + - + @@ -661,26 +682,26 @@ - - - - - + + + + + - - - + + + - - - + + + @@ -688,13 +709,13 @@ - - - + + + - + @@ -702,26 +723,26 @@ - - - - - + + + + + - - - + + + - - - + + + @@ -729,13 +750,13 @@ - - - + + + - + @@ -743,16 +764,16 @@ - - - - - + + + + + - + @@ -760,16 +781,16 @@ - - - - - + + + + + - - - + + + @@ -777,11 +798,11 @@ - - - - - + + + + + @@ -790,106 +811,122 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - - - - + + + + @@ -897,10 +934,10 @@ - - - - + + + + @@ -908,34 +945,34 @@ - - - - + + + + - + - + - + - + @@ -946,36 +983,36 @@ - - - - - - - + + + + + + + - - - - + + + + - + - - - - + + + + diff --git a/wwwroot/reports/project_principle_rationale_no_activity.frx b/wwwroot/reports/project_principle_rationale_no_activity.frx new file mode 100644 index 0000000..c38b65e --- /dev/null +++ b/wwwroot/reports/project_principle_rationale_no_activity.frx @@ -0,0 +1,967 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/project_request_thailands.frx b/wwwroot/reports/project_request_thailands.frx index 1f5ace6..8465e93 100644 --- a/wwwroot/reports/project_request_thailands.frx +++ b/wwwroot/reports/project_request_thailands.frx @@ -265,75 +265,75 @@ - - - - - - - + + + + + + + - + - - - - + + + + - - + + - - - - - - - - - + + + + + + + + + - + - + - + - + - + - + - + @@ -344,42 +344,42 @@ - - - + + + - + - + - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + - + @@ -387,15 +387,15 @@ - - - - - + + + + + - + @@ -403,81 +403,81 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + @@ -486,15 +486,15 @@ - - - + + + - - - + + + @@ -503,24 +503,24 @@ - - - - - + + + + + - - + + - - - + + + @@ -528,9 +528,9 @@ - - - + + + @@ -540,11 +540,11 @@ - - - - - + + + + + @@ -556,11 +556,11 @@ - - - - - + + + + + @@ -573,23 +573,23 @@ - - - - - + + + + + - + - - - + + + @@ -597,9 +597,9 @@ - - - + + + @@ -609,11 +609,11 @@ - - - - - + + + + + @@ -625,11 +625,11 @@ - - - - - + + + + + @@ -642,11 +642,11 @@ - - - - - + + + + + @@ -655,9 +655,9 @@ - - - + + + @@ -665,9 +665,9 @@ - - - + + + @@ -679,11 +679,11 @@ - - - - - + + + + + @@ -696,11 +696,11 @@ - - - - - + + + + + @@ -709,9 +709,9 @@ - - - + + + @@ -719,9 +719,9 @@ - - - + + + @@ -733,11 +733,11 @@ - - - - - + + + + + @@ -750,15 +750,15 @@ - - - - - + + + + + - + @@ -766,11 +766,11 @@ - - - - - + + + + + @@ -782,11 +782,11 @@ - - - - - + + + + + @@ -796,23 +796,23 @@ - - - - - - - - - - + + + + + + + + + + - + - - + + @@ -828,22 +828,22 @@ - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -862,78 +862,78 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - + - + - - + + - - + + @@ -942,29 +942,29 @@ - - - + + + - + - - + + - - + + @@ -973,9 +973,9 @@ - - - + + + @@ -983,14 +983,14 @@ - - - + + + - - - - + + + + @@ -998,10 +998,10 @@ - - - - + + + + @@ -1011,10 +1011,10 @@ - - - - + + + + @@ -1022,9 +1022,9 @@ - - - + + + diff --git a/wwwroot/reports/project_under_integrated_plan.frx b/wwwroot/reports/project_under_integrated_plan.frx index 329a76e..2f0ebaf 100644 --- a/wwwroot/reports/project_under_integrated_plan.frx +++ b/wwwroot/reports/project_under_integrated_plan.frx @@ -235,45 +235,45 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + - + @@ -282,61 +282,61 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + @@ -344,11 +344,11 @@ - - - - - + + + + + @@ -359,107 +359,107 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + - + - - - - + + + + - - - + + + @@ -469,76 +469,76 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - - - - - + + + + + - + - - + + @@ -546,11 +546,11 @@ - - - - - + + + + + @@ -559,10 +559,10 @@ - - - - + + + + @@ -571,10 +571,10 @@ - - - - + + + + @@ -591,17 +591,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -620,17 +620,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -646,27 +646,27 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + @@ -678,24 +678,24 @@ - - - - - + + + + + - - + + - - - + + + @@ -703,9 +703,9 @@ - - - + + + @@ -715,11 +715,11 @@ - - - - - + + + + + @@ -731,11 +731,11 @@ - - - - - + + + + + @@ -748,23 +748,23 @@ - - - - - + + + + + - + - - - + + + @@ -772,9 +772,9 @@ - - - + + + @@ -784,11 +784,11 @@ - - - - - + + + + + @@ -800,11 +800,11 @@ - - - - - + + + + + @@ -817,11 +817,11 @@ - - - - - + + + + + @@ -830,9 +830,9 @@ - - - + + + @@ -840,9 +840,9 @@ - - - + + + @@ -854,11 +854,11 @@ - - - - - + + + + + @@ -871,11 +871,11 @@ - - - - - + + + + + @@ -884,9 +884,9 @@ - - - + + + @@ -894,9 +894,9 @@ - - - + + + @@ -908,11 +908,11 @@ - - - - - + + + + + @@ -925,15 +925,15 @@ - - - - - + + + + + - + @@ -941,11 +941,11 @@ - - - - - + + + + + @@ -957,11 +957,11 @@ - - - - - + + + + + @@ -971,29 +971,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +