diff --git a/Controllers/GovernmentBudget.Controller.cs b/Controllers/GovernmentBudget.Controller.cs index e974ce2..ee48f67 100644 --- a/Controllers/GovernmentBudget.Controller.cs +++ b/Controllers/GovernmentBudget.Controller.cs @@ -1022,6 +1022,46 @@ namespace rmutr_report.Controllers { detail.total_amount = (detail.amount + detail.car_act); } + switch (detail.month) + { + case 1: + detail.month_th = "มกราคม"; + break; + case 2: + detail.month_th = "กุมภาพันธ์"; + break; + case 3: + detail.month_th = "มีนาคม"; + break; + case 4: + detail.month_th = "เมษายน"; + break; + case 5: + detail.month_th = "พฤษภาคม"; + break; + case 6: + detail.month_th = "มิถุนายน"; + break; + case 7: + detail.month_th = "กรกฎาคม"; + break; + case 8: + detail.month_th = "สิงหาคม"; + break; + case 9: + detail.month_th = "กันยายน"; + break; + case 10: + detail.month_th = "ตุลาคม"; + break; + case 11: + detail.month_th = "พฤศจิกายน"; + break; + case 12: + detail.month_th = "ธันวาคม"; + break; + } + } var _insurances = new List() { insurances }; diff --git a/Models/budget/budget_progress_insurances.cs b/Models/budget/budget_progress_insurances.cs index 14254c9..a778a04 100644 --- a/Models/budget/budget_progress_insurances.cs +++ b/Models/budget/budget_progress_insurances.cs @@ -13,7 +13,8 @@ namespace rmutr_report.Models public string car_number { get; set; } public decimal? amount { get; set; } public decimal? car_act { get; set; } - public string month { get; set; } + public int? month { get; set; } + public string month_th { get; set; } public decimal? total_amount { get; set; } } } \ No newline at end of file diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index fb4c05c..432e961 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 98125ac..c07703e 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index fb4c05c..432e961 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 98125ac..c07703e 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 89eaa16..9f761de 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16983176231557303 \ No newline at end of file +16983221242759201 \ No newline at end of file diff --git a/wwwroot/reports/budget_progress_insurances.frx b/wwwroot/reports/budget_progress_insurances.frx index 1f01013..0a455b5 100644 --- a/wwwroot/reports/budget_progress_insurances.frx +++ b/wwwroot/reports/budget_progress_insurances.frx @@ -1,11 +1,12 @@  - + - + + @@ -48,7 +49,7 @@ - +