bug fixed

2023-08-04 16:55:05 +07:00
parent 6e389605d9
commit bc55d24121
21 changed files with 224 additions and 124 deletions
--- a/Controllers/Budget.Controller.cs
+++ b/Controllers/Budget.Controller.cs
@@ -33,7 +33,6 @@ namespace rmutr_report.Controllers
        {
            foreach (var x in budget_reports)
            {
-                
                int sum1 = budget_reports.Sum(g => int.Parse(g.salaya));
                x.sum1 = sum1;
                int sum2 = budget_reports.Sum(g => int.Parse(g.bophitphimuk));
@@ -2793,7 +2792,7 @@ namespace rmutr_report.Controllers
                {
                    detail.row_no = null;
                }
-                }
+            }

            var summaryBudget = new List<summary_subsidy_projects>() { budget };

@@ -2819,7 +2818,7 @@ namespace rmutr_report.Controllers
                    return File(
                        stream,
                        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-                        "project_summary_subsidy"  + ".xlsx");
+                        "project_summary_subsidy" + ".xlsx");
            }

            return Ok();
--- a/Controllers/RoFive.Controller.cs
+++ b/Controllers/RoFive.Controller.cs
@@ -613,6 +613,16 @@ namespace rmutr_report.Controllers
        public IActionResult GetEstimateReport([FromRoute] string type,
            [FromBody] revenue_estimate_education_fee estimate)
        {
+            if (estimate.budget_project_name_th != null)
+            {
+                string myStr = estimate.budget_project_name_th;
+                string[] projectname = myStr.Split("ผู้สำเร็จการศึกษา");
+                foreach (string projectnames in projectname)
+                {
+                    estimate.side = projectnames;
+                }
+            }
+
            var estimateEducation = new List<revenue_estimate_education_fee>() { estimate };

            Report report = new Report();
@@ -4284,15 +4294,17 @@ namespace rmutr_report.Controllers

            return Ok();
        }
-         [HttpPost, Route("reports/budget_income_qualification/{type}")]
+
+        [HttpPost, Route("reports/budget_income_qualification/{type}")]
        [ApiExplorerSettings(GroupName = "reports")]
        public IActionResult GetForm1Report([FromRoute] string type,
            [FromBody] form_1_1 form1)
        {
-            if (form1.budget_income_qualification_date!=null)
+            if (form1.budget_income_qualification_date != null)
            {
-                form1.budget_income_qualification_dates = form1.budget_income_qualification_date.Value.ToString("dd MMMM yyyy", CultureInfo.CreateSpecificCulture("th-TH"));
- 
+                form1.budget_income_qualification_dates =
+                    form1.budget_income_qualification_date.Value.ToString("dd MMMM yyyy",
+                        CultureInfo.CreateSpecificCulture("th-TH"));
            }

            if (form1.budget_project_date != null)
--- a/Models/RoReport/compensation_head.cs
+++ b/Models/RoReport/compensation_head.cs
@@ -11,7 +11,6 @@ namespace rmutr_report.Models.RoThree
        public string sector { get; set; }
        public decimal? total_amount { get; set; }
        public List<compensation_head_detail> data { get; set; }
-
    }

    public class compensation_head_detail
--- a/Models/RoReport/form_1_1.cs
+++ b/Models/RoReport/form_1_1.cs
@@ -19,7 +19,9 @@ 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; }
@@ -34,16 +36,16 @@ namespace rmutr_report.Models.RoThree
        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 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; }
+        [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; }
    }
--- a/Models/RoReport/form_1_2.cs
+++ b/Models/RoReport/form_1_2.cs
@@ -54,6 +54,7 @@ namespace rmutr_report.Models.RoThree
        public decimal? salary { get; set; }

        public string new_position { get; set; }
+
        //
        public Guid? budget_project_uid { get; set; }
        public Guid? budget_plan_uid { get; set; }
--- a/Models/RoReport/form_1_3.cs
+++ b/Models/RoReport/form_1_3.cs
@@ -55,6 +55,7 @@ namespace rmutr_report.Models.RoThree

        //
        public string another_document_remark { get; set; }
+
        //
        public string budget_year { get; set; }
        public string agency_category_name { get; set; }
@@ -129,6 +130,7 @@ namespace rmutr_report.Models.RoThree

        //
        public int? row { get; set; }
+
        //
        public decimal? quantity { get; set; }
        public List<t_form_1_3_files> files { get; set; }
--- a/Models/RoReport/material_education.cs
+++ b/Models/RoReport/material_education.cs
@@ -10,7 +10,9 @@ namespace rmutr_report.Models.RoThree
        public string semester_year_1 { get; set; }
        public string semester_year_2 { get; set; }
        public string material_semester_year_1 { get; set; }
+
        public string material_semester_year_2 { get; set; }
+
        // 
        public decimal? semester_year_1_level_1 { get; set; }
        public decimal? semester_year_1_level_2 { get; set; }
@@ -19,7 +21,9 @@ namespace rmutr_report.Models.RoThree
        public decimal? semester_year_1_level_5 { get; set; }
        public decimal? total_semester_year_level_1 { get; set; }
        public decimal? rate_semester_year_level_1 { get; set; }
+
        public decimal? material_amount_1 { get; set; }
+
        //
        public decimal? semester_year_2_level_1 { get; set; }
        public decimal? semester_year_2_level_2 { get; set; }
@@ -43,7 +47,9 @@ namespace rmutr_report.Models.RoThree
        public decimal? semester_year_1_level_5 { get; set; }
        public decimal? total_semester_year_level_1 { get; set; }
        public decimal? rate_semester_year_level_1 { get; set; }
+
        public decimal? material_amount_1 { get; set; }
+
        //
        public decimal? semester_year_2_level_1 { get; set; }
        public decimal? semester_year_2_level_2 { get; set; }
@@ -55,7 +61,6 @@ namespace rmutr_report.Models.RoThree
        public decimal? material_amount_2 { get; set; }
        public decimal? total_material { get; set; }
        public List<material_education_detail2> data_2 { get; set; }
-
    }

    public class material_education_detail2
@@ -68,7 +73,9 @@ namespace rmutr_report.Models.RoThree
        public decimal? semester_year_1_level_5 { get; set; }
        public decimal? total_semester_year_level_1 { get; set; }
        public decimal? rate_semester_year_level_1 { get; set; }
+
        public decimal? material_amount_1 { get; set; }
+
        //
        public decimal? semester_year_2_level_1 { get; set; }
        public decimal? semester_year_2_level_2 { get; set; }
@@ -80,7 +87,6 @@ namespace rmutr_report.Models.RoThree
        public decimal? material_amount_2 { get; set; }
        public decimal? total_material { get; set; }
        public List<material_education_detail3> data_3 { get; set; }
-
    }

    public class material_education_detail3
@@ -93,7 +99,9 @@ namespace rmutr_report.Models.RoThree
        public decimal? semester_year_1_level_5 { get; set; }
        public decimal? total_semester_year_level_1 { get; set; }
        public decimal? rate_semester_year_level_1 { get; set; }
+
        public decimal? material_amount_1 { get; set; }
+
        //
        public decimal? semester_year_2_level_1 { get; set; }
        public decimal? semester_year_2_level_2 { get; set; }
--- a/Models/RoReport/material_fuel_lubricant.cs
+++ b/Models/RoReport/material_fuel_lubricant.cs
@@ -16,7 +16,6 @@ namespace rmutr_report.Models.RoThree
        public string type { get; set; }
        public decimal? total_amount { get; set; }
        public List<material_fuel_lubricant_data_detail> data_detail { get; set; }
-
    }

    public class material_fuel_lubricant_data_detail
--- a/Models/RoReport/material_ro_three.cs
+++ b/Models/RoReport/material_ro_three.cs
@@ -18,5 +18,5 @@ namespace rmutr_report.Models.RoThree
        public decimal? unit_price { get; set; }
        public decimal? material_amount { get; set; }
        public string remark { get; set; }
- }
+    }
 }
--- a/Models/RoReport/operating_budget_ro_three.cs
+++ b/Models/RoReport/operating_budget_ro_three.cs
@@ -12,8 +12,6 @@ namespace rmutr_report.Models.RoThree
        public string disbursement_result_year { get; set; }
        public string set_year { get; set; }
        public List<operating_budget_ro_three_detail> data_1 { get; set; }
-        
-
    }

    public class operating_budget_ro_three_detail
@@ -26,8 +24,7 @@ namespace rmutr_report.Models.RoThree
        public decimal? rate { get; set; }
        public decimal? total_amount { get; set; }
        public string remark { get; set; }
-        public List<operating_budget_ro_three_detail2> data_2{ get; set; }
-
+        public List<operating_budget_ro_three_detail2> data_2 { get; set; }
    }

    public class operating_budget_ro_three_detail2
@@ -41,8 +38,7 @@ namespace rmutr_report.Models.RoThree
        public decimal? rate { get; set; }
        public decimal? total_amount { get; set; }
        public string remark { get; set; }
-        public List<operating_budget_ro_three_detail3> data_3{ get; set; }
-
+        public List<operating_budget_ro_three_detail3> data_3 { get; set; }
    }

    public class operating_budget_ro_three_detail3
@@ -56,8 +52,7 @@ namespace rmutr_report.Models.RoThree
        public decimal? rate { get; set; }
        public decimal? total_amount { get; set; }
        public string remark { get; set; }
-        public List<operating_budget_ro_three_detail4> data_4{ get; set; }
-
+        public List<operating_budget_ro_three_detail4> data_4 { get; set; }
    }

    public class operating_budget_ro_three_detail4
--- a/Models/RoReport/revenue_estimate_education_fee.cs
+++ b/Models/RoReport/revenue_estimate_education_fee.cs
@@ -8,13 +8,11 @@ namespace rmutr_report.Models.RoThree
        public string area { get; set; }
        public string faculty { get; set; }
        public string semester { get; set; }
-        public string year  { get; set; }
-        public string budget_project_name_th  { get; set; }
-public List<revenue_estimate_education_fee_detail1> data_1 { get; set; }
-public string side { get; set; }
-public decimal? total_revenue { get; set; }
-
-
+        public string year { get; set; }
+        public string budget_project_name_th { get; set; }
+        public List<revenue_estimate_education_fee_detail1> data_1 { get; set; }
+        public string side { get; set; }
+        public decimal? total_revenue { get; set; }
    }

    public class revenue_estimate_education_fee_detail1
@@ -22,8 +20,8 @@ public decimal? total_revenue { get; set; }
        public string curriculum { get; set; }
        public decimal? total_curriculum { get; set; }
        public List<revenue_estimate_education_fee_detail2> data_2 { get; set; }
-
    }
+
    public class revenue_estimate_education_fee_detail2
    {
        public string year_class { get; set; }
@@ -41,9 +39,8 @@ public decimal? total_revenue { get; set; }
        public decimal? allocation { get; set; }
        public decimal? total_allocation_amount { get; set; }
        public List<revenue_estimate_education_fee_detail3> data_3 { get; set; }
-
-
    }
+
    public class revenue_estimate_education_fee_detail3
    {
        public string topic_code { get; set; }
--- a/Models/RoReport/revenue_estimate_income_summary.cs
+++ b/Models/RoReport/revenue_estimate_income_summary.cs
@@ -10,8 +10,8 @@ namespace rmutr_report.Models.RoThree
        public string register_semester_year_1 { get; set; }
        public string register_semester_year_2 { get; set; }
        public string education_semester_year_1 { get; set; }
-        public string  education_semester_year_2 { get; set; }
-        public List<revenue_estimate_income_summary_detail> data{ get; set; }
+        public string education_semester_year_2 { get; set; }
+        public List<revenue_estimate_income_summary_detail> data { get; set; }
        public decimal? sum_1 { get; set; }
        public decimal? sum_2 { get; set; }
        public decimal? sum_3 { get; set; }
@@ -31,7 +31,6 @@ namespace rmutr_report.Models.RoThree
        public string test { get; set; }
        public string position_test { get; set; }
        public string test_date { get; set; }
-
    }

    public class revenue_estimate_income_summary_detail
@@ -50,6 +49,5 @@ namespace rmutr_report.Models.RoThree
        public decimal? total_science { get; set; }
        public decimal? total_social { get; set; }
        public decimal? total_science_social { get; set; }
-
    }
 }
--- a/Models/RoReport/teaching_fee_ro_three.cs
+++ b/Models/RoReport/teaching_fee_ro_three.cs
@@ -15,6 +15,7 @@ namespace rmutr_report.Models.RoThree
        public string disbursement_result_semester_1 { get; set; }

        public List<teaching_fee_ro_three_data_1> data_1 { get; set; }
+
        //
        public decimal? table_1_ba_1 { get; set; }
        public decimal? table_1_ma_1 { get; set; }
@@ -35,7 +36,9 @@ namespace rmutr_report.Models.RoThree
        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; }
@@ -56,7 +59,9 @@ namespace rmutr_report.Models.RoThree
        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; }
@@ -67,7 +72,6 @@ namespace rmutr_report.Models.RoThree
        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
--- a/bin/Debug/netcoreapp3.1/rmutr_report.dll
+++ b/bin/Debug/netcoreapp3.1/rmutr_report.dll
--- a/bin/Debug/netcoreapp3.1/rmutr_report.pdb
+++ b/bin/Debug/netcoreapp3.1/rmutr_report.pdb
--- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.FileListAbsolute.txt
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.FileListAbsolute.txt
@@ -82,3 +82,87 @@ C:\Users\USER\Documents\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\win-x64\na
 C:\Users\USER\Documents\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\win-x86\native\sni.dll
 C:\Users\USER\Documents\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\unix\lib\netstandard2.0\System.Data.SqlClient.dll
 C:\Users\USER\Documents\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\win\lib\netstandard2.0\System.Data.SqlClient.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\appsettings.Development.json
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\appsettings.json
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\nuget.config
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\rmutr_report.exe
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\rmutr_report.deps.json
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\rmutr_report.runtimeconfig.json
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\rmutr_report.runtimeconfig.dev.json
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\rmutr_report.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\rmutr_report.pdb
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\rmutr_report.xml
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ClosedXML.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\DocumentFormat.OpenXml.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ExcelNumberFormat.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\FastReport.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.CodeAnalysis.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.CodeAnalysis.CSharp.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.CodeAnalysis.VisualBasic.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.OpenApi.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Swashbuckle.AspNetCore.Annotations.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Swashbuckle.AspNetCore.Swagger.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Swashbuckle.AspNetCore.SwaggerGen.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Swashbuckle.AspNetCore.SwaggerUI.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.Data.SqlClient.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.IO.Packaging.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\cs\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\de\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\es\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\fr\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\it\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ja\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ko\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\pl\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\pt-BR\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ru\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\tr\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\zh-Hans\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\zh-Hant\Microsoft.CodeAnalysis.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\cs\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\de\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\es\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\fr\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\it\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ja\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ko\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\pl\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\pt-BR\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ru\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\tr\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\zh-Hans\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\zh-Hant\Microsoft.CodeAnalysis.CSharp.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\cs\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\de\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\es\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\fr\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\it\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ja\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ko\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\pl\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\pt-BR\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\ru\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\tr\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\zh-Hans\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\zh-Hant\Microsoft.CodeAnalysis.VisualBasic.resources.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\any\lib\netcoreapp3.0\FastReport.Compat.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\any\lib\netcoreapp3.0\FastReport.DataVisualization.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\win-arm64\native\sni.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\win-x64\native\sni.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\win-x86\native\sni.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\unix\lib\netstandard2.0\System.Data.SqlClient.dll
+C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\win\lib\netstandard2.0\System.Data.SqlClient.dll
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.csproj.AssemblyReference.cache
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.AssemblyInfoInputs.cache
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.AssemblyInfo.cs
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.csproj.CoreCompileInputs.cache
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.MvcApplicationPartsAssemblyInfo.cs
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.MvcApplicationPartsAssemblyInfo.cache
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\rmutr_report.StaticWebAssets.Manifest.cache
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.RazorTargetAssemblyInfo.cache
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.csproj.CopyComplete
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.dll
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.xml
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.pdb
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.genruntimeconfig.cache
--- a/obj/Debug/netcoreapp3.1/rmutr_report.dll
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.dll
--- a/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache
@@ -1 +1 @@
-f530878fb081af78ff5e77410efde9fbbaab91cc
+9100175b74d683f6c7d65447027cdf445467204a
--- a/obj/Debug/netcoreapp3.1/rmutr_report.pdb
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.pdb
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-16911390038740016
+16911428465191941
--- a/wwwroot/reports/revenue_estimate_education_fee.frx
+++ b/wwwroot/reports/revenue_estimate_education_fee.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="08/04/2023 14:36:30" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="08/04/2023 16:50:23" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="revenue_estimate_education_fee" ReferenceName="revenue_estimate_education_fee" DataType="null" Enabled="true">
      <Column Name="budget_year" DataType="System.String"/>
@@ -12,7 +12,7 @@
      <Column Name="side" DataType="System.String"/>
      <BusinessObjectDataSource Name="data_1" DataType="System.Int32" Enabled="true">
        <Column Name="curriculum" DataType="System.String"/>
-              <Column Name="total_curriculum" DataType="System.Decimal"/>
+        <Column Name="total_curriculum" DataType="System.Decimal"/>
        <BusinessObjectDataSource Name="data_2" DataType="System.Int32" Enabled="true">
          <Column Name="year_class" DataType="System.String"/>
          <Column Name="code" DataType="System.String"/>
@@ -114,8 +114,8 @@
        </TableRow>
      </TableObject>
    </PageHeaderBand>
-    <DataBand Name="Data1" Top="261.93" Width="2003.4">
-      <DataBand Name="Data2" Top="268.71" Width="2003.4" Height="47.25" DataSource="data_1">
+    <DataBand Name="Data1" Top="262.56" Width="2003.4">
+      <DataBand Name="Data2" Top="269.96" Width="2003.4" Height="47.25" DataSource="data_1">
        <TableObject Name="Table17" Width="2003.4" Height="47.25" Border.Lines="All">
          <TableColumn Name="Column131" Width="37.8"/>
          <TableColumn Name="Column132" Width="274.05"/>
@@ -228,7 +228,7 @@
            <TableCell Name="Cell220" Fill.Color="198, 89, 17" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
          </TableRow>
        </TableObject>
-        <DataBand Name="Data3" Top="322.74" Width="2003.4" Height="47.25" DataSource="data_2">
+        <DataBand Name="Data3" Top="324.62" Width="2003.4" Height="47.25" DataSource="data_2">
          <TableObject Name="Table20" Width="2003.4" Height="47.25" Border.Lines="All">
            <TableColumn Name="Column176" Width="37.8"/>
            <TableColumn Name="Column177" Width="141.75"/>
@@ -278,7 +278,7 @@
              <TableCell Name="Cell250" Fill.Color="255, 255, 221" Text="[revenue_estimate_education_fee.data_1.data_2.total_allocation_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
            </TableRow>
          </TableObject>
-          <DataBand Name="Data4" Top="376.77" Width="2003.4" Height="47.25" DataSource="data_3">
+          <DataBand Name="Data4" Top="379.28" Width="2003.4" Height="47.25" DataSource="data_3">
            <TableObject Name="Table19" Width="2003.4" Height="47.25" Border.Lines="All">
              <TableColumn Name="Column161" Width="37.8"/>
              <TableColumn Name="Column162" Width="141.75"/>
@@ -329,7 +329,7 @@
              </TableRow>
            </TableObject>
          </DataBand>
-          <DataFooterBand Name="DataFooter2" Top="430.8" Width="2003.4" Height="37.8">
+          <DataFooterBand Name="DataFooter2" Top="433.94" Width="2003.4" Height="37.8">
            <TableObject Name="Table21" Width="2003.4" Height="37.8" Border.Lines="All">
              <TableColumn Name="Column191" Width="37.8"/>
              <TableColumn Name="Column192" Width="141.75"/>
@@ -376,14 +376,14 @@
                <TableCell Name="Cell262" Border.Lines="All" Fill.Color="169, 208, 142" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
                <TableCell Name="Cell263" Border.Lines="All" Fill.Color="169, 208, 142" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
                <TableCell Name="Cell264" Border.Lines="All" Fill.Color="169, 208, 142" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-                <TableCell Name="Cell265" Fill.Color="169, 208, 142" Text="[revenue_estimate_education_fee.total_curriculum]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+                <TableCell Fill.Color="169, 208, 142" Text="[revenue_estimate_education_fee.data_1.total_curriculum]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
              </TableRow>
            </TableObject>
          </DataFooterBand>
        </DataBand>
      </DataBand>
    </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="475.38" Width="2003.4" Height="37.8">
+    <ReportSummaryBand Name="ReportSummary1" Top="479.14" Width="2003.4" Height="37.8">
      <TableObject Name="Table22" Width="2003.4" Height="37.8" Border.Lines="All">
        <TableColumn Name="Column206" Width="37.8"/>
        <TableColumn Name="Column207" Width="141.75"/>