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

This commit is contained in:
kamonwan taengsuk
2023-11-21 16:13:10 +07:00
parent f7cd049397
commit b2820e7ac7
29 changed files with 585 additions and 1535 deletions

View File

@@ -4,19 +4,17 @@ namespace rmutr_report.Models.RoThree
{
public class teaching_fee_ro_three
{
public string budget_year_1 { get; set; }
public string date_range_1 { get; set; }
public string product_1 { get; set; }
public string semester_1 { get; set; }
public string academic_year_1 { get; set; }
public string agency_name_th_1 { get; set; }
public string sector_1 { get; set; }
public string disbursement_result_year_1 { get; set; }
public string disbursement_result_semester_1 { get; set; }
public string budget_year { get; set; }
public string date_range { get; set; }
public string product { get; set; }
public string semester { get; set; }
public string academic_year { get; set; }
public string agency_name_th { get; set; }
public string sector { get; set; }
public string disbursement_result_year { get; set; }
public string disbursement_result_semester { get; set; }
public List<teaching_fee_ro_three_data_1> data_1 { get; set; }
//
public List<teaching_fee_ro_three_data> data { get; set; }
public decimal? table_1_ba_1 { get; set; }
public decimal? table_1_ma_1 { get; set; }
public decimal? table_1_ba_2 { get; set; }
@@ -26,55 +24,9 @@ namespace rmutr_report.Models.RoThree
public decimal? table_1_teaching_fee_1 { get; set; }
public decimal? table_1_teaching_fee_2 { get; set; }
public decimal? table_1_total { get; set; }
public string budget_year_2 { get; set; }
public string date_range_2 { get; set; }
public string product_2 { get; set; }
public string semester_2 { get; set; }
public string academic_year_2 { get; set; }
public string agency_name_th_2 { get; set; }
public string sector_2 { get; set; }
public string disbursement_result_year_2 { get; set; }
public string disbursement_result_semester_2 { get; set; }
public List<teaching_fee_ro_three_data_1> data_2 { get; set; }
//
public decimal? table_2_ba_1 { get; set; }
public decimal? table_2_ma_1 { get; set; }
public decimal? table_2_ba_2 { get; set; }
public decimal? table_2_ma_2 { get; set; }
public decimal? table_2_ba_3 { get; set; }
public decimal? table_2_ma_3 { get; set; }
public decimal? table_2_teaching_fee_1 { get; set; }
public decimal? table_2_teaching_fee_2 { get; set; }
public decimal? table_2_total { get; set; }
public string budget_year_3 { get; set; }
public string date_range_3 { get; set; }
public string product_3 { get; set; }
public string semester_3 { get; set; }
public string academic_year_3 { get; set; }
public string agency_name_th_3 { get; set; }
public string sector_3 { get; set; }
public string disbursement_result_year_3 { get; set; }
public string disbursement_result_semester_3 { get; set; }
public List<teaching_fee_ro_three_data_1> data_3 { get; set; }
//
public decimal? table_3_ba_1 { get; set; }
public decimal? table_3_ma_1 { get; set; }
public decimal? table_3_ba_2 { get; set; }
public decimal? table_3_ma_2 { get; set; }
public decimal? table_3_ba_3 { get; set; }
public decimal? table_3_ma_3 { get; set; }
public decimal? table_3_teaching_fee_1 { get; set; }
public decimal? table_3_teaching_fee_2 { get; set; }
public decimal? table_3_total { get; set; }
}
public class teaching_fee_ro_three_data_1
public class teaching_fee_ro_three_data
{
public string display_name { get; set; }
public string position { get; set; }
@@ -85,8 +37,8 @@ namespace rmutr_report.Models.RoThree
public decimal? number_of_hours_ma_2 { get; set; }
public decimal? number_of_hours_ba_3 { get; set; }
public decimal? number_of_hours_ma_3 { get; set; }
public decimal? excess_teaching_fee_1 { get; set; }
public decimal? excess_teaching_fee_2 { get; set; }
public decimal? teaching_fee_1 { get; set; }
public decimal? teaching_fee_2 { get; set; }
public decimal? total { get; set; }
}
}