diff --git a/Models/RoReport/form_1_1.cs b/Models/RoReport/form_1_1.cs index a8b6f27..bfba110 100644 --- a/Models/RoReport/form_1_1.cs +++ b/Models/RoReport/form_1_1.cs @@ -9,8 +9,8 @@ namespace rmutr_report.Models.RoThree [Key] public Guid? budget_income_qualification_uid { get; set; } public Guid? budget_year_uid { get; set; } public int? budget_income_qualification_no { get; set; } + public string qualification_no { get; set; } public DateTime? budget_income_qualification_date { get; set; } - public string budget_income_qualification_dates { get; set; } public string budget_income_qualification_topic { get; set; } public string budget_income_qualification_dear { get; set; } public string first_name { get; set; } @@ -19,34 +19,27 @@ namespace rmutr_report.Models.RoThree public string position_name { get; set; } public Guid? agency_uid { get; set; } public Guid? budget_plan_uid { get; set; } - public Guid? budget_project_uid { get; set; } - - // - public string college_faculty_name_th { get; set; } - public string budget_project_name_th { get; set; } - public DateTime? budget_project_date { get; set; } - public string day_budget_project { get; set; } - public string month_budget_project { get; set; } - public string year_budget_project { get; set; } public int? budget_project_time_year { get; set; } public int? budget_project_time_month { get; set; } - public string due_to { get; set; } //เนื่องจาก + public Guid? faculty_uid { get; set; } public Guid? current_position_uid { get; set; } public Guid? new_position_uid { get; set; } public Guid? current_qualification_uid { get; set; } - public Guid? new_qualification_uid { get; set; } - - // - public string current_position { get; set; } - public string new_position { get; set; } - public string current_qualification { get; set; } - public string new_qualification { get; set; } [Column(TypeName = "decimal(18,2)")] public decimal? current_salary { get; set; } [Column(TypeName = "decimal(18,2)")] public decimal? new_salary { get; set; } public string budget_income_qualification_file_1 { get; set; } public string budget_income_qualification_file_2 { get; set; } + public string due_to { get; set; } + public int? current_education_level_id { get; set; } + public int? new_education_level_id { get; set; } + public string current_position { get; set; } + public string new_position { get; set; } + public string current_qualification { get; set; } + + public string new_qualification { get; set; } + public string remark { get; set; } } } \ No newline at end of file diff --git a/wwwroot/reports/change_position_offer_request_form.frx b/wwwroot/reports/change_position_offer_request_form.frx index 4b34761..8888ca9 100644 --- a/wwwroot/reports/change_position_offer_request_form.frx +++ b/wwwroot/reports/change_position_offer_request_form.frx @@ -1,5 +1,5 @@  - + @@ -35,7 +35,6 @@ - @@ -60,7 +59,6 @@ - @@ -135,6 +133,9 @@ + + + diff --git a/wwwroot/reports/new_rate_offer_request_form.frx b/wwwroot/reports/new_rate_offer_request_form.frx index 43cffdc..d35ee1b 100644 --- a/wwwroot/reports/new_rate_offer_request_form.frx +++ b/wwwroot/reports/new_rate_offer_request_form.frx @@ -1,5 +1,5 @@  - + @@ -58,7 +58,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -200,12 +200,12 @@ - - + + - + diff --git a/wwwroot/reports/qualifications_offer_request_form.frx b/wwwroot/reports/qualifications_offer_request_form.frx index 635fef9..8611607 100644 --- a/wwwroot/reports/qualifications_offer_request_form.frx +++ b/wwwroot/reports/qualifications_offer_request_form.frx @@ -1,7 +1,8 @@  - + + @@ -21,7 +22,7 @@ - + @@ -36,8 +37,8 @@ - - + + @@ -51,7 +52,7 @@ - + @@ -64,7 +65,7 @@ - + @@ -74,8 +75,8 @@ - - + + @@ -169,6 +170,7 @@ +