From 943e7cd68c772cf750fd92488977fae7bb2422e3 Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Tue, 21 Mar 2023 20:46:23 +0700 Subject: [PATCH] bug fixed --- Models/budget/durable_articles_three.cs | 5 + wwwroot/reports/durable_articles_three.frx | 111 ++++++++------------- 2 files changed, 49 insertions(+), 67 deletions(-) diff --git a/Models/budget/durable_articles_three.cs b/Models/budget/durable_articles_three.cs index c09643d..b4c04e1 100644 --- a/Models/budget/durable_articles_three.cs +++ b/Models/budget/durable_articles_three.cs @@ -50,6 +50,11 @@ namespace rmutr_report.Models public string incurring_debt { get; set; } public string quarter { get; set; } public string disbursement_durable { get; set; } + public string year1 { get; set; } + public string year2 { get; set; } + public string year3 { get; set; } + public string year4 { get; set; } + public string year5 { get; set; } public List objective_management {get; set; } public string other_clarifications { get; set; } public List quotation { get; set; } diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index ff4857c..3c1ef36 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -1,5 +1,5 @@  - + @@ -68,6 +68,11 @@ + + + + + @@ -118,8 +123,8 @@ - - + + @@ -133,7 +138,7 @@ - + @@ -148,7 +153,7 @@ - + @@ -167,55 +172,29 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -224,7 +203,7 @@ - + @@ -271,7 +250,7 @@ - + @@ -304,13 +283,11 @@ - + - - - + @@ -331,14 +308,14 @@ - - - - - + + + + + - + @@ -359,23 +336,23 @@ - + - + - + - + - +