bug fixed
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
kamonwan taengsuk
2023-09-04 12:50:47 +07:00
parent 9988205756
commit 1f02279f23
14 changed files with 1089 additions and 135 deletions

View File

@@ -56,9 +56,12 @@ namespace rmutr_report.Models
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
public List<twenty_one_data_activity1> twenty_one_activity1 { get; set; } //ข้อ 21 มีหลายกิจกรรม
public List<twenty_one_data_activity2> twenty_one_activity2 { get; set; } //ข้อ 21 มีหลายกิจกรรม
public List<twenty_one_data_activity3> twenty_one_activity3 { get; set; } //ข้อ 21 มีหลายกิจกรรม
// public List<twenty_one_data_activity1> twenty_one_activity1 { get; set; } //ข้อ 21 มีหลายกิจกรรม
// public List<twenty_one_data_activity2> twenty_one_activity2 { get; set; } //ข้อ 21 มีหลายกิจกรรม
// public List<twenty_one_data_activity3> twenty_one_activity3 { get; set; } //ข้อ 21 มีหลายกิจกรรม
public string text4 { get; set; } //ข้อ 21
public string text5 { get; set; } //ข้อ 21
public string text6 { get; set; } //ข้อ 21
public List<twenty_two_data> twenty_two { get; set; } //ข้อ 22
public List<twenty_three_data> twenty_three { get; set; } //ข้อ 23
public List<twenty_four_data> twenty_four { get; set; } //ข้อ 24
@@ -368,6 +371,12 @@ namespace rmutr_report.Models
}
public class twenty_one_data
{
public string activity { get; set; }
public List<twenty_one_data_detail> twenty_ones { get; set; }
}
public class twenty_one_data_detail
{
public string text1 { get; set; }
public string text2 { get; set; }
@@ -394,84 +403,85 @@ namespace rmutr_report.Models
public string clause2 { get; set; }
public string project_start_date { get; set; }
public string project_end_date { get; set; }
public string range { get; set; }
public string percentage_finish { get; set; }
public string clause3 { get; set; }
public string percentage1 { get; set; }
public string percentage2 { get; set; }
public string acquired_knowledge { get; set; }
public string detail1 { get; set; }
public string detail2 { get; set; }
public string clause4 { get; set; }
public decimal? expenses { get; set; }
}
public class twenty_one_data_activity1
{
public string clause1 { get; set; }
public string count_quantitative { get; set; }
public string khrang1 { get; set; }
public string text1 { get; set; }
public string count_unit { get; set; }
public string nuai_nap { get; set; }
public string text2 { get; set; }
public string count_project { get; set; }
public string khrang2 { get; set; }
public string text3 { get; set; }
public string count_training { get; set; }
public string rueang { get; set; }
public string text4 { get; set; }
public string count_knowledge { get; set; }
public string khrang3 { get; set; }
public List<twenty_one_data_activity1_detail> twenty_one_data_activity1_detail { get; set; }
}
public class twenty_one_data_activity1_detail
{
public string activity_clause1 { get; set; }
public string text1 { get; set; }
public string count_unit { get; set; }
public string nuai_nap { get; set; }
public string text2 { get; set; }
public string count_project { get; set; }
public string khrang2 { get; set; }
public string text3 { get; set; }
public string count_training { get; set; }
public string rueang { get; set; }
public string text4 { get; set; }
public string count_knowledge { get; set; }
public string khrang3 { get; set; }
}
public class twenty_one_data_activity2
{
public string clause2 { get; set; }
public string activity_clause2 { get; set; }
public string text5 { get; set; }
public string project_start_date { get; set; }
public string project_end_date { get; set; }
public string text6 { get; set; }
public string percentage_finish { get; set; }
}
public class twenty_one_data_activity3
{
public string text7 { get; set; }
public string text8 { get; set; }
public string text9 { get; set; }
public string text10 { get; set; }
public string clause3 { get; set; }
public string percentage1 { get; set; }
public string percentage2 { get; set; }
public string acquired_knowledge { get; set; }
public string detail1 { get; set; }
public string detail2 { get; set; }
public string detail { get; set; }
//public string detail2 { get; set; }
public string clause4 { get; set; }
public decimal? expenses { get; set; }
public string bath { get; set; }
}
// public class twenty_one_data_activity1
// {
// public string clause1 { get; set; }
// public string count_quantitative { get; set; }
// public string khrang1 { get; set; }
// public string text1 { get; set; }
// public string count_unit { get; set; }
// public string nuai_nap { get; set; }
// public string text2 { get; set; }
// public string count_project { get; set; }
// public string khrang2 { get; set; }
// public string text3 { get; set; }
// public string count_training { get; set; }
// public string rueang { get; set; }
// public string text4 { get; set; }
// public string count_knowledge { get; set; }
// public string khrang3 { get; set; }
// public List<twenty_one_data_activity1_detail> twenty_one_data_activity1_detail { get; set; }
//
// }
//
// public class twenty_one_data_activity1_detail
// {
// public string activity_clause1 { get; set; }
// public string text1 { get; set; }
// public string count_unit { get; set; }
// public string nuai_nap { get; set; }
// public string text2 { get; set; }
// public string count_project { get; set; }
// public string khrang2 { get; set; }
// public string text3 { get; set; }
// public string count_training { get; set; }
// public string rueang { get; set; }
// public string text4 { get; set; }
// public string count_knowledge { get; set; }
// public string khrang3 { get; set; }
// }
// public class twenty_one_data_activity2
// {
// public string clause2 { get; set; }
// public string activity_clause2 { get; set; }
//
// public string text5 { get; set; }
// public string project_start_date { get; set; }
// public string project_end_date { get; set; }
//
// public string text6 { get; set; }
// public string percentage_finish { get; set; }
//
// }
// public class twenty_one_data_activity3
// {
//
// public string text7 { get; set; }
// public string text8 { get; set; }
// public string text9 { get; set; }
// public string text10 { get; set; }
// public string clause3 { get; set; }
// public string percentage1 { get; set; }
// public string percentage2 { get; set; }
// public string acquired_knowledge { get; set; }
// public string detail1 { get; set; }
// public string detail2 { get; set; }
// public string clause4 { get; set; }
// public decimal? expenses { get; set; }
// public string bath { get; set; }
// }
public class twenty_two_data
{
public string list { get; set; }