From 943f6d9c7d8135da55e62991268711d0cad3f93b Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Tue, 25 Apr 2023 23:23:14 +0700 Subject: [PATCH] update --- Models/budget/budget_summary_report.cs | 65 ++++- wwwroot/reports/budget_summary_report.frx | 284 +++++++++++++++++++--- 2 files changed, 309 insertions(+), 40 deletions(-) diff --git a/Models/budget/budget_summary_report.cs b/Models/budget/budget_summary_report.cs index f5d28d2..cb7b7a2 100644 --- a/Models/budget/budget_summary_report.cs +++ b/Models/budget/budget_summary_report.cs @@ -15,19 +15,19 @@ namespace rmutr_report.Models public decimal? total_budget { get; set; } public string product { get; set; } public string set_request_year { get; set; } - public Listoperating_expenses{ get; set; } + public List group_header { get; set; } public string durable_articles_year { get; set; } - //public string durable_articles_product { get; set; } + public string durable_articles_product { get; set; } public List durable_articles_header { get; set; } public string building_year { get; set; } - //public string building_product { get; set; } + public string building_product { get; set; } public List building_header_1 { get; set; } public List building_header_2 { get; set; } public string research_support_year { get; set; } - //public string research_support_product { 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 string subsidy_service_product { get; set; } public List subsidy_service_header { get; set; } public string subsidy_science_year { get; set; } public List subsidy_science_header { get; set; } @@ -41,13 +41,66 @@ namespace rmutr_report.Models public List subsidy_budget_project_header { get; set; } public string integrated_plan_name { get; set; } public string integrated_plan_year { get; set; } - public Listintegrated_plan{ get; set; } + //public List integrated_plan_header { get; set; } public string strategic_plan_name { get; set; } public string strategic_plan_year { get; set; } //public List strategic_plan_header { get; set; } + public Listintegrated_plan{ get; set; } public Liststrategic_plan{ get; set; } } + public class group_headers2 + { + public string list_1 { get; set; } + public string list_2 { get; set; } + public string rowno { get; set; } + public string list_3 { get; set; } + public decimal? budget_amount { get; set; } + public decimal? total_amount_1 { get; set; } + public decimal? total_amount_2 { get; set; } + public List header { get; set; } + } + + public class expenditure_budget_proposal2 + { + public string rowno { get; set; } + public string header { get; set; } + public decimal? budget_amount { get; set; } + public List data_proposals { get; set; } + + + } + + public class expenditure_budget_proposals2 + { + public string list { get; set; } + public decimal? target_group_count { get; set; } + public string target_group_unit { get; set; } + public decimal? time_count { get; set; } + public string time_unit { get; set; } + public decimal? budget_count { get; set; } + public string budget_unit { get; set; } + public decimal? quantity { get; set; } + public string quantity_unit { get; set; } + public decimal? budget_amount { get; set; } + public List data_sub_proposals { get; set; } + + + } + + public class expenditure_budget_proposals3 + { + public string list { get; set; } + public decimal? target_group_count { get; set; } + public string target_group_unit { get; set; } + public decimal? time_count { get; set; } + public string time_unit { get; set; } + public decimal? budget_count { get; set; } + public string budget_unit { get; set; } + public decimal? quantity { get; set; } + public string quantity_unit { get; set; } + public decimal? budget_amount { get; set; } + } public class budget_summary_report_detail { public string product { get; set; } diff --git a/wwwroot/reports/budget_summary_report.frx b/wwwroot/reports/budget_summary_report.frx index 25db2f0..8f63ffc 100644 --- a/wwwroot/reports/budget_summary_report.frx +++ b/wwwroot/reports/budget_summary_report.frx @@ -1,5 +1,5 @@  - + @@ -21,11 +21,43 @@ - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -232,8 +264,8 @@ - - + + @@ -258,37 +290,221 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +