kamonwantaengsuk/rmutr_report
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

50
Models/RoReport/teaching_fee_extra_ro_three.cs Normal file
View File

@@ -0,0 +1,50 @@
using System.Collections.Generic;
namespace rmutr_report.Models.RoThree
{
public class teaching_fee_extra_ro_three
{
public string budget_year { get; set; }
public string product { get; set; }
public string agency_name_th { get; set; }
public string sector { get; set; }
public string area { get; set; }
public string year { get; set; }
public string semester { get; set; }
public List<teaching_fee_extra_ro_three_data> data { get; set; }
public decimal? month_1 { get; set; }
public decimal? month_2 { get; set; }
public decimal? month_3 { get; set; }
public decimal? month_4 { get; set; }
public decimal? month_5 { get; set; }
public decimal? month_6 { get; set; }
public decimal? month_7 { get; set; }
public decimal? month_8 { get; set; }
public decimal? month_9 { get; set; }
public decimal? month_10 { get; set; }
public decimal? month_11 { get; set; }
public decimal? month_12 { get; set; }
public decimal? total { get; set; }
}
public class teaching_fee_extra_ro_three_data
{
public string row_no { get; set; }
public string display_name { get; set; }
public string position { get; set; }
public string subject { get; set; }
public decimal? month_1 { get; set; }
public decimal? month_2 { get; set; }
public decimal? month_3 { get; set; }
public decimal? month_4 { get; set; }
public decimal? month_5 { get; set; }
public decimal? month_6 { get; set; }
public decimal? month_7 { get; set; }
public decimal? month_8 { get; set; }
public decimal? month_9 { get; set; }
public decimal? month_10 { get; set; }
public decimal? month_11 { get; set; }
public decimal? month_12 { get; set; }
public decimal? total { get; set; }
}
}

76
Models/RoReport/teaching_fee_ro_three.cs
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; }
}
}

2
Models/budget/project_principle_rationale.cs
View File

@@ -47,7 +47,6 @@ 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 string budget_unit_name_th { get; set; }//ข้อ 16
public string text1 { get; set; } //ข้อ 16
public string text2 { get; set; } //ข้อ 16
public string operational_activitie { get; set; }//ข้อ 15 ง.5-3
@@ -155,6 +154,7 @@ namespace rmutr_report.Models
public class sixteenth_data_detail
{
public string activity_table { get; set; }
public string budget_unit_name_th { get; set; }
public List<sixteenth_data_details> sixteenths2 { get; set; }
public decimal? salaya_total { get; set; }