bug fixed

This commit is contained in:
kamonwan taengsuk
2023-02-20 19:29:33 +07:00
parent 8c15e219bc
commit 81541824d8
3 changed files with 345 additions and 264 deletions

View File

@@ -37,11 +37,15 @@ namespace rmutr_report.Models
public List<fourteenth_data> fourteenth { get; set; } //ข้อ 14
public List<fifteenth_data> fifteenth { get; set; } //ข้อ 15
public int? count_activity { get; set; } //ข้อ 16
public int? total_target { get; set; } //ข้อ 16 ผลรวมกลุ่มเป้าหมาย
public int? total_board { get; set; } //ข้อ 16 ผลรวมคณะกรรมการ
public List<sixteenth_data> sixteenth { get; set; } //ข้อ 16
public List<sixteenth_data_detail> sixteenths { get; set; } //ข้อ 16 detail ตาราง
public List<seventeenth_data> seventeenth { get; set; } //ข้อ 17
public int? count_day { get; set; } //ข้อ 18
public List<eighteenth_data> eighteenth { get; set; } //ข้อ 18
public List<nineteenth_data> nineteenth { get; set; } //ข้อ 19
public List<nineteenth_data1> nineteenth1 { get; set; } //ข้อ 19
public decimal? budget_amount { get; set; } //ข้อ 20
public List<twentieth_data> twentieth { get; set; } //ข้อ 20
public List<twenty_one_data> twenty_one { get; set; } //ข้อ 21
@@ -214,14 +218,47 @@ namespace rmutr_report.Models
public string end_date { get; set; }
}
public class nineteenth_data1
{
public string text1 { get; set; }
public string text2 { get; set; }
public string text3 { get; set; }
public decimal? total_compensation { get; set; }
public decimal? total_expenses { get; set; }
public decimal? total_material { get; set; }
}
public class nineteenth_data
{
public string activity { get; set; }
public decimal? budget_total_amount { get; set; }
public decimal? budget_amount { get; set; }
//public string text { get; set; }
//public decimal? total { get; set; }
//public decimal? total_expenses { get; set; }
//public decimal? total_material { get; set; }
//public string activity { get; set; }
//public decimal? budget_amount { get; set; }
public decimal? compensation { get; set; }
public decimal? expenses { get; set; }
public decimal? material { get; set; }
public string text1 { get; set; }
public string text2 { get; set; }
public string text3 { get; set; }
public decimal? total_compensation { get; set; }
public decimal? total_expenses { get; set; }
public decimal? total_material { get; set; }
public List<nineteenth_data_headers> nineteenth_data_header { get; set; }
// public List<nineteenth_data_detail> nineteenths_compensation { get; set; }
// public List<nineteenth_data_detail2> nineteenths_expenses { get; set; }
// public List<nineteenth_data_detail3> nineteenths_material { get; set; }
}
public class nineteenth_data_headers
{
public string text4 { get; set; }
public decimal? budget_amount { get; set; }
public string activity { get; set; }
public List<nineteenth_data_detail> nineteenths_compensation { get; set; }
public List<nineteenth_data_detail2> nineteenths_expenses { get; set; }
public List<nineteenth_data_detail3> nineteenths_material { get; set; }
@@ -329,9 +366,11 @@ namespace rmutr_report.Models
public string nuai_nap { get; set; }
public string khrang1 { get; set; }
public string khrang2 { get; set; }
public string khrang3 { get; set; }
public string rueang { get; set; }
public string activity { get; set; }
public string clause1 { get; set; }
public string count_quantitative { get; set; }
public string count_unit { get; set; }
public string count_project { get; set; }
public string count_training { get; set; }
@@ -344,7 +383,8 @@ namespace rmutr_report.Models
public string percentage1 { get; set; }
public string percentage2 { get; set; }
public string acquired_knowledge { get; set; }
public string detail { get; set; }
public string detail1 { get; set; }
public string detail2 { get; set; }
public string clause4 { get; set; }
public decimal? expenses { get; set; }
}