diff --git a/Models/Hrregister/hr_offer_insignia.cs b/Models/Hrregister/hr_offer_insignia.cs new file mode 100644 index 0000000..10ab45e --- /dev/null +++ b/Models/Hrregister/hr_offer_insignia.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; + +namespace rmutr_report.Models.Hrregister +{ + public class hr_offer_insignia + { + public string year_name_th { get; set; } + public List data { get; set; } + public string money { get; set; } + } + + public class hr_offer_insignia_detail + { + public string insignia_class { get; set; } + public string display_name_th { get; set; } + public string position_level { get; set; } + public string hold_position_date { get; set; } + public decimal? salary { get; set; } + public string position_current { get; set; } + public string insignia_receive { get; set; } + public string insignia_receive_date { get; set; } + public string insignia_request { get; set; } + public string note { get; set; } + } +} \ No newline at end of file diff --git a/Models/Hrregister/hr_position_manage.cs b/Models/Hrregister/hr_position_manage.cs index 32cdd9b..94d2df6 100644 --- a/Models/Hrregister/hr_position_manage.cs +++ b/Models/Hrregister/hr_position_manage.cs @@ -14,7 +14,6 @@ namespace rmutr_report.Models.Hrregister public List summary { get; set; } public string total1 { get; set; } public string total2 { get; set; } - public string text { get; set; } } diff --git a/wwwroot/reports/hr_position_academic.frx b/wwwroot/reports/hr_position_academic.frx index 72ae249..c63177c 100644 --- a/wwwroot/reports/hr_position_academic.frx +++ b/wwwroot/reports/hr_position_academic.frx @@ -1,5 +1,5 @@  - + @@ -7,7 +7,6 @@ - @@ -61,7 +60,7 @@ - + @@ -84,19 +83,21 @@ - - - - - - - - - - - + + + + + + + + + + + + + - + @@ -109,6 +110,5 @@ -