diff --git a/Controllers/RoThree.Controller.cs b/Controllers/RoThree.Controller.cs index ce40c1a..67176fe 100644 --- a/Controllers/RoThree.Controller.cs +++ b/Controllers/RoThree.Controller.cs @@ -22,6 +22,7 @@ namespace rmutr_report.Controllers { this._setting = setting; } + [SwaggerOperation("ร.3 คำชี้แจงงบดำเนินงาน")] [HttpPost, Route("reports/operating_budget_ro_three/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -65,6 +66,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("รายงาน ค่าตอบแทนหัวหน้าภาควิชา")] [HttpPost, Route("reports/compensation_head_department/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -115,6 +117,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("รายงาน ค่าตอบแทนหัวหน้าสาขาวิชา")] [HttpPost, Route("reports/compensation_head_major/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -165,6 +168,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("รายงานค่าสอนพิเศษ")] [HttpPost, Route("reports/teaching_fee_extra_ro_three/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -179,12 +183,12 @@ namespace rmutr_report.Controllers 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; - } + 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_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); @@ -193,7 +197,7 @@ namespace rmutr_report.Controllers 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); + three.total = s.Sum(d => d.total); var threes = new List() { three }; @@ -233,12 +237,12 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("รายงานค่าสอน")] [HttpPost, Route("reports/teaching_fee_ro_three/{type}")] [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); @@ -283,6 +287,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("รายงานค่าสอนเกินภาระงาน")] [HttpPost, Route("reports/teaching_fee_workload/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -336,6 +341,7 @@ namespace rmutr_report.Controllers return Ok(); } + // [SwaggerOperation("รายงานค่าวัสดุสำนักงาน")] // [HttpPost, Route("reports/material_office/{type}")] // [ApiExplorerSettings(GroupName = "reports")] @@ -441,8 +447,6 @@ namespace rmutr_report.Controllers [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetMaterial3Report([FromRoute] string type, [FromBody] material_education three) { - - var threes = new List() { three }; Report report = new Report(); @@ -481,6 +485,7 @@ namespace rmutr_report.Controllers return Ok(); } + // [SwaggerOperation("รายงานวัสดุหนังสือ")] // [HttpPost, Route("reports/material_book/{type}")] // [ApiExplorerSettings(GroupName = "reports")] @@ -636,8 +641,6 @@ namespace rmutr_report.Controllers [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetMaterial7Report([FromRoute] string type, [FromBody] material_fuel_lubricant three) { - - var threes = new List() { three }; Report report = new Report(); @@ -676,6 +679,7 @@ namespace rmutr_report.Controllers return Ok(); } + // [SwaggerOperation("รายงานวัสดุไฟฟ้าและวิทยุ")] // [HttpPost, Route("reports/material_electric/{type}")] // [ApiExplorerSettings(GroupName = "reports")] @@ -926,7 +930,8 @@ namespace rmutr_report.Controllers return Ok(); } - [SwaggerOperation("รายงานวัสดุ ร3")] + + [SwaggerOperation("รายงานวัสดุ ร3")] [HttpPost, Route("reports/material_ro_three/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetMaterialRoThreeReport([FromRoute] string type, [FromBody] material_ro_three three) @@ -976,6 +981,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("ค่าตอบแทนอื่นๆ")] [HttpPost, Route("reports/other_compensation/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -992,8 +998,8 @@ namespace rmutr_report.Controllers { if (detail != null) { - detail.total_amount = ( detail.quantity_person * - detail.amount); + detail.total_amount = (detail.quantity_person * + detail.amount); } } @@ -1031,7 +1037,8 @@ namespace rmutr_report.Controllers return Ok(); } - [SwaggerOperation("ค่าตอบแทน_ค่าเช่าบ้าน")] + + [SwaggerOperation("ค่าตอบแทน_ค่าเช่าบ้าน")] [HttpPost, Route("reports/house_rent_ro_three/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetHouseRentReport([FromRoute] string type, @@ -1040,13 +1047,11 @@ namespace rmutr_report.Controllers if (houseRent.topic_type == 1) { houseRent.topic_name = "ค่าเช่าบ้านชาวต่างประเทศ"; - } if (houseRent.topic_type == 2) { houseRent.topic_name = "ค่าเช่าบ้านครูอาสาสมัคร(ชาวจีน)"; - } if (houseRent.topic_type == 3) @@ -1054,7 +1059,7 @@ namespace rmutr_report.Controllers houseRent.topic_name = "ค่าเช่าบ้านที่ปรึกษาชาวต่างประเทศ"; } - + var house = new List() { houseRent }; Report report = new Report(); report.Load(_setting.report_path + "house_rent_ro_three.frx"); @@ -1083,6 +1088,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("ค่าตอบแทนพิเศษรายเดือน_ค่าตอบแทนเงินประจำตำแหน่ง")] [HttpPost, Route("reports/compensation_ro_three/{type}")] [ApiExplorerSettings(GroupName = "reports")] @@ -1093,21 +1099,20 @@ namespace rmutr_report.Controllers if (compensationRoThree.topic_type == 1) { compensationRoThree.topic_name = "ค่าตอบแทนพิเศษรายเดือน อาจารย์ชาวต่างประเทศ"; - } if (compensationRoThree.topic_type == 2) { compensationRoThree.topic_name = "ค่าตอบแทนเงินประจำตำแหน่ง"; - } foreach (var detail in compensationRoThree.data) { detail.budget_amount = (detail.salary_rate * 12); } + compensationRoThree.total_amount = compensation.Sum(f => f.budget_amount); - + var compensationRoThrees = new List() { compensationRoThree }; Report report = new Report(); report.Load(_setting.report_path + "compensation_ro_three.frx"); @@ -1136,7 +1141,8 @@ namespace rmutr_report.Controllers return Ok(); } - [SwaggerOperation("เงินสมทบกองทุนประกันสังคม_เงินสมทบกองทุนเงินทดแทน")] + + [SwaggerOperation("เงินสมทบกองทุนประกันสังคม_เงินสมทบกองทุนเงินทดแทน")] [HttpPost, Route("reports/contributions/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetContributionsReport([FromRoute] string type, @@ -1148,7 +1154,7 @@ namespace rmutr_report.Controllers contributions.topic_name = "เงินสมทบกองทุนประกันสังคม"; foreach (var detail in contributions.data) { - detail.amount = (detail.salary * 5)/100; + detail.amount = (detail.salary * 5) / 100; detail.per_year = (detail.amount * 12); } } @@ -1158,14 +1164,14 @@ namespace rmutr_report.Controllers contributions.topic_name = "เงินสมทบกองทุนเงินทดแทน"; foreach (var detail in contributions.data) { - detail.amount = (detail.salary * (decimal?)0.2)/100; + detail.amount = (detail.salary * (decimal?)0.2) / 100; detail.per_year = (detail.amount * 12); } } - + contributions.total_amount = compensation.Sum(f => f.per_year); - + var _contributions = new List() { contributions }; Report report = new Report(); report.Load(_setting.report_path + "contributions.frx"); @@ -1194,5 +1200,203 @@ namespace rmutr_report.Controllers return Ok(); } + + [SwaggerOperation("ค่าใช้สอย ค่าจ้างเหมาบริการ")] + [HttpPost, Route("reports/service_fee_ro_three/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetServiesReport([FromRoute] string type, + [FromBody] service_fee_ro_three service) + { + var serviceFee = new List() { service }; + Report report = new Report(); + report.Load(_setting.report_path + "service_fee_ro_three.frx"); + report.RegisterData(serviceFee, "service_fee_ro_three"); + report.Prepare(); + + MemoryStream stream = new MemoryStream(); + switch (type) + { + case "pdf": + PDFExport pdf = new PDFExport(); + report.Export(pdf, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/pdf"); + + case "xls": + case "xlsx": + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + return File( + stream, + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + "service_fee_ro_three" + ".xlsx"); + } + + return Ok(); + } + [SwaggerOperation("2ค่าตอบแทนผู้ปฏิบัติงานให้ราชการ_6 7 8")] + [HttpPost, Route("reports/consultant_compensation/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetConsultantReport([FromRoute] string type, + [FromBody] consultant_compensation compensation) + { + var types = compensation.data.ToList(); + + if (compensation.topic_type==1) + { + compensation.topic_name = "ค่าตอบแทนที่ปรึกษา"; + } + if (compensation.topic_type==2) + { + compensation.topic_name = "ค่าตอบแทนเหมาจ่ายจัดหารถประจำตำแหน่ง"; + } + + if (compensation.topic_type==3) + { + compensation.topic_name = "ค่าตอบแทนอื่น ๆ"; + } + + if (compensation.topic_type==4) + { + compensation.topic_name = "ค่าคณะกรรมการตรวจการจ้าง"; + } + if (compensation.topic_type==5) + { + compensation.topic_name = "ค่าคณะกรรมการตรวจรับพัสดุ"; + } + if (compensation.topic_type==6) + { + compensation.topic_name = "ค่าคณะกรรมการกำหนดราคากลาง"; + } + foreach (var detail in compensation.data) + { + detail.total_amount = detail.quantity_day * detail.quantity_person * detail.rate; + } + compensation.total_amount = types.Sum(d => d.total_amount); + var compensations = new List() { compensation }; + Report report = new Report(); + report.Load(_setting.report_path + "consultant_compensation.frx"); + report.RegisterData(compensations, "consultant_compensation"); + report.Prepare(); + + MemoryStream stream = new MemoryStream(); + switch (type) + { + case "pdf": + PDFExport pdf = new PDFExport(); + report.Export(pdf, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/pdf"); + + case "xls": + case "xlsx": + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + return File( + stream, + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + "consultant_compensation" + ".xlsx"); + } + + return Ok(); + } + // [SwaggerOperation("ค่าเช่าที่ดิน")] + // [HttpPost, Route("reports/land_rent/{type}")] + // [ApiExplorerSettings(GroupName = "reports")] + // public IActionResult GetRentReport([FromRoute] string type, + // [FromBody] land_rent service) + // { + // service.total_amount = service.data.Sum(d => d.total_amount); + // var serviceFee = new List() { service }; + // Report report = new Report(); + // report.Load(_setting.report_path + "land_rent.frx"); + // report.RegisterData(serviceFee, "land_rent"); + // report.Prepare(); + // + // MemoryStream stream = new MemoryStream(); + // switch (type) + // { + // case "pdf": + // PDFExport pdf = new PDFExport(); + // report.Export(pdf, stream); + // stream.Seek(0, SeekOrigin.Begin); + // return File(stream, "application/pdf"); + // + // case "xls": + // case "xlsx": + // Excel2007Export excel = new Excel2007Export(); + // report.Export(excel, stream); + // stream.Seek(0, SeekOrigin.Begin); + // return File( + // stream, + // "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + // "land_rent" + ".xlsx"); + // } + // + // return Ok(); + // } + + [SwaggerOperation("ค่าใช้จ่ายดำเนินงาน รายละเอียดการคำนวณค่าใช้จ่ายในการประชุม")] + [HttpPost, Route("reports/calculate_meeting_expenses/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetCalReport([FromRoute] string type, + [FromBody] calculate_meeting_expenses calculate) + { + if (calculate.topic_type==1) + { + calculate.text1 = "ค่าใช้สอย : ค่าอาหารว่าง และค่าอาหารกลางวันในการประชุม"; + calculate.text2 = "ผลการเบิกจ่าย ค่าอาหารว่าง\nและค่าอาหารกลางวันเบิกจ่ายจริง"; + calculate.text3 = "อัตราค่าใช้จ่ายค่าอาหารว่าง\nและค่าอาหารกลางวัน"; + calculate.text4 = "รวมค่าอาหารว่างและค่าอาหารกลางวัน"; + } + if (calculate.topic_type==2) + { + calculate.text1 = "ค่าตอบแทน : ค่าเบี้ยประชุมคณะกรรมการ"; + calculate.text2 = "ผลการเบิกจ่าย ค่าเบี้ยประชุมเบิกจ่ายจริง"; + calculate.text3 = "อัตราค่าเบี้ยประชุม"; + calculate.text4 = "รวมค่าเบี้ยประชุม"; + } + int n = 1; + foreach (var data in calculate.data) + { + if (data.topic_type==1) + { + data.row_no = null; + data.no = n.ToString(); + n++; + } + + } + + var calculateMeeting = new List() { calculate }; + Report report = new Report(); + report.Load(_setting.report_path + "calculate_meeting_expenses.frx"); + report.RegisterData(calculateMeeting, "calculate_meeting_expenses"); + report.Prepare(); + + MemoryStream stream = new MemoryStream(); + switch (type) + { + case "pdf": + PDFExport pdf = new PDFExport(); + report.Export(pdf, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/pdf"); + + case "xls": + case "xlsx": + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + return File( + stream, + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + "calculate_meeting_expenses" + ".xlsx"); + } + + return Ok(); + } } } \ No newline at end of file diff --git a/Models/RoReport/calculate_meeting_expenses.cs b/Models/RoReport/calculate_meeting_expenses.cs new file mode 100644 index 0000000..e8ca5d1 --- /dev/null +++ b/Models/RoReport/calculate_meeting_expenses.cs @@ -0,0 +1,37 @@ +using System.Collections.Generic; + +namespace rmutr_report.Models.RoThree +{ + public class calculate_meeting_expenses + { + public int? topic_type { get; set; } + public string text1 { get; set; } + public string text2 { get; set; } + public string text3 { get; set; } + public string text4 { get; set; } + public string budget_year { get; set; } + public string date_range { get; set; } + public string product { get; set; } + public string agency_name_th { get; set; } + public string sector { get; set; } + public List data { get; set; } + public decimal? disbursement_result { get; set; } + public decimal? expense_rate { get; set; } + public decimal? count_person { get; set; } + public decimal? count_meetings { get; set; } + public decimal? total { get; set; } + } + + public class calculate_meeting_expenses_data_datail + { + public int? topic_type { get; set; } //1 2 + public string no { get; set; } + public string row_no { get; set; } + public string topic_name { get; set; } + public decimal? disbursement_result { get; set; } + public decimal? expense_rate { get; set; } + public decimal? count_person { get; set; } + public decimal? count_meetings { get; set; } + public decimal? total { get; set; } + } +} \ No newline at end of file diff --git a/Models/RoReport/consultant_compensation.cs b/Models/RoReport/consultant_compensation.cs new file mode 100644 index 0000000..835b4ef --- /dev/null +++ b/Models/RoReport/consultant_compensation.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; + +namespace rmutr_report.Models.RoThree +{ + public class consultant_compensation + { + public int? topic_type { get; set; } //1 2 3 4 5 6 + public string topic_name { get; set; } + public decimal? total_amount { get; set; } + + public List data { get; set; } + } + + public class consultant_compensation_detail + { + public string list { get; set; } + public decimal? quantity_day { get; set; } + public decimal? quantity_person { get; set; } + public decimal? rate { get; set; } + public decimal? total_amount { get; set; } + } +} \ No newline at end of file diff --git a/Models/RoReport/service_fee_ro_three.cs b/Models/RoReport/service_fee_ro_three.cs new file mode 100644 index 0000000..c6f1f98 --- /dev/null +++ b/Models/RoReport/service_fee_ro_three.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; + +namespace rmutr_report.Models.RoThree +{ + public class service_fee_ro_three + { + public string budget_year { get; set; } + public string date_range { get; set; } + public string product { get; set; } + public string agency_name_th { get; set; } + public string sector { get; set; } + public List data { get; set; } + + } + + public class service_fee_ro_three_data_datail + { + public string service_fee_type { get; set; } + public string list { get; set; } + public decimal? area { get; set; } + public decimal? count_person { get; set; } + public decimal? wage_month { get; set; } + public decimal? wage_year { 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 aba6dee..eb0bc83 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 a11cd4b..e0f9e1b 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.CoreCompileInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache index 638b00d..8518aca 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7f756dedd982898a1348e3caf80909b59a25dfec +5291f10d567e56972d289a7eb4de1376c3f1680a diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index aba6dee..eb0bc83 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 a11cd4b..e0f9e1b 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/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props index 73489c0..f8bd721 100644 --- a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +++ b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props @@ -224,6 +224,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\building_fours.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\calculate_meeting_expenses.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\calculate_meeting_expenses.frx)) + Package rmutr_report @@ -320,6 +336,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\compensation_ro_three.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\consultant_compensation.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\consultant_compensation.frx)) + Package rmutr_report @@ -800,6 +832,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\kpi_performance_expenditure_budget.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\land_rent.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\land_rent.frx)) + Package rmutr_report @@ -2240,6 +2288,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\service_fee.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\service_fee_ro_three.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\service_fee_ro_three.frx)) + Package rmutr_report diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index 4914a35..fb24454 100644 --- a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -8aa91144802a2244f9777f6b035a014da508a7f0 +9f07dd534e278fa2dd7afca679d31a5d182378cc diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 4fd88d9..08858c1 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17005579264145440 \ No newline at end of file +17006398170547166 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 5ee8d5e..81a113f 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17006386956318685 \ No newline at end of file +17006550334815667 \ No newline at end of file diff --git a/wwwroot/reports/calculate_meeting_expenses.frx b/wwwroot/reports/calculate_meeting_expenses.frx new file mode 100644 index 0000000..95b5c06 --- /dev/null +++ b/wwwroot/reports/calculate_meeting_expenses.frx @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/consultant_compensation.frx b/wwwroot/reports/consultant_compensation.frx new file mode 100644 index 0000000..a58618c --- /dev/null +++ b/wwwroot/reports/consultant_compensation.frx @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/service_fee_ro_three.frx b/wwwroot/reports/service_fee_ro_three.frx new file mode 100644 index 0000000..74336d5 --- /dev/null +++ b/wwwroot/reports/service_fee_ro_three.frx @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +