diff --git a/Controllers/PersonnelReportController.cs b/Controllers/PersonnelReportController.cs new file mode 100644 index 0000000..91972ef --- /dev/null +++ b/Controllers/PersonnelReportController.cs @@ -0,0 +1,307 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using FastReport; +using FastReport.Export.OoXML; +using FastReport.Export.Pdf; +using Microsoft.AspNetCore.Mvc; +using rmutr_report.Models; +using rmutr_report.Models.Personnel; +using Swashbuckle.AspNetCore.Annotations; + +namespace rmutr_report.Controllers +{ + [SwaggerTag("สำหรับรายงาน HR")] + public class PersonnelReport : Controller + { + readonly Setting _setting; + + public PersonnelReport(Setting setting) + { + _setting = setting; + } + + [HttpPost, Route("reports/personnel_1/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetPersonnel1Report([FromRoute] string type, [FromBody] personnel_report personnelReport1) + { + var sum1 = personnelReport1.personnel_report_detail.Sum(d => d.value_1); + var sum2 = personnelReport1.personnel_report_detail.Sum(d => d.value_2); + var sum3 = personnelReport1.personnel_report_detail.Sum(d => d.value_3); + var sum4 = personnelReport1.personnel_report_detail.Sum(d => d.value_4); + var sum5 = personnelReport1.personnel_report_detail.Sum(d => d.value_5); + var sum6 = personnelReport1.personnel_report_detail.Sum(d => d.value_6); + var sum7 = personnelReport1.personnel_report_detail.Sum(d => d.value_7); + var sum8 = personnelReport1.personnel_report_detail.Sum(d => d.value_8); + var sum9 = personnelReport1.personnel_report_detail.Sum(d => d.value_9); + var sum10 = personnelReport1.personnel_report_detail.Sum(d => d.value_10); + var sum11 = personnelReport1.personnel_report_detail.Sum(d => d.value_11); + var sum12 = personnelReport1.personnel_report_detail.Sum(d => d.value_12); + var sum13 = personnelReport1.personnel_report_detail.Sum(d => d.value_13); + var sum14 = personnelReport1.personnel_report_detail.Sum(d => d.value_14); + var sum15 = personnelReport1.personnel_report_detail.Sum(d => d.value_15); + var sum16 = personnelReport1.personnel_report_detail.Sum(d => d.value_16); + var sum17 = personnelReport1.personnel_report_detail.Sum(d => d.value_17); + var sum18 = personnelReport1.personnel_report_detail.Sum(d => d.value_18); + var sum19 = personnelReport1.personnel_report_detail.Sum(d => d.value_19); + var sum20 = personnelReport1.personnel_report_detail.Sum(d => d.value_20); + var sum21 = personnelReport1.personnel_report_detail.Sum(d => d.value_21); + var sum22 = personnelReport1.personnel_report_detail.Sum(d => d.value_22); + var sum23 = personnelReport1.personnel_report_detail.Sum(d => d.value_23); + var sum24 = personnelReport1.personnel_report_detail.Sum(d => d.value_24); + var sum25 = personnelReport1.personnel_report_detail.Sum(d => d.value_25); + var sum26 = personnelReport1.personnel_report_detail.Sum(d => d.value_26); + var sum27 = personnelReport1.personnel_report_detail.Sum(d => d.value_27); + var sum28 = personnelReport1.personnel_report_detail.Sum(d => d.value_28); + personnelReport1.value_1 = sum1; + personnelReport1.value_2 = sum2; + personnelReport1.value_3 = sum3; + personnelReport1.value_4 = sum4; + personnelReport1.value_5 = sum5; + personnelReport1.value_6 = sum6; + personnelReport1.value_7 = sum7; + personnelReport1.value_8 = sum8; + personnelReport1.value_9 = sum9; + personnelReport1.value_10 = sum10; + personnelReport1.value_11 = sum11; + personnelReport1.value_12 = sum12; + personnelReport1.value_13 = sum13; + personnelReport1.value_14 = sum14; + personnelReport1.value_15 = sum15; + personnelReport1.value_16 = sum16; + personnelReport1.value_17 = sum17; + personnelReport1.value_18 = sum18; + personnelReport1.value_19 = sum19; + personnelReport1.value_20 = sum20; + personnelReport1.value_21 = sum21; + personnelReport1.value_22 = sum22; + personnelReport1.value_23 = sum23; + personnelReport1.value_24 = sum2 + sum9 + sum15 + sum20; + personnelReport1.value_25 = sum25; + personnelReport1.value_26 = sum4 + sum13 + sum17 + sum22; + personnelReport1.value_27 = sum27; + personnelReport1.value_28 = personnelReport1.value_24 + personnelReport1.value_26; + + var report1 = new List() { personnelReport1 }; + + Report report = new Report(); + report.Load(_setting.report_path + "personnel_table_1.frx"); + report.RegisterData(report1, "personnel_report"); + 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": + Excel2007Export excels = new Excel2007Export(); + report.Export(excels, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/vnd.ms-excel"); + case "xlsx": + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + return File( + stream, + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + "personnelReport1" + ".xlsx"); + } + + return Ok(); + } + + [HttpPost, Route("reports/personnel_2/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetPersonnel2Report([FromRoute] string type, [FromBody] personnel_report personnelReport1) + { + var sum1 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_1); + var sum_1 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_1); + var sum2 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_2); + var sum_2 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_2); + var sum3 = personnelReport1.personnel_report_detail.Sum(d => d.value_3); + var sum4 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_4); + var sum_4 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_4); + var sum5 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_5); + var sum_5 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_5); + var sum6 = personnelReport1.personnel_report_detail.Sum(d => d.value_6); + var sum7 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_7); + var sum_7 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_7); + var sum8 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_8); + var sum_8 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_8); + var sum9 = personnelReport1.personnel_report_detail.Sum(d => d.value_9); + var sum10 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_10); + var sum_10 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_10); + var sum11 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_11); + var sum_11 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_11); + var sum12 = personnelReport1.personnel_report_detail.Sum(d => d.value_12); + var sum13 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_13); + var sum_13 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_13); + var sum14 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_14); + var sum_14 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_14); + var sum15 = personnelReport1.personnel_report_detail.Sum(d => d.value_15); + var sum16 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_16); + var sum_16 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_16); + var sum17 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 1).Sum(d => d.value_17); + var sum_17 = personnelReport1.personnel_report_detail.Where(f => f.topic_type == 4).Sum(d => d.value_17); + var sum18 = personnelReport1.personnel_report_detail.Sum(d => d.value_18); + + personnelReport1.value_1 = sum1 + sum_1; + personnelReport1.value_2 = sum2 + sum_2; + personnelReport1.value_3 = personnelReport1.value_1 + personnelReport1.value_2; + personnelReport1.value_4 = sum4 + sum_4; + personnelReport1.value_5 = sum5 + sum_5; + personnelReport1.value_6 = personnelReport1.value_4 + personnelReport1.value_5; + personnelReport1.value_7 = sum7 + sum_7; + personnelReport1.value_8 = sum8 + sum_8; + personnelReport1.value_9 = personnelReport1.value_7 + personnelReport1.value_8; + personnelReport1.value_10 = sum10 + sum_10; + personnelReport1.value_11 = sum11 + sum_11; + personnelReport1.value_12 = personnelReport1.value_10 + personnelReport1.value_11; + personnelReport1.value_13 = sum13 + sum_13; + personnelReport1.value_14 = sum14 + sum_14; + personnelReport1.value_15 = personnelReport1.value_13 + personnelReport1.value_14; + personnelReport1.value_16 = sum16 + sum_16; + personnelReport1.value_17 = sum17 + sum_17; + personnelReport1.value_18 = personnelReport1.value_16 + personnelReport1.value_17; + + foreach (var detail in personnelReport1.personnel_report_detail) + { + if (detail.topic_type == 3) + { + detail.topic = "- " + detail.topic; + } + } + + var report1 = new List() { personnelReport1 }; + + Report report = new Report(); + report.Load(_setting.report_path + "personnel_table_2.frx"); + report.RegisterData(report1, "personnel_report"); + 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": + Excel2007Export excels = new Excel2007Export(); + report.Export(excels, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/vnd.ms-excel"); + case "xlsx": + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + return File( + stream, + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + "personnelReport2" + ".xlsx"); + } + + return Ok(); + } + + [HttpPost, Route("reports/personnel_3/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetPersonnel3Report([FromRoute] string type, [FromBody] personnel_report personnelReport1) + { + var sum1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_1); + var sum1_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_1); + var sum1_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_1); + var sum2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_2); + var sum2_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_2); + var sum2_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_2); + var sum5 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_5); + var sum5_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_5); + var sum5_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_5); + var sum4 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_4); + var sum4_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_4); + var sum4_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_4); + var sum7 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_7); + var sum7_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_7); + var sum7_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_7); + var sum8 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_8); + var sum8_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_8); + var sum8_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_8); + var sum10 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_10); + var sum10_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_10); + var sum10_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_10); + var sum11 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_11); + var sum11_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_11); + var sum11_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_11); + var sum13 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_13); + var sum13_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_13); + var sum13_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_13); + var sum14 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 1).Sum(d => d.value_14); + var sum14_1 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 3).Sum(d => d.value_14); + var sum14_2 = personnelReport1.personnel_report_detail.Where(x => x.topic_type == 6).Sum(d => d.value_14); + + + personnelReport1.value_1 = sum1 + sum1_1 + sum1_2; + personnelReport1.value_2 = sum2 + sum2_1 + sum2_2; + personnelReport1.value_3 = personnelReport1.value_1 + personnelReport1.value_2; + personnelReport1.value_4 = sum4 + sum4_1 + sum4_2; + personnelReport1.value_5 = sum5 + sum5_1 + sum5_2; + personnelReport1.value_6 = personnelReport1.value_4 + personnelReport1.value_5; + personnelReport1.value_7 = sum7 + sum7_1 + sum7_2; + personnelReport1.value_8 = sum8 + sum8_1 + sum8_2; + personnelReport1.value_9 = personnelReport1.value_7 + personnelReport1.value_8; + personnelReport1.value_10 = sum10 + sum10_1 + sum10_2; + personnelReport1.value_11 = sum11 + sum11_1 + sum11_2; + personnelReport1.value_12 = personnelReport1.value_10 + personnelReport1.value_11; + personnelReport1.value_13 = sum13 + sum13_1 + sum13_2; + personnelReport1.value_14 = sum14 + sum14_1 + sum14_2; + personnelReport1.value_15 = personnelReport1.value_13 + personnelReport1.value_14; + + + foreach (var detail in personnelReport1.personnel_report_detail) + { + if (detail.topic_type == 4) + { + detail.topic = "- " + detail.topic; + } + } + + var report1 = new List() { personnelReport1 }; + + Report report = new Report(); + report.Load(_setting.report_path + "personnel_table_3.frx"); + report.RegisterData(report1, "personnel_report"); + 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": + Excel2007Export excels = new Excel2007Export(); + report.Export(excels, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/vnd.ms-excel"); + case "xlsx": + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + return File( + stream, + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + "personnelReport3" + ".xlsx"); + } + + return Ok(); + } + } +} \ No newline at end of file diff --git a/Models/Personnel/personnel_report.cs b/Models/Personnel/personnel_report.cs new file mode 100644 index 0000000..442868a --- /dev/null +++ b/Models/Personnel/personnel_report.cs @@ -0,0 +1,133 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; + +namespace rmutr_report.Models.Personnel +{ + public class personnel_report + { + [Key] public Guid? personnel_uid { get; set; } + public Guid? sync_uid { get; set; } + public string academic_year_name_th { get; set; } + public string agency_name_th { get; set; } + public string personnel_type_code { get; set; } + public List personnel_report_detail { get; set; } + public double? value_1 { get; set; } + public double? value_2 { get; set; } + public double? value_3 { get; set; } + public double? value_4 { get; set; } + + public double? value_5 { get; set; } + public double? value_6 { get; set; } + public double? value_7 { get; set; } + + public double? value_8 { get; set; } + public double? value_9 { get; set; } + public double? value_10 { get; set; } + + public double? value_11 { get; set; } + public double? value_12 { get; set; } + public double? value_13 { get; set; } + public double? value_14 { get; set; } + + public double? value_15 { get; set; } + public double? value_16 { get; set; } + public double? value_17 { get; set; } + + public double? value_18 { get; set; } + + + public double? value_19 { get; set; } + + public double? value_20 { get; set; } + + public double? value_21 { get; set; } + public double? value_22 { get; set; } + + public double? value_23 { get; set; } + + public double? value_24 { get; set; } + public double? value_25 { get; set; } + public double? value_26 { get; set; } + public double? value_27 { get; set; } + public double? value_28 { get; set; } + + public double? value_29 { get; set; } + + public double? value_30 { get; set; } + } + + public class t_personnel_report_detail + { + [Key] public Guid? personnel_report_detail_uid { get; set; } + public Guid? personnel_report_uid { get; set; } + public int? topic_type { get; set; } + public string topic { get; set; } + public double? value_1 { get; set; } + public double? value_2 { get; set; } + public double? value_3 { get; set; } + public double? value_4 { get; set; } + + public double? value_5 { get; set; } + public double? value_6 { get; set; } + public double? value_7 { get; set; } + + public double? value_8 { get; set; } + public double? value_9 { get; set; } + public double? value_10 { get; set; } + + public double? value_11 { get; set; } + public double? value_12 { get; set; } + public double? value_13 { get; set; } + public double? value_14 { get; set; } + + public double? value_15 { get; set; } + public double? value_16 { get; set; } + public double? value_17 { get; set; } + + public double? value_18 { get; set; } + + + public double? value_19 { get; set; } + + public double? value_20 { get; set; } + + public double? value_21 { get; set; } + public double? value_22 { get; set; } + + public double? value_23 { get; set; } + + public double? value_24 { get; set; } + public double? value_25 { get; set; } + public double? value_26 { get; set; } + public double? value_27 { get; set; } + public double? value_28 { get; set; } + + public double? value_29 { get; set; } + + public double? value_30 { get; set; } + public double? value_31 { get; set; } + + public double? value_32 { get; set; } + public double? value_33 { get; set; } + public double? value_34 { get; set; } + public double? value_35 { get; set; } + + public double? value_36 { get; set; } + public double? value_37 { get; set; } + public double? value_38 { get; set; } + public double? value_39 { get; set; } + public double? value_40 { get; set; } + public double? value_41 { get; set; } + public double? value_42 { get; set; } + public double? value_43 { get; set; } + public double? value_44 { get; set; } + public double? value_45 { get; set; } + + public double? value_46 { get; set; } + public double? value_47 { get; set; } + public double? value_48 { get; set; } + public double? value_49 { get; set; } + public double? value_50 { get; set; } + } +} \ No newline at end of file diff --git a/Models/budget/budget_summary_report.cs b/Models/budget/budget_summary_report.cs index 8b9efb8..43b4317 100644 --- a/Models/budget/budget_summary_report.cs +++ b/Models/budget/budget_summary_report.cs @@ -150,54 +150,55 @@ namespace rmutr_report.Models public class operating_expenses_details2 { - public int? color { get; set; } public string list { get; set; } public decimal? total_amount { get; set; } + public string remark { get; set; } - public List research_support_3 { get; set; } + + //public List research_support_3 { get; set; } //public List subsidy_science_3 { get; set; } //public List subsidy_society_3 { get; set; } } - public class operating_expenses_details3 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } + // public class operating_expenses_details3 + // { + // public int? color { get; set; } + // public string list { get; set; } + // public decimal? total_amount { get; set; } + // + // public List research_support_4 { get; set; } + // //public List subsidy_science_4 { get; set; } + // //public List subsidy_society_4 { get; set; } + // } - public List research_support_4 { get; set; } - //public List subsidy_science_4 { get; set; } - //public List subsidy_society_4 { get; set; } - } + // public class operating_expenses_details4 + // { + // public int? color { get; set; } + // public string list { get; set; } + // public decimal? total_amount { get; set; } + // + // public List research_support_detail { get; set; } + // //public List subsidy_science_detail { get; set; } + // //public List subsidy_society_detail { get; set; } + // } - public class operating_expenses_details4 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } + // public class operating_expenses_details5 + // { + // public string list { get; set; } + // public decimal? total_amount { get; set; } + // public string remark { get; set; } + // + // public List research_support_detail_2 { get; set; } + // //public List subsidy_science_detail_2 { get; set; } + // //public List subsidy_society_detail_2 { get; set; } + // } - public List research_support_detail { get; set; } - //public List subsidy_science_detail { get; set; } - //public List subsidy_society_detail { get; set; } - } - - public class operating_expenses_details5 - { - public string list { get; set; } - public decimal? total_amount { get; set; } - public string remark { get; set; } - - public List research_support_detail_2 { get; set; } - //public List subsidy_science_detail_2 { get; set; } - //public List subsidy_society_detail_2 { get; set; } - } - - public class operating_expenses_details6 - { - public string list { get; set; } - public decimal? total_amount { get; set; } - public string remark { get; set; } - } + // public class operating_expenses_details6 + // { + // public string list { get; set; } + // public decimal? total_amount { get; set; } + // public string remark { get; set; } + // } public class subsidy_science_details { @@ -208,38 +209,6 @@ namespace rmutr_report.Models } public class subsidy_science_details2 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List subsidy_science_3 { get; set; } - } - - public class subsidy_science_details3 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List subsidy_science_4 { get; set; } - } - - public class subsidy_science_details4 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List subsidy_science_detail { get; set; } - } - - public class subsidy_science_details5 - { - public string list { get; set; } - public decimal? total_amount { get; set; } - public string remark { get; set; } - public List subsidy_science_detail_2 { get; set; } - } - - public class subsidy_science_details6 { public string list { get; set; } public string unit { get; set; } @@ -248,6 +217,7 @@ namespace rmutr_report.Models public string remark { get; set; } } + public class subsidy_society_details { public int? color { get; set; } @@ -259,43 +229,15 @@ namespace rmutr_report.Models public class subsidy_society_details2 { public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List subsidy_society_3 { get; set; } - } - - public class subsidy_society_details3 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List subsidy_society_4 { get; set; } - } - - public class subsidy_society_details4 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List subsidy_society_detail { get; set; } - } - - public class subsidy_society_details5 - { - public string list { get; set; } - public decimal? total_amount { get; set; } - public string remark { get; set; } - public List subsidy_society_detail_2 { get; set; } - } - - public class subsidy_society_details6 - { public string list { get; set; } public string unit { get; set; } public decimal? unit_amount { get; set; } public decimal? total_amount { get; set; } public string remark { get; set; } } + + + // public class durable_articles_headers // { // public string header_name { get; set; } @@ -495,7 +437,7 @@ namespace rmutr_report.Models public class subsidy_service_headers_detail2 { public int? color { get; set; } - + //public string rowno { get; set; } public string list { get; set; } public decimal? amount_1 { get; set; } @@ -504,64 +446,64 @@ namespace rmutr_report.Models public decimal? amount_4 { get; set; } public decimal? amount_5 { get; set; } public decimal? amount_6 { get; set; } - + public decimal? amount_7 { get; set; } - - //public string remark { get; set; } - public List subsidy_service_3 { get; set; } + + public string remark { get; set; } + //public List subsidy_service_3 { get; set; } //public List subsidy_arts_culture_3 { get; set; } } + // + // public class subsidy_service_headers_detail3 + // { + // public int? color { get; set; } + // + // //public string rowno { get; set; } + // public string list { get; set; } + // public decimal? amount_1 { get; set; } + // public decimal? amount_2 { get; set; } + // public decimal? amount_3 { get; set; } + // public decimal? amount_4 { get; set; } + // public decimal? amount_5 { get; set; } + // public decimal? amount_6 { get; set; } + // + // public decimal? amount_7 { get; set; } + // + // //public string remark { get; set; } + // public List subsidy_service_4 { get; set; } + // //public List subsidy_arts_culture_4 { get; set; } + // } - public class subsidy_service_headers_detail3 - { - public int? color { get; set; } - - //public string rowno { get; set; } - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - public decimal? amount_6 { get; set; } - - public decimal? amount_7 { get; set; } - - //public string remark { get; set; } - public List subsidy_service_4 { get; set; } - //public List subsidy_arts_culture_4 { get; set; } - } - - public class subsidy_service_headers_detail4 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - public decimal? amount_6 { get; set; } - public decimal? amount_7 { get; set; } - - public List subsidy_service_detail { get; set; } - //public List subsidy_arts_culture_detail { get; set; } - } - - public class subsidy_service_headers_detail5 - { - //public string color { get; set; } - //public string rowno { get; set; } - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - public decimal? amount_6 { get; set; } - public decimal? amount_7 { get; set; } - public string remark { get; set; } - } + // public class subsidy_service_headers_detail4 + // { + // public int? color { get; set; } + // public string list { get; set; } + // public decimal? amount_1 { get; set; } + // public decimal? amount_2 { get; set; } + // public decimal? amount_3 { get; set; } + // public decimal? amount_4 { get; set; } + // public decimal? amount_5 { get; set; } + // public decimal? amount_6 { get; set; } + // public decimal? amount_7 { get; set; } + // + // public List subsidy_service_detail { get; set; } + // //public List subsidy_arts_culture_detail { get; set; } + // } + // + // public class subsidy_service_headers_detail5 + // { + // //public string color { get; set; } + // //public string rowno { get; set; } + // public string list { get; set; } + // public decimal? amount_1 { get; set; } + // public decimal? amount_2 { get; set; } + // public decimal? amount_3 { get; set; } + // public decimal? amount_4 { get; set; } + // public decimal? amount_5 { get; set; } + // public decimal? amount_6 { get; set; } + // public decimal? amount_7 { get; set; } + // public string remark { get; set; } + // } public class subsidy_arts_culture_detail { @@ -584,62 +526,6 @@ namespace rmutr_report.Models public class subsidy_arts_culture_detail2 { - public int? color { get; set; } - - //public string rowno { get; set; } - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - - public decimal? amount_6 { get; set; } - - //public decimal? amount_7 { get; set; } - //public string remark { get; set; } - public List subsidy_arts_culture_3 { get; set; } - } - - public class subsidy_arts_culture_detail3 - { - public int? color { get; set; } - - //public string rowno { get; set; } - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - - public decimal? amount_6 { get; set; } - - //public decimal? amount_7 { get; set; } - //public string remark { get; set; } - public List subsidy_arts_culture_4 { get; set; } - } - - public class subsidy_arts_culture_detail4 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - - public decimal? amount_6 { get; set; } - - //public decimal? amount_7 { get; set; } - public List subsidy_arts_culture_detail { get; set; } - } - - public class subsidy_arts_culture_detail5 - { - //public string color { get; set; } - //public string rowno { get; set; } public string list { get; set; } public decimal? amount_1 { get; set; } public decimal? amount_2 { get; set; } @@ -653,6 +539,12 @@ namespace rmutr_report.Models public string remark { get; set; } } + + + + + + public class thailand_details { public int? color { get; set; } @@ -662,30 +554,6 @@ namespace rmutr_report.Models } public class thailand_detail2 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List thailand_3 { get; set; } - } - - public class thailand_detail3 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List thailand_4 { get; set; } - } - - public class thailand_detail4 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List thailand_detail { get; set; } - } - - public class thailand_detail5 { public string list { get; set; } public string unit { get; set; } @@ -694,6 +562,8 @@ namespace rmutr_report.Models public string remark { get; set; } } + + public class subsidy_budget_details { public int? color { get; set; } @@ -710,7 +580,6 @@ namespace rmutr_report.Models public class subsidy_budget_details2 { - public int? color { get; set; } public string list { get; set; } public decimal? amount_1 { get; set; } public decimal? amount_2 { get; set; } @@ -719,61 +588,12 @@ namespace rmutr_report.Models public decimal? amount_5 { get; set; } public decimal? total_amount { get; set; } public string remark { get; set; } - public List subsidy_budget_project_3 { get; set; } } - public class subsidy_budget_details3 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - public decimal? total_amount { get; set; } - public string remark { get; set; } - public List subsidy_budget_project_4 { get; set; } - } + - public class subsidy_budget_details4 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - public decimal? total_amount { get; set; } - public string remark { get; set; } - public List subsidy_budget_project_detail { get; set; } - } + - public class subsidy_budget_details5 - { - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - public decimal? total_amount { get; set; } - public string remark { get; set; } - public List subsidy_budget_project_detail_2 { get; set; } - } - - public class subsidy_budget_details6 - { - public string list { get; set; } - public decimal? amount_1 { get; set; } - public decimal? amount_2 { get; set; } - public decimal? amount_3 { get; set; } - public decimal? amount_4 { get; set; } - public decimal? amount_5 { get; set; } - public decimal? total_amount { get; set; } - public string remark { get; set; } - } public class integrated_plan_details { public int? color { get; set; } @@ -783,37 +603,39 @@ namespace rmutr_report.Models } public class integrated_plan_detail2 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List integrated_plan_3 { get; set; } - } - - public class integrated_plan_detail3 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public Listintegrated_plan_4 { get; set; } - } - - public class integrated_plan_detail4 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List integrated_plan_detail { get; set; } - } - - public class integrated_plan_detail5 { public string list { get; set; } public string unit { get; set; } public decimal? unit_amount { get; set; } public decimal? total_amount { get; set; } public string remark { get; set; } + //public List integrated_plan_3 { get; set; } } + + // public class integrated_plan_detail3 + // { + // public int? color { get; set; } + // public string list { get; set; } + // public decimal? total_amount { get; set; } + // public Listintegrated_plan_4 { get; set; } + // } + // + // public class integrated_plan_detail4 + // { + // public int? color { get; set; } + // public string list { get; set; } + // public decimal? total_amount { get; set; } + // public List integrated_plan_detail { get; set; } + // } + + // public class integrated_plan_detail5 + // { + // public string list { get; set; } + // public string unit { get; set; } + // public decimal? unit_amount { get; set; } + // public decimal? total_amount { get; set; } + // public string remark { get; set; } + // } public class strategic_plan_details { public int? color { get; set; } @@ -823,35 +645,37 @@ namespace rmutr_report.Models } public class strategic_plan_details2 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List strategic_plan_3 { get; set; } - } - - public class strategic_plan_details3 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List strategic_plan_4 { get; set; } - } - - public class strategic_plan_details4 - { - public int? color { get; set; } - public string list { get; set; } - public decimal? total_amount { get; set; } - public List strategic_plan_detail { get; set; } - } - - public class strategic_plan_details5 { public string list { get; set; } public string unit { get; set; } public decimal? unit_amount { get; set; } public decimal? total_amount { get; set; } public string remark { get; set; } + //public List strategic_plan_3 { get; set; } } + + // public class strategic_plan_details3 + // { + // public int? color { get; set; } + // public string list { get; set; } + // public decimal? total_amount { get; set; } + // public List strategic_plan_4 { get; set; } + // } + // + // public class strategic_plan_details4 + // { + // public int? color { get; set; } + // public string list { get; set; } + // public decimal? total_amount { get; set; } + // public List strategic_plan_detail { get; set; } + // } + + // public class strategic_plan_details5 + // { + // public string list { get; set; } + // public string unit { get; set; } + // public decimal? unit_amount { get; set; } + // public decimal? total_amount { get; set; } + // public string remark { get; set; } + // } } \ No newline at end of file diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 2ed54e7..2797623 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 7d01e43..8926ca6 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.csproj.CoreCompileInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache index 3cf5bbd..c79e82f 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -dafcd97c1154f7c231cb7691293bbd8d24fedfcf +c9d0b288823c33aa8cd4e462ebf1e29f2a1ca1f9 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 2ed54e7..2797623 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 7d01e43..8926ca6 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 106508c..7979687 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16911428465191941 \ No newline at end of file +16916645559107601 \ No newline at end of file diff --git a/wwwroot/reports/budget_summary_report.frx b/wwwroot/reports/budget_summary_report.frx index 1db3d35..462392a 100644 --- a/wwwroot/reports/budget_summary_report.frx +++ b/wwwroot/reports/budget_summary_report.frx @@ -1,5 +1,5 @@  - + @@ -158,29 +158,9 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -205,39 +185,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -247,31 +195,11 @@ - + + - - - - - - - - - - - - - - - - - - - - - - + @@ -281,31 +209,11 @@ - + + - - - - - - - - - - - - - - - - - - - - - - + @@ -320,7 +228,6 @@ - @@ -328,36 +235,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -367,26 +245,11 @@ - + + - - - - - - - - - - - - - - - - - + @@ -402,7 +265,6 @@ - @@ -411,48 +273,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -462,26 +282,11 @@ - + + - - - - - - - - - - - - - - - - - + @@ -491,26 +296,11 @@ - + + - - - - - - - - - - - - - - - - - + @@ -575,8 +365,8 @@ - - + + @@ -1567,7 +1357,7 @@ - + @@ -1630,7 +1420,7 @@ - + @@ -1693,7 +1483,7 @@ - + @@ -1756,7 +1546,7 @@ - + @@ -1779,7 +1569,7 @@ - + @@ -1804,7 +1594,7 @@ - + @@ -1827,7 +1617,7 @@ - + @@ -1852,7 +1642,7 @@ - + @@ -1875,7 +1665,7 @@ - + @@ -1975,8 +1765,8 @@ - - + + @@ -2009,135 +1799,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2201,8 +1875,8 @@ - - + + @@ -2215,16 +1889,8 @@ - - - - - - - - - - + + @@ -2233,9 +1899,6 @@ - - - @@ -2245,9 +1908,6 @@ - - - @@ -2257,9 +1917,6 @@ - - - @@ -2269,9 +1926,6 @@ - - - @@ -2281,9 +1935,6 @@ - - - @@ -2293,9 +1944,6 @@ - - - @@ -2305,18 +1953,11 @@ - - - - - - - - + - + @@ -2329,17 +1970,9 @@ - - - - - - - - - - - + + + @@ -2347,11 +1980,8 @@ - - - - + @@ -2359,11 +1989,8 @@ - - - - + @@ -2371,11 +1998,8 @@ - - - - + @@ -2383,11 +2007,8 @@ - - - - + @@ -2395,11 +2016,8 @@ - - - - + @@ -2407,11 +2025,8 @@ - - - - + @@ -2419,356 +2034,10 @@ - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2816,8 +2085,8 @@ - - + + @@ -2826,271 +2095,41 @@ - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3145,27 +2184,11 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -3173,20 +2196,13 @@ - - - - - - - - + - - + + @@ -3195,243 +2211,36 @@ - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3491,8 +2300,8 @@ - - + + @@ -3504,412 +2313,100 @@ - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3956,8 +2453,8 @@ - - + + @@ -4002,161 +2499,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4216,8 +2575,8 @@ - - + + @@ -4280,325 +2639,69 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4645,8 +2748,8 @@ - - + + @@ -4691,161 +2794,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4892,8 +2857,8 @@ - - + + @@ -4938,161 +2903,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wwwroot/reports/personnel_table_1.frx b/wwwroot/reports/personnel_table_1.frx index 0b36263..6a2c8ee 100644 --- a/wwwroot/reports/personnel_table_1.frx +++ b/wwwroot/reports/personnel_table_1.frx @@ -1,23 +1,94 @@  - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -96,10 +167,10 @@ - + - - + + @@ -131,60 +202,156 @@ - - - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + @@ -219,54 +386,54 @@ - - + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/personnel_table_2.frx b/wwwroot/reports/personnel_table_2.frx index d397906..f6ff779 100644 --- a/wwwroot/reports/personnel_table_2.frx +++ b/wwwroot/reports/personnel_table_2.frx @@ -1,23 +1,94 @@ - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -72,10 +143,10 @@ - + - - + + @@ -98,51 +169,217 @@ - - - + - + + + - + - + + + - + + + + + - + + + - + + + + + - + + + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + @@ -167,44 +404,129 @@ - + + + + + - + + + + + - + + + + + - + + + + + - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/personnel_table_3.frx b/wwwroot/reports/personnel_table_3.frx index 3f3c7ad..da20d91 100644 --- a/wwwroot/reports/personnel_table_3.frx +++ b/wwwroot/reports/personnel_table_3.frx @@ -1,23 +1,94 @@ - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,10 +136,10 @@ - + - - + + @@ -88,48 +159,164 @@ - - - + - + + + + + - + - + + + + + - + - + + + + + - + - + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + @@ -149,43 +336,43 @@ - - - + + + - + - + - + - + - - - - - - - - - - + + + + + + + + + + diff --git a/wwwroot/reports/summary_all_project_table.frx b/wwwroot/reports/summary_all_project_table.frx index 6c20a24..141d9f3 100644 --- a/wwwroot/reports/summary_all_project_table.frx +++ b/wwwroot/reports/summary_all_project_table.frx @@ -1,5 +1,5 @@  - + @@ -158,29 +158,9 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -205,39 +185,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -247,31 +195,11 @@ - + + - - - - - - - - - - - - - - - - - - - - - - + @@ -281,31 +209,11 @@ - + + - - - - - - - - - - - - - - - - - - - - - - + @@ -320,7 +228,6 @@ - @@ -328,36 +235,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -367,26 +245,11 @@ - + + - - - - - - - - - - - - - - - - - + @@ -402,7 +265,6 @@ - @@ -411,48 +273,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -462,26 +282,11 @@ - + + - - - - - - - - - - - - - - - - - + @@ -491,26 +296,11 @@ - + + - - - - - - - - - - - - - - - - - + @@ -574,8 +364,8 @@ - - + + @@ -588,16 +378,8 @@ - - - - - - - - - - + + @@ -606,9 +388,6 @@ - - - @@ -618,9 +397,6 @@ - - - @@ -630,9 +406,6 @@ - - - @@ -642,9 +415,6 @@ - - - @@ -654,9 +424,6 @@ - - - @@ -666,9 +433,6 @@ - - - @@ -678,18 +442,11 @@ - - - - - - - - + - + @@ -702,17 +459,9 @@ - - - - - - - - - - - + + + @@ -720,11 +469,8 @@ - - - - + @@ -732,11 +478,8 @@ - - - - + @@ -744,11 +487,8 @@ - - - - + @@ -756,11 +496,8 @@ - - - - + @@ -768,11 +505,8 @@ - - - - + @@ -780,11 +514,8 @@ - - - - + @@ -792,356 +523,10 @@ - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1189,8 +574,8 @@ - - + + @@ -1199,271 +584,41 @@ - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1518,27 +673,11 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -1546,20 +685,13 @@ - - - - - - - - + - - + + @@ -1568,243 +700,36 @@ - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1864,8 +789,8 @@ - - + + @@ -1877,659 +802,100 @@ - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2589,8 +955,8 @@ - - + + @@ -2653,819 +1019,69 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -