diff --git a/Models/budget/budget_summary_report.cs b/Models/budget/budget_summary_report.cs index 1993ba3..8b9efb8 100644 --- a/Models/budget/budget_summary_report.cs +++ b/Models/budget/budget_summary_report.cs @@ -23,9 +23,12 @@ namespace rmutr_report.Models public decimal? durable_articles_budget { get; set; } public List durable_articles_1 { get; set; } + //public List receive_data { get; set; } public string list { get; set; } + public decimal? total_amount { get; set; } + //public List durable_articles_header1 { get; set; } public string building_year { get; set; } @@ -41,41 +44,37 @@ namespace rmutr_report.Models public decimal? research_support_budget { get; set; } //public string research_support_product { get; set; } - public List research_support { get; set; } + public List research_support_1 { get; set; } public string subsidy_service_year { get; set; } public decimal? subsidy_service_budget { get; set; } - public List subsidy_service { get; set; } + public List subsidy_service_1 { get; set; } public string subsidy_science_year { get; set; } public decimal? subsidy_science_budget { get; set; } - public List subsidy_science { get; set; } + public List subsidy_science_1 { get; set; } public string subsidy_society_year { get; set; } public decimal? subsidy_society_budget { get; set; } - public List subsidy_society { get; set; } + public List subsidy_society_1 { get; set; } public string subsidy_arts_culture_year { get; set; } public decimal? subsidy_arts_culture_budget { get; set; } - public List subsidy_arts_culture { get; set; } + public List subsidy_arts_culture_1 { get; set; } public string thailand_year { get; set; } public decimal? thailand_budget { get; set; } - public List thailand { get; set; } + public List thailand_1 { get; set; } public string subsidy_budget_project_year { get; set; } public decimal? subsidy_budget_project_budget { get; set; } - public List subsidy_budget_project { get; set; } + public List subsidy_budget_project_1 { get; set; } // public string integrated_plan_name { get; set; } public string integrated_plan_year { get; set; } public decimal? integrated_plan_budget { get; set; } - //public List integrated_plan_header { get; set; } - //public string strategic_plan_name { get; set; } + public List integrated_plan_1 { get; set; } public string strategic_plan_year { get; set; } public decimal? strategic_plan_budget { get; set; } - - //public List strategic_plan_header { get; set; } - public List integrated_plan { get; set; } - public List strategic_plan { get; set; } + public List strategic_plan_1 { get; set; } } public class group_headers2 @@ -140,14 +139,163 @@ namespace rmutr_report.Models public class operating_expenses_details { - public string color { get; set; } - - public string rowno { get; set; } + public int? color { get; set; } public string list { get; set; } - public decimal? amount { get; set; } + public decimal? total_amount { get; set; } + + public List research_support_2 { get; set; } + //public List subsidy_science_2 { get; set; } + //public List subsidy_society_2 { get; set; } + } + + public class operating_expenses_details2 + { + public int? color { get; set; } + public string list { get; set; } + public decimal? total_amount { 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 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_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 subsidy_science_details + { + public int? color { get; set; } + public string list { get; set; } + public decimal? total_amount { get; set; } + public List subsidy_science_2 { get; set; } + } + + 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; } + public decimal? unit_amount { get; set; } + public decimal? total_amount { get; set; } + public string remark { get; set; } + } + + public class subsidy_society_details + { + public int? color { get; set; } + public string list { get; set; } + public decimal? total_amount { get; set; } + public List subsidy_society_2 { get; set; } + } + + 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; } @@ -218,6 +366,7 @@ namespace rmutr_report.Models public string type_1 { get; set; } public string type_2 { get; set; } public string type_3 { get; set; } + public string remark { get; set; } //public List durable_articles_detail { get; set; } } @@ -246,26 +395,28 @@ namespace rmutr_report.Models public int? color { get; set; } public string list { get; set; } public decimal? total_amount { get; set; } - public Listbuilding_2{ get; set; } - + public List building_2 { get; set; } } - public class building_headers2{ + + public class building_headers2 + { public int? color { get; set; } public string list { get; set; } public decimal? total_amount { get; set; } - public Listbuilding_3{ get; set; } - + public List building_3 { get; set; } } public class building_headers3 { public int? color { get; set; } public string list { get; set; } + public decimal? total_amount { get; set; } + //public Listbuilding_4{ get; set; } - public Listdata_1{ get; set; } - public Listdata_2{ get; set; } - public Listdata_3{ get; set; } + public List data_1 { get; set; } + public List data_2 { get; set; } + public List data_3 { get; set; } } // public class building_headers4 @@ -281,33 +432,30 @@ namespace rmutr_report.Models public class building_headers4_detail1 { - public string list { get; set; } - public decimal? total_amount { get; set; } -public Listdata_1_detail { get; set; } + public decimal? total_amount { get; set; } + public List data_1_detail { get; set; } } public class data_1_details { - public string rowno { get; set; } public string list { get; set; } public decimal? total_amount { get; set; } - } public class building_headers4_detail2 { public string list { get; set; } - public decimal? total_amount { get; set; } - public Listdata_2_detail { get; set; } + public decimal? total_amount { get; set; } + public List data_2_detail { get; set; } } public class building_headers4_detail3 { public string list { get; set; } - public decimal? total_amount { get; set; } - public Listdata_3_detail { get; set; } + public decimal? total_amount { get; set; } + public List data_3_detail { get; set; } } public class data_3_details @@ -326,8 +474,84 @@ public Listdata_1_detail { get; set; } public class subsidy_service_headers_detail { - public string color { get; set; } - public string rowno { get; set; } + 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_2 { get; set; } + //public List subsidy_arts_culture_2 { get; set; } + } + + 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; } + 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_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_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; } @@ -339,23 +563,295 @@ public Listdata_1_detail { get; set; } public string remark { get; set; } } - // public class subsidy_science_headers - // { - // public string header_name { get; set; } - // public Listsubsidy_science{ get; set; } - // public Listsubsidy_society{ get; set; } - // public Listthailand{ get; set; } - // - // } - - public class subsidy_science_headers_detail + public class subsidy_arts_culture_detail + { + 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_2 { get; set; } + } + + 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; } + 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 thailand_details + { + public int? color { get; set; } + public string list { get; set; } + public decimal? total_amount { get; set; } + public List thailand_2 { get; set; } + } + + 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 color { get; set; } - public string rowno { get; set; } public string list { get; set; } public string unit { get; set; } public decimal? unit_amount { get; set; } - public decimal? amount { get; set; } + public decimal? total_amount { get; set; } + public string remark { get; set; } + } + + public class subsidy_budget_details + { + 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_2 { get; set; } + } + + 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; } + 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_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; } + public string list { get; set; } + public decimal? total_amount { get; set; } + public List integrated_plan_2 { get; set; } + } + + 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 class strategic_plan_details + { + public int? color { get; set; } + public string list { get; set; } + public decimal? total_amount { get; set; } + public List strategic_plan_2 { get; set; } + } + + 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; } } } \ No newline at end of file diff --git a/bin/Debug/net5.0/rmutr-report.dll b/bin/Debug/net5.0/rmutr-report.dll index 9a94e8c..2b553b1 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 9906d12..01efff4 100644 Binary files a/bin/Debug/net5.0/rmutr-report.pdb and b/bin/Debug/net5.0/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 4768c16..da5dc21 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 4768c16..da5dc21 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 9a94e8c..2b553b1 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 9906d12..01efff4 100644 Binary files a/obj/Debug/net5.0/rmutr-report.pdb and b/obj/Debug/net5.0/rmutr-report.pdb differ diff --git a/wwwroot/reports/budget_summary_report.frx b/wwwroot/reports/budget_summary_report.frx index 4cfa06c..c5b7329 100644 --- a/wwwroot/reports/budget_summary_report.frx +++ b/wwwroot/reports/budget_summary_report.frx @@ -1,5 +1,5 @@  - + @@ -153,17 +153,40 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + @@ -172,35 +195,123 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + @@ -208,56 +319,199 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1782,8 +2036,8 @@ - - + + @@ -1795,41 +2049,35 @@ - - + + - - - - + + + + - + - - + + - - - - + - + - - - - + - + @@ -1838,22 +2086,171 @@ - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1887,16 +2284,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -1910,14 +2307,14 @@ - - - + + + - - + + @@ -1930,95 +2327,567 @@ - + - - - - + - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - + - + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2048,12 +2917,12 @@ - - - - - - + + + + + + @@ -2065,8 +2934,8 @@ - - + + @@ -2075,39 +2944,27 @@ - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + @@ -2116,22 +2973,261 @@ - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2161,12 +3257,12 @@ - - - - - - + + + + + + @@ -2177,50 +3273,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + - + - - - - + - + - - - - + - + - - - - + - + @@ -2229,22 +3360,238 @@ - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2291,20 +3638,20 @@ - - - - - - - - - + + + + + + + + + - - + + @@ -2316,87 +3663,413 @@ - + - - - - + - + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - - - - + - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2425,11 +4098,11 @@ - - + + - + @@ -2442,8 +4115,8 @@ - - + + @@ -2452,39 +4125,27 @@ - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + @@ -2493,22 +4154,189 @@ - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2555,20 +4383,20 @@ - - - - - - - - - + + + + + + + + + - - + + @@ -2580,80 +4408,353 @@ - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2684,9 +4785,9 @@ - + - + @@ -2699,8 +4800,8 @@ - - + + @@ -2709,39 +4810,27 @@ - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + @@ -2750,22 +4839,189 @@ - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2796,9 +5052,9 @@ - + - + @@ -2811,8 +5067,8 @@ - - + + @@ -2821,39 +5077,27 @@ - + - - - - + - + - - - - + - + - - - - + - + - - - - + - + @@ -2862,22 +5106,189 @@ - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/ro_ten.frx b/wwwroot/reports/ro_ten.frx index ee39abe..fa4608e 100644 --- a/wwwroot/reports/ro_ten.frx +++ b/wwwroot/reports/ro_ten.frx @@ -1,5 +1,5 @@  - + @@ -33,7 +33,7 @@ - + @@ -50,8 +50,8 @@ - - + +