From e742276bf053f50d76b93dc60ebe7e877c083743 Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Wed, 15 Mar 2023 15:06:59 +0700 Subject: [PATCH] remove Specification --- Models/budget/durable_articles_three.cs | 36 +- wwwroot/reports/durable_articles_three.frx | 56 +-- wwwroot/reports/durable_articles_threeold.frx | 428 ++++++++++++++++++ 3 files changed, 454 insertions(+), 66 deletions(-) create mode 100644 wwwroot/reports/durable_articles_threeold.frx diff --git a/Models/budget/durable_articles_three.cs b/Models/budget/durable_articles_three.cs index 1655b84..dfbf28a 100644 --- a/Models/budget/durable_articles_three.cs +++ b/Models/budget/durable_articles_three.cs @@ -40,11 +40,11 @@ namespace rmutr_report.Models public string description_more2 { get; set; } public string image_description1 { get; set; } public string image_description2 { get; set; } - public List specification_data { get; set; } + //public List specification_data { get; set; } public string specification { get; set; } - public string quantity_specification { get; set; } - public decimal? unit_price_specification { get; set; } - public decimal? amount_specification { get; set; } + // public string quantity_specification { get; set; } + // public decimal? unit_price_specification { get; set; } + // public decimal? amount_specification { get; set; } public List budget_spending_plan {get; set; } public string procurement_process { get; set; } public string incurring_debt { get; set; } @@ -83,21 +83,21 @@ namespace rmutr_report.Models public string detail { get; set; } } - public class specification_datas - { - public string specification { get; set; } - public string quantity { get; set; } - public decimal? unit_price { get; set; } - public decimal? amount { get; set; } - public List data_detail { get; set; } - } + // public class specification_datas + // { + // public string specification { get; set; } + // public string quantity { get; set; } + // public decimal? unit_price { get; set; } + // public decimal? amount { get; set; } + // public List data_detail { get; set; } + // } - public class specification_data_details - { - public string list { get; set;} - public string quantity { get; set;} - public string attribute { get; set;} - } + // public class specification_data_details + // { + // public string list { get; set;} + // public string quantity { get; set;} + // public string attribute { get; set;} + // } public class budget_spending_plans { diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index 84e8378..bd5a416 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -1,5 +1,5 @@  - + @@ -37,9 +37,6 @@ - - - @@ -55,17 +52,6 @@ - - - - - - - - - - - @@ -133,8 +119,8 @@ - - + + @@ -148,7 +134,7 @@ - + @@ -163,7 +149,7 @@ - + @@ -246,36 +232,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/wwwroot/reports/durable_articles_threeold.frx b/wwwroot/reports/durable_articles_threeold.frx new file mode 100644 index 0000000..07bb0a5 --- /dev/null +++ b/wwwroot/reports/durable_articles_threeold.frx @@ -0,0 +1,428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +