diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs
index 980cc91..41af22c 100644
--- a/Controllers/Budget.Controller.cs
+++ b/Controllers/Budget.Controller.cs
@@ -3619,7 +3619,8 @@ namespace rmutr_report.Controllers
{
var workbook = new XLWorkbook();
var ws = workbook.Worksheets.Add("Sheet1");
- ws.Column(1).Width = 30;
+ //ws.Columns("A").AdjustToContents();
+ ws.Column(1).Width = 40;
ws.Column(2).Width = 20;
ws.Column(3).Width = 20;
ws.Column(4).Width = 20;
@@ -3672,24 +3673,27 @@ namespace rmutr_report.Controllers
ws.Range("A3:A5").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Range("A3:A5").Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204);
ws.Range("A3:A5").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
+ ws.Range("A3:A5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(3, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(3, 2).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204);
ws.Cell(3, 2).Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Cell(3, 2).Style.Font.FontSize = 10;
ws.Cell(3, 2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(3, 2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
-
+ ws.Cell(3, 2).Style.Alignment.WrapText = true;
ws.Cell(4, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(4, 2).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204);
ws.Cell(4, 2).Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Cell(4, 2).Style.Font.FontSize = 10;
ws.Cell(4, 2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
+
ws.Cell(5, 2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(5, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(5, 2).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204);
ws.Cell(5, 2).Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Cell(5, 2).Style.Font.FontSize = 10;
ws.Cell(5, 2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
+ ws.Cell(5, 2).Style.Alignment.WrapText = true;
}
foreach (var detail in requestSummary.data_1)
@@ -3716,7 +3720,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.NumberFormat.SetFormat("#,#0");
-
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
row++;
foreach (var detail2 in detail.data_2)
@@ -3737,6 +3742,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.NumberFormat.SetFormat("#,#0");
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
row++;
}
if (detail2.color=="2" && detail2.is_bold==null)
@@ -3755,6 +3762,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.NumberFormat.SetFormat("#,#0");
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
row++;
}
if (detail2.color=="3" && detail2.is_bold==null)
@@ -3773,6 +3782,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.NumberFormat.SetFormat("#,#0");
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
row++;
}
if (detail2.color==null && detail2.is_bold==null)
@@ -3791,6 +3802,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.NumberFormat.SetFormat("#,#0");
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
row++;
}
foreach (var detail3 in detail2.data_3)
@@ -3811,6 +3824,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.NumberFormat.SetFormat("#,#0");
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
row++;
}
@@ -3839,6 +3854,7 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(rowheads, cols), ws.Cell(rowheads , cols+ countbudgetplan - 1)).Style.Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(rowheads, cols), ws.Cell(rowheads , cols+ countbudgetplan - 1)).Style.Font.FontSize = 10;
ws.Range(ws.Cell(rowheads, cols), ws.Cell(rowheads , cols+ countbudgetplan - 1)).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204);
+ ws.Range(ws.Cell(rowheads, cols), ws.Cell(rowheads , cols+ countbudgetplan - 1)).Style.Alignment.WrapText = true;
ws.Cell(rowhead, col).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(rowhead, col).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
@@ -3848,7 +3864,7 @@ namespace rmutr_report.Controllers
ws.Cell(rowhead, col).Style.Font.FontSize = 10;
ws.Cell(rowhead, col).Style.Alignment.WrapText = true;
ws.Cell(rowhead, col).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204);
-
+ ws.Range("A3:A5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell("A3").Style.Alignment.WrapText = true;
ws.Cell("A3").Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Cell("A3").Style.Font.FontSize = 10;
@@ -3863,7 +3879,8 @@ namespace rmutr_report.Controllers
ws.Cell(rowvalue, col).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(rowvalue, col).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
+ ws.Cell(rowvalue, col).Style.Alignment.WrapText = true;
+ ws.Cell(rowheads, col).Style.Alignment.WrapText = true;
col++;
}
@@ -3884,6 +3901,8 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Fill.BackgroundColor =
XLColor.FromArgb(204, 153, 255);
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
foreach (var budgetPlan in detail.plans)
{
ws.Cell(row, col2).Value = budgetPlan.value??0;
@@ -3894,7 +3913,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
+ ws.Cell(row, cols).Style.Alignment.WrapText = true;
+
col2++;
}
row++;
@@ -3912,6 +3932,8 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Fill.BackgroundColor = XLColor.FromArgb(153, 204, 255);
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+
col2 = 2;
foreach (var budgetPlan in detail2.plans)
{
@@ -3923,7 +3945,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
+ ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
// col2++;
@@ -3940,6 +3962,7 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Fill.BackgroundColor =XLColor.FromArgb(255, 204, 153);
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
col2 = 2;
foreach (var budgetPlan in detail2.plans)
{
@@ -3951,7 +3974,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
+ ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
@@ -3969,6 +3992,7 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 255, 204);
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
+ ws.Cell(row, 1).Style.Alignment.WrapText =true;
col2 = 2;
foreach (var budgetPlan in detail2.plans)
{
@@ -3980,7 +4004,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
+ ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
@@ -3999,7 +4023,7 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
-
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
col2 = 2;
foreach (var budgetPlan in detail2.plans)
{
@@ -4009,7 +4033,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Style.Font.FontSize = 10;
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
+ ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
@@ -4029,6 +4053,7 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
col2 = 2;
foreach (var budgetPlan in detail3.plans)
{
@@ -4039,7 +4064,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
-
+ ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
// col2++;
@@ -4072,7 +4097,8 @@ namespace rmutr_report.Controllers
{
var workbook = new XLWorkbook();
var ws = workbook.Worksheets.Add("Sheet1");
- ws.Column(1).Width = 30;
+ //ws.Columns("A").AdjustToContents();
+ ws.Column(1).Width = 40;
ws.Column(2).Width = 20;
ws.Column(3).Width = 20;
ws.Column(4).Width = 20;
@@ -4116,6 +4142,7 @@ namespace rmutr_report.Controllers
ws.Cell(4, 2).Style.Font.FontName = "TH SarabunPSK";
ws.Cell(4, 2).Style.Font.FontSize = 10;
ws.Cell(4, 2).Style.Alignment.WrapText = true;
+ ws.Range("A3:A5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell("A3").Style.Alignment.WrapText = true;
ws.Cell("A3").Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Cell("A3").Style.Font.FontSize = 10;
@@ -4127,7 +4154,7 @@ namespace rmutr_report.Controllers
ws.Cell(3, 2).Style.Font.FontSize = 10;
ws.Cell(3, 2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(3, 2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
-
+ ws.Cell(3, 2).Style.Alignment.WrapText = true;
ws.Cell(4, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(4, 2).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204);
ws.Cell(4, 2).Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
@@ -4139,6 +4166,7 @@ namespace rmutr_report.Controllers
ws.Cell(5, 2).Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Cell(5, 2).Style.Font.FontSize = 10;
ws.Cell(5, 2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
+ ws.Cell(5, 2).Style.Alignment.WrapText = true;
}
foreach (var detail in requestSummary.data_1)
@@ -4165,6 +4193,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.NumberFormat.SetFormat("#,#0");
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
row++;
foreach (var detail2 in detail.data_2)
@@ -4182,6 +4212,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.NumberFormat.SetFormat("#,#0");
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
row++;
foreach (var detail3 in detail2.data_3)
@@ -4201,6 +4233,8 @@ namespace rmutr_report.Controllers
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 2).Style.NumberFormat.SetFormat("#,#0");
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
+ ws.Cell(row, 2).Style.Alignment.WrapText = true;
row++;
@@ -4229,6 +4263,7 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(rowheads, cols), ws.Cell(rowheads , cols+ countbudgetplan - 1)).Style.Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(rowheads, cols), ws.Cell(rowheads , cols+ countbudgetplan - 1)).Style.Font.FontSize = 10;
ws.Range(ws.Cell(rowheads, cols), ws.Cell(rowheads , cols+ countbudgetplan - 1)).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204);
+ ws.Range(ws.Cell(rowheads, cols), ws.Cell(rowheads , cols+ countbudgetplan - 1)).Style.Alignment.WrapText = true;
ws.Cell(rowhead, col).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(rowhead, col).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
@@ -4238,7 +4273,7 @@ namespace rmutr_report.Controllers
ws.Cell(rowhead, col).Style.Font.FontSize = 10;
ws.Cell(rowhead, col).Style.Alignment.WrapText = true;
ws.Cell(rowhead, col).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 153, 204);
-
+ ws.Range("A3:A5").Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell("A3").Style.Alignment.WrapText = true;
ws.Cell("A3").Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Cell("A3").Style.Font.FontSize = 10;
@@ -4253,7 +4288,7 @@ namespace rmutr_report.Controllers
ws.Cell(rowvalue, col).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(rowvalue, col).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(rowvalue, col).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
+ ws.Cell(rowvalue, col).Style.Alignment.WrapText = true;
col++;
}
@@ -4274,6 +4309,7 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Fill.BackgroundColor =
XLColor.FromArgb(204, 153, 255);
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
foreach (var budgetPlan in detail.plans)
{
ws.Cell(row, col2).Value = budgetPlan.value??0;
@@ -4284,6 +4320,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
+ ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
row++;
@@ -4297,6 +4334,7 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
col2 = 2;
foreach (var budgetPlan in detail2.plans)
@@ -4308,7 +4346,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
+ ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
@@ -4327,6 +4365,7 @@ namespace rmutr_report.Controllers
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
+ ws.Cell(row, 1).Style.Alignment.WrapText = true;
col2 = 2;
foreach (var budgetPlan in detail3.plans)
{
@@ -4337,7 +4376,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
-
+ ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll
index 1c5033e..610e473 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 6f52e84..74b24ef 100644
Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/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 2bc4b46..77398ae 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 2bc4b46..77398ae 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 6ae0fc3..9ac38f5 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
@@ -14,7 +14,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+62e9bfb30a3bed3a981fe95309ce278814246723")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fa07e5428e00c19a2a8055fba939148f2f0d8b2d")]
[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 d2e3815..566f622 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-1bb41e6f4b06ecaa87f57dc005b3418170b56de7020a3a6f92c599064fe85d3a
+2ca4ed1e7690a8e81e1928bc1990a28d5682b98006698e785075dec11ec2a71e
diff --git a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache
index ae9b4d7..eac805a 100644
--- a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache
+++ b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache
@@ -1 +1 @@
-7d8bc7748bcb23f08efa6e2e64caaaec25fe7f0de58058885b3c182813ae57c3
+6e1921a497d6bfa5a344720c448a8ff8bc8e02e2633ceeb78c84c1f8725d3b8f
diff --git a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache
index f133422..5296be0 100644
--- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-bd7a28b1ff560d689700f9ca68bb84d5faf27c38aa05370d4e053cc99d63dbce
+19f524a8977dfde4c18e31663a8680c099ec81b5c08ef13745f0dbefae8b9e82
diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll
index 1c5033e..610e473 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 6f52e84..74b24ef 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 3ba72c9..8e0efac 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
@@ -64,22 +64,6 @@
PreserveNewest
$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\all_plans.frx))
-
- Package
- rmutr_report
- $(MSBuildThisFileDirectory)..\staticwebassets\
- _content/rmutr_report
- reports\all_plans2.frx
-
-
-
-
-
-
-
- PreserveNewest
- $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\all_plans2.frx))
-
Package
rmutr_report
@@ -3040,6 +3024,86 @@
PreserveNewest
$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_income_cooperative.frx))
+
+ Package
+ rmutr_report
+ $(MSBuildThisFileDirectory)..\staticwebassets\
+ _content/rmutr_report
+ reports\summary_invest.frx
+
+
+
+
+
+
+
+ PreserveNewest
+ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_invest.frx))
+
+
+ Package
+ rmutr_report
+ $(MSBuildThisFileDirectory)..\staticwebassets\
+ _content/rmutr_report
+ reports\summary_invest_approve.frx
+
+
+
+
+
+
+
+ PreserveNewest
+ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_invest_approve.frx))
+
+
+ Package
+ rmutr_report
+ $(MSBuildThisFileDirectory)..\staticwebassets\
+ _content/rmutr_report
+ reports\summary_invest_approvev2.frx
+
+
+
+
+
+
+
+ PreserveNewest
+ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_invest_approvev2.frx))
+
+
+ Package
+ rmutr_report
+ $(MSBuildThisFileDirectory)..\staticwebassets\
+ _content/rmutr_report
+ reports\summary_invest_preview.frx
+
+
+
+
+
+
+
+ PreserveNewest
+ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_invest_preview.frx))
+
+
+ Package
+ rmutr_report
+ $(MSBuildThisFileDirectory)..\staticwebassets\
+ _content/rmutr_report
+ reports\summary_invest_previewv2.frx
+
+
+
+
+
+
+
+ PreserveNewest
+ $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_invest_previewv2.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 36f4c70..a3269f2 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 @@
-5e2b0a0b0aae1729058a1b869c574d0d8376900c6cb993c5031e219c517c5065
+b77baecdf45cb80236438e8a223568cbd6e07fc272289f2130dc9e2d455d9160
diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info
index f94e32b..be5b2dd 100644
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17249123958142058
\ No newline at end of file
+17249193125237173
\ No newline at end of file