diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index faf6d53..e3f653b 100644 --- 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() { 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(); diff --git a/Controllers/RoFive.Controller.cs b/Controllers/RoFive.Controller.cs index 0013f15..a669fe0 100644 --- 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() { 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) diff --git a/Models/RoReport/compensation_head.cs b/Models/RoReport/compensation_head.cs index 17a3efe..390d8bd 100644 --- 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 data { get; set; } - } public class compensation_head_detail diff --git a/Models/RoReport/form_1_1.cs b/Models/RoReport/form_1_1.cs index 15f1fca..a8b6f27 100644 --- 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; } } diff --git a/Models/RoReport/form_1_2.cs b/Models/RoReport/form_1_2.cs index 35fcee3..b695055 100644 --- 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; } diff --git a/Models/RoReport/form_1_3.cs b/Models/RoReport/form_1_3.cs index dc7fc1f..9ba9e91 100644 --- 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,11 +130,12 @@ namespace rmutr_report.Models.RoThree // public int? row { get; set; } + // public decimal? quantity { get; set; } public List files { get; set; } } - + public class t_form_1_3_files { [Key] public Guid? form_1_3_files_uid { get; set; } diff --git a/Models/RoReport/material_education.cs b/Models/RoReport/material_education.cs index 6732fef..f514212 100644 --- a/Models/RoReport/material_education.cs +++ b/Models/RoReport/material_education.cs @@ -10,99 +10,107 @@ 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; } - public decimal? semester_year_1_level_3 { get; set; } - public decimal? semester_year_1_level_4 { get; set; } - public decimal? semester_year_1_level_5 { get; set; } + public decimal? semester_year_1_level_1 { get; set; } + public decimal? semester_year_1_level_2 { get; set; } + public decimal? semester_year_1_level_3 { get; set; } + public decimal? semester_year_1_level_4 { get; set; } + 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? 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; } - public decimal? semester_year_2_level_3 { get; set; } - public decimal? semester_year_2_level_4 { get; set; } - public decimal? semester_year_2_level_5 { get; set; } + public decimal? semester_year_2_level_1 { get; set; } + public decimal? semester_year_2_level_2 { get; set; } + public decimal? semester_year_2_level_3 { get; set; } + public decimal? semester_year_2_level_4 { get; set; } + public decimal? semester_year_2_level_5 { get; set; } public decimal? total_semester_year_level_2 { get; set; } - public decimal? rate_semester_year_level_2 { get; set; } - public decimal? material_amount_2 { get; set; } - public decimal? total_material { get; set; } - public List data_1 { get; set; } + public decimal? rate_semester_year_level_2 { get; set; } + public decimal? material_amount_2 { get; set; } + public decimal? total_material { get; set; } + public List data_1 { get; set; } } public class material_education_detail1 { - public string education_level { get; set; } - public decimal? semester_year_1_level_1 { get; set; } - public decimal? semester_year_1_level_2 { get; set; } - public decimal? semester_year_1_level_3 { get; set; } - public decimal? semester_year_1_level_4 { get; set; } - public decimal? semester_year_1_level_5 { get; set; } + public string education_level { get; set; } + public decimal? semester_year_1_level_1 { get; set; } + public decimal? semester_year_1_level_2 { get; set; } + public decimal? semester_year_1_level_3 { get; set; } + public decimal? semester_year_1_level_4 { get; set; } + 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; } - public decimal? semester_year_2_level_3 { get; set; } - public decimal? semester_year_2_level_4 { get; set; } - public decimal? semester_year_2_level_5 { get; set; } - public decimal? total_semester_year_level_2 { get; set; } - public decimal? rate_semester_year_level_2 { get; set; } - public decimal? material_amount_2 { get; set; } - public decimal? total_material { get; set; } - public List data_2 { 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; } + public decimal? semester_year_2_level_3 { get; set; } + public decimal? semester_year_2_level_4 { get; set; } + public decimal? semester_year_2_level_5 { get; set; } + public decimal? total_semester_year_level_2 { get; set; } + public decimal? rate_semester_year_level_2 { get; set; } + public decimal? material_amount_2 { get; set; } + public decimal? total_material { get; set; } + public List data_2 { get; set; } } public class material_education_detail2 { - public string curriculum { get; set; } - public decimal? semester_year_1_level_1 { get; set; } - public decimal? semester_year_1_level_2 { get; set; } - public decimal? semester_year_1_level_3 { get; set; } - public decimal? semester_year_1_level_4 { get; set; } - public decimal? semester_year_1_level_5 { get; set; } + public string curriculum { get; set; } + public decimal? semester_year_1_level_1 { get; set; } + public decimal? semester_year_1_level_2 { get; set; } + public decimal? semester_year_1_level_3 { get; set; } + public decimal? semester_year_1_level_4 { get; set; } + 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; } - public decimal? semester_year_2_level_3 { get; set; } - public decimal? semester_year_2_level_4 { get; set; } - public decimal? semester_year_2_level_5 { get; set; } - public decimal? total_semester_year_level_2 { get; set; } - public decimal? rate_semester_year_level_2 { get; set; } - public decimal? material_amount_2 { get; set; } - public decimal? total_material { get; set; } - public List data_3 { 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; } + public decimal? semester_year_2_level_3 { get; set; } + public decimal? semester_year_2_level_4 { get; set; } + public decimal? semester_year_2_level_5 { get; set; } + public decimal? total_semester_year_level_2 { get; set; } + public decimal? rate_semester_year_level_2 { get; set; } + public decimal? material_amount_2 { get; set; } + public decimal? total_material { get; set; } + public List data_3 { get; set; } } public class material_education_detail3 { - public string major { get; set; } - public decimal? semester_year_1_level_1 { get; set; } - public decimal? semester_year_1_level_2 { get; set; } - public decimal? semester_year_1_level_3 { get; set; } - public decimal? semester_year_1_level_4 { get; set; } - public decimal? semester_year_1_level_5 { get; set; } + public string major { get; set; } + public decimal? semester_year_1_level_1 { get; set; } + public decimal? semester_year_1_level_2 { get; set; } + public decimal? semester_year_1_level_3 { get; set; } + public decimal? semester_year_1_level_4 { get; set; } + 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? 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; } - public decimal? semester_year_2_level_3 { get; set; } - public decimal? semester_year_2_level_4 { get; set; } - public decimal? semester_year_2_level_5 { get; set; } + public decimal? semester_year_2_level_1 { get; set; } + public decimal? semester_year_2_level_2 { get; set; } + public decimal? semester_year_2_level_3 { get; set; } + public decimal? semester_year_2_level_4 { get; set; } + public decimal? semester_year_2_level_5 { get; set; } public decimal? total_semester_year_level_2 { get; set; } - public decimal? rate_semester_year_level_2 { get; set; } - public decimal? material_amount_2 { get; set; } - public decimal? total_material { get; set; } + public decimal? rate_semester_year_level_2 { get; set; } + public decimal? material_amount_2 { get; set; } + public decimal? total_material { get; set; } } } \ No newline at end of file diff --git a/Models/RoReport/material_fuel_lubricant.cs b/Models/RoReport/material_fuel_lubricant.cs index 4cf4404..d71fe59 100644 --- a/Models/RoReport/material_fuel_lubricant.cs +++ b/Models/RoReport/material_fuel_lubricant.cs @@ -8,15 +8,14 @@ namespace rmutr_report.Models.RoThree public string agency_name_th { get; set; } public string sector { get; set; } public decimal? total_amount { get; set; } - public List data { get; set; } + public List data { get; set; } } public class material_fuel_lubricant_detail { public string type { get; set; } public decimal? total_amount { get; set; } - public List data_detail { get; set; } - + public List data_detail { get; set; } } public class material_fuel_lubricant_data_detail diff --git a/Models/RoReport/material_ro_three.cs b/Models/RoReport/material_ro_three.cs index 4d99256..d1afd31 100644 --- 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; } - } + } } \ No newline at end of file diff --git a/Models/RoReport/operating_budget_ro_three.cs b/Models/RoReport/operating_budget_ro_three.cs index 1f4ddc7..223a7c4 100644 --- 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 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 data_2{ get; set; } - + public List 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 data_3{ get; set; } - + public List 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 data_4{ get; set; } - + public List data_4 { get; set; } } public class operating_budget_ro_three_detail4 @@ -69,6 +64,6 @@ namespace rmutr_report.Models.RoThree public decimal? quantity_2 { get; set; } public decimal? rate { get; set; } public decimal? total_amount { get; set; } - public string remark { get; set; } + public string remark { get; set; } } } \ No newline at end of file diff --git a/Models/RoReport/revenue_estimate_education_fee.cs b/Models/RoReport/revenue_estimate_education_fee.cs index cc1ec3f..2871425 100644 --- 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 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 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 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 data_3 { get; set; } - - } + public class revenue_estimate_education_fee_detail3 { public string topic_code { get; set; } diff --git a/Models/RoReport/revenue_estimate_income_summary.cs b/Models/RoReport/revenue_estimate_income_summary.cs index c12cf39..b806427 100644 --- 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 data{ get; set; } + public string education_semester_year_2 { get; set; } + public List 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; } - } } \ No newline at end of file diff --git a/Models/RoReport/teaching_fee_ro_three.cs b/Models/RoReport/teaching_fee_ro_three.cs index 2d03b8d..d6cdc4f 100644 --- a/Models/RoReport/teaching_fee_ro_three.cs +++ b/Models/RoReport/teaching_fee_ro_three.cs @@ -13,8 +13,9 @@ namespace rmutr_report.Models.RoThree public string sector_1 { get; set; } public string disbursement_result_year_1 { get; set; } public string disbursement_result_semester_1 { get; set; } - + public List data_1 { get; set; } + // public decimal? table_1_ba_1 { get; set; } public decimal? table_1_ma_1 { get; set; } @@ -25,7 +26,7 @@ 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; } @@ -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 data_2 { get; set; } + // public decimal? table_2_ba_1 { get; set; } public decimal? table_2_ma_1 { get; set; } @@ -46,7 +49,7 @@ namespace rmutr_report.Models.RoThree 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; } @@ -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 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 diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 3921fc3..2ed54e7 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 a6f1555..7d01e43 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.csproj.FileListAbsolute.txt b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.FileListAbsolute.txt index 266fba5..3e53e9d 100644 --- 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 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 3921fc3..2ed54e7 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.genruntimeconfig.cache b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache index 572029b..ddb6a89 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache @@ -1 +1 @@ -f530878fb081af78ff5e77410efde9fbbaab91cc +9100175b74d683f6c7d65447027cdf445467204a diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index a6f1555..7d01e43 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 f27c53d..106508c 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16911390038740016 \ No newline at end of file +16911428465191941 \ No newline at end of file diff --git a/wwwroot/reports/revenue_estimate_education_fee.frx b/wwwroot/reports/revenue_estimate_education_fee.frx index a0c938d..a076805 100644 --- a/wwwroot/reports/revenue_estimate_education_fee.frx +++ b/wwwroot/reports/revenue_estimate_education_fee.frx @@ -1,5 +1,5 @@  - + @@ -12,7 +12,7 @@ - + @@ -114,8 +114,8 @@ - - + + @@ -228,7 +228,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -329,7 +329,7 @@ - + @@ -376,14 +376,14 @@ - + - +