diff --git a/Controllers/PlantGeneticConservationProject.Controller.cs b/Controllers/PlantGeneticConservationProject.Controller.cs index 022cb21..4bd162a 100644 --- a/Controllers/PlantGeneticConservationProject.Controller.cs +++ b/Controllers/PlantGeneticConservationProject.Controller.cs @@ -82,6 +82,8 @@ namespace rmutr_report.Controllers if (project.sixteenths != null) { + int t = 1; + string a = "กิจกรรมที่ "; foreach (var sixteenthData in project.sixteenths) { var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); @@ -92,6 +94,8 @@ namespace rmutr_report.Controllers sixteenthData.bophitphimuk_total = sum2; sixteenthData.pohchang_total = sum3; sixteenthData.klai_kangwon_total = sum4; + sixteenthData.activity_table = a + sixteenthData.activity_table; + t++; } } diff --git a/Controllers/RoThree.Controller.cs b/Controllers/RoThree.Controller.cs index 59963a8..ce40c1a 100644 --- a/Controllers/RoThree.Controller.cs +++ b/Controllers/RoThree.Controller.cs @@ -168,15 +168,38 @@ namespace rmutr_report.Controllers [SwaggerOperation("รายงานค่าสอนพิเศษ")] [HttpPost, Route("reports/teaching_fee_extra_ro_three/{type}")] [ApiExplorerSettings(GroupName = "reports")] - public IActionResult GetTeachExReport([FromRoute] string type, [FromBody] teaching_fee_ro_three three) + public IActionResult GetTeachExReport([FromRoute] string type, [FromBody] teaching_fee_extra_ro_three three) { - + var s = three.data.ToList(); + int r = 1; + foreach (var d in three.data) + { + d.row_no = r.ToString(); + r++; + d.total = d.month_1 + d.month_2 + d.month_3 + d.month_4 + d.month_5 + d.month_6 + d.month_7 + + d.month_8 + d.month_9 + + d.month_10 + d.month_11 + d.month_12; - var threes = new List() { three }; + } + three.month_1 = three.data.Sum(d => d.month_1); + three.month_2 = three.data.Sum(d => d.month_2); + three.month_3 = three.data.Sum(d => d.month_3); + three.month_4= three.data.Sum(d => d.month_4); + three.month_5 = three.data.Sum(d => d.month_5); + three.month_6 = three.data.Sum(d => d.month_6); + three.month_7 = three.data.Sum(d => d.month_7); + three.month_8 = three.data.Sum(d => d.month_8); + three.month_9 = three.data.Sum(d => d.month_9); + three.month_10 = three.data.Sum(d => d.month_10); + three.month_11 = three.data.Sum(d => d.month_11); + three.month_12 = three.data.Sum(d => d.month_12); + three.total = s.Sum(d=>d.total); + + var threes = new List() { three }; Report report = new Report(); report.Load(_setting.report_path + "teaching_fee_extra.frx"); - report.RegisterData(threes, "teaching_fee_ro_three"); + report.RegisterData(threes, "teaching_fee_extra_ro_three"); report.Prepare(); MemoryStream stream = new MemoryStream(); @@ -215,7 +238,12 @@ namespace rmutr_report.Controllers [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetTeachReport([FromRoute] string type, [FromBody] teaching_fee_ro_three three) { - + + // three.table_1_ba_2 = three.data.Sum(d => d.number_of_hours_ba_2); + // three.table_1_ma_2 = three.data.Sum(d => d.number_of_hours_ma_2); + // three.table_1_teaching_fee_1 = three.data.Sum(d => d.teaching_fee_1); + // three.table_1_teaching_fee_2 = three.data.Sum(d => d.teaching_fee_2); + // three.table_1_total = three.data.Sum(d => d.total); var threes = new List() { three }; @@ -260,7 +288,15 @@ namespace rmutr_report.Controllers [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetTeachWorkloadReport([FromRoute] string type, [FromBody] teaching_fee_ro_three three) { - + // three.table_1_ba_1 = three.data.Sum(d => d.number_of_hours_ba_1); + // three.table_1_ma_1 = three.data.Sum(d => d.number_of_hours_ma_1); + // three.table_1_ba_2 = three.data.Sum(d => d.number_of_hours_ba_2); + // three.table_1_ma_2 = three.data.Sum(d => d.number_of_hours_ma_2); + // three.table_1_ba_3 = three.data.Sum(d => d.number_of_hours_ba_3); + // three.table_1_ma_3 = three.data.Sum(d => d.number_of_hours_ma_3); + // three.table_1_teaching_fee_1 = three.data.Sum(d => d.teaching_fee_1); + // three.table_1_teaching_fee_2 = three.data.Sum(d => d.teaching_fee_2); + // three.table_1_total = three.data.Sum(d => d.total); var threes = new List() { three }; diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index 7c6891f..5709640 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -55,6 +55,8 @@ namespace rmutr_report.Controllers if (project.sixteenths != null) { + int t = 1; + string a = "กิจกรรมที่ "; foreach (var sixteenthData in project.sixteenths) { var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); @@ -65,6 +67,8 @@ namespace rmutr_report.Controllers sixteenthData.bophitphimuk_total = sum2; sixteenthData.pohchang_total = sum3; sixteenthData.klai_kangwon_total = sum4; + sixteenthData.activity_table = a + sixteenthData.activity_table; + t++; } } diff --git a/Controllers/project_request_thailand.Controller.cs b/Controllers/project_request_thailand.Controller.cs index 7b5bc56..9010859 100644 --- a/Controllers/project_request_thailand.Controller.cs +++ b/Controllers/project_request_thailand.Controller.cs @@ -100,6 +100,8 @@ namespace rmutr_report.Controllers if (project.sixteenths != null) { + int t = 1; + string a = "กิจกรรมที่ "; foreach (var sixteenthData in project.sixteenths) { var sum1 = sixteenthData.sixteenths2.Sum(d => d.salaya); @@ -110,6 +112,8 @@ namespace rmutr_report.Controllers sixteenthData.bophitphimuk_total = sum2; sixteenthData.pohchang_total = sum3; sixteenthData.klai_kangwon_total = sum4; + sixteenthData.activity_table = a + sixteenthData.activity_table; + t++; } } diff --git a/Models/RoReport/teaching_fee_extra_ro_three.cs b/Models/RoReport/teaching_fee_extra_ro_three.cs new file mode 100644 index 0000000..9ef8899 --- /dev/null +++ b/Models/RoReport/teaching_fee_extra_ro_three.cs @@ -0,0 +1,50 @@ +using System.Collections.Generic; + +namespace rmutr_report.Models.RoThree +{ + public class teaching_fee_extra_ro_three + { + public string budget_year { get; set; } + public string product { get; set; } + public string agency_name_th { get; set; } + public string sector { get; set; } + public string area { get; set; } + public string year { get; set; } + public string semester { get; set; } + public List data { get; set; } + public decimal? month_1 { get; set; } + public decimal? month_2 { get; set; } + public decimal? month_3 { get; set; } + public decimal? month_4 { get; set; } + public decimal? month_5 { get; set; } + public decimal? month_6 { get; set; } + public decimal? month_7 { get; set; } + public decimal? month_8 { get; set; } + public decimal? month_9 { get; set; } + public decimal? month_10 { get; set; } + public decimal? month_11 { get; set; } + public decimal? month_12 { get; set; } + public decimal? total { get; set; } + } + + public class teaching_fee_extra_ro_three_data + { + public string row_no { get; set; } + public string display_name { get; set; } + public string position { get; set; } + public string subject { get; set; } + public decimal? month_1 { get; set; } + public decimal? month_2 { get; set; } + public decimal? month_3 { get; set; } + public decimal? month_4 { get; set; } + public decimal? month_5 { get; set; } + public decimal? month_6 { get; set; } + public decimal? month_7 { get; set; } + public decimal? month_8 { get; set; } + public decimal? month_9 { get; set; } + public decimal? month_10 { get; set; } + public decimal? month_11 { get; set; } + public decimal? month_12 { get; set; } + public decimal? total { 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 d6cdc4f..7bb4068 100644 --- a/Models/RoReport/teaching_fee_ro_three.cs +++ b/Models/RoReport/teaching_fee_ro_three.cs @@ -4,19 +4,17 @@ namespace rmutr_report.Models.RoThree { public class teaching_fee_ro_three { - public string budget_year_1 { get; set; } - public string date_range_1 { get; set; } - public string product_1 { get; set; } - public string semester_1 { get; set; } - public string academic_year_1 { get; set; } - public string agency_name_th_1 { get; set; } - public string sector_1 { get; set; } - public string disbursement_result_year_1 { get; set; } - public string disbursement_result_semester_1 { get; set; } + public string budget_year { get; set; } + public string date_range { get; set; } + public string product { get; set; } + public string semester { get; set; } + public string academic_year { get; set; } + public string agency_name_th { get; set; } + public string sector { get; set; } + public string disbursement_result_year { get; set; } + public string disbursement_result_semester { get; set; } - public List data_1 { get; set; } - - // + public List data { get; set; } public decimal? table_1_ba_1 { get; set; } public decimal? table_1_ma_1 { get; set; } public decimal? table_1_ba_2 { get; set; } @@ -26,55 +24,9 @@ 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; } - public string semester_2 { get; set; } - public string academic_year_2 { get; set; } - public string agency_name_th_2 { get; set; } - 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; } - public decimal? table_2_ba_2 { get; set; } - public decimal? table_2_ma_2 { get; set; } - public decimal? table_2_ba_3 { get; set; } - public decimal? table_2_ma_3 { get; set; } - 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; } - public string semester_3 { get; set; } - public string academic_year_3 { get; set; } - public string agency_name_th_3 { get; set; } - 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; } - public decimal? table_3_ba_2 { get; set; } - public decimal? table_3_ma_2 { get; set; } - public decimal? table_3_ba_3 { get; set; } - public decimal? table_3_ma_3 { get; set; } - 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 + + public class teaching_fee_ro_three_data { public string display_name { get; set; } public string position { get; set; } @@ -85,8 +37,8 @@ namespace rmutr_report.Models.RoThree public decimal? number_of_hours_ma_2 { get; set; } public decimal? number_of_hours_ba_3 { get; set; } public decimal? number_of_hours_ma_3 { get; set; } - public decimal? excess_teaching_fee_1 { get; set; } - public decimal? excess_teaching_fee_2 { get; set; } + public decimal? teaching_fee_1 { get; set; } + public decimal? teaching_fee_2 { get; set; } public decimal? total { get; set; } } } \ No newline at end of file diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index b728ef6..f236bd9 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -47,7 +47,6 @@ namespace rmutr_report.Models public List fourteenth { get; set; } //ข้อ 14 public List fifteenth { get; set; } //ข้อ 15 public int? count_activity { get; set; } //ข้อ 16 - public string budget_unit_name_th { get; set; }//ข้อ 16 public string text1 { get; set; } //ข้อ 16 public string text2 { get; set; } //ข้อ 16 public string operational_activitie { get; set; }//ข้อ 15 ง.5-3 @@ -155,6 +154,7 @@ namespace rmutr_report.Models public class sixteenth_data_detail { public string activity_table { get; set; } + public string budget_unit_name_th { get; set; } public List sixteenths2 { get; set; } public decimal? salaya_total { get; set; } diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index c86d53f..83dd89e 100644 Binary files a/bin/Debug/net5.0/rmutr_report.dll and b/bin/Debug/net5.0/rmutr_report.dll differ diff --git a/bin/Debug/net5.0/rmutr_report.pdb b/bin/Debug/net5.0/rmutr_report.pdb index 7742de2..e816734 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index c35890b..271b973 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 d67e45f..47e3e42 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/net5.0/ref/rmutr_report.dll b/obj/Debug/net5.0/ref/rmutr_report.dll index 060ba4e..928709a 100644 Binary files a/obj/Debug/net5.0/ref/rmutr_report.dll and b/obj/Debug/net5.0/ref/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/refint/rmutr_report.dll b/obj/Debug/net5.0/refint/rmutr_report.dll index 060ba4e..928709a 100644 Binary files a/obj/Debug/net5.0/refint/rmutr_report.dll and b/obj/Debug/net5.0/refint/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache index 480db4d..3e38278 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -03718e4376c42f44a957d0167b63237ffcc1512b +73f4f2af1cc3f6d90852199db8c00bcd253aa685 diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index c86d53f..83dd89e 100644 Binary files a/obj/Debug/net5.0/rmutr_report.dll and b/obj/Debug/net5.0/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index 7742de2..e816734 100644 Binary files a/obj/Debug/net5.0/rmutr_report.pdb and b/obj/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props index 3af2419..73489c0 100644 --- a/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +++ b/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props @@ -336,6 +336,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\contributions.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\control_cost_construction.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\control_cost_construction.frx)) + Package rmutr_report @@ -992,6 +1008,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\material_office.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\material_ro_three.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\material_ro_three.frx)) + Package rmutr_report diff --git a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index 0ccbae9..4914a35 100644 --- a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -9fdb36bdc21e43e3de61118b3e5b09a1b8490e9e +8aa91144802a2244f9777f6b035a014da508a7f0 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache index 6bf3b69..638b00d 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -9cfeedd89b72b1f5267ec4e7959ae277c719f5c6 +7f756dedd982898a1348e3caf80909b59a25dfec diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index c35890b..271b973 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 d67e45f..47e3e42 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.model.nuget.info b/obj/rider.project.model.nuget.info index 1c77f1b..416c446 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17004727362833215 \ No newline at end of file +17005432766324116 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 416c446..4fd88d9 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17005432766324116 \ No newline at end of file +17005579264145440 \ No newline at end of file diff --git a/wwwroot/reports/plant_genetic_conservation_project.frx b/wwwroot/reports/plant_genetic_conservation_project.frx index 5b7eddb..50162bf 100644 --- a/wwwroot/reports/plant_genetic_conservation_project.frx +++ b/wwwroot/reports/plant_genetic_conservation_project.frx @@ -1,5 +1,5 @@  - + @@ -74,12 +74,12 @@ - + @@ -327,26 +327,26 @@ - - + + - + - + - + - + - + @@ -362,7 +362,7 @@ - + @@ -371,12 +371,12 @@ - + - + @@ -388,16 +388,16 @@ - + - + - + - + @@ -405,19 +405,19 @@ - + - + - + - + - + @@ -457,11 +457,11 @@ - + - + - + @@ -472,11 +472,11 @@ - + - + - + @@ -486,9 +486,9 @@ - + - + @@ -507,8 +507,8 @@ - - + + @@ -523,7 +523,7 @@ - + @@ -550,12 +550,12 @@ - - + + - + @@ -570,7 +570,7 @@ - + @@ -608,7 +608,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -677,7 +677,7 @@ - + @@ -694,7 +694,7 @@ - + @@ -709,7 +709,7 @@ - + @@ -731,7 +731,7 @@ - + @@ -748,7 +748,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -785,7 +785,7 @@ - + @@ -802,7 +802,7 @@ - + @@ -817,7 +817,7 @@ - + @@ -839,7 +839,7 @@ - + @@ -856,7 +856,7 @@ - + @@ -871,7 +871,7 @@ - + @@ -888,7 +888,7 @@ - + @@ -898,7 +898,7 @@ - + diff --git a/wwwroot/reports/project_principle_rationale_1.frx b/wwwroot/reports/project_principle_rationale_1.frx index 29f8b3e..ab852e3 100644 --- a/wwwroot/reports/project_principle_rationale_1.frx +++ b/wwwroot/reports/project_principle_rationale_1.frx @@ -1,5 +1,5 @@  - + @@ -64,12 +64,12 @@ - + @@ -302,12 +302,12 @@ - - + + - + @@ -331,11 +331,11 @@ - + - + @@ -346,83 +346,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + @@ -438,7 +438,7 @@ - + @@ -453,7 +453,7 @@ - + @@ -473,13 +473,13 @@ - + - + - + - + @@ -490,11 +490,11 @@ - + - + - + @@ -503,11 +503,11 @@ - + - + @@ -515,14 +515,14 @@ - - + + - + - + @@ -546,7 +546,7 @@ - + @@ -561,14 +561,14 @@ - + - + - + @@ -592,7 +592,7 @@ - + @@ -609,9 +609,9 @@ - + - + @@ -633,7 +633,7 @@ - + @@ -650,9 +650,9 @@ - + - + @@ -674,7 +674,7 @@ - + @@ -691,9 +691,9 @@ - + - + @@ -715,7 +715,7 @@ - + @@ -732,7 +732,7 @@ - + @@ -747,7 +747,7 @@ - + diff --git a/wwwroot/reports/project_request_thailands.frx b/wwwroot/reports/project_request_thailands.frx index 3e4e049..9e1008f 100644 --- a/wwwroot/reports/project_request_thailands.frx +++ b/wwwroot/reports/project_request_thailands.frx @@ -1,5 +1,5 @@  - + @@ -74,12 +74,12 @@ - + @@ -327,21 +327,21 @@ - + - + - + - + - + @@ -364,14 +364,14 @@ - + - + - + @@ -384,13 +384,13 @@ - + - + - + @@ -398,17 +398,17 @@ - + - + - + - + @@ -448,11 +448,11 @@ - + - + - + @@ -463,11 +463,11 @@ - + - + - + @@ -476,9 +476,9 @@ - + - + @@ -497,8 +497,8 @@ - - + + @@ -513,7 +513,7 @@ - + @@ -540,12 +540,12 @@ - - + + - + @@ -560,7 +560,7 @@ - + @@ -598,7 +598,7 @@ - + @@ -615,7 +615,7 @@ - + @@ -630,7 +630,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -684,7 +684,7 @@ - + @@ -699,7 +699,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -738,7 +738,7 @@ - + @@ -753,7 +753,7 @@ - + @@ -775,7 +775,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -807,7 +807,7 @@ - + @@ -829,7 +829,7 @@ - + @@ -846,7 +846,7 @@ - + @@ -861,7 +861,7 @@ - + @@ -878,7 +878,7 @@ - + @@ -888,7 +888,7 @@ - + diff --git a/wwwroot/reports/teaching_fee.frx b/wwwroot/reports/teaching_fee.frx index a7d929d..eca9b66 100644 --- a/wwwroot/reports/teaching_fee.frx +++ b/wwwroot/reports/teaching_fee.frx @@ -1,17 +1,17 @@  - + - - - - - - - - - - + + + + + + + + + + @@ -21,8 +21,8 @@ - - + + @@ -34,106 +34,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + - - - - - + + + + - - - - - - + - - - + - - - - + + - + @@ -141,23 +66,7 @@ - - - - - - - - - - - - - - - - - + @@ -167,353 +76,53 @@ - + - - - + - - - + - - - - - + + + + + - - - - - + - - - - - - - - - - - - + + + + + + + + - - - + + + - + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/wwwroot/reports/teaching_fee_extra.frx b/wwwroot/reports/teaching_fee_extra.frx index 25252fc..8218531 100644 --- a/wwwroot/reports/teaching_fee_extra.frx +++ b/wwwroot/reports/teaching_fee_extra.frx @@ -1,519 +1,220 @@  - + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + + + + + + + + + + + - - - - - - + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/teaching_fee_workload.frx b/wwwroot/reports/teaching_fee_workload.frx index 63ba7d9..e5de10c 100644 --- a/wwwroot/reports/teaching_fee_workload.frx +++ b/wwwroot/reports/teaching_fee_workload.frx @@ -1,17 +1,17 @@  - + - - - - - - - - - - + + + + + + + + + + @@ -21,8 +21,8 @@ - - + + @@ -34,70 +34,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -110,17 +46,17 @@ - + - + - - - - - + + + + + @@ -179,7 +115,7 @@ - + @@ -194,22 +130,22 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + @@ -240,283 +176,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -