diff --git a/Controllers/AgencyReport.Controller.cs b/Controllers/AgencyReport.Controller.cs new file mode 100644 index 0000000..bcca404 --- /dev/null +++ b/Controllers/AgencyReport.Controller.cs @@ -0,0 +1,173 @@ +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using ClosedXML.Excel; +using FastReport; +using FastReport.Export.Csv; +using FastReport.Export.Mht; +using FastReport.Export.OoXML; +using FastReport.Export.Pdf; +using Microsoft.AspNetCore.Mvc; +using rmutr_report.Models; +using Swashbuckle.AspNetCore.Annotations; + +namespace rmutr_report.Controllers +{ + [SwaggerTag("สำหรับรายงานผลการดำเนินงานโครงการ")] + public class AgencyReport: Controller + { + public readonly Setting _setting; + + public AgencyReport(Setting setting) + { + this._setting = setting; + } + [HttpPost, Route("reports/agency_report/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetAgencyReport([FromRoute] string type, [FromBody] List agencyReports) + { + foreach (var agencyReport in agencyReports) + { + if (agencyReport.start_date!=null && agencyReport.end_date!=null) + { + agencyReport.startdate = agencyReport.start_date?.ToString("dd MMMM yyyy", + CultureInfo.CreateSpecificCulture("th-TH")) ?? ""; + agencyReport.enddate = agencyReport.end_date?.ToString("dd MMMM yyyy", + CultureInfo.CreateSpecificCulture("th-TH")) ?? ""; + } + + if (agencyReport.bool_11_1==true) + { + agencyReport.bool_11_1_text = "X"; + } + else + { + agencyReport.bool_11_1_text = ""; + } + if (agencyReport.bool_11_2==true) + { + agencyReport.bool_11_2_text = "X"; + } + else + { + agencyReport.bool_11_2_text = ""; + } + if (agencyReport.bool_11_3==true) + { + agencyReport.bool_11_3_text = "X"; + }else + { + agencyReport.bool_11_3_text = ""; + } + // + if (agencyReport.bool_13_1==true) + { + agencyReport.text_13_1 = "X"; + } + else + { + agencyReport.text_13_1 = ""; + } + if (agencyReport.bool_13_2==true) + { + agencyReport.text_13_2 = "X"; + } + else + { + agencyReport.text_13_2 = ""; + } + if (agencyReport.bool_13_3==true) + { + agencyReport.text_13_3 = "X"; + }else + { + agencyReport.text_13_3 = ""; + } + if (agencyReport.bool_13_4==true) + { + agencyReport.text_13_4 = "X"; + }else + { + agencyReport.text_13_4 = ""; + } + if (agencyReport.bool_13_5==true) + { + agencyReport.text_13_5 = "X"; + }else + { + agencyReport.text_13_5 = ""; + } + if (agencyReport.bool_13_6==true) + { + agencyReport.text_13_6 = "X"; + }else + { + agencyReport.text_13_6 = ""; + } + if (agencyReport.bool_13_7==true) + { + agencyReport.text_13_7 = "X"; + }else + { + agencyReport.text_13_7 = ""; + } + // + if (agencyReport.bool_25_1==true) + { + agencyReport.text_25_1 = "X"; + } + else + { + agencyReport.text_25_1 = ""; + } + if (agencyReport.bool_25_2==true) + { + agencyReport.text_25_2 = "X"; + } + else + { + agencyReport.text_25_2 = ""; + } + } + + Report report = new Report(); + report.Load(_setting.report_path + "agency_report.frx"); + report.RegisterData(agencyReports, "agency_report"); + 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.ms-excel"); + break; + case "mht": + MHTExport mht = new MHTExport(); + report.Export(mht, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "multipart/related"); + break; + case "doc": case "docx": + Word2007Export word = new Word2007Export(); + report.Export(word, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "appllication/vnd.ms-word"); + break; + } + + return Ok(); + } + + } +} \ No newline at end of file diff --git a/Models/budget/agency_report.cs b/Models/budget/agency_report.cs new file mode 100644 index 0000000..9bfe4cb --- /dev/null +++ b/Models/budget/agency_report.cs @@ -0,0 +1,323 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; + +public class agency_report +{ + [Key] public Guid? agency_report_uid { get; set; } + public Guid? change_project_detail_uid { get; set; } + public string budget_year_uid { get; set; } + public string budget_year_name_th { get; set; } + public string project_name_th { get; set; } + public string responsible_agency_name_th { get; set; } + + public string responsible_faculty_name_th { get; set; } + + //4. ระยะเวลาดำเนินโครงการ + public DateTime? start_date { get; set; } + + public DateTime? end_date { get; set; } + public string startdate { get; set; } + public string enddate { get; set; } + + //5. สถานที่ดำเนินโครงการ + public string location { get; set; } + + //6. ผลผลิต + public string text_6 { get; set; } + + //7 + public string text_7 { get; set; } + + public string text_9 { get; set; } + + public string text_10 { get; set; } + + //11. งบประมาณ + public bool? bool_11_1 { get; set; } + public bool? bool_11_2 { get; set; } + public bool? bool_11_3 { get; set; } + public string bool_11_1_text { get; set; } + public string bool_11_2_text { get; set; } + public string bool_11_3_text { get; set; } + public string bool_11_3_remark { get; set; } //ไม่ได้ใช้ + public string text_11_1 { get; set; } + public string text_11_2 { get; set; } + + public string text_11_3 { get; set; } + public decimal? decimal_11_1 { get; set; } + public decimal? decimal_11_2 { get; set; } + + public decimal? decimal_11_3 { get; set; } + + //12.1 เชิงปริมาณ + public decimal? decimal_12_1_1 { get; set; } + public decimal? decimal_12_1_2 { get; set; } + public decimal? decimal_12_1_3 { get; set; } + public decimal? decimal_12_1_4 { get; set; } + public decimal? decimal_12_1_5 { get; set; } + public decimal? decimal_12_1_6 { get; set; } + public decimal? decimal_12_1_7 { get; set; } + public decimal? decimal_12_1_8 { get; set; } + public decimal? decimal_12_1_9 { get; set; } + public decimal? decimal_12_1_10 { get; set; } + public decimal? decimal_12_1_11 { get; set; } + public decimal? decimal_12_1_12 { get; set; } + public decimal? decimal_12_1_13 { get; set; } + public decimal? decimal_12_1_14 { get; set; } + public decimal? decimal_12_1_15 { get; set; } + public decimal? decimal_12_1_16 { get; set; } + public decimal? decimal_12_1_17 { get; set; } + public decimal? decimal_12_1_18 { get; set; } + public decimal? decimal_12_1_19 { get; set; } + public decimal? decimal_12_1_20 { get; set; } + public decimal? decimal_12_1_21 { get; set; } + + public decimal? decimal_12_1_22 { get; set; } + + //12.2 เชิงคุณภาพ (เลือกตอบตามผลผลิตของโครงการ) + public decimal? decimal_12_2_1 { get; set; } + public decimal? decimal_12_2_2 { get; set; } + public decimal? decimal_12_2_3 { get; set; } + public decimal? decimal_12_2_4 { get; set; } + public decimal? decimal_12_2_5 { get; set; } + public decimal? decimal_12_2_6 { get; set; } + public decimal? decimal_12_2_7 { get; set; } + public decimal? decimal_12_2_8 { get; set; } + public decimal? decimal_12_2_9 { get; set; } + public decimal? decimal_12_2_10 { get; set; } + public decimal? decimal_12_2_11 { get; set; } + public decimal? decimal_12_2_12 { get; set; } + public decimal? decimal_12_2_13 { get; set; } + public decimal? decimal_12_2_14 { get; set; } + + public decimal? decimal_12_3_1 { get; set; } + + //12.4 ตัวชี้วัดตามวัตถุประสงค์ของโครงการ + public string decimal_12_4_row_1_1 { get; set; } + public string decimal_12_4_row_1_2 { get; set; } + public string decimal_12_4_row_1_3 { get; set; } + public string decimal_12_4_row_1_4 { get; set; } + public string decimal_12_4_row_1_5 { get; set; } + public string decimal_12_4_row_2_1 { get; set; } + public string decimal_12_4_row_2_2 { get; set; } + public string decimal_12_4_row_2_3 { get; set; } + public string decimal_12_4_row_2_4 { get; set; } + public string decimal_12_4_row_2_5 { get; set; } + public string decimal_12_4_row_3_1 { get; set; } + public string decimal_12_4_row_3_2 { get; set; } + public string decimal_12_4_row_3_3 { get; set; } + public string decimal_12_4_row_3_4 { get; set; } + public string decimal_12_4_row_3_5 { get; set; } + public string decimal_12_4_file { get; set; } + + //13. ผลการดำเนินโครงการนี้สอดคล้องค่านิยม (D - MOVE UP) ของมหาวิทยาลัยด้านใด + public bool? bool_13_1 { get; set; } + public bool? bool_13_2 { get; set; } + public bool? bool_13_3 { get; set; } + public bool? bool_13_4 { get; set; } + public bool? bool_13_5 { get; set; } + public bool? bool_13_6 { get; set; } + public bool? bool_13_7 { get; set; } + public string text_13_1 { get; set; } + public string text_13_2 { get; set; } + public string text_13_3 { get; set; } + public string text_13_4 { get; set; } + public string text_13_5 { get; set; } + public string text_13_6 { get; set; } + public string text_13_7 { get; set; } + public string text_13_remark { get; set; } + + + public string text_14 { get; set; } + + //15. โครงการนี้สอดคล้องกับเป้าหมายการพัฒนาที่ยั่งยืน (Sustainable Development Goals : SDGs) ด้านใด + public string text_15 { get; set; } + + //16. วิเคราะห์ความคุ้มค่าของการดำเนินงานโครงการ + public string text_16 { get; set; } + public string text_17 { get; set; } + public string text_18 { get; set; } + public string text_19 { get; set; } + public string text_20 { get; set; } + + public string text_21 { get; set; } + + //22. ผลที่คาดว่าจะได้รับ + public string text_22_1 { get; set; } + + public string text_22_2 { get; set; } + + //23. แผนการดำเนินการ + public string text_23 { get; set; } + + public string text_24 { get; set; } + + //25. ประสงค์จะนำเสนอโครงการนี้ในรายงานประจำปีของมหาวิทยาลัยฯ + public bool? bool_25_1 { get; set; } + public bool? bool_25_2 { get; set; } + public string text_25_1 { get; set; } + public string text_25_2 { get; set; } + public string text_25_row_1_1 { get; set; } + public string text_25_row_1_2 { get; set; } + public decimal? decimal_25_row_1_1 { get; set; } + public decimal? decimal_25_row_1_2 { get; set; } + public string text_25_row_2 { get; set; } + public decimal? decimal_25_row_2_1 { get; set; } + public decimal? decimal_25_row_2_2 { get; set; } + public string text_25_row_3 { get; set; } + public decimal? decimal_25_row_3_1 { get; set; } + public decimal? decimal_25_row_3_2 { get; set; } + public string text_25_row_4 { get; set; } + public decimal? decimal_25_row_4_1 { get; set; } + public decimal? decimal_25_row_4_2 { get; set; } + public string text_25_row_5 { get; set; } + public decimal? decimal_25_row_5_1 { get; set; } + public decimal? decimal_25_row_5_2 { get; set; } + public string text_25_row_6 { get; set; } + public decimal? decimal_25_row_6_1 { get; set; } + public decimal? decimal_25_row_6_2 { get; set; } + public string text_25_row_7 { get; set; } + public decimal? decimal_25_row_7_1 { get; set; } + public decimal? decimal_25_row_7_2 { get; set; } + public string text_25_row_8 { get; set; } + public decimal? decimal_25_row_8_1 { get; set; } + public decimal? decimal_25_row_8_2 { get; set; } + public string text_25_row_9 { get; set; } + public decimal? decimal_25_row_9_1 { get; set; } + public decimal? decimal_25_row_9_2 { get; set; } + public string text_25_row_10 { get; set; } + public decimal? decimal_25_row_10_1 { get; set; } + public decimal? decimal_25_row_10_2 { get; set; } + public string text_25_row_11 { get; set; } + public decimal? decimal_25_row_11_1 { get; set; } + public decimal? decimal_25_row_11_2 { get; set; } + public string text_25_row_12 { get; set; } + public decimal? decimal_25_row_12_1 { get; set; } + public decimal? decimal_25_row_12_2 { get; set; } + public string text_25_row_13 { get; set; } + public decimal? decimal_25_row_13_1 { get; set; } + public decimal? decimal_25_row_13_2 { get; set; } + public string text_25_row_14 { get; set; } + public decimal? decimal_25_row_14_1 { get; set; } + public decimal? decimal_25_row_14_2 { get; set; } + public string text_25_row_15 { get; set; } + public decimal? decimal_25_row_15_1 { get; set; } + public decimal? decimal_25_row_15_2 { get; set; } + public string text_25_row_16 { get; set; } + public decimal? decimal_25_row_16_1 { get; set; } + public decimal? decimal_25_row_16_2 { get; set; } + public string text_25_row_17 { get; set; } + public decimal? decimal_25_row_17_1 { get; set; } + public decimal? decimal_25_row_17_2 { get; set; } + public string text_25_row_18 { get; set; } + public decimal? decimal_25_row_18_1 { get; set; } + public decimal? decimal_25_row_18_2 { get; set; } + public string text_25_row_19 { get; set; } + public decimal? decimal_25_row_19_1 { get; set; } + public decimal? decimal_25_row_19_2 { get; set; } + public string text_25_row_20 { get; set; } + public decimal? decimal_25_row_20_1 { get; set; } + public decimal? decimal_25_row_20_2 { get; set; } + public string text_25_row_21 { get; set; } + public decimal? decimal_25_row_21_1 { get; set; } + public decimal? decimal_25_row_21_2 { get; set; } + public string text_25_row_22 { get; set; } + public decimal? decimal_25_row_22_1 { get; set; } + public decimal? decimal_25_row_22_2 { get; set; } + public string text_25_row_23 { get; set; } + public decimal? decimal_25_row_23_1 { get; set; } + public decimal? decimal_25_row_23_2 { get; set; } + public string text_25_row_24 { get; set; } + public decimal? decimal_25_row_24_1 { get; set; } + public decimal? decimal_25_row_24_2 { get; set; } + public string text_25_row_25 { get; set; } + public decimal? decimal_25_row_25_1 { get; set; } + public decimal? decimal_25_row_25_2 { get; set; } + public string text_25_row_26 { get; set; } + public decimal? decimal_25_row_26_1 { get; set; } + public decimal? decimal_25_row_26_2 { get; set; } + public string text_25_row_27 { get; set; } + public decimal? decimal_25_row_27_1 { get; set; } + public decimal? decimal_25_row_27_2 { get; set; } + public string text_25_row_28 { get; set; } + public decimal? decimal_25_row_28_1 { get; set; } + public decimal? decimal_25_row_28_2 { get; set; } + public string text_25_row_29 { get; set; } + public decimal? decimal_25_row_29_1 { get; set; } + public decimal? decimal_25_row_29_2 { get; set; } + public string text_25_row_30 { get; set; } + public decimal? decimal_25_row_30_1 { get; set; } + public decimal? decimal_25_row_30_2 { get; set; } + public string text_25_row_31 { get; set; } + public decimal? decimal_25_row_31_1 { get; set; } + public decimal? decimal_25_row_31_2 { get; set; } + public string text_25_row_32 { get; set; } + public decimal? decimal_25_row_32_1 { get; set; } + public decimal? decimal_25_row_32_2 { get; set; } + public string text_25_row_33 { get; set; } + public decimal? decimal_25_row_33_1 { get; set; } + public decimal? decimal_25_row_33_2 { get; set; } + public string text_25_row_34 { get; set; } + public decimal? decimal_25_row_34_1 { get; set; } + public decimal? decimal_25_row_34_2 { get; set; } + public string text_25_row_35 { get; set; } + public decimal? decimal_25_row_35_1 { get; set; } + public decimal? decimal_25_row_35_2 { get; set; } + public string text_25_row_36 { get; set; } + public decimal? decimal_25_row_36_1 { get; set; } + public decimal? decimal_25_row_36_2 { get; set; } + public string text_25_row_37 { get; set; } + public decimal? decimal_25_row_37_1 { get; set; } + public decimal? decimal_25_row_37_2 { get; set; } + public string text_25_row_38 { get; set; } + public decimal? decimal_25_row_38_1 { get; set; } + public decimal? decimal_25_row_38_2 { get; set; } + public string text_25_row_39 { get; set; } + public decimal? decimal_25_row_39_1 { get; set; } + public decimal? decimal_25_row_39_2 { get; set; } + public string text_25_row_40 { get; set; } + public decimal? decimal_25_row_40_1 { get; set; } + public decimal? decimal_25_row_40_2 { get; set; } + public string text_25_row_41 { get; set; } + public decimal? decimal_25_row_41_1 { get; set; } + public decimal? decimal_25_row_41_2 { get; set; } + public string text_25_row_42 { get; set; } + public decimal? decimal_25_row_42_1 { get; set; } + public decimal? decimal_25_row_42_2 { get; set; } + public decimal? decimal_25_total_1 { get; set; } + + public decimal? decimal_25_total_2 { get; set; } + +//26. แบบฟอร์มรายงานผลการดำเนินการโครงการ + public string text_26_1 { get; set; } + public string text_26_2 { get; set; } + public string text_26_3 { get; set; } + public string text_26_4_row_1_1 { get; set; } + public string text_26_4_row_1_2 { get; set; } + public string text_26_4_row_1_3 { get; set; } + public string text_26_4_row_2_1 { get; set; } + public string text_26_4_row_2_2 { get; set; } + public string text_26_4_row_2_3 { get; set; } + public string text_26_4_row_3_1 { get; set; } + public string text_26_4_row_3_2 { get; set; } + public string text_26_4_row_3_3 { get; set; } + public bool? is_sent { get; set; } + public List agency_report_details { get; set; } +} + +public class agency_report_detail +{ + //8. ประเด็นยุทธศาสตร์ของมหาวิทยาลัย + //14.1 ตัวชี้วัดผลสัมฤทธิ์ + //14.2 ตัวชี้วัดเชิงนโยบาย + //25 แนบไฟล์ + [Key] public Guid? agency_report_detail_uid { get; set; } + public Guid? agency_report_uid { get; set; } + public decimal? type { get; set; } + public string text_1 { get; set; } + public string text_2 { get; set; } + public string file_url { get; set; } + public string file_name { get; set; } + public decimal? row { 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 f8212e0..d3c409c 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 80fe96c..eba8e46 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/net5.0/rmutr_report.runtimeconfig.dev.json b/bin/Debug/net5.0/rmutr_report.runtimeconfig.dev.json index 2d16c52..08bbb47 100644 --- a/bin/Debug/net5.0/rmutr_report.runtimeconfig.dev.json +++ b/bin/Debug/net5.0/rmutr_report.runtimeconfig.dev.json @@ -2,7 +2,8 @@ "runtimeOptions": { "additionalProbingPaths": [ "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\USER\\.nuget\\packages" + "C:\\Users\\USER\\.nuget\\packages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ] } } \ No newline at end of file diff --git a/bin/Debug/netcoreapp3.1/font2021.3.0.list b/bin/Debug/netcoreapp3.1/font2021.3.0.list index 779220a..7ea214f 100644 --- a/bin/Debug/netcoreapp3.1/font2021.3.0.list +++ b/bin/Debug/netcoreapp3.1/font2021.3.0.list @@ -496,3 +496,16 @@ Microsoft Uighur-B C:\WINDOWS\Fonts\MSUIGHUB.TTF Microsoft Uighur C:\WINDOWS\Fonts\MSUIGHUR.TTF JS Wansika C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\JS-Wansika-Italic.ttf SimSun-ExtG C:\WINDOWS\Fonts\SimsunExtG.ttf +TH Niramit AS Bold-B C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\TH Niramit AS-IT๙ Bold Italic.ttf +TH Niramit AS-B C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\TH Niramit AS-IT๙ Bold Italic.ttf +TH NiramitIT๙ -B C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\TH Niramit AS-IT๙ Bold Italic.ttf +TH NiramitIT๙-B C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\TH NiramitIT๙ Bold.ttf +TH Niramit AS Italic C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\TH NiramitIT๙ Italic.ttf +TH Niramit AS C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\TH NiramitIT๙ Italic.ttf +TH NiramitIT๙ C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\TH NiramitIT๙ Italic.ttf +TH Niramit AS Regular C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\TH NiramitIT๙.ttf +TH SarabunIT๙-B C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\THSarabunIT๙ Bold.ttf +TH SarabunIT๙ C:\Users\USER\AppData\Local\Microsoft\Windows\Fonts\THSarabunIT๙ Italic.ttf +Nirmala Text C:\WINDOWS\Fonts\Nirmala.ttc +Nirmala Text-B C:\WINDOWS\Fonts\Nirmala.ttc +Nirmala Text Semilight C:\WINDOWS\Fonts\Nirmala.ttc diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 714e04c..8dbaedc 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 c12a4db..9636810 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.runtimeconfig.dev.json b/bin/Debug/netcoreapp3.1/rmutr_report.runtimeconfig.dev.json index 2d16c52..08bbb47 100644 --- a/bin/Debug/netcoreapp3.1/rmutr_report.runtimeconfig.dev.json +++ b/bin/Debug/netcoreapp3.1/rmutr_report.runtimeconfig.dev.json @@ -2,7 +2,8 @@ "runtimeOptions": { "additionalProbingPaths": [ "C:\\Users\\USER\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\USER\\.nuget\\packages" + "C:\\Users\\USER\\.nuget\\packages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ] } } \ No newline at end of file diff --git a/obj/Debug/net5.0/ref/rmutr_report.dll b/obj/Debug/net5.0/ref/rmutr_report.dll index 2a02331..ee21ddd 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 2a02331..ee21ddd 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.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index ecd8b91..52f7543 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ca8e2cd5296c02fd741e685680952221fc102ef8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91cff19bff1260866d947163111eb8dd29ad5077")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache index b25aa80..56e93e5 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -26ccf86dd2309d691421f4882a4ddf3cf76361cfee1b17fa9e0baddd28d07262 +0acb8f26062a50e497e3d20f8ebbaf2a2401ca261db2b8a593f3d5291aef38be diff --git a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig index 2d0442e..ed28e23 100644 --- a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = rmutr_report -build_property.ProjectDir = D:\rmutr_report\ +build_property.ProjectDir = D:\RiderProjects\rmutr_report\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache index ef3c634..c8dc2f0 100644 --- a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -08619e1b8ba5e27a3732f2f406b29a11619bf4ec3fadc7dbee79f3643968f813 +9366782ca8670ec554b748dfb699af96890da62fe84a37ad0dedfa8a188a61c7 diff --git a/obj/Debug/net5.0/rmutr_report.assets.cache b/obj/Debug/net5.0/rmutr_report.assets.cache index 0fd8e0c..70b70da 100644 Binary files a/obj/Debug/net5.0/rmutr_report.assets.cache and b/obj/Debug/net5.0/rmutr_report.assets.cache differ diff --git a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache index 2e7a948..a6fe560 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1113be5b04dbff14ad751114777351ff07a88f9d67472e81e74a85b3dc9706ae +afa51354446f76983805385c50d950b725c69d494d45a2a50d7b7ccdad211a64 diff --git a/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt b/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt index bb95249..df85465 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt +++ b/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt @@ -293,3 +293,114 @@ D:\rmutr_report\obj\Debug\net5.0\rmutr_report.xml D:\rmutr_report\obj\Debug\net5.0\rmutr_report.pdb D:\rmutr_report\obj\Debug\net5.0\rmutr_report.genruntimeconfig.cache D:\rmutr_report\obj\Debug\net5.0\ref\rmutr_report.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\appsettings.Development.json +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\appsettings.json +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\nuget.config +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.exe +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.deps.json +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.runtimeconfig.json +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.runtimeconfig.dev.json +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.pdb +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.xml +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ClosedXML.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\DocumentFormat.OpenXml.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\EPPlus.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\EPPlus.Interfaces.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\EPPlus.System.Drawing.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ExcelNumberFormat.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\FastReport.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.Bcl.AsyncInterfaces.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.CSharp.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.VisualBasic.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.Extensions.Configuration.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.Extensions.Configuration.FileExtensions.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.Extensions.Configuration.Json.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.Extensions.FileProviders.Abstractions.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.Extensions.FileProviders.Physical.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.Extensions.FileSystemGlobbing.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.Extensions.Primitives.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.IO.RecyclableMemoryStream.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.OpenApi.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.Annotations.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.Swagger.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.SwaggerGen.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.SwaggerUI.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\System.Data.SqlClient.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\System.Formats.Asn1.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\System.IO.Packaging.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\System.Runtime.CompilerServices.Unsafe.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\System.Security.Cryptography.Pkcs.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\System.Text.Encoding.CodePages.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\System.Text.Encodings.Web.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\System.Text.Json.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.CSharp.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.VisualBasic.resources.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\any\lib\netcoreapp3.0\FastReport.Compat.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\any\lib\netcoreapp3.0\FastReport.DataVisualization.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\win-arm64\native\sni.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\win-x64\native\sni.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\win-x86\native\sni.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\unix\lib\netstandard2.0\System.Data.SqlClient.dll +D:\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\win\lib\netstandard2.0\System.Data.SqlClient.dll +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.csproj.AssemblyReference.cache +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.GeneratedMSBuildEditorConfig.editorconfig +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.AssemblyInfoInputs.cache +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.AssemblyInfo.cs +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.csproj.CoreCompileInputs.cache +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.MvcApplicationPartsAssemblyInfo.cs +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.MvcApplicationPartsAssemblyInfo.cache +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.RazorTargetAssemblyInfo.cache +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\scopedcss\bundle\rmutr_report.styles.css +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\rmutr_report.StaticWebAssets.Manifest.cache +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\rmutr_report.StaticWebAssets.Pack.cache +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.build.rmutr_report.props +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildMultiTargeting.rmutr_report.props +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildTransitive.rmutr_report.props +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_re.3485F772.Up2Date +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.dll +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\refint\rmutr_report.dll +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.xml +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.pdb +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.genruntimeconfig.cache +D:\RiderProjects\rmutr_report\obj\Debug\net5.0\ref\rmutr_report.dll diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index f8212e0..d3c409c 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.genruntimeconfig.cache b/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache index f62e5e1..baa35c3 100644 --- a/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache +++ b/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache @@ -1 +1 @@ -9fd51d689317bae2df7e6c03e1aa38a8ef39c0ee7fa204d8be959658ed865b39 +a5ef75f99af2eee31f5a932ded7be2dc15e8717b653f96aa244f5d67f305128a diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index 80fe96c..eba8e46 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 4470696..feaf436 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 @@ -48,6 +48,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\academic_position_leave_graph.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\agency_report.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\agency_report.frx)) + Package rmutr_report @@ -112,6 +128,38 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\budget_expenditure_report_from_revenue_excel2.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_excel2.frx)) + + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\budget_expenditure_report_from_revenue_excel2_color.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_excel2_color.frx)) + Package rmutr_report @@ -256,6 +304,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\building_fours.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\building_fours_v1.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\building_fours_v1.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 5b22b50..87d2cab 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 @@ -13cdb6bff8b6334d2005de7ec93a4a0ae5333f90c9132f14305e07a5ef439f62 +55bc044448429e1c530fe751e53f25556ac50f37a37299c368138242061eff81 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index ecd8b91..52f7543 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ca8e2cd5296c02fd741e685680952221fc102ef8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+91cff19bff1260866d947163111eb8dd29ad5077")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache index b25aa80..56e93e5 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -26ccf86dd2309d691421f4882a4ddf3cf76361cfee1b17fa9e0baddd28d07262 +0acb8f26062a50e497e3d20f8ebbaf2a2401ca261db2b8a593f3d5291aef38be diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig index fad4428..316f18f 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig @@ -1,5 +1,5 @@ is_global = true build_property.RootNamespace = rmutr_report -build_property.ProjectDir = D:\rmutr_report\ +build_property.ProjectDir = D:\RiderProjects\rmutr_report\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index 6549a4d..c8dc2f0 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -6af9db90da3c0573e9e42df4e8ac89a3cab676a807efa559c3d02814cd3045b6 +9366782ca8670ec554b748dfb699af96890da62fe84a37ad0dedfa8a188a61c7 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache b/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache index e3168c4..16c9b8b 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache and b/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache index e75ed08..31ab3d8 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -839c9e7f0873da70dfcac7ef6998ba9642d45b9afb515631acc12aaf50522c14 +c105c231f3ce6711e6210b4ac2e3c37dad34786ee49ff96c064a57f960448e53 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 714e04c..8dbaedc 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 878997a..8b998e9 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache @@ -1 +1 @@ -b5e2c653fe076104930b2af9403f19014bcf70280af39b285ad36d16ee89c7d3 +f02913d971b707b91ab7c0c5663ad551d5d3657a660bd7326091bba4bcd29ab6 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index c12a4db..9636810 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 83b642d..feaf436 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 @@ -48,6 +48,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\academic_position_leave_graph.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\agency_report.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\agency_report.frx)) + Package rmutr_report @@ -112,38 +128,6 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue.frx)) - - Package - rmutr_report - $(MSBuildThisFileDirectory)..\staticwebassets\ - _content/rmutr_report - reports\budget_expenditure_report_from_revenue_excel.frx - - - - - - - - PreserveNewest - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_excel.frx)) - - - Package - rmutr_report - $(MSBuildThisFileDirectory)..\staticwebassets\ - _content/rmutr_report - reports\budget_expenditure_report_from_revenue_excel1.frx - - - - - - - - PreserveNewest - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_excel1.frx)) - Package rmutr_report @@ -160,6 +144,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_excel2.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\budget_expenditure_report_from_revenue_excel2_color.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_excel2_color.frx)) + Package rmutr_report @@ -304,22 +304,6 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\building_fours.frx)) - - Package - rmutr_report - $(MSBuildThisFileDirectory)..\staticwebassets\ - _content/rmutr_report - reports\building_fours_1.frx - - - - - - - - PreserveNewest - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\building_fours_1.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 b6b428d..87d2cab 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 @@ -feb24e70c21b9d83dc31845e6343ebf94a5549a3846e2fb29ef9fc07034acaa5 +55bc044448429e1c530fe751e53f25556ac50f37a37299c368138242061eff81 diff --git a/obj/project.assets.json b/obj/project.assets.json index cd98167..0b72775 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -3118,19 +3118,23 @@ ] }, "packageFolders": { - "C:\\Users\\USER\\.nuget\\packages\\": {} + "C:\\Users\\USER\\.nuget\\packages\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\rmutr_report\\rmutr_report.csproj", + "projectUniqueName": "D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "projectName": "rmutr_report", - "projectPath": "D:\\rmutr_report\\rmutr_report.csproj", + "projectPath": "D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "D:\\rmutr_report\\obj\\", + "outputPath": "D:\\RiderProjects\\rmutr_report\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "D:\\rmutr_report\\NuGet.Config", + "D:\\RiderProjects\\rmutr_report\\NuGet.Config", "D:\\NuGet.Config", "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" @@ -3152,6 +3156,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -3198,7 +3207,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.203\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.404\\RuntimeIdentifierGraph.json" } } } diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index 068226f..f26cce9 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "rUOAOzehChssPqQT5A5pXZDHvL3N7xxXXX7/cNkHi3kQhRV10qx83fPVJLbEpFHTGl0hrDKn0t4LxnofGuxdDQ==", + "dgSpecHash": "OgRsEN1GWs4=", "success": true, - "projectFilePath": "D:\\rmutr_report\\rmutr_report.csproj", + "projectFilePath": "D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "expectedPackageFiles": [ "C:\\Users\\USER\\.nuget\\packages\\closedxml\\0.96.0\\closedxml.0.96.0.nupkg.sha512", "C:\\Users\\USER\\.nuget\\packages\\documentformat.openxml\\2.16.0\\documentformat.openxml.2.16.0.nupkg.sha512", diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json index e2c98cd..5331053 100644 --- a/obj/project.packagespec.json +++ b/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"D:\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"D:\\rmutr_report\\rmutr_report.csproj","outputPath":"D:\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"EPPlus":{"target":"Package","version":"[7.2.2, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.203\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","outputPath":"D:\\RiderProjects\\rmutr_report\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"],"originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"EPPlus":{"target":"Package","version":"[7.2.2, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.404\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 71cb858..146e73e 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17271548316688011 \ No newline at end of file +17376239754643386 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index dd93377..c6af64b 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17280226596462567 \ No newline at end of file +17379510230109028 \ No newline at end of file diff --git a/obj/rmutr_report.csproj.nuget.dgspec.json b/obj/rmutr_report.csproj.nuget.dgspec.json index b98222f..e9e7695 100644 --- a/obj/rmutr_report.csproj.nuget.dgspec.json +++ b/obj/rmutr_report.csproj.nuget.dgspec.json @@ -1,20 +1,23 @@ { "format": 1, "restore": { - "D:\\rmutr_report\\rmutr_report.csproj": {} + "D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj": {} }, "projects": { - "D:\\rmutr_report\\rmutr_report.csproj": { + "D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\rmutr_report\\rmutr_report.csproj", + "projectUniqueName": "D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "projectName": "rmutr_report", - "projectPath": "D:\\rmutr_report\\rmutr_report.csproj", + "projectPath": "D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "D:\\rmutr_report\\obj\\", + "outputPath": "D:\\RiderProjects\\rmutr_report\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], "configFilePaths": [ - "D:\\rmutr_report\\NuGet.Config", + "D:\\RiderProjects\\rmutr_report\\NuGet.Config", "D:\\NuGet.Config", "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" @@ -36,6 +39,11 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { @@ -82,7 +90,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.203\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.404\\RuntimeIdentifierGraph.json" } } } diff --git a/obj/rmutr_report.csproj.nuget.g.props b/obj/rmutr_report.csproj.nuget.g.props index 700cf72..7ce0999 100644 --- a/obj/rmutr_report.csproj.nuget.g.props +++ b/obj/rmutr_report.csproj.nuget.g.props @@ -5,12 +5,13 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\USER\.nuget\packages\ + C:\Users\USER\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.9.1 + 6.12.2 + diff --git a/wwwroot/reports/agency_report.frx b/wwwroot/reports/agency_report.frx new file mode 100644 index 0000000..d1177f9 --- /dev/null +++ b/wwwroot/reports/agency_report.frx @@ -0,0 +1,843 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +