diff --git a/Controllers/RoFive.Controller.cs b/Controllers/RoFive.Controller.cs index ecd56a2..d9c71b6 100644 --- a/Controllers/RoFive.Controller.cs +++ b/Controllers/RoFive.Controller.cs @@ -1480,7 +1480,7 @@ namespace rmutr_report.Controllers XLColor.FromArgb(255, 255, 153); ws.Range(ws.Cell(row, 1), ws.Cell(row, 3)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; - ws.Cell(row, rowhead2 + 6).Style.Alignment.Horizontal = + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 6)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 6)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = @@ -1612,6 +1612,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 7)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 7)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 7)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 7)).Style.Border.RightBorder = @@ -1737,6 +1739,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 8)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 8)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 8)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 8)).Style.Border.RightBorder = @@ -1862,6 +1866,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 9)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 8)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 9)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 9)).Style.Border.RightBorder = @@ -1987,6 +1993,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 10)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 10)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 10)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 10)).Style.Border.RightBorder = @@ -2112,6 +2120,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 11)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 11)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 11)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 11)).Style.Border.RightBorder = @@ -2237,6 +2247,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 12)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 12)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 12)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 12)).Style.Border.RightBorder = @@ -2362,6 +2374,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 13)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 13)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 13)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 13)).Style.Border.RightBorder = @@ -2487,6 +2501,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 14)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 14)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 14)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 14)).Style.Border.RightBorder = @@ -2612,6 +2628,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 15)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 15)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 15)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 15)).Style.Border.RightBorder = @@ -2737,6 +2755,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 16)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 16)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 16)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 16)).Style.Border.RightBorder = @@ -2862,6 +2882,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 17)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 17)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 17)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 17)).Style.Border.RightBorder = @@ -2987,6 +3009,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 18)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 18)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 18)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 18)).Style.Border.RightBorder = @@ -3112,6 +3136,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 19)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 19)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 19)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 19)).Style.Border.RightBorder = @@ -3237,6 +3263,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 20)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 20)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 20)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 20)).Style.Border.RightBorder = @@ -3362,6 +3390,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 21)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 21)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 21)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 20)).Style.Border.RightBorder = @@ -3487,6 +3517,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 22)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 22)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 22)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 22)).Style.Border.RightBorder = @@ -3612,6 +3644,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 23)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 23)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 23)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 23)).Style.Border.RightBorder = @@ -3737,6 +3771,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 24)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 24)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 24)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 24)).Style.Border.RightBorder = @@ -3862,6 +3898,8 @@ namespace rmutr_report.Controllers ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 25)).Style.NumberFormat.SetFormat("#,#"); ws.Range(ws.Cell(row, 1), ws.Cell(row, 2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; + ws.Range(ws.Cell(row, 4), ws.Cell(row, rowhead2 + 25)).Style.Alignment.Horizontal = + XLAlignmentHorizontalValues.Right; ws.Range(ws.Cell(row, 3), ws.Cell(row, rowhead2 + 25)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Range(ws.Cell(row, 1), ws.Cell(row, rowhead2 + 25)).Style.Border.RightBorder = diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 8050259..21f111a 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 824ebfc..8db1ef3 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index f7dda84..75aab31 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 131c030..04138c0 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 8050259..21f111a 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 824ebfc..8db1ef3 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/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index f7dda84..75aab31 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 131c030..04138c0 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/rider.project.restore.info b/obj/rider.project.restore.info index 494d60b..ff63691 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16952815406574131 \ No newline at end of file +16957192658674699 \ No newline at end of file diff --git a/wwwroot/reports/revenue_estimate_education_fee.frx b/wwwroot/reports/revenue_estimate_education_fee.frx index a076805..66e5279 100644 --- a/wwwroot/reports/revenue_estimate_education_fee.frx +++ b/wwwroot/reports/revenue_estimate_education_fee.frx @@ -1,5 +1,5 @@  - + @@ -114,8 +114,8 @@ - - + + @@ -228,7 +228,7 @@ - + @@ -268,17 +268,17 @@ - - + + - - + + - + @@ -318,18 +318,18 @@ - - + + - - + + - + @@ -383,7 +383,7 @@ - + @@ -430,7 +430,7 @@ - +