diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 608c941..5c8a7a6 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -146,7 +146,7 @@ namespace rmutr_report.Controllers } Report report = new Report(); - report.Load(_setting.report_path + "budget_summary_report_moc.frx"); + report.Load(_setting.report_path + "budget_summary_report.frx"); report.RegisterData(_budget_summary_report, "budget_summary_report"); report.Prepare(); diff --git a/Models/budget/budget_summary_report.cs b/Models/budget/budget_summary_report.cs index cb7b7a2..9287ffe 100644 --- a/Models/budget/budget_summary_report.cs +++ b/Models/budget/budget_summary_report.cs @@ -17,33 +17,44 @@ namespace rmutr_report.Models public string set_request_year { get; set; } public List group_header { get; set; } public string durable_articles_year { get; set; } - public string durable_articles_product { get; set; } - public List durable_articles_header { get; set; } + //public string durable_articles_product { get; set; } + public decimal? durable_articles_budget { get; set; } + public Listdurable_articles{ get; set; } + //public List durable_articles_header1 { get; set; } public string building_year { get; set; } - public string building_product { get; set; } - public List building_header_1 { get; set; } - public List building_header_2 { get; set; } + //public string building_product { get; set; } + public decimal? building_budget{ get; set; } + //public List building_header_1 { get; set; } + public Listbuilding{ get; set; } public string research_support_year { get; set; } - public string research_support_product { get; set; } + public decimal? research_support_budget{ get; set; } + //public string research_support_product { get; set; } public Listresearch_support{ get; set; } public string subsidy_service_year { get; set; } - public string subsidy_service_product { get; set; } - public List subsidy_service_header { get; set; } + public decimal? subsidy_service_budget{ get; set; } + public Listsubsidy_service{ get; set; } public string subsidy_science_year { get; set; } - public List subsidy_science_header { get; set; } + public decimal? subsidy_science_budget { get; set; } + public Listsubsidy_science{ get; set; } public string subsidy_society_year { get; set; } - public List subsidy_society_header { get; set; } + public decimal? subsidy_society_budget { get; set; } + public Listsubsidy_society{ get; set; } public string subsidy_arts_culture_year { get; set; } - public List subsidy_arts_culture_header { get; set; } + public decimal? subsidy_arts_culture_budget { get; set; } + public Listsubsidy_arts_culture{ get; set; } public string thailand_year { get; set; } - public List thailand_header { get; set; } + public decimal? thailand_budget { get; set; } + public Listthailand{ get; set; } public string subsidy_budget_project_year { get; set; } - public List subsidy_budget_project_header { get; set; } - public string integrated_plan_name { get; set; } + public decimal? subsidy_budget_project_budget { get; set; } + public Listsubsidy_budget_project{ 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 string strategic_plan_name { get; set; } public string strategic_plan_year { get; set; } + public decimal? strategic_plan_budget { get; set; } //public List strategic_plan_header { get; set; } public Listintegrated_plan{ get; set; } public Liststrategic_plan{ get; set; } @@ -115,22 +126,37 @@ namespace rmutr_report.Models public class operating_expenses_details { + public string color { get; set; } + public string rowno { get; set; } public string list { get; set; } public decimal? amount { get; set; } public string remark { get; set; } } - public class durable_articles_headers - { - public string header_name { get; set; } + // public class durable_articles_headers + // { + // public string header_name { get; set; } + // public string color { get; set; } + // public decimal? total_amount { get; set; } + // public List durable_articles_header2 { get; set; } + // + // } - public Listdurable_articles{ get; set; } - - } + // public class durable_articles_headers2 + // { + // public string header_name { get; set; } + // public string color { get; set; } + // public decimal? total_amount { get; set; } + // public Listdurable_articles{ get; set; } + // + // } public class durable_articles_detail { + public string color { get; set; } + public string rowno { get; set; } + public string list { get; set; } public string unit { get; set; } public string unit_amount { get; set; } @@ -146,27 +172,29 @@ namespace rmutr_report.Models public string remark { get; set; } } - public class building_headers1 - { - public string header_name { get; set; } - public Listbuilding_1{ get; set; } - - } - - public class building_headers1_detail - { - public string rowno { get; set; } - public string list { get; set; } - } - public class building_headers2 - { - public string header_name { get; set; } - public Listbuilding_2{ get; set; } - - } + // public class building_headers1 + // { + // public string header_name { get; set; } + // public Listbuilding_1{ get; set; } + // + // } + // + // public class building_headers1_detail + // { + // public string rowno { get; set; } + // public string list { get; set; } + // } + // public class building_headers2 + // { + // public string header_name { get; set; } + // public Listbuilding_2{ get; set; } + // + // } public class building_headers2_detail { + public string color { get; set; } + public string rowno { get; set; } public string list { get; set; } public string unit { get; set; } public string unit_amount { get; set; } @@ -177,17 +205,10 @@ namespace rmutr_report.Models public string remark { get; set; } } - - public class subsidy_service_headers - { - public string header_name { get; set; } - public Listsubsidy_service{ get; set; } - public Listsubsidy_arts_culture{ get; set; } - public Listsubsidy_budget_project{ get; set; } - } - - public class subsidy_service_headers_detail + public class subsidy_service_headers_detail { + 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; } @@ -200,17 +221,19 @@ namespace rmutr_report.Models } - 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 + // { + // 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 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; } diff --git a/bin/Debug/net5.0/rmutr-report.dll b/bin/Debug/net5.0/rmutr-report.dll index eaadc07..d202c52 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 b8ac87b..e9d6326 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 049b16c..ed9181c 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 049b16c..ed9181c 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 eaadc07..d202c52 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 b8ac87b..e9d6326 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 8f63ffc..25f52dc 100644 --- a/wwwroot/reports/budget_summary_report.frx +++ b/wwwroot/reports/budget_summary_report.frx @@ -1,5 +1,5 @@  - + @@ -60,142 +60,140 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + @@ -289,8 +287,8 @@ - - + + @@ -367,8 +365,8 @@ - - + + @@ -421,7 +419,7 @@ - + @@ -448,7 +446,7 @@ - + @@ -475,7 +473,7 @@ - + @@ -577,78 +575,172 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -706,109 +798,107 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -838,23 +928,58 @@ - + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -868,8 +993,8 @@ - - + + @@ -887,8 +1012,8 @@ - - + + @@ -898,7 +1023,7 @@ - + @@ -919,58 +1044,109 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -982,8 +1158,8 @@ - - + + @@ -997,14 +1173,14 @@ - - + + - + - + @@ -1017,42 +1193,73 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -1064,8 +1271,8 @@ - - + + @@ -1079,14 +1286,14 @@ - - + + - + - + @@ -1099,42 +1306,73 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -1146,8 +1384,8 @@ - - + + @@ -1178,8 +1416,8 @@ - - + + @@ -1188,59 +1426,105 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -1251,8 +1535,8 @@ - - + + @@ -1266,14 +1550,14 @@ - - + + - + - + @@ -1286,42 +1570,73 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - @@ -1333,8 +1648,8 @@ - - + + @@ -1365,8 +1680,8 @@ - - + + @@ -1375,71 +1690,110 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + @@ -1453,14 +1807,14 @@ - - + + - + @@ -1473,22 +1827,71 @@ - - + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1496,13 +1899,13 @@ - + - - + + @@ -1516,14 +1919,14 @@ - - + + - + @@ -1536,22 +1939,71 @@ - - + + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +