diff --git a/Controllers/GovernmentBudget.Controller.cs b/Controllers/GovernmentBudget.Controller.cs index 8925a0a..b1b0469 100644 --- a/Controllers/GovernmentBudget.Controller.cs +++ b/Controllers/GovernmentBudget.Controller.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using ClosedXML.Excel; using FastReport; using FastReport.Export.OoXML; @@ -20,6 +21,7 @@ namespace rmutr_report.Controllers { this._setting = setting; } + [SwaggerOperation("รับเงินแผ่นดิน")] [HttpPost, Route("reports/receive_government/{type}")] //รับเงินแผ่นดิน [ApiExplorerSettings(GroupName = "reports")] @@ -62,6 +64,7 @@ namespace rmutr_report.Controllers return Ok(); } + [SwaggerOperation("การจัดสรรงบประมาณแผ่นดินรวมทุกแผนงาน, แผนงานบุคลากร, พื้นฐาน+ยุทธศาตร์")] [HttpPost, Route("reports/budget_government_allocate/{type}")] // (พื้นฐาน+ยุทธศาตร์) [ApiExplorerSettings(GroupName = "reports")] @@ -71,7 +74,7 @@ namespace rmutr_report.Controllers var workbook = new XLWorkbook(); var ws = workbook.Worksheets.Add("การจัดสรรงบประมาณแผ่นดิน"); ws.Range("A1:S1").Merge().Value = "การจัดสรรงบประมาณแผ่นดิน ปีงบประมาณ พ.ศ. " + allocate.budget_year - + " (" + allocate.report_name + ")";//" (แผนงาน พื้นฐาน และ แผนงาน ยุทธศาสตร์ฯ)"; + + " (" + allocate.report_name + ")"; //" (แผนงาน พื้นฐาน และ แผนงาน ยุทธศาสตร์ฯ)"; ws.Range("A1:S1").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; ws.Range("A1:S1").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Range("A1:S1").Style.Font.FontName = "TH SarabunPSK"; @@ -394,7 +397,7 @@ namespace rmutr_report.Controllers if (detail.color == 3) // ชื่อคณะ สีแดงอ่อน { - ws.Range(ws.Cell(row, 1), ws.Cell(row + 1, 1)).Merge().Value = detail.list; + ws.Range(ws.Cell(row, 1), ws.Cell(row + 1, 1)).Merge().Value = detail.list; ws.Range(ws.Cell(row, 2), ws.Cell(row, 5)).Merge().Value = detail.total_budget_personnel; ws.Range(ws.Cell(row, 6), ws.Cell(row, 9)).Merge().Value = detail.total_budget_operating; ws.Range(ws.Cell(row, 10), ws.Cell(row, 11)).Merge().Value = detail.total_budget_investment; @@ -428,6 +431,7 @@ namespace rmutr_report.Controllers row++; } + if (detail.color == 5) // ชื่อคณะ สีขาว { ws.Cell(row, 1).Value = "'- " + detail.list; @@ -466,7 +470,7 @@ namespace rmutr_report.Controllers if (detail.color == 4) // ชื่อย่อยคณะ สีเทาอ่อน { - ws.Range(ws.Cell(row, 1), ws.Cell(row + 1, 1)).Merge().Value = detail.list; + ws.Range(ws.Cell(row, 1), ws.Cell(row + 1, 1)).Merge().Value = detail.list; ws.Range(ws.Cell(row, 2), ws.Cell(row, 5)).Merge().Value = detail.total_budget_personnel; ws.Range(ws.Cell(row, 6), ws.Cell(row, 9)).Merge().Value = detail.total_budget_operating; ws.Range(ws.Cell(row, 10), ws.Cell(row, 11)).Merge().Value = detail.total_budget_investment; @@ -737,6 +741,7 @@ namespace rmutr_report.Controllers ws.Cell(row, 17).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; row++; } + if (detail2.color == 5) // ชื่อคณะ สีขาว detail { ws.Cell(row, 1).Value = null; @@ -934,7 +939,6 @@ namespace rmutr_report.Controllers ws.Cell(row, 17).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; row++; } - } } @@ -948,5 +952,227 @@ namespace rmutr_report.Controllers "budget_government_allocate" + ".xlsx"); } } + + [SwaggerOperation("1 รายการวัสดุ 2 รายการค่าใช้สอย")] + [HttpPost, Route("reports/national_budget_list/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetNationalBudgetListReport([FromRoute] string type, + [FromBody] national_budget_list _nationalBudgetList) + { + string item = "รายการวัสดุ (คำของบประมาณรายจ่าย ปี "; + string item2 = "รายการค่าใช้สอย (คำของบประมาณรายจ่าย ปี "; + if (_nationalBudgetList.report_type == 1) + { + _nationalBudgetList.budget_year = item + _nationalBudgetList.budget_year + ")"; + } + + if (_nationalBudgetList.report_type == 2) + { + _nationalBudgetList.budget_year = item2 + _nationalBudgetList.budget_year + ")"; + } + + + foreach (var detail in _nationalBudgetList.data) + { + if (detail != null) + { + detail.total_amount = (detail.quantity * detail.unit_price); + } + } + + + var nationalBudgetLists = new List() { _nationalBudgetList }; + Report report = new Report(); + report.Load(_setting.report_path + "national_budget_list.frx"); + report.RegisterData(nationalBudgetLists, "national_budget_list"); + 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", + "ค่าคณะกรรมการตรวจสอบพัสดุในงานจ้างก่อสร้าง" + ".xlsx"); + } + + return Ok(); + } + + [SwaggerOperation("ค่าคณะกรรมการตรวจสอบพัสดุในงานจ้างก่อสร้าง,ค่าคณะกรรมการอื่น ๆ")] + [HttpPost, Route("reports/parcel_inspection_committee/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetCommitteeReport([FromRoute] string type, + [FromBody] parcel_inspection_committee committee) + { + int no = 1; + + foreach (var data in committee.data) + { + data.list = "รายการ " + no; + no++; + foreach (var detail in data.data_detail) + { + if (detail != null) + { + data.total_amount = (detail.quantity * detail.quantity_person * detail.quantity_work * + detail.amount); + } + } + + var s = committee.data.Sum(d => d.total_amount); + committee.total_all_amount = s; + } + + + var _committees = new List() { committee }; + Report report = new Report(); + report.Load(_setting.report_path + "other_committee_fee.frx"); + report.RegisterData(_committees, "parcel_inspection_committee"); + 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", + "national_budget_list" + ".xlsx"); + } + + return Ok(); + } + + [SwaggerOperation("ค่าจ้างให้บริการงานจ้างออกแบบ")] + [HttpPost, Route("reports/design_services/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetDesignServicesReport([FromRoute] string type, + [FromBody] parcel_inspection_committee committee) + { + int no = 1; + string per = "%"; + + foreach (var data in committee.data) + { + data.list = "รายการ " + no; + no++; + foreach (var detail in data.data_detail) + { + if (detail != null) + { + detail.unit = detail.quantity_work + per; + detail.amount = (detail.quantity * detail.quantity_person * detail.quantity_work)/100; + } + } + + var total = data.data_detail.Sum(d => d.amount); + data.total_amount = total; + + var s = committee.data.Sum(d => d.total_amount); + committee.total_all_amount = s; + } + + var _committees = new List() { committee }; + Report report = new Report(); + report.Load(_setting.report_path + "design_services.frx"); + report.RegisterData(_committees, "parcel_inspection_committee"); + 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", + "ค่าจ้างให้บริการงานจ้างออกแบบ" + ".xlsx"); + } + + return Ok(); + } + [SwaggerOperation("ค่าอาหารทำการนอกเวลา 1 วันทำการปกติ 2 วันหยุดราชการ")] + [HttpPost, Route("reports/meal_costs_outside/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetDesignServicesReport([FromRoute] string type, + [FromBody] meal_costs_outside mealCostsOutsides) + { + var meals = mealCostsOutsides.data.ToList(); + if (mealCostsOutsides.topic_type==1) + { + mealCostsOutsides.topic = "วันทำการปกติ"; + } + if (mealCostsOutsides.topic_type==2) + { + mealCostsOutsides.topic = "วันหยุดราชการ"; + } + foreach (var detail in mealCostsOutsides.data) + { + detail.total_amount = (detail.day*detail.person*detail.amount); + } + mealCostsOutsides.day = mealCostsOutsides.data.Sum(d => d.day); + mealCostsOutsides.person = mealCostsOutsides.data.Sum(d => d.person); + mealCostsOutsides.amount = mealCostsOutsides.data.Sum(d => d.amount); + mealCostsOutsides.total_amount = meals.Sum(f => f.total_amount); + + var meal = new List() { mealCostsOutsides }; + Report report = new Report(); + report.Load(_setting.report_path + "meal_costs_outside.frx"); + report.RegisterData(meal, "meal_costs_outside"); + 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", + "ค่าอาหารทำการนอกเวลา" + ".xlsx"); + } + + return Ok(); + } } } \ No newline at end of file diff --git a/Models/budget/meal_costs_outside.cs b/Models/budget/meal_costs_outside.cs new file mode 100644 index 0000000..acb46ad --- /dev/null +++ b/Models/budget/meal_costs_outside.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; + +namespace rmutr_report.Models +{ + public class meal_costs_outside + { + public int? topic_type { get; set; } + public string topic { get; set; } + public decimal? day { get; set; } + public decimal? person { get; set; } + public decimal? amount { get; set; } + public decimal? total_amount { get; set; } + + public Listdata { get; set; } + } + + public class meal_costs_outside_detail + { + public string topic { get; set; } + public decimal? day { get; set; } + public decimal? person { get; set; } + public decimal? amount { get; set; } + public decimal? total_amount { get; set; } + } +} \ No newline at end of file diff --git a/Models/budget/national_budget_list.cs b/Models/budget/national_budget_list.cs new file mode 100644 index 0000000..2fd3f05 --- /dev/null +++ b/Models/budget/national_budget_list.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; + +namespace rmutr_report.Models +{ + public class national_budget_list + { + public int? report_type { get; set; } + public string type { get; set; } + public string budget_year { get; set; } + public List data { get; set; } + } + + public class national_budget_list_detail + { + public string list { get; set; } + public decimal? quantity { get; set; } + public string unit { get; set; } + public decimal? unit_price { get; set; } + public decimal? total_amount { get; set; } + + } +} \ No newline at end of file diff --git a/Models/budget/parcel_inspection_committee.cs b/Models/budget/parcel_inspection_committee.cs new file mode 100644 index 0000000..09ac945 --- /dev/null +++ b/Models/budget/parcel_inspection_committee.cs @@ -0,0 +1,29 @@ +using System.Collections.Generic; + +namespace rmutr_report.Models +{ + public class parcel_inspection_committee + { + public string topic_name { get; set; } + public decimal? total_all_amount { get; set; } + public List data { get; set; } + } + + public class committee + { + public string list { get; set; } + public decimal? total_amount { get; set; } + + public List data_detail { get; set; } + + } + + public class committee_data + { + public decimal? quantity { get; set; } + public decimal? quantity_person { get; set; } + public decimal? amount { get; set; } + public decimal? quantity_work { get; set; } + public string unit { get; set; } + } +} \ No newline at end of file diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 7e4cf0c..2d37eba 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 b574dbf..01da731 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 0104036..64df514 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 ade3ac6..0b5d828 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 abb4ad6..3a5a213 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 abb4ad6..3a5a213 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 4132dda..014f47f 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6f98eaa7cd9622032caa74a0439d02842244e219 +4fe8cf0520c1058922f88691f3962ea94be0b3dc diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 7e4cf0c..2d37eba 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 b574dbf..01da731 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 f5cfe77..38c965f 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 @@ -320,6 +320,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\data_line_support.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\design_services.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\design_services.frx)) + Package rmutr_report @@ -896,6 +912,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\material_sport.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\meal_costs_outside.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\meal_costs_outside.frx)) + Package rmutr_report @@ -912,6 +944,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\mtef_plan.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\national_budget_list.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\national_budget_list.frx)) + Package rmutr_report @@ -1008,6 +1056,38 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\operating_expenses.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\other_committee_fee.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\other_committee_fee.frx)) + + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\parcel_inspection_committee.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\parcel_inspection_committee.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 44b7a29..df46552 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 @@ -30ffb1b917a7940f2113a9893d63f0242ae2ce84 +5f92d7595eb0985f81447ccd37a39776df99a9b9 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache index 8e55b9a..853563f 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e7bf80044d6fb9241039252a0030601ca4d59acf +bde60c3a1e262956ffbc03163cd461622f8b5747 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 0104036..64df514 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 ade3ac6..0b5d828 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 f5cfe77..38c965f 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 @@ -320,6 +320,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\data_line_support.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\design_services.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\design_services.frx)) + Package rmutr_report @@ -896,6 +912,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\material_sport.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\meal_costs_outside.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\meal_costs_outside.frx)) + Package rmutr_report @@ -912,6 +944,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\mtef_plan.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\national_budget_list.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\national_budget_list.frx)) + Package rmutr_report @@ -1008,6 +1056,38 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\operating_expenses.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\other_committee_fee.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\other_committee_fee.frx)) + + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\parcel_inspection_committee.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\parcel_inspection_committee.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 44b7a29..df46552 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 @@ -30ffb1b917a7940f2113a9893d63f0242ae2ce84 +5f92d7595eb0985f81447ccd37a39776df99a9b9 diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index dbcd193..01d5c0e 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -16976933854287525 \ No newline at end of file +16978702836935477 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index dbcd193..aec0e52 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16976933854287525 \ No newline at end of file +16978837858099535 \ No newline at end of file diff --git a/wwwroot/reports/design_services.frx b/wwwroot/reports/design_services.frx new file mode 100644 index 0000000..ea2bb15 --- /dev/null +++ b/wwwroot/reports/design_services.frx @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/meal_costs_outside.frx b/wwwroot/reports/meal_costs_outside.frx new file mode 100644 index 0000000..be6aca2 --- /dev/null +++ b/wwwroot/reports/meal_costs_outside.frx @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/national_budget_list.frx b/wwwroot/reports/national_budget_list.frx new file mode 100644 index 0000000..05f3c0e --- /dev/null +++ b/wwwroot/reports/national_budget_list.frx @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/other_committee_fee.frx b/wwwroot/reports/other_committee_fee.frx new file mode 100644 index 0000000..bac0fd3 --- /dev/null +++ b/wwwroot/reports/other_committee_fee.frx @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/parcel_inspection_committee.frx b/wwwroot/reports/parcel_inspection_committee.frx new file mode 100644 index 0000000..3fb3fe6 --- /dev/null +++ b/wwwroot/reports/parcel_inspection_committee.frx @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +