update
This commit is contained in:
@@ -146,7 +146,7 @@ namespace rmutr_report.Controllers
|
|||||||
|
|
||||||
}
|
}
|
||||||
Report report = new Report();
|
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.RegisterData(_budget_summary_report, "budget_summary_report");
|
||||||
report.Prepare();
|
report.Prepare();
|
||||||
|
|
||||||
|
|||||||
@@ -17,33 +17,44 @@ namespace rmutr_report.Models
|
|||||||
public string set_request_year { get; set; }
|
public string set_request_year { get; set; }
|
||||||
public List<group_headers2> group_header { get; set; }
|
public List<group_headers2> group_header { get; set; }
|
||||||
public string durable_articles_year { 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_headers> durable_articles_header { get; set; }
|
public decimal? durable_articles_budget { get; set; }
|
||||||
|
public List<durable_articles_detail>durable_articles{ get; set; }
|
||||||
|
//public List<durable_articles_headers> durable_articles_header1 { get; set; }
|
||||||
public string building_year { get; set; }
|
public string building_year { get; set; }
|
||||||
public string building_product { get; set; }
|
//public string building_product { get; set; }
|
||||||
public List<building_headers1> building_header_1 { get; set; }
|
public decimal? building_budget{ get; set; }
|
||||||
public List<building_headers2> building_header_2 { get; set; }
|
//public List<building_headers1> building_header_1 { get; set; }
|
||||||
|
public List<building_headers2_detail>building{ get; set; }
|
||||||
public string research_support_year { 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 List<operating_expenses_details>research_support{ get; set; }
|
public List<operating_expenses_details>research_support{ get; set; }
|
||||||
public string subsidy_service_year { get; set; }
|
public string subsidy_service_year { get; set; }
|
||||||
public string subsidy_service_product { get; set; }
|
public decimal? subsidy_service_budget{ get; set; }
|
||||||
public List<subsidy_service_headers> subsidy_service_header { get; set; }
|
public List<subsidy_service_headers_detail>subsidy_service{ get; set; }
|
||||||
public string subsidy_science_year { get; set; }
|
public string subsidy_science_year { get; set; }
|
||||||
public List<subsidy_science_headers> subsidy_science_header { get; set; }
|
public decimal? subsidy_science_budget { get; set; }
|
||||||
|
public List<subsidy_science_headers_detail>subsidy_science{ get; set; }
|
||||||
public string subsidy_society_year { get; set; }
|
public string subsidy_society_year { get; set; }
|
||||||
public List<subsidy_science_headers> subsidy_society_header { get; set; }
|
public decimal? subsidy_society_budget { get; set; }
|
||||||
|
public List<subsidy_science_headers_detail>subsidy_society{ get; set; }
|
||||||
public string subsidy_arts_culture_year { get; set; }
|
public string subsidy_arts_culture_year { get; set; }
|
||||||
public List<subsidy_service_headers> subsidy_arts_culture_header { get; set; }
|
public decimal? subsidy_arts_culture_budget { get; set; }
|
||||||
|
public List<subsidy_service_headers_detail>subsidy_arts_culture{ get; set; }
|
||||||
public string thailand_year { get; set; }
|
public string thailand_year { get; set; }
|
||||||
public List<subsidy_science_headers> thailand_header { get; set; }
|
public decimal? thailand_budget { get; set; }
|
||||||
|
public List<subsidy_science_headers_detail>thailand{ get; set; }
|
||||||
public string subsidy_budget_project_year { get; set; }
|
public string subsidy_budget_project_year { get; set; }
|
||||||
public List<subsidy_service_headers> subsidy_budget_project_header { get; set; }
|
public decimal? subsidy_budget_project_budget { get; set; }
|
||||||
public string integrated_plan_name { get; set; }
|
public List<subsidy_service_headers_detail>subsidy_budget_project{ get; set; }
|
||||||
|
// public string integrated_plan_name { get; set; }
|
||||||
public string integrated_plan_year { get; set; }
|
public string integrated_plan_year { get; set; }
|
||||||
|
public decimal? integrated_plan_budget { get; set; }
|
||||||
//public List<subsidy_science_headers> integrated_plan_header { get; set; }
|
//public List<subsidy_science_headers> 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 string strategic_plan_year { get; set; }
|
||||||
|
public decimal? strategic_plan_budget { get; set; }
|
||||||
//public List<subsidy_science_headers> strategic_plan_header { get; set; }
|
//public List<subsidy_science_headers> strategic_plan_header { get; set; }
|
||||||
public List<subsidy_science_headers_detail>integrated_plan{ get; set; }
|
public List<subsidy_science_headers_detail>integrated_plan{ get; set; }
|
||||||
public List<subsidy_science_headers_detail>strategic_plan{ get; set; }
|
public List<subsidy_science_headers_detail>strategic_plan{ get; set; }
|
||||||
@@ -115,22 +126,37 @@ namespace rmutr_report.Models
|
|||||||
|
|
||||||
public class operating_expenses_details
|
public class operating_expenses_details
|
||||||
{
|
{
|
||||||
|
public string color { get; set; }
|
||||||
|
|
||||||
public string rowno { get; set; }
|
public string rowno { get; set; }
|
||||||
public string list { get; set; }
|
public string list { get; set; }
|
||||||
public decimal? amount { get; set; }
|
public decimal? amount { get; set; }
|
||||||
public string remark { get; set; }
|
public string remark { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class durable_articles_headers
|
// public class durable_articles_headers
|
||||||
{
|
// {
|
||||||
public string header_name { get; set; }
|
// public string header_name { get; set; }
|
||||||
|
// public string color { get; set; }
|
||||||
|
// public decimal? total_amount { get; set; }
|
||||||
|
// public List<durable_articles_headers2> durable_articles_header2 { get; set; }
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
|
||||||
public List<durable_articles_detail>durable_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 List<durable_articles_detail>durable_articles{ get; set; }
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
|
||||||
public class durable_articles_detail
|
public class durable_articles_detail
|
||||||
{
|
{
|
||||||
|
public string color { get; set; }
|
||||||
|
public string rowno { get; set; }
|
||||||
|
|
||||||
public string list { get; set; }
|
public string list { get; set; }
|
||||||
public string unit { get; set; }
|
public string unit { get; set; }
|
||||||
public string unit_amount { get; set; }
|
public string unit_amount { get; set; }
|
||||||
@@ -146,27 +172,29 @@ namespace rmutr_report.Models
|
|||||||
public string remark { get; set; }
|
public string remark { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class building_headers1
|
// public class building_headers1
|
||||||
{
|
// {
|
||||||
public string header_name { get; set; }
|
// public string header_name { get; set; }
|
||||||
public List<building_headers1_detail>building_1{ get; set; }
|
// public List<building_headers1_detail>building_1{ get; set; }
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public class building_headers1_detail
|
// public class building_headers1_detail
|
||||||
{
|
// {
|
||||||
public string rowno { get; set; }
|
// public string rowno { get; set; }
|
||||||
public string list { get; set; }
|
// public string list { get; set; }
|
||||||
}
|
// }
|
||||||
public class building_headers2
|
// public class building_headers2
|
||||||
{
|
// {
|
||||||
public string header_name { get; set; }
|
// public string header_name { get; set; }
|
||||||
public List<building_headers2_detail>building_2{ get; set; }
|
// public List<building_headers2_detail>building_2{ get; set; }
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
|
||||||
public class building_headers2_detail
|
public class building_headers2_detail
|
||||||
{
|
{
|
||||||
|
public string color { get; set; }
|
||||||
|
public string rowno { get; set; }
|
||||||
public string list { get; set; }
|
public string list { get; set; }
|
||||||
public string unit { get; set; }
|
public string unit { get; set; }
|
||||||
public string unit_amount { get; set; }
|
public string unit_amount { get; set; }
|
||||||
@@ -177,17 +205,10 @@ namespace rmutr_report.Models
|
|||||||
public string remark { get; set; }
|
public string remark { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
public class subsidy_service_headers_detail
|
||||||
public class subsidy_service_headers
|
|
||||||
{
|
|
||||||
public string header_name { get; set; }
|
|
||||||
public List<subsidy_service_headers_detail>subsidy_service{ get; set; }
|
|
||||||
public List<subsidy_service_headers_detail>subsidy_arts_culture{ get; set; }
|
|
||||||
public List<subsidy_service_headers_detail>subsidy_budget_project{ get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class subsidy_service_headers_detail
|
|
||||||
{
|
{
|
||||||
|
public string color { get; set; }
|
||||||
|
public string rowno { get; set; }
|
||||||
public string list { get; set; }
|
public string list { get; set; }
|
||||||
public decimal? amount_1 { get; set; }
|
public decimal? amount_1 { get; set; }
|
||||||
public decimal? amount_2 { get; set; }
|
public decimal? amount_2 { get; set; }
|
||||||
@@ -200,17 +221,19 @@ namespace rmutr_report.Models
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class subsidy_science_headers
|
// public class subsidy_science_headers
|
||||||
{
|
// {
|
||||||
public string header_name { get; set; }
|
// public string header_name { get; set; }
|
||||||
public List<subsidy_science_headers_detail>subsidy_science{ get; set; }
|
// public List<subsidy_science_headers_detail>subsidy_science{ get; set; }
|
||||||
public List<subsidy_science_headers_detail>subsidy_society{ get; set; }
|
// public List<subsidy_science_headers_detail>subsidy_society{ get; set; }
|
||||||
public List<subsidy_science_headers_detail>thailand{ get; set; }
|
// public List<subsidy_science_headers_detail>thailand{ get; set; }
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
|
||||||
public class subsidy_science_headers_detail
|
public class subsidy_science_headers_detail
|
||||||
{
|
{
|
||||||
|
public string color { get; set; }
|
||||||
|
public string rowno { get; set; }
|
||||||
public string list { get; set; }
|
public string list { get; set; }
|
||||||
public string unit { get; set; }
|
public string unit { get; set; }
|
||||||
public decimal? unit_amount { get; set; }
|
public decimal? unit_amount { get; set; }
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user