diff --git a/Models/RoReport/summary_income_cooperative.cs b/Models/RoReport/summary_income_cooperative.cs index 1b4c83f..66828f3 100644 --- a/Models/RoReport/summary_income_cooperative.cs +++ b/Models/RoReport/summary_income_cooperative.cs @@ -18,11 +18,11 @@ namespace rmutr_report.Models.RoThree { public int? topic_type { get; set; } public string topic { get; set; } - public decimal? revenue_estimates { get; set; } - public decimal? deduct_expenses_percent60 { get; set; } - public decimal? deduct_expenses_percent10 { get; set; } - public decimal? balance { get; set; } - public decimal? deduct_tuition_fees { get; set; } - public decimal? balance_university { get; set; } + public double? revenue_estimates { get; set; } + public double? deduct_expenses_percent60 { get; set; } + public double? deduct_expenses_percent10 { get; set; } + public double? balance { get; set; } + public double? deduct_tuition_fees { get; set; } + public double? balance_university { get; set; } } } \ No newline at end of file diff --git a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig index c04e72e..024ee7d 100644 --- a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig @@ -5,6 +5,7 @@ build_property.UsingMicrosoftNETSdkWeb = true build_property.ProjectTypeGuids = build_property.InvariantGlobalization = build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = rmutr_report build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\ diff --git a/obj/Debug/net5.0/rmutr_report.assets.cache b/obj/Debug/net5.0/rmutr_report.assets.cache index 3b0323b..1277276 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/project.assets.json b/obj/project.assets.json index 13c8c8c..707a3a3 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -2219,7 +2219,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index fe8f515..28c12cd 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "TgdSlhcNLrmoGcymKBKtBNUewM9z9QdY0FESfevGdFzEBUl5TotP+ysyCZqFpczcvGDJdBKPRCtfqngiN8LZRQ==", + "dgSpecHash": "8irQbGlYTk6GhRXUatdtl8V/UPVSHhAKvRA/fBqq4PDWndm+7Mq7ntB5KcbGRVcfyfrzqzd0FCFJywKJHvt+xw==", "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 daed5e1..d90624c 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\\6.0.407\\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\\7.0.401\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index ff63691..eac753a 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16957192658674699 \ No newline at end of file +16963968833075202 \ 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 6a65beb..30f5a64 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\\6.0.407\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json" } } } diff --git a/wwwroot/reports/summary_income_cooperative.frx b/wwwroot/reports/summary_income_cooperative.frx index 14b5ed6..1006058 100644 --- a/wwwroot/reports/summary_income_cooperative.frx +++ b/wwwroot/reports/summary_income_cooperative.frx @@ -12,12 +12,12 @@ - - - - - - + + + + + +