diff --git a/Controllers/CalculationExcessTuitionFee.Controller.cs b/Controllers/CalculationExcessTuitionFee.Controller.cs
index bb0f86f..0c16627 100644
--- a/Controllers/CalculationExcessTuitionFee.Controller.cs
+++ b/Controllers/CalculationExcessTuitionFee.Controller.cs
@@ -29,42 +29,42 @@ namespace rmutr_report.Controllers
ws.Range("A1:M1").Style.Alignment.WrapText = true;
ws.Range("A1:M1").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Range("A1:M1").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
- ws.Cell("A1").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("A1").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("A1").Style.Font.FontSize = 25;
ws.Range("A1:N1").Style.Font.Bold = true;
ws.Cell("N1").Value = "แบบ ง.6";
ws.Cell("N1").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell("N1").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
- ws.Cell("N1").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("N1").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("N1").Style.Font.FontSize = 14;
ws.Cell("N1").Style.Font.Bold = true;
ws.Range("A2:D2").Merge().Value = "หน่วยงาน "+ _calculation_excess_tuition_fee.agency;
- ws.Cell("A2").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("A2").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("A2").Style.Font.FontSize = 14;
ws.Cell("A2").Style.Font.Bold = true;
ws.Cell("A2").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell("A2").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Range("E2:G2").Merge().Value = "พื้นที่ "+ _calculation_excess_tuition_fee.area;
- ws.Cell("E2").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("E2").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("E2").Style.Font.FontSize = 14;
ws.Cell("E2").Style.Font.Bold = true;
ws.Cell("E2").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell("E2").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Range("A3:G3").Merge().Value = "ผลผลิต "+ _calculation_excess_tuition_fee.product;
- ws.Cell("A3").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("A3").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("A3").Style.Font.FontSize = 14;
ws.Cell("A3").Style.Font.Bold = true;
ws.Cell("A3").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell("A3").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Range("A5:A6").Merge().Value = "ลำดับที่";
- ws.Cell("A5").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("A5").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("A5").Style.Font.FontSize = 14;
ws.Cell("A5").Style.Font.Bold = true;
ws.Cell("A5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell("A5").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Range("A5:A6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range("B5:C6").Merge().Value = "ชื่อ - สกุล (1)";
- ws.Cell("B5").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("B5").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("B5").Style.Font.FontSize = 14;
ws.Cell("B5").Style.Font.Bold = true;
ws.Cell("B5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
@@ -72,7 +72,7 @@ namespace rmutr_report.Controllers
ws.Range("B5:C6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range("D5:D6").Merge().Value = "ตำแหน่ง (2)";
- ws.Cell("D5").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("D5").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("D5").Style.Font.FontSize = 14;
ws.Cell("D5").Style.Font.Bold = true;
ws.Cell("D5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
@@ -80,7 +80,7 @@ namespace rmutr_report.Controllers
ws.Range("D5:D6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range("E5:E6").Merge().Value = "ประเภทบุคลากร (3)";
- ws.Cell("E5").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("E5").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("E5").Style.Font.FontSize = 14;
ws.Cell("E5").Style.Font.Bold = true;
ws.Cell("E5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
@@ -89,7 +89,7 @@ namespace rmutr_report.Controllers
ws.Range("F5:H5").Merge().Value = "จำนวนชั่วโมงที่สอน / 1 ภาคการศึกษา "+_calculation_excess_tuition_fee.academic_semester_name_th1+
" / "+" "+_calculation_excess_tuition_fee.academic_year_name_th1+")";
- ws.Cell("F5").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("F5").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("F5").Style.Font.FontSize = 14;
ws.Cell("F5").Style.Font.Bold = true;
ws.Cell("F5").Style.Alignment.WrapText = true;
@@ -98,7 +98,7 @@ namespace rmutr_report.Controllers
ws.Range("F5:H5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell("F6").Value = "จำนวนชั่วโมงที่สอนตามภาระงานแต่ละประเภท (ตามเกณฑ์) (4)";
- ws.Cell("F6").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("F6").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("F6").Style.Font.FontSize = 14;
ws.Cell("F6").Style.Font.Bold = true;
ws.Cell("F6").Style.Alignment.WrapText = true;
@@ -107,7 +107,7 @@ namespace rmutr_report.Controllers
ws.Cell("F6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell("G6").Value = "จำนวนชั่วโมงที่สอนจริงตามภาระงานแต่ละประเภท (5)";
- ws.Cell("G6").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("G6").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("G6").Style.Font.FontSize = 14;
ws.Cell("G6").Style.Font.Bold = true;
ws.Cell("G6").Style.Alignment.WrapText = true;
@@ -116,7 +116,7 @@ namespace rmutr_report.Controllers
ws.Cell("G6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell("H6").Value = "ผลต่าง ระหว่าง (5) - (4) = (6)";
- ws.Cell("H6").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("H6").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("H6").Style.Font.FontSize = 14;
ws.Cell("H6").Style.Font.Bold = true;
ws.Cell("H6").Style.Alignment.WrapText = true;
@@ -125,7 +125,7 @@ namespace rmutr_report.Controllers
ws.Cell("H6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range("I5:I6").Merge().Value = "อัตราค่าสอน(400) x ( 6 ) = (7)";
- ws.Cell("I5").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("I5").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("I5").Style.Font.FontSize = 14;
ws.Cell("I5").Style.Font.Bold = true;
ws.Cell("I5").Style.Alignment.WrapText = true;
@@ -135,7 +135,7 @@ namespace rmutr_report.Controllers
ws.Range("J5:L5").Merge().Value = "จำนวนชั่วโมงที่สอน / 1 ภาคการศึกษา "+_calculation_excess_tuition_fee.academic_semester_name_th2+
" / "+" "+_calculation_excess_tuition_fee.academic_year_name_th2+")";
- ws.Cell("J5").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("J5").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("J5").Style.Font.FontSize = 14;
ws.Cell("J5").Style.Font.Bold = true;
ws.Cell("J5").Style.Alignment.WrapText = true;
@@ -144,7 +144,7 @@ namespace rmutr_report.Controllers
ws.Range("J5:L5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell("J6").Value = "จำนวนชั่วโมงที่สอนตามภาระงานแต่ละประเภท (ตามเกณฑ์) (8)";
- ws.Cell("J6").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("J6").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("J6").Style.Font.FontSize = 14;
ws.Cell("J6").Style.Font.Bold = true;
ws.Cell("J6").Style.Alignment.WrapText = true;
@@ -153,7 +153,7 @@ namespace rmutr_report.Controllers
ws.Cell("J6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell("K6").Value = "จำนวนชั่วโมงที่สอนจริงตามภาระงานแต่ละประเภท (9)";
- ws.Cell("K6").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("K6").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("K6").Style.Font.FontSize = 14;
ws.Cell("K6").Style.Font.Bold = true;
ws.Cell("K6").Style.Alignment.WrapText = true;
@@ -162,7 +162,7 @@ namespace rmutr_report.Controllers
ws.Cell("K6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell("L6").Value = "ผลต่าง ระหว่าง (9) - (8) = (10)";
- ws.Cell("L6").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("L6").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("L6").Style.Font.FontSize = 14;
ws.Cell("L6").Style.Font.Bold = true;
ws.Cell("L6").Style.Alignment.WrapText = true;
@@ -171,7 +171,7 @@ namespace rmutr_report.Controllers
ws.Cell("L6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range("M5:M6").Merge().Value = "อัตราค่าสอน(400) x (10) = (11)";
- ws.Cell("M5").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("M5").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("M5").Style.Font.FontSize = 14;
ws.Cell("M5").Style.Font.Bold = true;
ws.Cell("M5").Style.Alignment.WrapText = true;
@@ -180,7 +180,7 @@ namespace rmutr_report.Controllers
ws.Range("M5:M6").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range("N5:N6").Merge().Value = "รวมงบประมาณ (7) + (11) = (12)";
- ws.Cell("N5").Style.Font.FontName = "TH Sarabun New";
+ ws.Cell("N5").Style.Font.FontName = "TH SarabunPSK";
ws.Cell("N5").Style.Font.FontSize = 14;
ws.Cell("N5").Style.Font.Bold = true;
ws.Cell("N5").Style.Alignment.WrapText = true;
@@ -266,7 +266,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, 14).Value = expenses.teach_rate_1 + expenses.teach_rate_2;
ws.Range(ws.Cell(row, 1), ws.Cell(row, 14)).Style.Font.FontName =
- "TH Sarabun New";
+ "TH SarabunPSK";
ws.Range(ws.Cell(row, 1), ws.Cell(row, 14)).Style.Font.FontSize = 14;
ws.Range(ws.Cell(row, 1), ws.Cell(row, 14)).Style.Alignment.WrapText = true;
ws.Range(ws.Cell(row, 1), ws.Cell(row, 14)).Style.Alignment.Vertical =
@@ -306,7 +306,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, 14).Value = sum13;
ws.Range(ws.Cell(row, 1), ws.Cell(row, 14)).Style.Font.FontName =
- "TH Sarabun New";
+ "TH SarabunPSK";
ws.Range(ws.Cell(row, 1), ws.Cell(row, 14)).Style.Font.FontSize = 14;
ws.Range(ws.Cell(row, 1), ws.Cell(row, 14)).Style.Alignment.WrapText = true;
ws.Range(ws.Cell(row, 1), ws.Cell(row, 14)).Style.Alignment.Vertical =
diff --git a/Controllers/Expenses.Controller.cs b/Controllers/Expenses.Controller.cs
index 1850780..832c85b 100644
--- a/Controllers/Expenses.Controller.cs
+++ b/Controllers/Expenses.Controller.cs
@@ -71,18 +71,18 @@ namespace rmutr_report.Controllers
// ws.Range("A1:D1").Style.Alignment.WrapText = true;
// ws.Range("A1:D1").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
// ws.Range("A1:D1").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
- // ws.Cell("A1").Style.Font.FontName = "TH Sarabun New";
+ // ws.Cell("A1").Style.Font.FontName = "TH SarabunPSK";
// ws.Cell("A1").Style.Font.FontSize = 14;
// ws.Range("A1:D1").Style.Font.Bold = true;
// ws.Range("A2:D2").Merge().Value = "ผลผลิต " + _operating_expenses.product+ " หน่วยงาน " + _operating_expenses.agency + " พื้นที่ "+_operating_expenses.area;
// ws.Range("A2:D2").Style.Alignment.WrapText = true;
// ws.Range("A2:D2").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
// ws.Range("A2:D2").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
- // ws.Cell("A2").Style.Font.FontName = "TH Sarabun New";
+ // ws.Cell("A2").Style.Font.FontName = "TH SarabunPSK";
// ws.Cell("A2").Style.Font.FontSize = 14;
// ws.Range("A2:D2").Style.Font.Bold = true;
// ws.Cell("D3").Value = "หน่วย : "+ _operating_expenses.total_amount +" บาท";
- // ws.Cell("D3").Style.Font.FontName = "TH Sarabun New";
+ // ws.Cell("D3").Style.Font.FontName = "TH SarabunPSK";
// ws.Cell("D3").Style.Font.FontSize = 14;
// ws.Cell("D3").Style.Font.Bold = true;
// ws.Cell("D3").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
@@ -90,7 +90,7 @@ namespace rmutr_report.Controllers
// //ws.Cell("D3").DataType = XLDataType.Number;
// ws.Cell("D3").Style.NumberFormat.NumberFormatId = 2;
// ws.Cell("A4").Value = "ลำดับที่";
- // ws.Cell("A4").Style.Font.FontName = "TH Sarabun New";
+ // ws.Cell("A4").Style.Font.FontName = "TH SarabunPSK";
// ws.Cell("A4").Style.Font.FontSize = 14;
// ws.Cell("A4").Style.Font.Bold = true;
// ws.Cell("A4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
@@ -100,7 +100,7 @@ namespace rmutr_report.Controllers
// ws.Cell("A5").Style.Border.TopBorder = XLBorderStyleValues.Thin;
// ws.Cell("A5").Style.Border.RightBorder = XLBorderStyleValues.Thin;
// ws.Cell("B4").Value = "งบรายจ่าย";
- // ws.Cell("B4").Style.Font.FontName = "TH Sarabun New";
+ // ws.Cell("B4").Style.Font.FontName = "TH SarabunPSK";
// ws.Cell("B4").Style.Font.FontSize = 14;
// ws.Cell("B4").Style.Font.Bold = true;
// ws.Cell("B4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
@@ -110,7 +110,7 @@ namespace rmutr_report.Controllers
// ws.Cell("B5").Style.Border.TopBorder = XLBorderStyleValues.Thin;
// ws.Cell("B5").Style.Border.RightBorder = XLBorderStyleValues.Thin;
// ws.Cell("C4").Value = "คำขอตั้ง";
- // ws.Cell("C4").Style.Font.FontName = "TH Sarabun New";
+ // ws.Cell("C4").Style.Font.FontName = "TH SarabunPSK";
// ws.Cell("C4").Style.Font.FontSize = 14;
// ws.Cell("C4").Style.Font.Bold = true;
// ws.Cell("C4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
@@ -120,7 +120,7 @@ namespace rmutr_report.Controllers
// ws.Cell("C5").Style.Border.TopBorder = XLBorderStyleValues.Thin;
// ws.Cell("C5").Style.Border.RightBorder = XLBorderStyleValues.Thin;
// ws.Cell("D4").Value = "สรุปคำชี้แจง";
- // ws.Cell("D4").Style.Font.FontName = "TH Sarabun New";
+ // ws.Cell("D4").Style.Font.FontName = "TH SarabunPSK";
// ws.Cell("D4").Style.Font.FontSize = 14;
// ws.Cell("D4").Style.Font.Bold = true;
// ws.Cell("D4").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
@@ -144,7 +144,7 @@ namespace rmutr_report.Controllers
// {
// ws.Cell("C5").Value = "ปี "+_operating_expenses.request_year;
// ws.Cell("C5").Style.Alignment.WrapText = true;
- // ws.Cell("C5").Style.Font.FontName = "TH Sarabun New";
+ // ws.Cell("C5").Style.Font.FontName = "TH SarabunPSK";
// ws.Cell("C5").Style.Font.FontSize = 14;
// ws.Cell("C5").Style.Font.Bold = true;
// ws.Cell("C5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
@@ -158,7 +158,7 @@ namespace rmutr_report.Controllers
// ws.Cell(row, 4).Value = expenses.clarification_summary;
//
// ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Font.FontName =
- // "TH Sarabun New";
+ // "TH SarabunPSK";
// ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Font.FontSize = 14;
// ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Alignment.WrapText = true;
// ws.Range(ws.Cell(row, 1), ws.Cell(row, 4)).Style.Alignment.Vertical =
diff --git a/obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs b/obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs
index 2f7e5ec..3b1554c 100644
--- a/obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs
+++ b/obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs
@@ -1,4 +1,4 @@
//
using System;
using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v5.0", FrameworkDisplayName = "")]
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v5.0", FrameworkDisplayName = ".NET 5.0")]
diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
index 337d668..7d63e16 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-b48f1bd72c29690b00599a37fe20d70100e422f1
+f5dfedcaccda50e61bd739707e09ac1f8f1f155f84f01a86842a0ff8ce71abef
diff --git a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
index 024ee7d..7bc55a8 100644
--- a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
+++ b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
@@ -9,3 +9,5 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = rmutr_report
build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/obj/Debug/net5.0/rmutr_report.assets.cache b/obj/Debug/net5.0/rmutr_report.assets.cache
index 1a2d725..f8e124f 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.AssemblyReference.cache b/obj/Debug/net5.0/rmutr_report.csproj.AssemblyReference.cache
index 9579abe..75b69fb 100644
Binary files a/obj/Debug/net5.0/rmutr_report.csproj.AssemblyReference.cache and b/obj/Debug/net5.0/rmutr_report.csproj.AssemblyReference.cache differ
diff --git a/obj/project.assets.json b/obj/project.assets.json
index c4db42f..b2883a0 100644
--- a/obj/project.assets.json
+++ b/obj/project.assets.json
@@ -2222,7 +2222,7 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100-rc.2.23502.2\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache
index 3d9b058..35b024f 100644
--- a/obj/project.nuget.cache
+++ b/obj/project.nuget.cache
@@ -1,6 +1,6 @@
{
"version": 2,
- "dgSpecHash": "NaImI9gFxI0nTH5asNNWxixoRKMe4FQEuqAkFpRfxpplhDDwgygsD5A4O/A+g1DCi00G8bAbgPBMUpmKczF09g==",
+ "dgSpecHash": "JOnKe/Ddk35VVck98iy4OKXBMQmnPEVeuSFEW8BevZN56q2gL5mQsUz943ys/qGiAYjZQNuA+0IDMB/ruh0oFg==",
"success": true,
"projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
"expectedPackageFiles": [
diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json
index 003bae8..75cec1d 100644
--- a/obj/project.packagespec.json
+++ b/obj/project.packagespec.json
@@ -1 +1 @@
-"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\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":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"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\\7.0.402\\RuntimeIdentifierGraph.json"}}
\ No newline at end of file
+"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\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":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"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.100-rc.2.23502.2\\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 a0345ab..ae38e6d 100644
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17019368780973156
\ No newline at end of file
+17019436011989991
\ No newline at end of file
diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info
index 1a424aa..ae38e6d 100644
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-17019422716095550
\ No newline at end of file
+17019436011989991
\ 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 95ea792..91a9a6d 100644
--- a/obj/rmutr_report.csproj.nuget.dgspec.json
+++ b/obj/rmutr_report.csproj.nuget.dgspec.json
@@ -77,7 +77,7 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.100-rc.2.23502.2\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/obj/rmutr_report.csproj.nuget.g.props b/obj/rmutr_report.csproj.nuget.g.props
index 83e0f01..99f6172 100644
--- a/obj/rmutr_report.csproj.nuget.g.props
+++ b/obj/rmutr_report.csproj.nuget.g.props
@@ -7,7 +7,7 @@
$(UserProfile)\.nuget\packages\
C:\Users\USER\.nuget\packages\
PackageReference
- 6.6.0
+ 6.8.0
diff --git a/wwwroot/reports/budget_expenditure_from_revenue.frx b/wwwroot/reports/budget_expenditure_from_revenue.frx
index 60dbede..1c24e9c 100644
--- a/wwwroot/reports/budget_expenditure_from_revenue.frx
+++ b/wwwroot/reports/budget_expenditure_from_revenue.frx
@@ -54,7 +54,7 @@
-
+
@@ -67,53 +67,53 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -122,68 +122,68 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -214,20 +214,20 @@
-
+
-
-
+
+
-
+
-
-
-
+
+
+
-
+
@@ -235,152 +235,152 @@
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
@@ -388,9 +388,9 @@
-
-
-
+
+
+
@@ -423,33 +423,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue.frx b/wwwroot/reports/budget_expenditure_report_from_revenue.frx
index 94e4826..5305a0e 100644
--- a/wwwroot/reports/budget_expenditure_report_from_revenue.frx
+++ b/wwwroot/reports/budget_expenditure_report_from_revenue.frx
@@ -59,69 +59,69 @@
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
index 85f072e..412a3fd 100644
--- a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
+++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
@@ -1,5 +1,5 @@
-
+
@@ -86,7 +86,7 @@
-
+
diff --git a/wwwroot/reports/mtef_plan.frx b/wwwroot/reports/mtef_plan.frx
index 868951f..56dc09c 100644
--- a/wwwroot/reports/mtef_plan.frx
+++ b/wwwroot/reports/mtef_plan.frx
@@ -42,25 +42,25 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -77,81 +77,81 @@
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
@@ -172,37 +172,37 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+