From fe9afb3409d45a595b0ab704e8737b5ad51c798c Mon Sep 17 00:00:00 2001 From: Doug Waldron Date: Wed, 14 Jan 2026 11:02:49 -0500 Subject: [PATCH 01/12] Target .NET 10 Common project properties were moved to "Directory.Build.props" files --- .github/workflows/sonarcloud-scan.yml | 6 +++--- .vscode/launch.json | 4 ++-- Directory.Build.props | 4 ++++ FMS.Domain/FMS.Domain.csproj | 4 ---- FMS.Infrastructure/FMS.Infrastructure.csproj | 3 --- FMS/FMS.csproj | 1 - .../PublishProfiles/Publish-Development.pubxml | 1 - .../PublishProfiles/Publish-Production.pubxml | 1 - .../PublishProfiles/Publish-Staging.pubxml | 1 - global.json | 2 +- tests/Directory.Build.props | 12 ++++++++++++ tests/FMS.App.Tests/FMS.App.Tests.csproj | 5 ----- tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj | 5 ----- .../FMS.Infrastructure.Tests.csproj | 5 ----- tests/TestHelpers/TestHelpers.csproj | 4 ---- 15 files changed, 22 insertions(+), 36 deletions(-) create mode 100644 tests/Directory.Build.props diff --git a/.github/workflows/sonarcloud-scan.yml b/.github/workflows/sonarcloud-scan.yml index 20552bdf..2d7e0fed 100644 --- a/.github/workflows/sonarcloud-scan.yml +++ b/.github/workflows/sonarcloud-scan.yml @@ -68,7 +68,7 @@ jobs: run: | .\.sonar\scanner\dotnet-sonarscanner begin /k:"gaepdit_FMS" /o:"gaepdit" /d:sonar.token="$env:SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths=coverage.xml /d:sonar.exclusions=FMS.Infrastructure/Migrations/**,FMS/Platform/DevHelpers/SeedData/** dotnet build - coverlet .\artifacts\FMS.Domain.Tests\bin\Debug\net9.0\FMS.Domain.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Domain.Tests --no-build" - coverlet .\artifacts\FMS.App.Tests\bin\Debug\net9.0\FMS.App.Tests.dll --target "dotnet" --targetargs "test tests/FMS.App.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" - coverlet .\artifacts\FMS.Infrastructure.Tests\bin\Debug\net9.0\FMS.Infrastructure.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Infrastructure.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" -f=opencover -o="coverage.xml" + coverlet .\artifacts\FMS.Domain.Tests\bin\Debug\net10.0\FMS.Domain.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Domain.Tests --no-build" + coverlet .\artifacts\FMS.App.Tests\bin\Debug\net10.0\FMS.App.Tests.dll --target "dotnet" --targetargs "test tests/FMS.App.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" + coverlet .\artifacts\FMS.Infrastructure.Tests\bin\Debug\net10.0\FMS.Infrastructure.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Infrastructure.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" -f=opencover -o="coverage.xml" .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="$env:SONAR_TOKEN" diff --git a/.vscode/launch.json b/.vscode/launch.json index 9f1bd96d..ba0920aa 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/artifacts/FMS/bin/Debug/net9.0/FMS.dll", + "program": "${workspaceFolder}/artifacts/FMS/bin/Debug/net10.0/FMS.dll", "args": [], "cwd": "${workspaceFolder}/FMS", "stopAtEntry": false, @@ -35,7 +35,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/artifacts/FMS/bin/Debug/net9.0/FMS.dll", + "program": "${workspaceFolder}/artifacts/FMS/bin/Debug/net10.0/FMS.dll", "args": [], "cwd": "${workspaceFolder}/FMS", "stopAtEntry": false, diff --git a/Directory.Build.props b/Directory.Build.props index abb6ac00..e5f16be5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,8 @@ + + net10.0 + + $(MSBuildThisFileDirectory)artifacts\$(MSBuildProjectName)\bin\ $(MSBuildThisFileDirectory)artifacts\$(MSBuildProjectName)\obj\ diff --git a/FMS.Domain/FMS.Domain.csproj b/FMS.Domain/FMS.Domain.csproj index 9c68f373..cf5dfaaf 100644 --- a/FMS.Domain/FMS.Domain.csproj +++ b/FMS.Domain/FMS.Domain.csproj @@ -1,9 +1,5 @@  - - net9.0 - - diff --git a/FMS.Infrastructure/FMS.Infrastructure.csproj b/FMS.Infrastructure/FMS.Infrastructure.csproj index 09fd4955..d255a324 100644 --- a/FMS.Infrastructure/FMS.Infrastructure.csproj +++ b/FMS.Infrastructure/FMS.Infrastructure.csproj @@ -1,7 +1,4 @@  - - net9.0 - diff --git a/FMS/FMS.csproj b/FMS/FMS.csproj index ca2d1b71..3859b92b 100644 --- a/FMS/FMS.csproj +++ b/FMS/FMS.csproj @@ -1,7 +1,6 @@ - net9.0 FMS FMS.Program 9eaa6ee0-f5de-4484-8e00-194a201392e7 diff --git a/FMS/Properties/PublishProfiles/Publish-Development.pubxml b/FMS/Properties/PublishProfiles/Publish-Development.pubxml index 703f4ed9..293649d7 100644 --- a/FMS/Properties/PublishProfiles/Publish-Development.pubxml +++ b/FMS/Properties/PublishProfiles/Publish-Development.pubxml @@ -22,7 +22,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>true false true - net9.0 diff --git a/FMS/Properties/PublishProfiles/Publish-Production.pubxml b/FMS/Properties/PublishProfiles/Publish-Production.pubxml index f84473d2..b809e40f 100644 --- a/FMS/Properties/PublishProfiles/Publish-Production.pubxml +++ b/FMS/Properties/PublishProfiles/Publish-Production.pubxml @@ -22,7 +22,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>true false true - net9.0 diff --git a/FMS/Properties/PublishProfiles/Publish-Staging.pubxml b/FMS/Properties/PublishProfiles/Publish-Staging.pubxml index dd992185..cff8e0b7 100644 --- a/FMS/Properties/PublishProfiles/Publish-Staging.pubxml +++ b/FMS/Properties/PublishProfiles/Publish-Staging.pubxml @@ -22,7 +22,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_SavePWD>true false true - net9.0 diff --git a/global.json b/global.json index 2d4ad6b7..4372662a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.0", + "version": "10.0.0", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props new file mode 100644 index 00000000..2b079617 --- /dev/null +++ b/tests/Directory.Build.props @@ -0,0 +1,12 @@ + + + net10.0 + false + true + + + + $(MSBuildThisFileDirectory)..\artifacts\$(MSBuildProjectName)\bin\ + $(MSBuildThisFileDirectory)..\artifacts\$(MSBuildProjectName)\obj\ + + diff --git a/tests/FMS.App.Tests/FMS.App.Tests.csproj b/tests/FMS.App.Tests/FMS.App.Tests.csproj index 74ec5e9f..2766ba23 100644 --- a/tests/FMS.App.Tests/FMS.App.Tests.csproj +++ b/tests/FMS.App.Tests/FMS.App.Tests.csproj @@ -1,10 +1,5 @@ - - net9.0 - false - - diff --git a/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj b/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj index 1fcd1eaa..2e9d7d07 100644 --- a/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj +++ b/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj @@ -1,10 +1,5 @@ - - net9.0 - false - - diff --git a/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj b/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj index 6b8994ba..7f8062d6 100644 --- a/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj +++ b/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj @@ -1,10 +1,5 @@ - - net9.0 - false - - diff --git a/tests/TestHelpers/TestHelpers.csproj b/tests/TestHelpers/TestHelpers.csproj index e2440519..64eb54c2 100644 --- a/tests/TestHelpers/TestHelpers.csproj +++ b/tests/TestHelpers/TestHelpers.csproj @@ -1,9 +1,5 @@ - - net9.0 - - From 68365c148650b8e171885faa6ef9ae5df8782fc0 Mon Sep 17 00:00:00 2001 From: Doug Waldron Date: Wed, 26 Nov 2025 16:50:22 -0500 Subject: [PATCH 02/12] Stop tracking JetBrains files in git --- .gitignore | 8 +- .../.idea/codeStyles/codeStyleConfig.xml | 5 - .idea/.idea.FMS/.idea/dataSources.xml | 15 - .idea/.idea.FMS/.idea/encodings.xml | 4 - .idea/.idea.FMS/.idea/indexLayout.xml | 10 - .../inspectionProfiles/Project_Default.xml | 44 - .../.idea/projectSettingsUpdater.xml | 7 - .idea/.idea.FMS/.idea/sonarlint.xml | 8 - .idea/.idea.FMS/.idea/sqldialects.xml | 6 - .idea/.idea.FMS/.idea/vcs.xml | 6 - .idea/config/applicationhost.config | 988 ------------------ 11 files changed, 3 insertions(+), 1098 deletions(-) delete mode 100644 .idea/.idea.FMS/.idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/.idea.FMS/.idea/dataSources.xml delete mode 100644 .idea/.idea.FMS/.idea/encodings.xml delete mode 100644 .idea/.idea.FMS/.idea/indexLayout.xml delete mode 100644 .idea/.idea.FMS/.idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/.idea.FMS/.idea/projectSettingsUpdater.xml delete mode 100644 .idea/.idea.FMS/.idea/sonarlint.xml delete mode 100644 .idea/.idea.FMS/.idea/sqldialects.xml delete mode 100644 .idea/.idea.FMS/.idea/vcs.xml delete mode 100644 .idea/config/applicationhost.config diff --git a/.gitignore b/.gitignore index 2f9df388..c7987ce1 100644 --- a/.gitignore +++ b/.gitignore @@ -542,7 +542,7 @@ FodyWeavers.xsd ######################## ### Project-specific ### -# Web deploy settings +# Don't ignore web deploy settings !**/PublishProfiles/*.pubxml # Environment settings files @@ -553,11 +553,9 @@ appsettings.*.json .artifacts/ # Library Manager **/wwwroot/lib/ -# Webpack -**/wwwroot/dist/ -# SonarLint Rider plugin -.idea/**/sonarlint-state.xml +# JetBrains config files +.idea/ # Code coverage report from ReportGenerator coveragereport/ diff --git a/.idea/.idea.FMS/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.FMS/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 7ad1bf11..00000000 --- a/.idea/.idea.FMS/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/dataSources.xml b/.idea/.idea.FMS/.idea/dataSources.xml deleted file mode 100644 index 566869ac..00000000 --- a/.idea/.idea.FMS/.idea/dataSources.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - sqlserver.localdb.jb - true - com.jetbrains.jdbc.sqlserver.SqlServerDriver - Server=(localdb)\MSSQLLocalDB;Database=fms-temp - - - - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/encodings.xml b/.idea/.idea.FMS/.idea/encodings.xml deleted file mode 100644 index df87cf95..00000000 --- a/.idea/.idea.FMS/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/indexLayout.xml b/.idea/.idea.FMS/.idea/indexLayout.xml deleted file mode 100644 index 1ead36c7..00000000 --- a/.idea/.idea.FMS/.idea/indexLayout.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - .github - - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.FMS/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 6a354378..00000000 --- a/.idea/.idea.FMS/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/projectSettingsUpdater.xml b/.idea/.idea.FMS/.idea/projectSettingsUpdater.xml deleted file mode 100644 index 64af657f..00000000 --- a/.idea/.idea.FMS/.idea/projectSettingsUpdater.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/sonarlint.xml b/.idea/.idea.FMS/.idea/sonarlint.xml deleted file mode 100644 index e4de475c..00000000 --- a/.idea/.idea.FMS/.idea/sonarlint.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/sqldialects.xml b/.idea/.idea.FMS/.idea/sqldialects.xml deleted file mode 100644 index 62c574d9..00000000 --- a/.idea/.idea.FMS/.idea/sqldialects.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/.idea.FMS/.idea/vcs.xml b/.idea/.idea.FMS/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/.idea.FMS/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/config/applicationhost.config b/.idea/config/applicationhost.config deleted file mode 100644 index 1bc1c985..00000000 --- a/.idea/config/applicationhost.config +++ /dev/null @@ -1,988 +0,0 @@ - - - - - - -
-
-
-
-
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 65514a48d1ae5f057c1afdb9e8660ed2b54c8da6 Mon Sep 17 00:00:00 2001 From: Doug Waldron Date: Wed, 14 Jan 2026 11:33:40 -0500 Subject: [PATCH 03/12] Update NuGet packages and update related code - FluentAssertions is now AwesomeAssertions; `using` statements were updated. - MS Identity now references an `IdentityPasskeyData` class that causes as error in EF; a fix was added to the DbContext config. - The following unused NuGet packages were removed: - axios (already included as a JS lib instead) - Microsoft.Extensions.Identity.Stores - Microsoft.Graph --- Directory.Packages.props | 43 +++++++++---------- FMS.Domain/Entities/LocationClass.cs | 1 - FMS.Domain/FMS.Domain.csproj | 3 -- FMS.Infrastructure/Contexts/FmsDbContext.cs | 3 ++ FMS.Infrastructure/FMS.Infrastructure.csproj | 1 - .../AllowedActionTakenRepository.cs | 1 - FMS/FMS.csproj | 1 - .../Account/AccountIndexTests.cs | 2 +- .../FMS.App.Tests/Cabinets/CabinetAddTests.cs | 2 +- .../Cabinets/CabinetDetailsTests.cs | 2 +- .../Cabinets/CabinetEditTests.cs | 2 +- .../Cabinets/CabinetIndexTests.cs | 2 +- tests/FMS.App.Tests/FMS.App.Tests.csproj | 1 - .../Facilities/FacilityAddTests.cs | 2 +- .../Facilities/FacilityDeleteTests.cs | 2 +- .../Facilities/FacilityDetailsTests.cs | 2 +- .../Facilities/FacilityEditTests.cs | 2 +- .../Facilities/FacilityUndeleteTests.cs | 2 +- .../FMS.App.Tests/Files/FilesDetailsTests.cs | 2 +- tests/FMS.App.Tests/Files/FilesIndexTests.cs | 2 +- .../Helpers/ExportHelperTests.cs | 2 +- .../Helpers/GeoCoordHelperTests.cs | 2 +- .../Helpers/UserDomainValidationTest.cs | 2 +- tests/FMS.App.Tests/Users/UserDetailsTests.cs | 2 +- tests/FMS.App.Tests/Users/UserEditTests.cs | 2 +- tests/FMS.App.Tests/Users/UserSearchTests.cs | 2 +- .../FMS.Domain.Tests/CabinetExtensionTests.cs | 2 +- .../FMS.Domain.Tests/FMS.Domain.Tests.csproj | 1 - tests/FMS.Domain.Tests/FileTests.cs | 2 +- .../ActionTakenRepositoryTests.cs | 2 +- .../AllowedActionTakenRepositoryTest.cs | 2 +- .../BudgetCodeRepositoryTests.cs | 2 +- .../CabinetRepositoryTests.cs | 2 +- .../ContactRepositoryTests.cs | 2 +- .../ContactTypeRepositoryTests.cs | 2 +- .../EventRepositoryTest.cs | 2 +- .../EventTypeRepositoryTest.cs | 4 +- .../FMS.Infrastructure.Tests.csproj | 1 - .../FacilityRepositoryTests.cs | 2 +- .../FacilityStatusRepositoryTests.cs | 2 +- .../FacilityTypeRepositoryTests.cs | 2 +- .../FileRepositoryTests.cs | 2 +- .../ItemsListRepositoryTests.cs | 2 +- .../LocationRepositoryTests.cs | 2 +- .../OnsiteScoreRepositoryTest.cs | 2 +- .../ParcelTypeRepositoryTests.cs | 2 +- .../PhoneRepositoryTests.cs | 2 +- .../ScoreRepositoryTest.cs | 2 +- tests/Playwright.Tests/AddFacilitiesTests.cs | 2 +- tests/Playwright.Tests/AuthTests.cs | 2 +- tests/Playwright.Tests/LocationSearchTests.cs | 2 +- tests/Playwright.Tests/PlaywrightTests.csproj | 2 +- tests/TestHelpers/SeedData/StatusSeedData.cs | 1 - tests/TestHelpers/TestHelpers.csproj | 1 - 54 files changed, 66 insertions(+), 78 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 22dc0e6a..8d9e1e05 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,36 +4,33 @@ - - - - + + + - + - - + + - + - - - - - - - - - - + + + + + + + + - + - - - - + + + + \ No newline at end of file diff --git a/FMS.Domain/Entities/LocationClass.cs b/FMS.Domain/Entities/LocationClass.cs index 8c405b68..3aead474 100644 --- a/FMS.Domain/Entities/LocationClass.cs +++ b/FMS.Domain/Entities/LocationClass.cs @@ -1,6 +1,5 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; -using Microsoft.Graph.Models.Security; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/FMS.Domain/FMS.Domain.csproj b/FMS.Domain/FMS.Domain.csproj index cf5dfaaf..7ba44c12 100644 --- a/FMS.Domain/FMS.Domain.csproj +++ b/FMS.Domain/FMS.Domain.csproj @@ -8,10 +8,7 @@ - - - all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/FMS.Infrastructure/Contexts/FmsDbContext.cs b/FMS.Infrastructure/Contexts/FmsDbContext.cs index 7d6bdc31..73a324d6 100644 --- a/FMS.Infrastructure/Contexts/FmsDbContext.cs +++ b/FMS.Infrastructure/Contexts/FmsDbContext.cs @@ -112,6 +112,9 @@ protected override void OnModelCreating(ModelBuilder builder) builder.Entity(entityType).Property(AuditProperties.InsertUser); builder.Entity(entityType).Property(AuditProperties.UpdateUser); } + + // Fix primary key error for IdentityPasskeyData + builder.Entity(e => e.HasNoKey()); } public override Task SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken()) diff --git a/FMS.Infrastructure/FMS.Infrastructure.csproj b/FMS.Infrastructure/FMS.Infrastructure.csproj index d255a324..35a8e40a 100644 --- a/FMS.Infrastructure/FMS.Infrastructure.csproj +++ b/FMS.Infrastructure/FMS.Infrastructure.csproj @@ -1,6 +1,5 @@  - diff --git a/FMS.Infrastructure/Repositories/AllowedActionTakenRepository.cs b/FMS.Infrastructure/Repositories/AllowedActionTakenRepository.cs index d53bb93b..bb64ed0e 100644 --- a/FMS.Infrastructure/Repositories/AllowedActionTakenRepository.cs +++ b/FMS.Infrastructure/Repositories/AllowedActionTakenRepository.cs @@ -4,7 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using Microsoft.Graph.Models; using System; using System.Collections.Generic; using System.Linq; diff --git a/FMS/FMS.csproj b/FMS/FMS.csproj index 3859b92b..48abe054 100644 --- a/FMS/FMS.csproj +++ b/FMS/FMS.csproj @@ -14,7 +14,6 @@ - diff --git a/tests/FMS.App.Tests/Account/AccountIndexTests.cs b/tests/FMS.App.Tests/Account/AccountIndexTests.cs index 9b9119c6..e1354a01 100644 --- a/tests/FMS.App.Tests/Account/AccountIndexTests.cs +++ b/tests/FMS.App.Tests/Account/AccountIndexTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Entities.Users; using FMS.Domain.Services; using FMS.Pages.Account; diff --git a/tests/FMS.App.Tests/Cabinets/CabinetAddTests.cs b/tests/FMS.App.Tests/Cabinets/CabinetAddTests.cs index 0152e1a1..a950f13b 100644 --- a/tests/FMS.App.Tests/Cabinets/CabinetAddTests.cs +++ b/tests/FMS.App.Tests/Cabinets/CabinetAddTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Cabinets; diff --git a/tests/FMS.App.Tests/Cabinets/CabinetDetailsTests.cs b/tests/FMS.App.Tests/Cabinets/CabinetDetailsTests.cs index 21f27f7b..64da847b 100644 --- a/tests/FMS.App.Tests/Cabinets/CabinetDetailsTests.cs +++ b/tests/FMS.App.Tests/Cabinets/CabinetDetailsTests.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Repositories; using FMS.Pages.Cabinets; using Microsoft.AspNetCore.Mvc; diff --git a/tests/FMS.App.Tests/Cabinets/CabinetEditTests.cs b/tests/FMS.App.Tests/Cabinets/CabinetEditTests.cs index 499ad2e3..a34c49fd 100644 --- a/tests/FMS.App.Tests/Cabinets/CabinetEditTests.cs +++ b/tests/FMS.App.Tests/Cabinets/CabinetEditTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Cabinets; diff --git a/tests/FMS.App.Tests/Cabinets/CabinetIndexTests.cs b/tests/FMS.App.Tests/Cabinets/CabinetIndexTests.cs index f97c20f1..c4edaf56 100644 --- a/tests/FMS.App.Tests/Cabinets/CabinetIndexTests.cs +++ b/tests/FMS.App.Tests/Cabinets/CabinetIndexTests.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Repositories; using FMS.Pages.Cabinets; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/tests/FMS.App.Tests/FMS.App.Tests.csproj b/tests/FMS.App.Tests/FMS.App.Tests.csproj index 2766ba23..47b98c21 100644 --- a/tests/FMS.App.Tests/FMS.App.Tests.csproj +++ b/tests/FMS.App.Tests/FMS.App.Tests.csproj @@ -6,7 +6,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/tests/FMS.App.Tests/Facilities/FacilityAddTests.cs b/tests/FMS.App.Tests/Facilities/FacilityAddTests.cs index 5715200f..54662152 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityAddTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityAddTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Facilities; diff --git a/tests/FMS.App.Tests/Facilities/FacilityDeleteTests.cs b/tests/FMS.App.Tests/Facilities/FacilityDeleteTests.cs index 4c50e8d8..28310303 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityDeleteTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityDeleteTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Facilities; diff --git a/tests/FMS.App.Tests/Facilities/FacilityDetailsTests.cs b/tests/FMS.App.Tests/Facilities/FacilityDetailsTests.cs index 00957159..f5d74823 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityDetailsTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityDetailsTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Repositories; using FMS.Pages.Facilities; using Microsoft.AspNetCore.Mvc; diff --git a/tests/FMS.App.Tests/Facilities/FacilityEditTests.cs b/tests/FMS.App.Tests/Facilities/FacilityEditTests.cs index a797171f..a9b23c98 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityEditTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityEditTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Facilities; diff --git a/tests/FMS.App.Tests/Facilities/FacilityUndeleteTests.cs b/tests/FMS.App.Tests/Facilities/FacilityUndeleteTests.cs index 599afa57..ef21c71a 100644 --- a/tests/FMS.App.Tests/Facilities/FacilityUndeleteTests.cs +++ b/tests/FMS.App.Tests/Facilities/FacilityUndeleteTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Facilities; diff --git a/tests/FMS.App.Tests/Files/FilesDetailsTests.cs b/tests/FMS.App.Tests/Files/FilesDetailsTests.cs index 7ca0a851..8f24796b 100644 --- a/tests/FMS.App.Tests/Files/FilesDetailsTests.cs +++ b/tests/FMS.App.Tests/Files/FilesDetailsTests.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Pages.Files; diff --git a/tests/FMS.App.Tests/Files/FilesIndexTests.cs b/tests/FMS.App.Tests/Files/FilesIndexTests.cs index 52d207a3..63f906da 100644 --- a/tests/FMS.App.Tests/Files/FilesIndexTests.cs +++ b/tests/FMS.App.Tests/Files/FilesIndexTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Dto.PaginatedList; using FMS.Domain.Repositories; diff --git a/tests/FMS.App.Tests/Helpers/ExportHelperTests.cs b/tests/FMS.App.Tests/Helpers/ExportHelperTests.cs index e3400d77..7cb3f327 100644 --- a/tests/FMS.App.Tests/Helpers/ExportHelperTests.cs +++ b/tests/FMS.App.Tests/Helpers/ExportHelperTests.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using FluentAssertions; +using AwesomeAssertions; using JetBrains.Annotations; using NUnit.Framework; using FMS.Helpers; diff --git a/tests/FMS.App.Tests/Helpers/GeoCoordHelperTests.cs b/tests/FMS.App.Tests/Helpers/GeoCoordHelperTests.cs index cc29f4db..a6eb2610 100644 --- a/tests/FMS.App.Tests/Helpers/GeoCoordHelperTests.cs +++ b/tests/FMS.App.Tests/Helpers/GeoCoordHelperTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using NUnit.Framework; namespace FMS.App.Tests.Helpers diff --git a/tests/FMS.App.Tests/Helpers/UserDomainValidationTest.cs b/tests/FMS.App.Tests/Helpers/UserDomainValidationTest.cs index 48217b33..88a54b8c 100644 --- a/tests/FMS.App.Tests/Helpers/UserDomainValidationTest.cs +++ b/tests/FMS.App.Tests/Helpers/UserDomainValidationTest.cs @@ -1,5 +1,5 @@ using FMS.Helpers; -using FluentAssertions; +using AwesomeAssertions; using NUnit.Framework; namespace FMS.App.Tests.Helpers diff --git a/tests/FMS.App.Tests/Users/UserDetailsTests.cs b/tests/FMS.App.Tests/Users/UserDetailsTests.cs index 532d7626..4e1a4446 100644 --- a/tests/FMS.App.Tests/Users/UserDetailsTests.cs +++ b/tests/FMS.App.Tests/Users/UserDetailsTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Services; using FMS.Pages.Users; using Microsoft.AspNetCore.Mvc; diff --git a/tests/FMS.App.Tests/Users/UserEditTests.cs b/tests/FMS.App.Tests/Users/UserEditTests.cs index dd1975ed..1e472ec8 100644 --- a/tests/FMS.App.Tests/Users/UserEditTests.cs +++ b/tests/FMS.App.Tests/Users/UserEditTests.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Entities.Users; using FMS.Domain.Services; using FMS.Pages.Users; diff --git a/tests/FMS.App.Tests/Users/UserSearchTests.cs b/tests/FMS.App.Tests/Users/UserSearchTests.cs index 501e54e1..24d6545f 100644 --- a/tests/FMS.App.Tests/Users/UserSearchTests.cs +++ b/tests/FMS.App.Tests/Users/UserSearchTests.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Services; using FMS.Pages.Users; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/tests/FMS.Domain.Tests/CabinetExtensionTests.cs b/tests/FMS.Domain.Tests/CabinetExtensionTests.cs index 217a1f1d..5e9c2442 100644 --- a/tests/FMS.Domain.Tests/CabinetExtensionTests.cs +++ b/tests/FMS.Domain.Tests/CabinetExtensionTests.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Extensions; diff --git a/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj b/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj index 2e9d7d07..a98d6408 100644 --- a/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj +++ b/tests/FMS.Domain.Tests/FMS.Domain.Tests.csproj @@ -6,7 +6,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - all diff --git a/tests/FMS.Domain.Tests/FileTests.cs b/tests/FMS.Domain.Tests/FileTests.cs index d1fc67fa..d672ebe9 100644 --- a/tests/FMS.Domain.Tests/FileTests.cs +++ b/tests/FMS.Domain.Tests/FileTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Entities; using System; using System.Diagnostics.CodeAnalysis; diff --git a/tests/FMS.Infrastructure.Tests/ActionTakenRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ActionTakenRepositoryTests.cs index 0fb639a3..1ebd2cd2 100644 --- a/tests/FMS.Infrastructure.Tests/ActionTakenRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ActionTakenRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; namespace FMS.Infrastructure.Tests { diff --git a/tests/FMS.Infrastructure.Tests/AllowedActionTakenRepositoryTest.cs b/tests/FMS.Infrastructure.Tests/AllowedActionTakenRepositoryTest.cs index ed6a5044..3955db5d 100644 --- a/tests/FMS.Infrastructure.Tests/AllowedActionTakenRepositoryTest.cs +++ b/tests/FMS.Infrastructure.Tests/AllowedActionTakenRepositoryTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; diff --git a/tests/FMS.Infrastructure.Tests/BudgetCodeRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/BudgetCodeRepositoryTests.cs index aef91840..547825b8 100644 --- a/tests/FMS.Infrastructure.Tests/BudgetCodeRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/BudgetCodeRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; namespace FMS.Infrastructure.Tests { diff --git a/tests/FMS.Infrastructure.Tests/CabinetRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/CabinetRepositoryTests.cs index c1266653..220e0c4c 100644 --- a/tests/FMS.Infrastructure.Tests/CabinetRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/CabinetRepositoryTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using TestHelpers; using NUnit.Framework; diff --git a/tests/FMS.Infrastructure.Tests/ContactRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ContactRepositoryTests.cs index a1e17f8e..0f953d48 100644 --- a/tests/FMS.Infrastructure.Tests/ContactRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ContactRepositoryTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; diff --git a/tests/FMS.Infrastructure.Tests/ContactTypeRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ContactTypeRepositoryTests.cs index 47f523ba..b7ed47f1 100644 --- a/tests/FMS.Infrastructure.Tests/ContactTypeRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ContactTypeRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/FMS.Infrastructure.Tests/EventRepositoryTest.cs b/tests/FMS.Infrastructure.Tests/EventRepositoryTest.cs index 4bffa5a1..ac46b8f3 100644 --- a/tests/FMS.Infrastructure.Tests/EventRepositoryTest.cs +++ b/tests/FMS.Infrastructure.Tests/EventRepositoryTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; diff --git a/tests/FMS.Infrastructure.Tests/EventTypeRepositoryTest.cs b/tests/FMS.Infrastructure.Tests/EventTypeRepositoryTest.cs index 5d7dacec..fe5a3b81 100644 --- a/tests/FMS.Infrastructure.Tests/EventTypeRepositoryTest.cs +++ b/tests/FMS.Infrastructure.Tests/EventTypeRepositoryTest.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; @@ -15,7 +15,7 @@ using FMS.Infrastructure.Contexts; using FMS.Domain.Dto; using FMS.Infrastructure.Repositories; -using FluentAssertions; +using AwesomeAssertions; using NSubstitute; using Microsoft.AspNetCore.Http; diff --git a/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj b/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj index 7f8062d6..f9f80b58 100644 --- a/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj +++ b/tests/FMS.Infrastructure.Tests/FMS.Infrastructure.Tests.csproj @@ -6,7 +6,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/tests/FMS.Infrastructure.Tests/FacilityRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/FacilityRepositoryTests.cs index e04f9f96..818e350b 100644 --- a/tests/FMS.Infrastructure.Tests/FacilityRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/FacilityRepositoryTests.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using TestHelpers; diff --git a/tests/FMS.Infrastructure.Tests/FacilityStatusRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/FacilityStatusRepositoryTests.cs index 028782f1..8afc2221 100644 --- a/tests/FMS.Infrastructure.Tests/FacilityStatusRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/FacilityStatusRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/FMS.Infrastructure.Tests/FacilityTypeRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/FacilityTypeRepositoryTests.cs index 7cded4ad..120a9bbf 100644 --- a/tests/FMS.Infrastructure.Tests/FacilityTypeRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/FacilityTypeRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; namespace FMS.Infrastructure.Tests { diff --git a/tests/FMS.Infrastructure.Tests/FileRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/FileRepositoryTests.cs index 65e2ee0b..40766010 100644 --- a/tests/FMS.Infrastructure.Tests/FileRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/FileRepositoryTests.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using TestHelpers; using NUnit.Framework; diff --git a/tests/FMS.Infrastructure.Tests/ItemsListRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ItemsListRepositoryTests.cs index 74d51a9b..906352dd 100644 --- a/tests/FMS.Infrastructure.Tests/ItemsListRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ItemsListRepositoryTests.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Repositories; using TestHelpers; using NUnit.Framework; diff --git a/tests/FMS.Infrastructure.Tests/LocationRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/LocationRepositoryTests.cs index 59c804fa..2f4321cb 100644 --- a/tests/FMS.Infrastructure.Tests/LocationRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/LocationRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/FMS.Infrastructure.Tests/OnsiteScoreRepositoryTest.cs b/tests/FMS.Infrastructure.Tests/OnsiteScoreRepositoryTest.cs index b5a92f4b..148f558f 100644 --- a/tests/FMS.Infrastructure.Tests/OnsiteScoreRepositoryTest.cs +++ b/tests/FMS.Infrastructure.Tests/OnsiteScoreRepositoryTest.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using AwesomeAssertions; using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; diff --git a/tests/FMS.Infrastructure.Tests/ParcelTypeRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/ParcelTypeRepositoryTests.cs index a7c8ee43..65cecacd 100644 --- a/tests/FMS.Infrastructure.Tests/ParcelTypeRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/ParcelTypeRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/FMS.Infrastructure.Tests/PhoneRepositoryTests.cs b/tests/FMS.Infrastructure.Tests/PhoneRepositoryTests.cs index 57046675..7e402d5e 100644 --- a/tests/FMS.Infrastructure.Tests/PhoneRepositoryTests.cs +++ b/tests/FMS.Infrastructure.Tests/PhoneRepositoryTests.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; namespace FMS.Infrastructure.Tests { diff --git a/tests/FMS.Infrastructure.Tests/ScoreRepositoryTest.cs b/tests/FMS.Infrastructure.Tests/ScoreRepositoryTest.cs index 7fdbdac4..ae3a494b 100644 --- a/tests/FMS.Infrastructure.Tests/ScoreRepositoryTest.cs +++ b/tests/FMS.Infrastructure.Tests/ScoreRepositoryTest.cs @@ -9,7 +9,7 @@ using FMS.Domain.Entities; using FMS.Domain.Dto; using Microsoft.AspNetCore.Http; -using FluentAssertions; +using AwesomeAssertions; using System.Collections.Generic; namespace FMS.Infrastructure.Tests diff --git a/tests/Playwright.Tests/AddFacilitiesTests.cs b/tests/Playwright.Tests/AddFacilitiesTests.cs index 3a8b5fb1..efe50559 100644 --- a/tests/Playwright.Tests/AddFacilitiesTests.cs +++ b/tests/Playwright.Tests/AddFacilitiesTests.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.Playwright; using NUnit.Framework; diff --git a/tests/Playwright.Tests/AuthTests.cs b/tests/Playwright.Tests/AuthTests.cs index 0aa41615..fbb9ed0d 100644 --- a/tests/Playwright.Tests/AuthTests.cs +++ b/tests/Playwright.Tests/AuthTests.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.Playwright; using NUnit.Framework; diff --git a/tests/Playwright.Tests/LocationSearchTests.cs b/tests/Playwright.Tests/LocationSearchTests.cs index 2f1f55ff..7c65fc94 100644 --- a/tests/Playwright.Tests/LocationSearchTests.cs +++ b/tests/Playwright.Tests/LocationSearchTests.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using FluentAssertions; +using AwesomeAssertions; using Microsoft.Playwright; using NUnit.Framework; diff --git a/tests/Playwright.Tests/PlaywrightTests.csproj b/tests/Playwright.Tests/PlaywrightTests.csproj index 1ef4015e..5df12552 100644 --- a/tests/Playwright.Tests/PlaywrightTests.csproj +++ b/tests/Playwright.Tests/PlaywrightTests.csproj @@ -5,7 +5,7 @@ - + diff --git a/tests/TestHelpers/SeedData/StatusSeedData.cs b/tests/TestHelpers/SeedData/StatusSeedData.cs index b1ba020b..8fefc117 100644 --- a/tests/TestHelpers/SeedData/StatusSeedData.cs +++ b/tests/TestHelpers/SeedData/StatusSeedData.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using Microsoft.Graph.Models; using System; using System.Collections.Generic; diff --git a/tests/TestHelpers/TestHelpers.csproj b/tests/TestHelpers/TestHelpers.csproj index 64eb54c2..5cc900b2 100644 --- a/tests/TestHelpers/TestHelpers.csproj +++ b/tests/TestHelpers/TestHelpers.csproj @@ -1,7 +1,6 @@ - all From 73b02554ed6ad1e68ec5152254bdd8d1b871f461 Mon Sep 17 00:00:00 2001 From: Doug Waldron Date: Wed, 14 Jan 2026 11:51:13 -0500 Subject: [PATCH 04/12] Change build folder configuration Build artifacts will be output in two locations: - `artifacts` for the app projects - `tests\artifacts` for the test projects The command to create a new EF migration has been simplified. --- .github/workflows/sonarcloud-scan.yml | 6 +++--- .gitignore | 2 +- Directory.Build.props | 6 +----- FMS/FMS.csproj | 24 ++++++++++++++---------- README.md | 4 ++-- tests/Directory.Build.props | 6 +----- 6 files changed, 22 insertions(+), 26 deletions(-) diff --git a/.github/workflows/sonarcloud-scan.yml b/.github/workflows/sonarcloud-scan.yml index 2d7e0fed..329fdcf3 100644 --- a/.github/workflows/sonarcloud-scan.yml +++ b/.github/workflows/sonarcloud-scan.yml @@ -68,7 +68,7 @@ jobs: run: | .\.sonar\scanner\dotnet-sonarscanner begin /k:"gaepdit_FMS" /o:"gaepdit" /d:sonar.token="$env:SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths=coverage.xml /d:sonar.exclusions=FMS.Infrastructure/Migrations/**,FMS/Platform/DevHelpers/SeedData/** dotnet build - coverlet .\artifacts\FMS.Domain.Tests\bin\Debug\net10.0\FMS.Domain.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Domain.Tests --no-build" - coverlet .\artifacts\FMS.App.Tests\bin\Debug\net10.0\FMS.App.Tests.dll --target "dotnet" --targetargs "test tests/FMS.App.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" - coverlet .\artifacts\FMS.Infrastructure.Tests\bin\Debug\net10.0\FMS.Infrastructure.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Infrastructure.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" -f=opencover -o="coverage.xml" + coverlet .\tests\artifacts\bin\FMS.Domain.Tests\debug\FMS.Domain.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Domain.Tests --no-build" + coverlet .\tests\artifacts\bin\FMS.App.Tests\debug\FMS.App.Tests.dll --target "dotnet" --targetargs "test tests/FMS.App.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" + coverlet .\tests\artifacts\bin\FMS.Infrastructure.Tests\debug\FMS.Infrastructure.Tests.dll --target "dotnet" --targetargs "test tests/FMS.Infrastructure.Tests --no-build" --exclude "[TestHelpers]*" --exclude "[FMS.Infrastructure]FMS.Infrastructure.Migrations.*" --merge-with "coverage.json" -f=opencover -o="coverage.xml" .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="$env:SONAR_TOKEN" diff --git a/.gitignore b/.gitignore index c7987ce1..c40c2c36 100644 --- a/.gitignore +++ b/.gitignore @@ -550,7 +550,7 @@ appsettings.*.json ## Build artifacts # MSBuild -.artifacts/ +artifacts/ # Library Manager **/wwwroot/lib/ diff --git a/Directory.Build.props b/Directory.Build.props index e5f16be5..6a603f53 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,6 @@ net10.0 - - - - $(MSBuildThisFileDirectory)artifacts\$(MSBuildProjectName)\bin\ - $(MSBuildThisFileDirectory)artifacts\$(MSBuildProjectName)\obj\ + true diff --git a/FMS/FMS.csproj b/FMS/FMS.csproj index 48abe054..b37dacf0 100644 --- a/FMS/FMS.csproj +++ b/FMS/FMS.csproj @@ -40,6 +40,10 @@ + + + + appsettings.json @@ -49,15 +53,15 @@ - - - filePath - appsettings.*.json - - - filePath - web.config - - + + + filePath + appsettings.*.json + + + filePath + web.config + + diff --git a/README.md b/README.md index 988a99d5..91d931ef 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Instructions for adding a new Entity Framework database migration: 2. Run the following command with an appropriate migration name: - `dotnet ef migrations add NAME_OF_MIGRATION --msbuildprojectextensionspath ..\artifacts\FMS.Infrastructure\obj\` + `dotnet ef migrations add NAME_OF_MIGRATION` Example to show exact path: - `TK's path: D:\source\repos\FMS\fms.infrastructure> dotnet ef migrations add NAME_OF_MIGRATION --msbuildprojectextensionspath ..\artifacts\FMS.Infrastructure\obj\` +`TK's path: D:\source\repos\FMS\fms.infrastructure> dotnet ef migrations add NAME_OF_MIGRATION` diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 2b079617..2a5c7892 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -3,10 +3,6 @@ net10.0 false true - - - - $(MSBuildThisFileDirectory)..\artifacts\$(MSBuildProjectName)\bin\ - $(MSBuildThisFileDirectory)..\artifacts\$(MSBuildProjectName)\obj\ + true From 1a60210bf3f0df502fc68c5232accd964ad634fa Mon Sep 17 00:00:00 2001 From: Doug Waldron Date: Wed, 14 Jan 2026 11:52:47 -0500 Subject: [PATCH 05/12] Move GitHub workflow permissions to job level --- .github/workflows/dotnet-test.yml | 6 +++--- .github/workflows/raygun-deployment.yml | 6 +++--- .github/workflows/sonarcloud-scan.yml | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dotnet-test.yml b/.github/workflows/dotnet-test.yml index a73192a7..011c3359 100644 --- a/.github/workflows/dotnet-test.yml +++ b/.github/workflows/dotnet-test.yml @@ -3,9 +3,6 @@ name: .NET Unit Tests on: pull_request: -permissions: - contents: read - jobs: dotnet-test: # ↓ Change this to "false" to disable the workflow without any alert messages. @@ -14,6 +11,9 @@ jobs: name: Run unit tests runs-on: windows-latest + permissions: + contents: read + steps: - name: Check out repository uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 diff --git a/.github/workflows/raygun-deployment.yml b/.github/workflows/raygun-deployment.yml index 6ae2c943..aa809951 100644 --- a/.github/workflows/raygun-deployment.yml +++ b/.github/workflows/raygun-deployment.yml @@ -6,13 +6,13 @@ on: push: tags: [prod/*] -permissions: - contents: read - jobs: raygun-deployment: name: Send deployment info to Raygun runs-on: ubuntu-latest + permissions: + contents: read + steps: - name: Get the version number id: get_version diff --git a/.github/workflows/sonarcloud-scan.yml b/.github/workflows/sonarcloud-scan.yml index 329fdcf3..cc77f877 100644 --- a/.github/workflows/sonarcloud-scan.yml +++ b/.github/workflows/sonarcloud-scan.yml @@ -4,10 +4,6 @@ on: pull_request: types: [opened, synchronize, reopened] -permissions: - contents: read - issues: write - jobs: sonarcloud-scan: # ↓ Change this to "false" to disable the workflow without any alert messages. @@ -16,6 +12,10 @@ jobs: name: Analyze with SonarCloud runs-on: windows-latest + permissions: + contents: read + issues: write + steps: - name: Set up Java JDK uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e From 6b70e8d71a491e36a66b464a1659b20b29ca0465 Mon Sep 17 00:00:00 2001 From: Doug Waldron Date: Wed, 14 Jan 2026 12:04:48 -0500 Subject: [PATCH 06/12] Enable the new Microsoft Testing Platform --- global.json | 14 ++++++++------ tests/Directory.Build.props | 16 ++++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/global.json b/global.json index 4372662a..98c62c95 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,10 @@ { - "sdk": { - "version": "10.0.0", - "rollForward": "latestFeature", - "allowPrerelease": false - } + "sdk": { + "version": "10.0.0", + "rollForward": "latestFeature", + "allowPrerelease": false + }, + "test": { + "runner": "Microsoft.Testing.Platform" } - +} diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 2a5c7892..d3b3d000 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,8 +1,12 @@ - - net10.0 - false - true - true - + + net10.0 + false + true + true + + + true + Exe + From ca2c97a3592f3f7a9e5b0630aa2c789c76d5458b Mon Sep 17 00:00:00 2001 From: Doug Waldron Date: Wed, 14 Jan 2026 12:23:05 -0500 Subject: [PATCH 07/12] Move test project build artifacts into the common artifacts folder --- tests/Directory.Build.props | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index d3b3d000..9b68865b 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -3,10 +3,14 @@ net10.0 false true - true true Exe + + + true + $(MSBuildThisFileDirectory)..\artifacts + From c18774fb0d7ecd001847b117cc72031dd47269ff Mon Sep 17 00:00:00 2001 From: Doug Waldron Date: Wed, 14 Jan 2026 14:24:50 -0500 Subject: [PATCH 08/12] Simplify using statements --- Directory.Build.props | 1 + FMS.Domain/Data/ContactStatus.cs | 6 +- FMS.Domain/Data/Counties.cs | 1 - FMS.Domain/Data/PhoneTypes.cs | 5 +- FMS.Domain/Data/States.cs | 4 +- .../AbandonedInactiveEditDto.cs | 4 +- .../AbandonedInactiveSummaryDto.cs | 1 - .../Dto/ActionTaken/ActionTakenSummaryDto.cs | 1 - .../AllowedActionTakenEditDto.cs | 1 - .../AllowedActionTakenSpec.cs | 1 - .../AllowedActionTakenSummaryDto.cs | 1 - .../Dto/BudgetCode/BudgetCodeEditDto.cs | 4 +- .../Dto/BudgetCode/BudgetCodeSummaryDto.cs | 1 - FMS.Domain/Dto/Cabinet/CabinetEditDto.cs | 1 - FMS.Domain/Dto/Cabinet/CabinetExtensions.cs | 16 +- FMS.Domain/Dto/Cabinet/CabinetSummaryDto.cs | 3 +- FMS.Domain/Dto/Chemical/ChemicalEditDto.cs | 3 +- FMS.Domain/Dto/Chemical/ChemicalSummaryDto.cs | 3 +- .../ComplianceOfficerDetailDto.cs | 1 - .../ComplianceOfficerSummaryDto.cs | 1 - FMS.Domain/Dto/Contact/ContactCreateDto.cs | 3 +- FMS.Domain/Dto/Contact/ContactEditDto.cs | 1 - FMS.Domain/Dto/Contact/ContactSummaryDto.cs | 3 - .../Dto/ContactType/ContactTypeEditDto.cs | 3 +- .../Dto/ContactType/ContactTypeSummaryDto.cs | 1 - FMS.Domain/Dto/Event/EventCreateDto.cs | 3 +- FMS.Domain/Dto/Event/EventEditDto.cs | 1 - FMS.Domain/Dto/Event/EventSummaryDto.cs | 1 - .../EventContractor/EventContractorEditDto.cs | 1 - .../EventContractorSummaryDto.cs | 8 +- FMS.Domain/Dto/EventType/EventTypeEditDto.cs | 3 +- .../Dto/EventType/EventTypeSummaryDto.cs | 1 - FMS.Domain/Dto/Facility/FacilityBasicDto.cs | 1 - FMS.Domain/Dto/Facility/FacilityCreateDto.cs | 3 +- FMS.Domain/Dto/Facility/FacilityDetailDto.cs | 30 +- FMS.Domain/Dto/Facility/FacilityEditDto.cs | 8 +- FMS.Domain/Dto/Facility/FacilityMapSpec.cs | 4 +- .../Dto/Facility/FacilityMapSummaryDto.cs | 3 +- FMS.Domain/Dto/Facility/FacilitySpec.cs | 29 +- FMS.Domain/Dto/Facility/FacilitySummaryDto.cs | 5 +- .../FacilityStatusSummaryDto.cs | 1 - .../Dto/FacilityType/FacilityTypeCreateDto.cs | 4 +- .../FacilityType/FacilityTypeSummaryDto.cs | 1 - FMS.Domain/Dto/File/FileDetailDto.cs | 6 +- FMS.Domain/Dto/File/FileSpec.cs | 3 +- .../Dto/FundingSource/FundingSourceEditDto.cs | 3 +- .../FundingSource/FundingSourceSummaryDto.cs | 1 - .../GAPSAssessment/GAPSAssessmentCreateDto.cs | 3 +- .../GAPSAssessment/GapsAssessmentEditDto.cs | 7 +- .../GapsAssessmentSummaryDto.cs | 5 - .../GroundwaterScoreCreateDto.cs | 3 +- .../GroundwaterScoreEditDto.cs | 3 +- .../GroundwaterStatusEditDto.cs | 3 +- .../GroundwaterStatusSummaryDto.cs | 1 - .../HsrpFacilityPropertiesCreateDto.cs | 1 - .../HsrpFacilityPropertiesDetailDto.cs | 1 - .../HsrpFacilityPropertiesEditDto.cs | 1 - FMS.Domain/Dto/Location/LocationCreateDto.cs | 4 +- FMS.Domain/Dto/Location/LocationEditDto.cs | 1 - FMS.Domain/Dto/Location/LocationSummaryDto.cs | 3 +- .../LocationClass/LocationClassCreateDto.cs | 7 +- .../Dto/LocationClass/LocationClassEditDto.cs | 5 - .../LocationClass/LocationClassSummaryDto.cs | 5 - .../Dto/OnSiteScore/OnSiteScoreCreateDto.cs | 3 +- .../Dto/OnSiteScore/OnsiteScoreEditDto.cs | 3 +- .../OrganizationalUnitSummaryDto.cs | 1 - .../Dto/OverallStatus/OverallStatusEditDto.cs | 3 +- .../OverallStatus/OverallStatusSummaryDto.cs | 3 +- FMS.Domain/Dto/PaginatedList/PaginatedList.cs | 4 +- FMS.Domain/Dto/Parcel/ParcelCreateDto.cs | 3 +- FMS.Domain/Dto/Parcel/ParcelEditDto.cs | 1 - FMS.Domain/Dto/Parcel/ParcelSummaryDto.cs | 3 +- .../Dto/ParcelType/ParcelTypeEditDto.cs | 3 +- .../Dto/ParcelType/ParcelTypeSummaryDto.cs | 1 - FMS.Domain/Dto/Phone/PhoneCreateDto.cs | 3 +- FMS.Domain/Dto/Phone/PhoneEditDto.cs | 3 +- FMS.Domain/Dto/Phone/PhoneSummaryDto.cs | 1 - .../Reports/AssignmentListReportByCODto.cs | 6 - .../AssignmentListReportByCountyDto.cs | 6 - .../Reports/AssignmentListReportByHSIDto.cs | 6 - .../AssignmentListReportBySiteNameDto.cs | 6 - .../Reports/AssignmentListReportByUnitDto.cs | 6 - .../RetentionRecordDetailDto.cs | 1 - FMS.Domain/Dto/Score/ScoreCreateDto.cs | 3 +- FMS.Domain/Dto/Score/ScoreEditDto.cs | 3 +- FMS.Domain/Dto/Score/ScoreSummaryDto.cs | 3 +- .../Dto/SoilStatus/SoilStatusEditDto.cs | 3 +- .../Dto/SoilStatus/SoilStatusSummaryDto.cs | 3 +- .../Dto/SourceStatus/SourceStatusEditDto.cs | 3 +- .../SourceStatus/SourceStatusSummaryDto.cs | 3 +- FMS.Domain/Dto/Status/StatusCreateDto.cs | 1 - FMS.Domain/Dto/Status/StatusEditDto.cs | 1 - .../Dto/Substance/SubstanceCreateDto.cs | 1 - FMS.Domain/Dto/Substance/SubstanceEditDto.cs | 3 +- .../Dto/Substance/SubstanceSummaryDto.cs | 3 +- FMS.Domain/Entities/AllowedActionTaken.cs | 4 +- FMS.Domain/Entities/Base/BaseModel.cs | 4 +- FMS.Domain/Entities/Cabinet.cs | 4 +- FMS.Domain/Entities/ComplianceOfficer.cs | 1 - FMS.Domain/Entities/Contact.cs | 3 - FMS.Domain/Entities/Event.cs | 1 - FMS.Domain/Entities/EventContractor.cs | 5 - FMS.Domain/Entities/Facility.cs | 7 +- FMS.Domain/Entities/FacilityType.cs | 5 +- FMS.Domain/Entities/File.cs | 7 +- FMS.Domain/Entities/FundingSource.cs | 4 +- FMS.Domain/Entities/GroundwaterScore.cs | 5 +- FMS.Domain/Entities/HSRPFacilityProperties.cs | 5 +- FMS.Domain/Entities/Location.cs | 2 - FMS.Domain/Entities/LocationClass.cs | 6 - FMS.Domain/Entities/OnSiteScore.cs | 5 +- FMS.Domain/Entities/OverallStatus.cs | 4 +- FMS.Domain/Entities/Parcel.cs | 3 +- FMS.Domain/Entities/ParcelType.cs | 4 +- FMS.Domain/Entities/Phone.cs | 1 - FMS.Domain/Entities/RetentionRecord.cs | 1 - FMS.Domain/Entities/Score.cs | 2 - FMS.Domain/Entities/SoilStatus.cs | 2 +- FMS.Domain/Entities/SourceStatus.cs | 1 - FMS.Domain/Entities/Status.cs | 4 +- FMS.Domain/Entities/Substance.cs | 3 +- FMS.Domain/Entities/Users/ApplicationUser.cs | 1 - FMS.Domain/Extensions/StringExtensions.cs | 5 +- FMS.Domain/GlobalUsings.cs | 1 + .../IAbandonedInactiveRepository.cs | 3 - .../Repositories/IActionTakenRepository.cs | 3 - .../IAllowedActionTakenRepository.cs | 4 - .../Repositories/IBudgetCodeRepository.cs | 3 - FMS.Domain/Repositories/ICabinetRepository.cs | 5 +- .../Repositories/IChemicalRepository.cs | 3 - .../IComplianceOfficerRepository.cs | 5 +- FMS.Domain/Repositories/IContactRepository.cs | 5 +- .../Repositories/IContactTypeRepository.cs | 5 +- .../IEventContractorRepository.cs | 6 - FMS.Domain/Repositories/IEventRepository.cs | 6 +- .../Repositories/IEventTypeRepository.cs | 5 +- .../Repositories/IFacilityRepository.cs | 5 +- .../Repositories/IFacilityStatusRepository.cs | 3 - .../Repositories/IFacilityTypeRepository.cs | 3 - FMS.Domain/Repositories/IFileRepository.cs | 4 +- .../Repositories/IFundingSourceRepository.cs | 3 - .../Repositories/IGapsAssessmentRepository.cs | 7 +- .../IGroundwaterScoreRepository.cs | 4 +- .../IGroundwaterStatusRepository.cs | 3 - .../IHsrpFacilityPropertiesRepository.cs | 7 +- .../Repositories/IItemsListRepository.cs | 6 +- .../Repositories/ILocationClassRepository.cs | 5 +- .../Repositories/ILocationRepository.cs | 5 +- .../Repositories/IOnsiteScoreRepository.cs | 2 - .../IOrganizationalUnitRepository.cs | 3 - .../Repositories/IOverallStatusRepository.cs | 3 - FMS.Domain/Repositories/IParcelRepository.cs | 3 - .../Repositories/IParcelTypeRepository.cs | 3 - FMS.Domain/Repositories/IPhoneRepository.cs | 3 - .../Repositories/IReportingRepository.cs | 5 - FMS.Domain/Repositories/IScoreRepository.cs | 5 +- .../Repositories/ISoilStatusRepository.cs | 5 +- .../Repositories/ISourceStatusRepository.cs | 5 +- FMS.Domain/Repositories/IStatusRepository.cs | 4 +- .../Repositories/ISubstanceRepository.cs | 8 +- FMS.Domain/Services/IUserService.cs | 5 +- FMS.Domain/Services/UserView.cs | 4 +- FMS.Domain/Utils/Prevent.cs | 2 - FMS.Infrastructure/Contexts/FmsDbContext.cs | 4 - .../DbScripts/GetNearbyFacilities.cs | 3 +- FMS.Infrastructure/GlobalUsings.cs | 1 + .../AbandonedInactiveRepository.cs | 4 - .../Repositories/ActionTakenRepository.cs | 4 - .../AllowedActionTakenRepository.cs | 4 - .../Repositories/BudgetCodeRepository.cs | 6 +- .../Repositories/CabinetRepository.cs | 6 +- .../Repositories/ChemicalRepository.cs | 6 +- FMS.Infrastructure/Repositories/Common.cs | 6 +- .../ComplianceOfficerRepository.cs | 6 +- .../Repositories/ContactRepository.cs | 6 +- .../Repositories/ContactTypeRepository.cs | 4 - .../Repositories/EventContractorRepository.cs | 4 - .../Repositories/EventRepository.cs | 6 +- .../Repositories/EventTypeRepository.cs | 4 - .../Repositories/FacilityRepository.cs | 341 +++++++++--------- .../Repositories/FacilityStatusRepository.cs | 4 - .../Repositories/FacilityTypeRepository.cs | 22 +- .../Repositories/FileRepository.cs | 6 +- .../Repositories/FundingSourceRepository.cs | 4 - .../Repositories/GapsAssessmentRepository.cs | 5 - .../GroundwaterScoreRepository.cs | 5 +- .../GroundwaterStatusRepository.cs | 4 - .../HsrpFacilityPropertiesRepository.cs | 4 - .../Repositories/ItemsListRepository.cs | 4 - .../Repositories/LocationClassRepository.cs | 4 - .../Repositories/LocationRepository.cs | 4 - .../Repositories/OnsiteScoreRepository.cs | 3 - .../OrganizationalUnitRepository.cs | 4 - .../Repositories/OverallStatusRepository.cs | 4 - .../Repositories/ParcelRepository.cs | 6 +- .../Repositories/ParcelTypeRepository.cs | 4 - .../Repositories/PhoneRepository.cs | 4 - .../Repositories/ReportingRepository.cs | 5 - .../Repositories/ScoreRepository.cs | 4 - .../Repositories/SoilStatusRepository.cs | 4 - .../Repositories/SourceStatusRepository.cs | 4 - .../Repositories/StatusRepository.cs | 4 - .../Repositories/SubstanceRepository.cs | 5 - FMS.Infrastructure/Services/UserService.cs | 6 +- FMS/Api/ChemicalSearchController.cs | 3 - FMS/Api/eventActionController.cs | 2 - FMS/Helpers/AllowedActionTakenHelper.cs | 4 - FMS/Helpers/EmailHelper.cs | 3 +- FMS/Helpers/EventSortHelper.cs | 3 - FMS/Helpers/EventSummaryDtoScalar.cs | 1 - FMS/Helpers/ExportHelper.cs | 4 - FMS/Helpers/FacilityDetailDtoScalar.cs | 87 +++-- FMS/Helpers/FacilityDetailHSIScalarDto.cs | 6 - FMS/Helpers/FacilityPendingDtoScalar.cs | 1 - FMS/Helpers/FacilityValidationDtoScalar.cs | 1 - FMS/Helpers/FormValidationHelper.cs | 1 - FMS/Helpers/GeoCoordHelper.cs | 4 +- FMS/Helpers/SelectListHelper.cs | 3 - FMS/Helpers/URLHelper.cs | 1 - FMS/Helpers/UserDomainValidation.cs | 2 - FMS/Pages/Account/ExternalLogin.cshtml.cs | 7 - FMS/Pages/Account/Index.cshtml.cs | 3 - FMS/Pages/Account/Logout.cshtml.cs | 2 - FMS/Pages/Cabinets/Add.cshtml.cs | 3 +- FMS/Pages/Cabinets/Details.cshtml.cs | 1 - FMS/Pages/Cabinets/Edit.cshtml.cs | 2 - FMS/Pages/Cabinets/Index.cshtml.cs | 2 - FMS/Pages/Contact/Add.cshtml | 1 - FMS/Pages/Contact/Add.cshtml.cs | 2 - FMS/Pages/Contact/Edit.cshtml | 1 - FMS/Pages/Contact/Edit.cshtml.cs | 2 - FMS/Pages/Error.cshtml.cs | 2 +- FMS/Pages/Event/Add.cshtml | 2 - FMS/Pages/Event/Add.cshtml.cs | 3 - FMS/Pages/Event/Delete.cshtml.cs | 2 - FMS/Pages/Event/Edit.cshtml | 2 - FMS/Pages/Event/Edit.cshtml.cs | 4 - FMS/Pages/Facilities/Add.cshtml | 1 - FMS/Pages/Facilities/Add.cshtml.cs | 72 ++-- FMS/Pages/Facilities/Delete.cshtml.cs | 4 +- FMS/Pages/Facilities/Details.cshtml | 1 - FMS/Pages/Facilities/Details.cshtml.cs | 30 +- FMS/Pages/Facilities/Edit.cshtml | 23 +- FMS/Pages/Facilities/Edit.cshtml.cs | 139 ++++--- .../Facilities/EditRetentionRecord.cshtml.cs | 2 - FMS/Pages/Facilities/Index.cshtml.cs | 4 - FMS/Pages/Facilities/Map.cshtml.cs | 128 ++++--- FMS/Pages/Facilities/Undelete.cshtml.cs | 4 +- FMS/Pages/Files/Details.cshtml.cs | 3 +- FMS/Pages/Files/Index.cshtml.cs | 1 - FMS/Pages/GroundwaterScore/Edit.cshtml | 2 - FMS/Pages/GroundwaterScore/Edit.cshtml.cs | 2 - FMS/Pages/HsrpFacilityProperties/Edit.cshtml | 2 - .../HsrpFacilityProperties/Edit.cshtml.cs | 2 - FMS/Pages/Location/Edit.cshtml | 2 - FMS/Pages/Location/Edit.cshtml.cs | 2 - .../AbandonedInactive/Add.cshtml.cs | 1 - .../AbandonedInactive/Edit.cshtml.cs | 2 - .../AbandonedInactive/Index.cshtml.cs | 3 - .../Maintenance/ActionTaken/Add.cshtml.cs | 1 - .../Maintenance/ActionTaken/Edit.cshtml.cs | 2 - .../Maintenance/ActionTaken/Index.cshtml.cs | 3 - .../AllowedActionTaken/Edit.cshtml.cs | 4 - .../AllowedActionTaken/Index.cshtml.cs | 2 - .../Maintenance/BudgetCode/Add.cshtml.cs | 1 - .../Maintenance/BudgetCode/Edit.cshtml.cs | 2 - .../Maintenance/BudgetCode/Index.cshtml.cs | 5 +- FMS/Pages/Maintenance/Chemical/Add.cshtml.cs | 1 - FMS/Pages/Maintenance/Chemical/Edit.cshtml.cs | 2 - .../Maintenance/Chemical/Index.cshtml.cs | 3 - .../ComplianceOfficer/Index.cshtml.cs | 5 +- .../Maintenance/ContactType/Add.cshtml.cs | 1 - .../Maintenance/ContactType/Edit.cshtml.cs | 2 - .../Maintenance/ContactType/Index.cshtml.cs | 3 - .../Maintenance/EventContractor/Add.cshtml.cs | 1 - .../EventContractor/Edit.cshtml.cs | 2 - .../EventContractor/Index.cshtml.cs | 3 - FMS/Pages/Maintenance/EventType/Add.cshtml.cs | 1 - .../Maintenance/EventType/Edit.cshtml.cs | 2 - .../Maintenance/EventType/Index.cshtml.cs | 3 - .../Maintenance/FacilityStatus/Add.cshtml.cs | 1 - .../Maintenance/FacilityStatus/Edit.cshtml.cs | 2 - .../FacilityStatus/Index.cshtml.cs | 5 +- .../Maintenance/FacilityType/Add.cshtml.cs | 1 - .../Maintenance/FacilityType/Edit.cshtml.cs | 2 - .../Maintenance/FacilityType/Index.cshtml.cs | 5 +- .../Maintenance/FundingSource/Add.cshtml.cs | 1 - .../Maintenance/FundingSource/Edit.cshtml.cs | 2 - .../Maintenance/FundingSource/Index.cshtml.cs | 3 - .../Maintenance/GapsAssessment/Add.cshtml.cs | 1 - .../Maintenance/GapsAssessment/Edit.cshtml.cs | 2 - .../GapsAssessment/Index.cshtml.cs | 3 - .../GroundwaterStatus/Add.cshtml.cs | 1 - .../GroundwaterStatus/Edit.cshtml.cs | 2 - .../GroundwaterStatus/Index.cshtml.cs | 3 - .../Maintenance/LocationClass/Add.cshtml.cs | 1 - .../Maintenance/LocationClass/Edit.cshtml.cs | 2 - .../Maintenance/LocationClass/Index.cshtml.cs | 3 - .../OrganizationalUnit/Add.cshtml.cs | 1 - .../OrganizationalUnit/Edit.cshtml.cs | 2 - .../OrganizationalUnit/Index.cshtml.cs | 5 +- .../Maintenance/OverallStatus/Add.cshtml.cs | 1 - .../Maintenance/OverallStatus/Edit.cshtml.cs | 2 - .../Maintenance/OverallStatus/Index.cshtml.cs | 3 - .../Maintenance/ParcelType/Add.cshtml.cs | 1 - .../Maintenance/ParcelType/Edit.cshtml.cs | 2 - .../Maintenance/ParcelType/Index.cshtml.cs | 3 - .../Maintenance/SoilStatus/Add.cshtml.cs | 1 - .../Maintenance/SoilStatus/Edit.cshtml.cs | 2 - .../Maintenance/SoilStatus/Index.cshtml.cs | 3 - .../Maintenance/SourceStatus/Add.cshtml.cs | 1 - .../Maintenance/SourceStatus/Edit.cshtml.cs | 2 - .../Maintenance/SourceStatus/Index.cshtml.cs | 3 - FMS/Pages/OnsiteScore/Edit.cshtml | 2 - FMS/Pages/OnsiteScore/Edit.cshtml.cs | 2 - FMS/Pages/Parcel/Add.cshtml | 2 - FMS/Pages/Parcel/Add.cshtml.cs | 2 - FMS/Pages/Parcel/Edit.cshtml | 2 - FMS/Pages/Parcel/Edit.cshtml.cs | 2 - FMS/Pages/Phone/Add.cshtml | 2 - FMS/Pages/Phone/Add.cshtml.cs | 2 - FMS/Pages/Phone/Edit.cshtml | 2 - FMS/Pages/Phone/Edit.cshtml.cs | 2 - .../Reporting/AssignmentList/Index.cshtml | 1 - .../Reporting/AssignmentList/Index.cshtml.cs | 5 - FMS/Pages/Reporting/Delisted/Index.cshtml | 1 - FMS/Pages/Reporting/Delisted/Index.cshtml.cs | 1 - FMS/Pages/Reporting/Events/Index.cshtml | 1 - FMS/Pages/Reporting/Events/Index.cshtml.cs | 1 - FMS/Pages/Reporting/Index.cshtml.cs | 1 - FMS/Pages/Reporting/PAF/Index.cshtml | 1 - FMS/Pages/Reporting/PAF/Index.cshtml.cs | 1 - FMS/Pages/Reporting/SiteSummary/Index.cshtml | 1 - .../Reporting/SiteSummary/Index.cshtml.cs | 1 - FMS/Pages/Score/Edit.cshtml | 2 - FMS/Pages/Score/Edit.cshtml.cs | 2 - FMS/Pages/Shared/_HSIMenuPartial.cshtml | 4 +- FMS/Pages/Status/Edit.cshtml | 2 - FMS/Pages/Status/Edit.cshtml.cs | 2 - FMS/Pages/Substance/Add.cshtml | 2 - FMS/Pages/Substance/Add.cshtml.cs | 3 - FMS/Pages/Substance/Delete.cshtml.cs | 2 - FMS/Pages/Substance/Edit.cshtml.cs | 2 - FMS/Pages/Users/Details.cshtml.cs | 5 +- FMS/Pages/Users/Edit.cshtml.cs | 3 - FMS/Pages/Users/Index.cshtml.cs | 7 +- .../WebHostEnvironmentExtensions.cs | 5 +- FMS/Platform/Extensions/StringExtensions.cs | 5 +- FMS/Platform/Extensions/TempDataExtensions.cs | 2 +- FMS/Platform/GlobalConstants.cs | 4 +- FMS/Program.cs | 3 - FMS/Services/MigratorHostedService.cs | 8 +- FMS/Startup.cs | 6 - tests/Directory.Build.props | 25 +- .../Account/AccountIndexTests.cs | 7 +- .../FMS.App.Tests/Cabinets/CabinetAddTests.cs | 7 +- .../Cabinets/CabinetDetailsTests.cs | 8 +- .../Cabinets/CabinetEditTests.cs | 10 +- .../Cabinets/CabinetIndexTests.cs | 6 +- .../Facilities/FacilityAddTests.cs | 6 - .../Facilities/FacilityDeleteTests.cs | 7 +- .../Facilities/FacilityDetailsTests.cs | 13 +- .../Facilities/FacilityEditTests.cs | 7 +- .../Facilities/FacilityUndeleteTests.cs | 7 +- .../FMS.App.Tests/Files/FilesDetailsTests.cs | 9 +- tests/FMS.App.Tests/Files/FilesIndexTests.cs | 11 +- tests/FMS.App.Tests/GlobalUsings.cs | 3 + .../Helpers/ExportHelperTests.cs | 7 +- .../Helpers/GeoCoordHelperTests.cs | 5 +- .../Helpers/UserDomainValidationTest.cs | 2 - tests/FMS.App.Tests/Users/UserDetailsTests.cs | 7 +- tests/FMS.App.Tests/Users/UserEditTests.cs | 8 +- tests/FMS.App.Tests/Users/UserSearchTests.cs | 7 +- tests/FMS.App.Tests/Users/UserTestData.cs | 4 +- .../FMS.Domain.Tests/CabinetExtensionTests.cs | 7 +- tests/FMS.Domain.Tests/FileTests.cs | 4 - tests/FMS.Domain.Tests/GlobalUsings.cs | 3 + .../ActionTakenRepositoryTests.cs | 12 +- .../AllowedActionTakenRepositoryTest.cs | 9 - .../BudgetCodeRepositoryTests.cs | 12 +- .../CabinetRepositoryTests.cs | 8 +- .../ContactRepositoryTests.cs | 8 +- .../ContactTypeRepositoryTests.cs | 13 +- .../EventRepositoryTest.cs | 9 - .../EventTypeRepositoryTest.cs | 16 +- .../FacilityRepositoryTests.cs | 9 +- .../FacilityStatusRepositoryTests.cs | 13 +- .../FacilityTypeRepositoryTests.cs | 12 +- .../FileRepositoryTests.cs | 10 +- .../FMS.Infrastructure.Tests/GlobalUsings.cs | 3 + .../ItemsListRepositoryTests.cs | 10 +- .../LocationRepositoryTests.cs | 13 +- .../OnsiteScoreRepositoryTest.cs | 8 +- .../ParcelTypeRepositoryTests.cs | 13 +- .../PhoneRepositoryTests.cs | 12 +- .../ScoreRepositoryTest.cs | 13 +- tests/TestHelpers/GlobalUsings.cs | 1 + tests/TestHelpers/RepositoryHelper.cs | 7 +- tests/TestHelpers/ResourceHelper.cs | 3 - .../SeedData/AbandonedInactiveSeedData.cs | 2 - .../SeedData/ActionTakenSeedData.cs | 2 - .../SeedData/AllowedActionTakenSeedData.cs | 2 - .../SeedData/BudgetCodeSeedData.cs | 4 +- tests/TestHelpers/SeedData/CabinetSeedData.cs | 4 +- .../TestHelpers/SeedData/ChemicalSeedData.cs | 2 - .../SeedData/ComplianceOfficerSeedData.cs | 4 +- tests/TestHelpers/SeedData/ContactSeedData.cs | 2 - .../SeedData/ContactTypeSeedData.cs | 2 - .../SeedData/EventContractorSeedData.cs | 4 +- tests/TestHelpers/SeedData/EventSeedData.cs | 2 - .../TestHelpers/SeedData/EventTypeSeedData.cs | 2 - .../TestHelpers/SeedData/FacilitySeedData.cs | 2 - .../SeedData/FacilityStatusSeedData.cs | 4 +- .../SeedData/FacilityTypeSeedData.cs | 4 +- tests/TestHelpers/SeedData/FileSeedData.cs | 4 +- .../SeedData/FundingSourceSeedData.cs | 2 - .../SeedData/GapsAssessmentSeedData.cs | 2 - .../SeedData/GroundwaterScoreSeedData.cs | 2 - .../SeedData/GroundwaterStatusSeedData.cs | 2 - .../HsrpFacilityPropertiesSeedData.cs | 2 - .../SeedData/LocationClassSeedData.cs | 4 +- .../TestHelpers/SeedData/LocationSeedData.cs | 2 - .../SeedData/OnSiteScoreSeedData.cs | 2 - .../SeedData/OrganizationalUnitSeedData.cs | 4 +- .../SeedData/OverallStatusSeedData.cs | 2 - tests/TestHelpers/SeedData/ParcelSeedData.cs | 2 - .../SeedData/ParcelTypeSeedData.cs | 4 +- tests/TestHelpers/SeedData/PhoneSeedData.cs | 2 - .../SeedData/RetentionRecordSeedData.cs | 4 +- tests/TestHelpers/SeedData/ScoreSeedData.cs | 2 - tests/TestHelpers/SeedData/SeedData.cs | 4 +- .../SeedData/SoilStatusSeedData.cs | 2 - .../SeedData/SourceStatusSeedData.cs | 2 - tests/TestHelpers/SeedData/StatusSeedData.cs | 4 +- .../TestHelpers/SeedData/SubstanceSeedData.cs | 2 - 435 files changed, 676 insertions(+), 1783 deletions(-) create mode 100644 FMS.Domain/GlobalUsings.cs create mode 100644 FMS.Infrastructure/GlobalUsings.cs create mode 100644 tests/FMS.App.Tests/GlobalUsings.cs create mode 100644 tests/FMS.Domain.Tests/GlobalUsings.cs create mode 100644 tests/FMS.Infrastructure.Tests/GlobalUsings.cs create mode 100644 tests/TestHelpers/GlobalUsings.cs diff --git a/Directory.Build.props b/Directory.Build.props index 6a603f53..1afbdd1a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ net10.0 + enable true diff --git a/FMS.Domain/Data/ContactStatus.cs b/FMS.Domain/Data/ContactStatus.cs index 50b6f537..19c3ae99 100644 --- a/FMS.Domain/Data/ContactStatus.cs +++ b/FMS.Domain/Data/ContactStatus.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace FMS.Domain.Data +namespace FMS.Domain.Data { public static partial class Data { diff --git a/FMS.Domain/Data/Counties.cs b/FMS.Domain/Data/Counties.cs index bed7bec8..6d7d291b 100644 --- a/FMS.Domain/Data/Counties.cs +++ b/FMS.Domain/Data/Counties.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System.Collections.Generic; namespace FMS.Domain.Data { diff --git a/FMS.Domain/Data/PhoneTypes.cs b/FMS.Domain/Data/PhoneTypes.cs index d7f32e1a..001ba508 100644 --- a/FMS.Domain/Data/PhoneTypes.cs +++ b/FMS.Domain/Data/PhoneTypes.cs @@ -1,7 +1,4 @@ -using FMS.Domain.Entities; -using System.Collections.Generic; - -namespace FMS.Domain.Data +namespace FMS.Domain.Data { public static partial class Data { diff --git a/FMS.Domain/Data/States.cs b/FMS.Domain/Data/States.cs index a023d934..e96fe0a2 100644 --- a/FMS.Domain/Data/States.cs +++ b/FMS.Domain/Data/States.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace FMS.Domain.Data +namespace FMS.Domain.Data { public static partial class Data { diff --git a/FMS.Domain/Dto/AbandonedInactive/AbandonedInactiveEditDto.cs b/FMS.Domain/Dto/AbandonedInactive/AbandonedInactiveEditDto.cs index de8f6fa9..0c4dc085 100644 --- a/FMS.Domain/Dto/AbandonedInactive/AbandonedInactiveEditDto.cs +++ b/FMS.Domain/Dto/AbandonedInactive/AbandonedInactiveEditDto.cs @@ -1,5 +1,5 @@ -using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; +using FMS.Domain.Entities; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/AbandonedInactive/AbandonedInactiveSummaryDto.cs b/FMS.Domain/Dto/AbandonedInactive/AbandonedInactiveSummaryDto.cs index bf294039..4bf35086 100644 --- a/FMS.Domain/Dto/AbandonedInactive/AbandonedInactiveSummaryDto.cs +++ b/FMS.Domain/Dto/AbandonedInactive/AbandonedInactiveSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/ActionTaken/ActionTakenSummaryDto.cs b/FMS.Domain/Dto/ActionTaken/ActionTakenSummaryDto.cs index 8bf7783d..55252286 100644 --- a/FMS.Domain/Dto/ActionTaken/ActionTakenSummaryDto.cs +++ b/FMS.Domain/Dto/ActionTaken/ActionTakenSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenEditDto.cs b/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenEditDto.cs index 60c2a66f..5a20897c 100644 --- a/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenEditDto.cs +++ b/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenEditDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenSpec.cs b/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenSpec.cs index adf3b4ae..99c046d8 100644 --- a/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenSpec.cs +++ b/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenSpec.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenSummaryDto.cs b/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenSummaryDto.cs index 3ee436be..db122a1d 100644 --- a/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenSummaryDto.cs +++ b/FMS.Domain/Dto/AllowedActionTaken/AllowedActionTakenSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/BudgetCode/BudgetCodeEditDto.cs b/FMS.Domain/Dto/BudgetCode/BudgetCodeEditDto.cs index 6587e6aa..2d29f5dc 100644 --- a/FMS.Domain/Dto/BudgetCode/BudgetCodeEditDto.cs +++ b/FMS.Domain/Dto/BudgetCode/BudgetCodeEditDto.cs @@ -1,5 +1,5 @@ -using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; +using FMS.Domain.Entities; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/BudgetCode/BudgetCodeSummaryDto.cs b/FMS.Domain/Dto/BudgetCode/BudgetCodeSummaryDto.cs index b9774d6b..d97176a2 100644 --- a/FMS.Domain/Dto/BudgetCode/BudgetCodeSummaryDto.cs +++ b/FMS.Domain/Dto/BudgetCode/BudgetCodeSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Cabinet/CabinetEditDto.cs b/FMS.Domain/Dto/Cabinet/CabinetEditDto.cs index 0aadb6ae..0bfe41b1 100644 --- a/FMS.Domain/Dto/Cabinet/CabinetEditDto.cs +++ b/FMS.Domain/Dto/Cabinet/CabinetEditDto.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Cabinet/CabinetExtensions.cs b/FMS.Domain/Dto/Cabinet/CabinetExtensions.cs index 3d3f0f48..9e14b30e 100644 --- a/FMS.Domain/Dto/Cabinet/CabinetExtensions.cs +++ b/FMS.Domain/Dto/Cabinet/CabinetExtensions.cs @@ -1,19 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using FMS.Domain.Entities; -using FMS.Domain.Utils; +using FMS.Domain.Utils; namespace FMS.Domain.Dto { public static class CabinetExtensions { public static List GetCabinetsForFile(this IEnumerable cabinets, string fileLabel) - { - Prevent.NullOrEmpty(fileLabel, nameof(fileLabel)); - if (!File.IsValidFileLabelFormat(fileLabel)) - { - throw new ArgumentException($"File label '{fileLabel}' is invalid.", nameof(fileLabel)); + { + Prevent.NullOrEmpty(fileLabel, nameof(fileLabel)); + if (!File.IsValidFileLabelFormat(fileLabel)) + { + throw new ArgumentException($"File label '{fileLabel}' is invalid.", nameof(fileLabel)); } return cabinets.Where(e => diff --git a/FMS.Domain/Dto/Cabinet/CabinetSummaryDto.cs b/FMS.Domain/Dto/Cabinet/CabinetSummaryDto.cs index fdf509c7..1c6cb2d0 100644 --- a/FMS.Domain/Dto/Cabinet/CabinetSummaryDto.cs +++ b/FMS.Domain/Dto/Cabinet/CabinetSummaryDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Chemical/ChemicalEditDto.cs b/FMS.Domain/Dto/Chemical/ChemicalEditDto.cs index 7f6611b2..70e60b4d 100644 --- a/FMS.Domain/Dto/Chemical/ChemicalEditDto.cs +++ b/FMS.Domain/Dto/Chemical/ChemicalEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Chemical/ChemicalSummaryDto.cs b/FMS.Domain/Dto/Chemical/ChemicalSummaryDto.cs index ee5d2865..d215b9d4 100644 --- a/FMS.Domain/Dto/Chemical/ChemicalSummaryDto.cs +++ b/FMS.Domain/Dto/Chemical/ChemicalSummaryDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/ComplianceOfficer/ComplianceOfficerDetailDto.cs b/FMS.Domain/Dto/ComplianceOfficer/ComplianceOfficerDetailDto.cs index 6c361772..75bfd616 100644 --- a/FMS.Domain/Dto/ComplianceOfficer/ComplianceOfficerDetailDto.cs +++ b/FMS.Domain/Dto/ComplianceOfficer/ComplianceOfficerDetailDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/ComplianceOfficer/ComplianceOfficerSummaryDto.cs b/FMS.Domain/Dto/ComplianceOfficer/ComplianceOfficerSummaryDto.cs index 7c5ac801..1072ca7d 100644 --- a/FMS.Domain/Dto/ComplianceOfficer/ComplianceOfficerSummaryDto.cs +++ b/FMS.Domain/Dto/ComplianceOfficer/ComplianceOfficerSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Contact/ContactCreateDto.cs b/FMS.Domain/Dto/Contact/ContactCreateDto.cs index 6b9c91ef..2c7b32b1 100644 --- a/FMS.Domain/Dto/Contact/ContactCreateDto.cs +++ b/FMS.Domain/Dto/Contact/ContactCreateDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Contact/ContactEditDto.cs b/FMS.Domain/Dto/Contact/ContactEditDto.cs index f4c56bba..75b115c2 100644 --- a/FMS.Domain/Dto/Contact/ContactEditDto.cs +++ b/FMS.Domain/Dto/Contact/ContactEditDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Contact/ContactSummaryDto.cs b/FMS.Domain/Dto/Contact/ContactSummaryDto.cs index 24080e95..e1cd5d8f 100644 --- a/FMS.Domain/Dto/Contact/ContactSummaryDto.cs +++ b/FMS.Domain/Dto/Contact/ContactSummaryDto.cs @@ -1,9 +1,6 @@ using FMS.Domain.Entities; -using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Globalization; -using System.Linq; using System.Text.RegularExpressions; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/ContactType/ContactTypeEditDto.cs b/FMS.Domain/Dto/ContactType/ContactTypeEditDto.cs index d1204f80..2ca1a01a 100644 --- a/FMS.Domain/Dto/ContactType/ContactTypeEditDto.cs +++ b/FMS.Domain/Dto/ContactType/ContactTypeEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/ContactType/ContactTypeSummaryDto.cs b/FMS.Domain/Dto/ContactType/ContactTypeSummaryDto.cs index d9aeedd3..a7af058b 100644 --- a/FMS.Domain/Dto/ContactType/ContactTypeSummaryDto.cs +++ b/FMS.Domain/Dto/ContactType/ContactTypeSummaryDto.cs @@ -1,4 +1,3 @@ -using System; using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; diff --git a/FMS.Domain/Dto/Event/EventCreateDto.cs b/FMS.Domain/Dto/Event/EventCreateDto.cs index 4f4aaab3..9cd5a780 100644 --- a/FMS.Domain/Dto/Event/EventCreateDto.cs +++ b/FMS.Domain/Dto/Event/EventCreateDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Event/EventEditDto.cs b/FMS.Domain/Dto/Event/EventEditDto.cs index 58bad3ca..b6205112 100644 --- a/FMS.Domain/Dto/Event/EventEditDto.cs +++ b/FMS.Domain/Dto/Event/EventEditDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/FMS.Domain/Dto/Event/EventSummaryDto.cs b/FMS.Domain/Dto/Event/EventSummaryDto.cs index a599d134..07107e88 100644 --- a/FMS.Domain/Dto/Event/EventSummaryDto.cs +++ b/FMS.Domain/Dto/Event/EventSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/FMS.Domain/Dto/EventContractor/EventContractorEditDto.cs b/FMS.Domain/Dto/EventContractor/EventContractorEditDto.cs index 88e65ff8..f5991997 100644 --- a/FMS.Domain/Dto/EventContractor/EventContractorEditDto.cs +++ b/FMS.Domain/Dto/EventContractor/EventContractorEditDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/EventContractor/EventContractorSummaryDto.cs b/FMS.Domain/Dto/EventContractor/EventContractorSummaryDto.cs index 8c61b528..9a9f3723 100644 --- a/FMS.Domain/Dto/EventContractor/EventContractorSummaryDto.cs +++ b/FMS.Domain/Dto/EventContractor/EventContractorSummaryDto.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; +using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/EventType/EventTypeEditDto.cs b/FMS.Domain/Dto/EventType/EventTypeEditDto.cs index 1ee47bda..a38fedd2 100644 --- a/FMS.Domain/Dto/EventType/EventTypeEditDto.cs +++ b/FMS.Domain/Dto/EventType/EventTypeEditDto.cs @@ -1,5 +1,4 @@ -using System; -using FMS.Domain.Entities; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/EventType/EventTypeSummaryDto.cs b/FMS.Domain/Dto/EventType/EventTypeSummaryDto.cs index 180b8fde..9ef7faaf 100644 --- a/FMS.Domain/Dto/EventType/EventTypeSummaryDto.cs +++ b/FMS.Domain/Dto/EventType/EventTypeSummaryDto.cs @@ -1,4 +1,3 @@ -using System; using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; diff --git a/FMS.Domain/Dto/Facility/FacilityBasicDto.cs b/FMS.Domain/Dto/Facility/FacilityBasicDto.cs index e7d10b79..17222d4b 100644 --- a/FMS.Domain/Dto/Facility/FacilityBasicDto.cs +++ b/FMS.Domain/Dto/Facility/FacilityBasicDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Facility/FacilityCreateDto.cs b/FMS.Domain/Dto/Facility/FacilityCreateDto.cs index 96399f25..fd1df91b 100644 --- a/FMS.Domain/Dto/Facility/FacilityCreateDto.cs +++ b/FMS.Domain/Dto/Facility/FacilityCreateDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Facility/FacilityDetailDto.cs b/FMS.Domain/Dto/Facility/FacilityDetailDto.cs index f52649ed..794bff62 100644 --- a/FMS.Domain/Dto/Facility/FacilityDetailDto.cs +++ b/FMS.Domain/Dto/Facility/FacilityDetailDto.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; -using System.Linq; using FMS.Domain.Entities; using FMS.Domain.Extensions; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { @@ -30,18 +26,18 @@ public FacilityDetailDto(Facility facility) State = facility.State; PostalCode = facility.PostalCode; Latitude = facility.Latitude; - Longitude = facility.Longitude; - HasERecord = facility.HasERecord; - // *** these properties only apply to Release Notifications *** + Longitude = facility.Longitude; + HasERecord = facility.HasERecord; + // *** these properties only apply to Release Notifications *** HSInumber = facility.HSInumber; DeterminationLetterDate = facility.DeterminationLetterDate; PreRQSMcleanup = facility.PreRQSMcleanup; ImageChecked = facility.ImageChecked; DeferredOnSiteScoring = facility.DeferredOnSiteScoring; AdditionalDataRequested = facility.AdditionalDataRequested; - VRPReferral = facility.VRPReferral; - RNDateReceived = facility.RNDateReceived; - HistoricalUnit = facility.HistoricalUnit; + VRPReferral = facility.VRPReferral; + RNDateReceived = facility.RNDateReceived; + HistoricalUnit = facility.HistoricalUnit; HistoricalComplianceOfficer = facility.HistoricalComplianceOfficer; // ******************************************************** IsRetained = facility.IsRetained; @@ -123,9 +119,9 @@ public FacilityDetailDto(Facility facility) [Display(Name = "Longitude")] [DisplayFormat(DataFormatString = "{0:F6}")] - public decimal Longitude { get; } - - // The following properties only apply to Release Notifications + public decimal Longitude { get; } + + // The following properties only apply to Release Notifications [Display(Name = "HSI Number")] public string HSInumber { get; set; } @@ -145,7 +141,7 @@ public FacilityDetailDto(Facility facility) public bool AdditionalDataRequested { get; set; } [Display(Name = "VRP Deferral")] - public bool VRPReferral { get; set; } + public bool VRPReferral { get; set; } [Display(Name = "Date Received")] public DateOnly? RNDateReceived { get; set; } @@ -184,8 +180,8 @@ public FacilityDetailDto(Facility facility) [Display(Name = "Class")] public Location LocationDetails { get; set; } - public List Parcels { get; } - + public List Parcels { get; } + public List Contacts { get; } public Score ScoreDetails { get; set; } diff --git a/FMS.Domain/Dto/Facility/FacilityEditDto.cs b/FMS.Domain/Dto/Facility/FacilityEditDto.cs index ad76f7d8..3c7c1ee6 100644 --- a/FMS.Domain/Dto/Facility/FacilityEditDto.cs +++ b/FMS.Domain/Dto/Facility/FacilityEditDto.cs @@ -1,6 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { @@ -34,7 +32,7 @@ public FacilityEditDto(FacilityDetailDto facility) ImageChecked = facility.ImageChecked; DeferredOnSiteScoring = facility.DeferredOnSiteScoring; AdditionalDataRequested = facility.AdditionalDataRequested; - VRPReferral = facility.VRPReferral; + VRPReferral = facility.VRPReferral; RNDateReceived = facility.RNDateReceived; HasERecord = facility.HasERecord; IsRetained = facility.IsRetained; @@ -98,7 +96,7 @@ public FacilityEditDto(FacilityDetailDto facility) public string State { get; set; } [Required] - [Display(Name = "ZIP Code")] + [Display(Name = "ZIP Code")] [RegularExpression(@"^\d{5}$", ErrorMessage = "Invalid Zip Code format. Please enter a 5-digit number.")] public string PostalCode { get; set; } diff --git a/FMS.Domain/Dto/Facility/FacilityMapSpec.cs b/FMS.Domain/Dto/Facility/FacilityMapSpec.cs index e86443bc..17587634 100644 --- a/FMS.Domain/Dto/Facility/FacilityMapSpec.cs +++ b/FMS.Domain/Dto/Facility/FacilityMapSpec.cs @@ -1,6 +1,4 @@ -using FMS.Domain.Entities; -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Facility/FacilityMapSummaryDto.cs b/FMS.Domain/Dto/Facility/FacilityMapSummaryDto.cs index 76e501fb..ceb2e659 100644 --- a/FMS.Domain/Dto/Facility/FacilityMapSummaryDto.cs +++ b/FMS.Domain/Dto/Facility/FacilityMapSummaryDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Facility/FacilitySpec.cs b/FMS.Domain/Dto/Facility/FacilitySpec.cs index 408e65a1..dd0398b0 100644 --- a/FMS.Domain/Dto/Facility/FacilitySpec.cs +++ b/FMS.Domain/Dto/Facility/FacilitySpec.cs @@ -1,14 +1,11 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Diagnostics.CodeAnalysis; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { public class FacilitySpec { - public FacilitySort SortBy { get; set; } = FacilitySort.Name; - + public FacilitySort SortBy { get; set; } = FacilitySort.Name; + public bool FirstPass { get; set; } = true; [Display(Name = "Facility Number")] @@ -55,7 +52,7 @@ public class FacilitySpec [Display(Name = "State")] public string State { get; set; } - + [Display(Name = "ZIP Code")] public string PostalCode { get; set; } @@ -82,15 +79,15 @@ public class FacilitySpec {nameof(FirstPass), FirstPass.ToString()}, }; - public void TrimAll() - { - FileLabel = FileLabel?.Trim(); - FacilityNumber = FacilityNumber?.Trim(); - Name = Name?.Trim(); - Location = Location?.Trim(); - Address = Address?.Trim(); - City = City?.Trim(); - PostalCode = PostalCode?.Trim(); + public void TrimAll() + { + FileLabel = FileLabel?.Trim(); + FacilityNumber = FacilityNumber?.Trim(); + Name = Name?.Trim(); + Location = Location?.Trim(); + Address = Address?.Trim(); + City = City?.Trim(); + PostalCode = PostalCode?.Trim(); } } } \ No newline at end of file diff --git a/FMS.Domain/Dto/Facility/FacilitySummaryDto.cs b/FMS.Domain/Dto/Facility/FacilitySummaryDto.cs index 43f9fc22..9c04cd00 100644 --- a/FMS.Domain/Dto/Facility/FacilitySummaryDto.cs +++ b/FMS.Domain/Dto/Facility/FacilitySummaryDto.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using System.Linq; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/FacilityStatus/FacilityStatusSummaryDto.cs b/FMS.Domain/Dto/FacilityStatus/FacilityStatusSummaryDto.cs index 803ba1f2..e9ecb2c9 100644 --- a/FMS.Domain/Dto/FacilityStatus/FacilityStatusSummaryDto.cs +++ b/FMS.Domain/Dto/FacilityStatus/FacilityStatusSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/FacilityType/FacilityTypeCreateDto.cs b/FMS.Domain/Dto/FacilityType/FacilityTypeCreateDto.cs index 1eafffd8..41f94b2e 100644 --- a/FMS.Domain/Dto/FacilityType/FacilityTypeCreateDto.cs +++ b/FMS.Domain/Dto/FacilityType/FacilityTypeCreateDto.cs @@ -1,5 +1,5 @@ -using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; +using FMS.Domain.Entities; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/FacilityType/FacilityTypeSummaryDto.cs b/FMS.Domain/Dto/FacilityType/FacilityTypeSummaryDto.cs index a0d07c06..76e13240 100644 --- a/FMS.Domain/Dto/FacilityType/FacilityTypeSummaryDto.cs +++ b/FMS.Domain/Dto/FacilityType/FacilityTypeSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/File/FileDetailDto.cs b/FMS.Domain/Dto/File/FileDetailDto.cs index 38c81b2e..d16e186a 100644 --- a/FMS.Domain/Dto/File/FileDetailDto.cs +++ b/FMS.Domain/Dto/File/FileDetailDto.cs @@ -1,8 +1,4 @@ -using FMS.Domain.Entities; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/File/FileSpec.cs b/FMS.Domain/Dto/File/FileSpec.cs index a78c2476..10f1bae9 100644 --- a/FMS.Domain/Dto/File/FileSpec.cs +++ b/FMS.Domain/Dto/File/FileSpec.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/FundingSource/FundingSourceEditDto.cs b/FMS.Domain/Dto/FundingSource/FundingSourceEditDto.cs index 7122ecae..9ad5d8cf 100644 --- a/FMS.Domain/Dto/FundingSource/FundingSourceEditDto.cs +++ b/FMS.Domain/Dto/FundingSource/FundingSourceEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/FundingSource/FundingSourceSummaryDto.cs b/FMS.Domain/Dto/FundingSource/FundingSourceSummaryDto.cs index aa510a22..242552c4 100644 --- a/FMS.Domain/Dto/FundingSource/FundingSourceSummaryDto.cs +++ b/FMS.Domain/Dto/FundingSource/FundingSourceSummaryDto.cs @@ -1,4 +1,3 @@ -using System; using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; diff --git a/FMS.Domain/Dto/GAPSAssessment/GAPSAssessmentCreateDto.cs b/FMS.Domain/Dto/GAPSAssessment/GAPSAssessmentCreateDto.cs index 954b50f6..4a880e0e 100644 --- a/FMS.Domain/Dto/GAPSAssessment/GAPSAssessmentCreateDto.cs +++ b/FMS.Domain/Dto/GAPSAssessment/GAPSAssessmentCreateDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/GAPSAssessment/GapsAssessmentEditDto.cs b/FMS.Domain/Dto/GAPSAssessment/GapsAssessmentEditDto.cs index cd63b5ff..9a17538e 100644 --- a/FMS.Domain/Dto/GAPSAssessment/GapsAssessmentEditDto.cs +++ b/FMS.Domain/Dto/GAPSAssessment/GapsAssessmentEditDto.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using FMS.Domain.Entities; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/GAPSAssessment/GapsAssessmentSummaryDto.cs b/FMS.Domain/Dto/GAPSAssessment/GapsAssessmentSummaryDto.cs index cc1e401b..be341c0a 100644 --- a/FMS.Domain/Dto/GAPSAssessment/GapsAssessmentSummaryDto.cs +++ b/FMS.Domain/Dto/GAPSAssessment/GapsAssessmentSummaryDto.cs @@ -1,10 +1,5 @@ using FMS.Domain.Entities; -using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/GroundwaterScore/GroundwaterScoreCreateDto.cs b/FMS.Domain/Dto/GroundwaterScore/GroundwaterScoreCreateDto.cs index 4a5e0bcc..c8b99530 100644 --- a/FMS.Domain/Dto/GroundwaterScore/GroundwaterScoreCreateDto.cs +++ b/FMS.Domain/Dto/GroundwaterScore/GroundwaterScoreCreateDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/GroundwaterScore/GroundwaterScoreEditDto.cs b/FMS.Domain/Dto/GroundwaterScore/GroundwaterScoreEditDto.cs index 1263824f..3ff84cbc 100644 --- a/FMS.Domain/Dto/GroundwaterScore/GroundwaterScoreEditDto.cs +++ b/FMS.Domain/Dto/GroundwaterScore/GroundwaterScoreEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/GroundwaterStatus/GroundwaterStatusEditDto.cs b/FMS.Domain/Dto/GroundwaterStatus/GroundwaterStatusEditDto.cs index 05306f88..537e17d2 100644 --- a/FMS.Domain/Dto/GroundwaterStatus/GroundwaterStatusEditDto.cs +++ b/FMS.Domain/Dto/GroundwaterStatus/GroundwaterStatusEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/GroundwaterStatus/GroundwaterStatusSummaryDto.cs b/FMS.Domain/Dto/GroundwaterStatus/GroundwaterStatusSummaryDto.cs index e4a411b4..5b816ba5 100644 --- a/FMS.Domain/Dto/GroundwaterStatus/GroundwaterStatusSummaryDto.cs +++ b/FMS.Domain/Dto/GroundwaterStatus/GroundwaterStatusSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesCreateDto.cs b/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesCreateDto.cs index 8d448e47..cf4a805c 100644 --- a/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesCreateDto.cs +++ b/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesCreateDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesDetailDto.cs b/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesDetailDto.cs index 838127fc..c7e752bf 100644 --- a/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesDetailDto.cs +++ b/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesDetailDto.cs @@ -1,6 +1,5 @@ using FMS.Domain.Entities; using Microsoft.AspNetCore.Mvc; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesEditDto.cs b/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesEditDto.cs index a8d7f8c8..8857cc65 100644 --- a/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesEditDto.cs +++ b/FMS.Domain/Dto/HsrpFacilityProperties/HsrpFacilityPropertiesEditDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Location/LocationCreateDto.cs b/FMS.Domain/Dto/Location/LocationCreateDto.cs index b7d47ec9..5d3658cc 100644 --- a/FMS.Domain/Dto/Location/LocationCreateDto.cs +++ b/FMS.Domain/Dto/Location/LocationCreateDto.cs @@ -1,6 +1,4 @@ -using FMS.Domain.Entities; -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Location/LocationEditDto.cs b/FMS.Domain/Dto/Location/LocationEditDto.cs index aa60de55..8a30b939 100644 --- a/FMS.Domain/Dto/Location/LocationEditDto.cs +++ b/FMS.Domain/Dto/Location/LocationEditDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Location/LocationSummaryDto.cs b/FMS.Domain/Dto/Location/LocationSummaryDto.cs index 5913de11..5bcac1ef 100644 --- a/FMS.Domain/Dto/Location/LocationSummaryDto.cs +++ b/FMS.Domain/Dto/Location/LocationSummaryDto.cs @@ -1,6 +1,5 @@ -using System; -using System.ComponentModel.DataAnnotations; using FMS.Domain.Entities; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/LocationClass/LocationClassCreateDto.cs b/FMS.Domain/Dto/LocationClass/LocationClassCreateDto.cs index cb2eec78..dd6852b2 100644 --- a/FMS.Domain/Dto/LocationClass/LocationClassCreateDto.cs +++ b/FMS.Domain/Dto/LocationClass/LocationClassCreateDto.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/LocationClass/LocationClassEditDto.cs b/FMS.Domain/Dto/LocationClass/LocationClassEditDto.cs index f01e98ab..9070ff09 100644 --- a/FMS.Domain/Dto/LocationClass/LocationClassEditDto.cs +++ b/FMS.Domain/Dto/LocationClass/LocationClassEditDto.cs @@ -1,10 +1,5 @@ using FMS.Domain.Entities; -using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/LocationClass/LocationClassSummaryDto.cs b/FMS.Domain/Dto/LocationClass/LocationClassSummaryDto.cs index a81dabd8..f48d37e2 100644 --- a/FMS.Domain/Dto/LocationClass/LocationClassSummaryDto.cs +++ b/FMS.Domain/Dto/LocationClass/LocationClassSummaryDto.cs @@ -1,10 +1,5 @@ using FMS.Domain.Entities; -using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/OnSiteScore/OnSiteScoreCreateDto.cs b/FMS.Domain/Dto/OnSiteScore/OnSiteScoreCreateDto.cs index a7414aed..a0f61051 100644 --- a/FMS.Domain/Dto/OnSiteScore/OnSiteScoreCreateDto.cs +++ b/FMS.Domain/Dto/OnSiteScore/OnSiteScoreCreateDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/OnSiteScore/OnsiteScoreEditDto.cs b/FMS.Domain/Dto/OnSiteScore/OnsiteScoreEditDto.cs index a7ce6ab8..6947ce12 100644 --- a/FMS.Domain/Dto/OnSiteScore/OnsiteScoreEditDto.cs +++ b/FMS.Domain/Dto/OnSiteScore/OnsiteScoreEditDto.cs @@ -1,6 +1,5 @@ -using System; -using System.ComponentModel.DataAnnotations; using FMS.Domain.Entities; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/OrganizationalUnit/OrganizationalUnitSummaryDto.cs b/FMS.Domain/Dto/OrganizationalUnit/OrganizationalUnitSummaryDto.cs index aec1e3f4..5d909cdc 100644 --- a/FMS.Domain/Dto/OrganizationalUnit/OrganizationalUnitSummaryDto.cs +++ b/FMS.Domain/Dto/OrganizationalUnit/OrganizationalUnitSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/OverallStatus/OverallStatusEditDto.cs b/FMS.Domain/Dto/OverallStatus/OverallStatusEditDto.cs index 403b06ef..d36d5c12 100644 --- a/FMS.Domain/Dto/OverallStatus/OverallStatusEditDto.cs +++ b/FMS.Domain/Dto/OverallStatus/OverallStatusEditDto.cs @@ -1,5 +1,4 @@ -using System; -using FMS.Domain.Entities; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/OverallStatus/OverallStatusSummaryDto.cs b/FMS.Domain/Dto/OverallStatus/OverallStatusSummaryDto.cs index 047f248d..1c9fe0c8 100644 --- a/FMS.Domain/Dto/OverallStatus/OverallStatusSummaryDto.cs +++ b/FMS.Domain/Dto/OverallStatus/OverallStatusSummaryDto.cs @@ -1,5 +1,4 @@ -using System; -using FMS.Domain.Entities; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/PaginatedList/PaginatedList.cs b/FMS.Domain/Dto/PaginatedList/PaginatedList.cs index 7d20e165..59d52900 100644 --- a/FMS.Domain/Dto/PaginatedList/PaginatedList.cs +++ b/FMS.Domain/Dto/PaginatedList/PaginatedList.cs @@ -1,7 +1,5 @@ -using System; +using FMS.Domain.Utils; using System.Collections; -using System.Collections.Generic; -using FMS.Domain.Utils; namespace FMS.Domain.Dto.PaginatedList { diff --git a/FMS.Domain/Dto/Parcel/ParcelCreateDto.cs b/FMS.Domain/Dto/Parcel/ParcelCreateDto.cs index 4e9620bd..24c88239 100644 --- a/FMS.Domain/Dto/Parcel/ParcelCreateDto.cs +++ b/FMS.Domain/Dto/Parcel/ParcelCreateDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Parcel/ParcelEditDto.cs b/FMS.Domain/Dto/Parcel/ParcelEditDto.cs index 4f7d5e01..9daf5f94 100644 --- a/FMS.Domain/Dto/Parcel/ParcelEditDto.cs +++ b/FMS.Domain/Dto/Parcel/ParcelEditDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Parcel/ParcelSummaryDto.cs b/FMS.Domain/Dto/Parcel/ParcelSummaryDto.cs index ec4ee8ae..d3d2f082 100644 --- a/FMS.Domain/Dto/Parcel/ParcelSummaryDto.cs +++ b/FMS.Domain/Dto/Parcel/ParcelSummaryDto.cs @@ -1,5 +1,4 @@ -using System; -using FMS.Domain.Entities; +using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/ParcelType/ParcelTypeEditDto.cs b/FMS.Domain/Dto/ParcelType/ParcelTypeEditDto.cs index 1ddbabef..fa93b904 100644 --- a/FMS.Domain/Dto/ParcelType/ParcelTypeEditDto.cs +++ b/FMS.Domain/Dto/ParcelType/ParcelTypeEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/ParcelType/ParcelTypeSummaryDto.cs b/FMS.Domain/Dto/ParcelType/ParcelTypeSummaryDto.cs index f4557f61..4d459db9 100644 --- a/FMS.Domain/Dto/ParcelType/ParcelTypeSummaryDto.cs +++ b/FMS.Domain/Dto/ParcelType/ParcelTypeSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Phone/PhoneCreateDto.cs b/FMS.Domain/Dto/Phone/PhoneCreateDto.cs index e484b143..11ccc723 100644 --- a/FMS.Domain/Dto/Phone/PhoneCreateDto.cs +++ b/FMS.Domain/Dto/Phone/PhoneCreateDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Phone/PhoneEditDto.cs b/FMS.Domain/Dto/Phone/PhoneEditDto.cs index 90324f50..38c0989e 100644 --- a/FMS.Domain/Dto/Phone/PhoneEditDto.cs +++ b/FMS.Domain/Dto/Phone/PhoneEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Phone/PhoneSummaryDto.cs b/FMS.Domain/Dto/Phone/PhoneSummaryDto.cs index 97db3aaa..145aac01 100644 --- a/FMS.Domain/Dto/Phone/PhoneSummaryDto.cs +++ b/FMS.Domain/Dto/Phone/PhoneSummaryDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Reports/AssignmentListReportByCODto.cs b/FMS.Domain/Dto/Reports/AssignmentListReportByCODto.cs index 7d019359..93fccbb8 100644 --- a/FMS.Domain/Dto/Reports/AssignmentListReportByCODto.cs +++ b/FMS.Domain/Dto/Reports/AssignmentListReportByCODto.cs @@ -1,11 +1,5 @@ using ClosedXML.Attributes; using FMS.Domain.Entities; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Reports/AssignmentListReportByCountyDto.cs b/FMS.Domain/Dto/Reports/AssignmentListReportByCountyDto.cs index 91f5dcd1..8630b8ed 100644 --- a/FMS.Domain/Dto/Reports/AssignmentListReportByCountyDto.cs +++ b/FMS.Domain/Dto/Reports/AssignmentListReportByCountyDto.cs @@ -1,11 +1,5 @@ using ClosedXML.Attributes; using FMS.Domain.Entities; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Reports/AssignmentListReportByHSIDto.cs b/FMS.Domain/Dto/Reports/AssignmentListReportByHSIDto.cs index 9086ff60..8ea7279a 100644 --- a/FMS.Domain/Dto/Reports/AssignmentListReportByHSIDto.cs +++ b/FMS.Domain/Dto/Reports/AssignmentListReportByHSIDto.cs @@ -1,11 +1,5 @@ using ClosedXML.Attributes; using FMS.Domain.Entities; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Reports/AssignmentListReportBySiteNameDto.cs b/FMS.Domain/Dto/Reports/AssignmentListReportBySiteNameDto.cs index c243970b..9493fb2a 100644 --- a/FMS.Domain/Dto/Reports/AssignmentListReportBySiteNameDto.cs +++ b/FMS.Domain/Dto/Reports/AssignmentListReportBySiteNameDto.cs @@ -1,11 +1,5 @@ using ClosedXML.Attributes; using FMS.Domain.Entities; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Reports/AssignmentListReportByUnitDto.cs b/FMS.Domain/Dto/Reports/AssignmentListReportByUnitDto.cs index 3e9fa915..673849b5 100644 --- a/FMS.Domain/Dto/Reports/AssignmentListReportByUnitDto.cs +++ b/FMS.Domain/Dto/Reports/AssignmentListReportByUnitDto.cs @@ -1,11 +1,5 @@ using ClosedXML.Attributes; using FMS.Domain.Entities; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/RetentionRecord/RetentionRecordDetailDto.cs b/FMS.Domain/Dto/RetentionRecord/RetentionRecordDetailDto.cs index 88c26a13..58d2727d 100644 --- a/FMS.Domain/Dto/RetentionRecord/RetentionRecordDetailDto.cs +++ b/FMS.Domain/Dto/RetentionRecord/RetentionRecordDetailDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Score/ScoreCreateDto.cs b/FMS.Domain/Dto/Score/ScoreCreateDto.cs index a77dcd1e..64184c37 100644 --- a/FMS.Domain/Dto/Score/ScoreCreateDto.cs +++ b/FMS.Domain/Dto/Score/ScoreCreateDto.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Score/ScoreEditDto.cs b/FMS.Domain/Dto/Score/ScoreEditDto.cs index d147d785..113ba923 100644 --- a/FMS.Domain/Dto/Score/ScoreEditDto.cs +++ b/FMS.Domain/Dto/Score/ScoreEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Score/ScoreSummaryDto.cs b/FMS.Domain/Dto/Score/ScoreSummaryDto.cs index 72e07567..c4f6becb 100644 --- a/FMS.Domain/Dto/Score/ScoreSummaryDto.cs +++ b/FMS.Domain/Dto/Score/ScoreSummaryDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/SoilStatus/SoilStatusEditDto.cs b/FMS.Domain/Dto/SoilStatus/SoilStatusEditDto.cs index fa234857..105719d6 100644 --- a/FMS.Domain/Dto/SoilStatus/SoilStatusEditDto.cs +++ b/FMS.Domain/Dto/SoilStatus/SoilStatusEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/SoilStatus/SoilStatusSummaryDto.cs b/FMS.Domain/Dto/SoilStatus/SoilStatusSummaryDto.cs index 94ffc364..f03030f2 100644 --- a/FMS.Domain/Dto/SoilStatus/SoilStatusSummaryDto.cs +++ b/FMS.Domain/Dto/SoilStatus/SoilStatusSummaryDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/SourceStatus/SourceStatusEditDto.cs b/FMS.Domain/Dto/SourceStatus/SourceStatusEditDto.cs index b1e45bfc..b79fb492 100644 --- a/FMS.Domain/Dto/SourceStatus/SourceStatusEditDto.cs +++ b/FMS.Domain/Dto/SourceStatus/SourceStatusEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/SourceStatus/SourceStatusSummaryDto.cs b/FMS.Domain/Dto/SourceStatus/SourceStatusSummaryDto.cs index bef7c635..d750f7d9 100644 --- a/FMS.Domain/Dto/SourceStatus/SourceStatusSummaryDto.cs +++ b/FMS.Domain/Dto/SourceStatus/SourceStatusSummaryDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Status/StatusCreateDto.cs b/FMS.Domain/Dto/Status/StatusCreateDto.cs index 8a113942..9201d790 100644 --- a/FMS.Domain/Dto/Status/StatusCreateDto.cs +++ b/FMS.Domain/Dto/Status/StatusCreateDto.cs @@ -1,4 +1,3 @@ -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Status/StatusEditDto.cs b/FMS.Domain/Dto/Status/StatusEditDto.cs index 41e54265..4b8fdc9a 100644 --- a/FMS.Domain/Dto/Status/StatusEditDto.cs +++ b/FMS.Domain/Dto/Status/StatusEditDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Substance/SubstanceCreateDto.cs b/FMS.Domain/Dto/Substance/SubstanceCreateDto.cs index eecb889f..9afab7bd 100644 --- a/FMS.Domain/Dto/Substance/SubstanceCreateDto.cs +++ b/FMS.Domain/Dto/Substance/SubstanceCreateDto.cs @@ -1,5 +1,4 @@ using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto diff --git a/FMS.Domain/Dto/Substance/SubstanceEditDto.cs b/FMS.Domain/Dto/Substance/SubstanceEditDto.cs index 2d211d1b..09cddf93 100644 --- a/FMS.Domain/Dto/Substance/SubstanceEditDto.cs +++ b/FMS.Domain/Dto/Substance/SubstanceEditDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Dto/Substance/SubstanceSummaryDto.cs b/FMS.Domain/Dto/Substance/SubstanceSummaryDto.cs index c78663d7..f05c001a 100644 --- a/FMS.Domain/Dto/Substance/SubstanceSummaryDto.cs +++ b/FMS.Domain/Dto/Substance/SubstanceSummaryDto.cs @@ -1,6 +1,5 @@ -using System; +using FMS.Domain.Entities; using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities; namespace FMS.Domain.Dto { diff --git a/FMS.Domain/Entities/AllowedActionTaken.cs b/FMS.Domain/Entities/AllowedActionTaken.cs index dfab5c79..c78deff5 100644 --- a/FMS.Domain/Entities/AllowedActionTaken.cs +++ b/FMS.Domain/Entities/AllowedActionTaken.cs @@ -1,6 +1,4 @@ -using System; -using FMS.Domain.Dto; -using FMS.Domain.Entities.Base; +using FMS.Domain.Entities.Base; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/Base/BaseModel.cs b/FMS.Domain/Entities/Base/BaseModel.cs index 36ff8188..c2cea1f8 100644 --- a/FMS.Domain/Entities/Base/BaseModel.cs +++ b/FMS.Domain/Entities/Base/BaseModel.cs @@ -1,6 +1,4 @@ -using System; - -namespace FMS.Domain.Entities.Base +namespace FMS.Domain.Entities.Base { public abstract class BaseModel { diff --git a/FMS.Domain/Entities/Cabinet.cs b/FMS.Domain/Entities/Cabinet.cs index 4443cd5e..96d62f22 100644 --- a/FMS.Domain/Entities/Cabinet.cs +++ b/FMS.Domain/Entities/Cabinet.cs @@ -1,5 +1,5 @@ -using System.ComponentModel.DataAnnotations; -using FMS.Domain.Entities.Base; +using FMS.Domain.Entities.Base; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/ComplianceOfficer.cs b/FMS.Domain/Entities/ComplianceOfficer.cs index cee36d58..90c8ccda 100644 --- a/FMS.Domain/Entities/ComplianceOfficer.cs +++ b/FMS.Domain/Entities/ComplianceOfficer.cs @@ -1,7 +1,6 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; using System.ComponentModel.DataAnnotations; -using System.Linq; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/Contact.cs b/FMS.Domain/Entities/Contact.cs index 916fcd5d..6f0b65a6 100644 --- a/FMS.Domain/Entities/Contact.cs +++ b/FMS.Domain/Entities/Contact.cs @@ -1,8 +1,5 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; -using System; -using System.Collections; -using System.Collections.Generic; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/Event.cs b/FMS.Domain/Entities/Event.cs index d0239473..6add02bb 100644 --- a/FMS.Domain/Entities/Event.cs +++ b/FMS.Domain/Entities/Event.cs @@ -1,6 +1,5 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Entities diff --git a/FMS.Domain/Entities/EventContractor.cs b/FMS.Domain/Entities/EventContractor.cs index 887e6f4a..f97d6420 100644 --- a/FMS.Domain/Entities/EventContractor.cs +++ b/FMS.Domain/Entities/EventContractor.cs @@ -1,10 +1,5 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/Facility.cs b/FMS.Domain/Entities/Facility.cs index a1ed309e..d13ea8dd 100644 --- a/FMS.Domain/Entities/Facility.cs +++ b/FMS.Domain/Entities/Facility.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Diagnostics.CodeAnalysis; using FMS.Domain.Dto; using FMS.Domain.Entities.Base; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/FacilityType.cs b/FMS.Domain/Entities/FacilityType.cs index b33e7624..5e12afec 100644 --- a/FMS.Domain/Entities/FacilityType.cs +++ b/FMS.Domain/Entities/FacilityType.cs @@ -1,8 +1,7 @@ -using System; +using FMS.Domain.Dto; +using FMS.Domain.Entities.Base; using System.ComponentModel.DataAnnotations; using System.Text.RegularExpressions; -using FMS.Domain.Dto; -using FMS.Domain.Entities.Base; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/File.cs b/FMS.Domain/Entities/File.cs index c52f7237..c63ee951 100644 --- a/FMS.Domain/Entities/File.cs +++ b/FMS.Domain/Entities/File.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text.RegularExpressions; using FMS.Domain.Entities.Base; using FMS.Domain.Utils; +using System.ComponentModel.DataAnnotations; +using System.Text.RegularExpressions; using static FMS.Domain.Data.Data; namespace FMS.Domain.Entities diff --git a/FMS.Domain/Entities/FundingSource.cs b/FMS.Domain/Entities/FundingSource.cs index 98655fe5..25a9971c 100644 --- a/FMS.Domain/Entities/FundingSource.cs +++ b/FMS.Domain/Entities/FundingSource.cs @@ -1,5 +1,5 @@ -using FMS.Domain.Entities.Base; -using FMS.Domain.Dto; +using FMS.Domain.Dto; +using FMS.Domain.Entities.Base; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/GroundwaterScore.cs b/FMS.Domain/Entities/GroundwaterScore.cs index 83af21d5..d28b1ef7 100644 --- a/FMS.Domain/Entities/GroundwaterScore.cs +++ b/FMS.Domain/Entities/GroundwaterScore.cs @@ -1,7 +1,6 @@ -using System; -using System.ComponentModel.DataAnnotations; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Base; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/HSRPFacilityProperties.cs b/FMS.Domain/Entities/HSRPFacilityProperties.cs index 24b7f083..1e92c601 100644 --- a/FMS.Domain/Entities/HSRPFacilityProperties.cs +++ b/FMS.Domain/Entities/HSRPFacilityProperties.cs @@ -1,7 +1,6 @@ -using System; -using System.ComponentModel.DataAnnotations; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Base; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/Location.cs b/FMS.Domain/Entities/Location.cs index 4ffa9fd1..fdbd4268 100644 --- a/FMS.Domain/Entities/Location.cs +++ b/FMS.Domain/Entities/Location.cs @@ -1,5 +1,3 @@ -using System; -using System.ComponentModel.DataAnnotations; using FMS.Domain.Dto; using FMS.Domain.Entities.Base; diff --git a/FMS.Domain/Entities/LocationClass.cs b/FMS.Domain/Entities/LocationClass.cs index 3aead474..887386c1 100644 --- a/FMS.Domain/Entities/LocationClass.cs +++ b/FMS.Domain/Entities/LocationClass.cs @@ -1,12 +1,6 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; -using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Security.AccessControl; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/OnSiteScore.cs b/FMS.Domain/Entities/OnSiteScore.cs index 09c99099..306ff6ce 100644 --- a/FMS.Domain/Entities/OnSiteScore.cs +++ b/FMS.Domain/Entities/OnSiteScore.cs @@ -1,7 +1,6 @@ -using System; -using System.ComponentModel.DataAnnotations; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Base; +using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/OverallStatus.cs b/FMS.Domain/Entities/OverallStatus.cs index 3d451e02..1e788774 100644 --- a/FMS.Domain/Entities/OverallStatus.cs +++ b/FMS.Domain/Entities/OverallStatus.cs @@ -1,5 +1,5 @@ -using FMS.Domain.Entities.Base; -using FMS.Domain.Dto; +using FMS.Domain.Dto; +using FMS.Domain.Entities.Base; namespace FMS.Domain.Entities diff --git a/FMS.Domain/Entities/Parcel.cs b/FMS.Domain/Entities/Parcel.cs index e421becd..0a9ff084 100644 --- a/FMS.Domain/Entities/Parcel.cs +++ b/FMS.Domain/Entities/Parcel.cs @@ -1,5 +1,4 @@ -using System; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Base; namespace FMS.Domain.Entities diff --git a/FMS.Domain/Entities/ParcelType.cs b/FMS.Domain/Entities/ParcelType.cs index 326149a9..ec2898b0 100644 --- a/FMS.Domain/Entities/ParcelType.cs +++ b/FMS.Domain/Entities/ParcelType.cs @@ -1,5 +1,5 @@ -using FMS.Domain.Entities.Base; -using FMS.Domain.Dto; +using FMS.Domain.Dto; +using FMS.Domain.Entities.Base; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/Phone.cs b/FMS.Domain/Entities/Phone.cs index 14636c67..dbb2c944 100644 --- a/FMS.Domain/Entities/Phone.cs +++ b/FMS.Domain/Entities/Phone.cs @@ -1,6 +1,5 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Entities diff --git a/FMS.Domain/Entities/RetentionRecord.cs b/FMS.Domain/Entities/RetentionRecord.cs index 68b2e2eb..ad6885f3 100644 --- a/FMS.Domain/Entities/RetentionRecord.cs +++ b/FMS.Domain/Entities/RetentionRecord.cs @@ -1,6 +1,5 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; -using System; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/Score.cs b/FMS.Domain/Entities/Score.cs index 470027ee..b00d204f 100644 --- a/FMS.Domain/Entities/Score.cs +++ b/FMS.Domain/Entities/Score.cs @@ -1,7 +1,5 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; -using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Entities diff --git a/FMS.Domain/Entities/SoilStatus.cs b/FMS.Domain/Entities/SoilStatus.cs index 7d4bb964..73fda6fc 100644 --- a/FMS.Domain/Entities/SoilStatus.cs +++ b/FMS.Domain/Entities/SoilStatus.cs @@ -1,5 +1,5 @@ -using FMS.Domain.Entities.Base; using FMS.Domain.Dto; +using FMS.Domain.Entities.Base; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Entities diff --git a/FMS.Domain/Entities/SourceStatus.cs b/FMS.Domain/Entities/SourceStatus.cs index 3ab4ed3e..d89282f7 100644 --- a/FMS.Domain/Entities/SourceStatus.cs +++ b/FMS.Domain/Entities/SourceStatus.cs @@ -1,6 +1,5 @@ using FMS.Domain.Dto; using FMS.Domain.Entities.Base; -using System; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/Status.cs b/FMS.Domain/Entities/Status.cs index 512ef8b4..de63c878 100644 --- a/FMS.Domain/Entities/Status.cs +++ b/FMS.Domain/Entities/Status.cs @@ -1,8 +1,6 @@ -using System; -using FMS.Domain.Entities.Base; using FMS.Domain.Dto; +using FMS.Domain.Entities.Base; using System.ComponentModel.DataAnnotations; -using System.Data.SqlTypes; namespace FMS.Domain.Entities { diff --git a/FMS.Domain/Entities/Substance.cs b/FMS.Domain/Entities/Substance.cs index 4fbaf1a2..e23d7086 100644 --- a/FMS.Domain/Entities/Substance.cs +++ b/FMS.Domain/Entities/Substance.cs @@ -1,5 +1,4 @@ -using System; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Base; namespace FMS.Domain.Entities diff --git a/FMS.Domain/Entities/Users/ApplicationUser.cs b/FMS.Domain/Entities/Users/ApplicationUser.cs index a153d319..592cb60e 100644 --- a/FMS.Domain/Entities/Users/ApplicationUser.cs +++ b/FMS.Domain/Entities/Users/ApplicationUser.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Identity; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Entities.Users diff --git a/FMS.Domain/Extensions/StringExtensions.cs b/FMS.Domain/Extensions/StringExtensions.cs index 57aa866e..7c0c6818 100644 --- a/FMS.Domain/Extensions/StringExtensions.cs +++ b/FMS.Domain/Extensions/StringExtensions.cs @@ -1,7 +1,4 @@ -using System.Collections.Generic; -using System.Linq; - -namespace FMS.Domain.Extensions +namespace FMS.Domain.Extensions { public static class StringExtensions { diff --git a/FMS.Domain/GlobalUsings.cs b/FMS.Domain/GlobalUsings.cs new file mode 100644 index 00000000..9a06a0b6 --- /dev/null +++ b/FMS.Domain/GlobalUsings.cs @@ -0,0 +1 @@ +global using File = FMS.Domain.Entities.File; diff --git a/FMS.Domain/Repositories/IAbandonedInactiveRepository.cs b/FMS.Domain/Repositories/IAbandonedInactiveRepository.cs index 32d6d210..5baea600 100644 --- a/FMS.Domain/Repositories/IAbandonedInactiveRepository.cs +++ b/FMS.Domain/Repositories/IAbandonedInactiveRepository.cs @@ -1,7 +1,4 @@ using FMS.Domain.Dto; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IActionTakenRepository.cs b/FMS.Domain/Repositories/IActionTakenRepository.cs index 11fa2efc..4a5ffbd3 100644 --- a/FMS.Domain/Repositories/IActionTakenRepository.cs +++ b/FMS.Domain/Repositories/IActionTakenRepository.cs @@ -1,7 +1,4 @@ using FMS.Domain.Dto; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IAllowedActionTakenRepository.cs b/FMS.Domain/Repositories/IAllowedActionTakenRepository.cs index bb59f816..80114d22 100644 --- a/FMS.Domain/Repositories/IAllowedActionTakenRepository.cs +++ b/FMS.Domain/Repositories/IAllowedActionTakenRepository.cs @@ -1,8 +1,4 @@ using FMS.Domain.Dto; -using FMS.Domain.Entities; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IBudgetCodeRepository.cs b/FMS.Domain/Repositories/IBudgetCodeRepository.cs index 6dc3b97e..a74d2c53 100644 --- a/FMS.Domain/Repositories/IBudgetCodeRepository.cs +++ b/FMS.Domain/Repositories/IBudgetCodeRepository.cs @@ -1,7 +1,4 @@ using FMS.Domain.Dto; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/ICabinetRepository.cs b/FMS.Domain/Repositories/ICabinetRepository.cs index af460ff8..1509fa81 100644 --- a/FMS.Domain/Repositories/ICabinetRepository.cs +++ b/FMS.Domain/Repositories/ICabinetRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IChemicalRepository.cs b/FMS.Domain/Repositories/IChemicalRepository.cs index a87742ee..0bfe2fd3 100644 --- a/FMS.Domain/Repositories/IChemicalRepository.cs +++ b/FMS.Domain/Repositories/IChemicalRepository.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities; diff --git a/FMS.Domain/Repositories/IComplianceOfficerRepository.cs b/FMS.Domain/Repositories/IComplianceOfficerRepository.cs index 15762765..d63edadf 100644 --- a/FMS.Domain/Repositories/IComplianceOfficerRepository.cs +++ b/FMS.Domain/Repositories/IComplianceOfficerRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IContactRepository.cs b/FMS.Domain/Repositories/IContactRepository.cs index 316980d9..e215ba8a 100644 --- a/FMS.Domain/Repositories/IContactRepository.cs +++ b/FMS.Domain/Repositories/IContactRepository.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; +using FMS.Domain.Dto; using FMS.Domain.Entities; -using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IContactTypeRepository.cs b/FMS.Domain/Repositories/IContactTypeRepository.cs index 4bf809e2..cb526a8f 100644 --- a/FMS.Domain/Repositories/IContactTypeRepository.cs +++ b/FMS.Domain/Repositories/IContactTypeRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IEventContractorRepository.cs b/FMS.Domain/Repositories/IEventContractorRepository.cs index 4a39accd..d292b8aa 100644 --- a/FMS.Domain/Repositories/IEventContractorRepository.cs +++ b/FMS.Domain/Repositories/IEventContractorRepository.cs @@ -1,10 +1,4 @@ using FMS.Domain.Dto; -using FMS.Domain.Entities; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IEventRepository.cs b/FMS.Domain/Repositories/IEventRepository.cs index 460d03b0..e84766b6 100644 --- a/FMS.Domain/Repositories/IEventRepository.cs +++ b/FMS.Domain/Repositories/IEventRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Entities; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IEventTypeRepository.cs b/FMS.Domain/Repositories/IEventTypeRepository.cs index 565ed5e4..22c13d10 100644 --- a/FMS.Domain/Repositories/IEventTypeRepository.cs +++ b/FMS.Domain/Repositories/IEventTypeRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IFacilityRepository.cs b/FMS.Domain/Repositories/IFacilityRepository.cs index a2664f57..4e5c6960 100644 --- a/FMS.Domain/Repositories/IFacilityRepository.cs +++ b/FMS.Domain/Repositories/IFacilityRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Dto.PaginatedList; namespace FMS.Domain.Repositories diff --git a/FMS.Domain/Repositories/IFacilityStatusRepository.cs b/FMS.Domain/Repositories/IFacilityStatusRepository.cs index 21e563cb..2764811b 100644 --- a/FMS.Domain/Repositories/IFacilityStatusRepository.cs +++ b/FMS.Domain/Repositories/IFacilityStatusRepository.cs @@ -1,7 +1,4 @@ using FMS.Domain.Dto; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IFacilityTypeRepository.cs b/FMS.Domain/Repositories/IFacilityTypeRepository.cs index 389a2732..284eeada 100644 --- a/FMS.Domain/Repositories/IFacilityTypeRepository.cs +++ b/FMS.Domain/Repositories/IFacilityTypeRepository.cs @@ -1,7 +1,4 @@ using FMS.Domain.Dto; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IFileRepository.cs b/FMS.Domain/Repositories/IFileRepository.cs index 08eaf422..44f15a97 100644 --- a/FMS.Domain/Repositories/IFileRepository.cs +++ b/FMS.Domain/Repositories/IFileRepository.cs @@ -1,6 +1,4 @@ -using System; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Dto.PaginatedList; namespace FMS.Domain.Repositories diff --git a/FMS.Domain/Repositories/IFundingSourceRepository.cs b/FMS.Domain/Repositories/IFundingSourceRepository.cs index c8e90f59..5284da78 100644 --- a/FMS.Domain/Repositories/IFundingSourceRepository.cs +++ b/FMS.Domain/Repositories/IFundingSourceRepository.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; namespace FMS.Domain.Repositories diff --git a/FMS.Domain/Repositories/IGapsAssessmentRepository.cs b/FMS.Domain/Repositories/IGapsAssessmentRepository.cs index 27348dc6..22f81ca7 100644 --- a/FMS.Domain/Repositories/IGapsAssessmentRepository.cs +++ b/FMS.Domain/Repositories/IGapsAssessmentRepository.cs @@ -1,10 +1,5 @@ using FMS.Domain.Dto; -using FMS.Domain.Entities; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + namespace FMS.Domain.Repositories { public interface IGapsAssessmentRepository : IDisposable diff --git a/FMS.Domain/Repositories/IGroundwaterScoreRepository.cs b/FMS.Domain/Repositories/IGroundwaterScoreRepository.cs index e803d6ad..553094b7 100644 --- a/FMS.Domain/Repositories/IGroundwaterScoreRepository.cs +++ b/FMS.Domain/Repositories/IGroundwaterScoreRepository.cs @@ -1,6 +1,4 @@ -using System; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IGroundwaterStatusRepository.cs b/FMS.Domain/Repositories/IGroundwaterStatusRepository.cs index c8789d35..d536c1ae 100644 --- a/FMS.Domain/Repositories/IGroundwaterStatusRepository.cs +++ b/FMS.Domain/Repositories/IGroundwaterStatusRepository.cs @@ -1,7 +1,4 @@ using FMS.Domain.Dto; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IHsrpFacilityPropertiesRepository.cs b/FMS.Domain/Repositories/IHsrpFacilityPropertiesRepository.cs index cd542fe0..4357009d 100644 --- a/FMS.Domain/Repositories/IHsrpFacilityPropertiesRepository.cs +++ b/FMS.Domain/Repositories/IHsrpFacilityPropertiesRepository.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IItemsListRepository.cs b/FMS.Domain/Repositories/IItemsListRepository.cs index ebdfcc97..e8461b58 100644 --- a/FMS.Domain/Repositories/IItemsListRepository.cs +++ b/FMS.Domain/Repositories/IItemsListRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace FMS.Domain.Repositories +namespace FMS.Domain.Repositories { /// /// Provides an interface for retrieving lists of entities as key, value pairs diff --git a/FMS.Domain/Repositories/ILocationClassRepository.cs b/FMS.Domain/Repositories/ILocationClassRepository.cs index f118e865..b150e99a 100644 --- a/FMS.Domain/Repositories/ILocationClassRepository.cs +++ b/FMS.Domain/Repositories/ILocationClassRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/ILocationRepository.cs b/FMS.Domain/Repositories/ILocationRepository.cs index 7ee722a0..5012753a 100644 --- a/FMS.Domain/Repositories/ILocationRepository.cs +++ b/FMS.Domain/Repositories/ILocationRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IOnsiteScoreRepository.cs b/FMS.Domain/Repositories/IOnsiteScoreRepository.cs index 28dc33de..a18e65d7 100644 --- a/FMS.Domain/Repositories/IOnsiteScoreRepository.cs +++ b/FMS.Domain/Repositories/IOnsiteScoreRepository.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; namespace FMS.Domain.Repositories diff --git a/FMS.Domain/Repositories/IOrganizationalUnitRepository.cs b/FMS.Domain/Repositories/IOrganizationalUnitRepository.cs index aeb6752f..8b4cb93a 100644 --- a/FMS.Domain/Repositories/IOrganizationalUnitRepository.cs +++ b/FMS.Domain/Repositories/IOrganizationalUnitRepository.cs @@ -1,7 +1,4 @@ using FMS.Domain.Dto; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IOverallStatusRepository.cs b/FMS.Domain/Repositories/IOverallStatusRepository.cs index d15e2c00..12a45659 100644 --- a/FMS.Domain/Repositories/IOverallStatusRepository.cs +++ b/FMS.Domain/Repositories/IOverallStatusRepository.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; namespace FMS.Domain.Repositories diff --git a/FMS.Domain/Repositories/IParcelRepository.cs b/FMS.Domain/Repositories/IParcelRepository.cs index 83d9872d..555836f5 100644 --- a/FMS.Domain/Repositories/IParcelRepository.cs +++ b/FMS.Domain/Repositories/IParcelRepository.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; namespace FMS.Domain.Repositories diff --git a/FMS.Domain/Repositories/IParcelTypeRepository.cs b/FMS.Domain/Repositories/IParcelTypeRepository.cs index 46109f10..149c8707 100644 --- a/FMS.Domain/Repositories/IParcelTypeRepository.cs +++ b/FMS.Domain/Repositories/IParcelTypeRepository.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; namespace FMS.Domain.Repositories diff --git a/FMS.Domain/Repositories/IPhoneRepository.cs b/FMS.Domain/Repositories/IPhoneRepository.cs index 51cd1b4d..ea616fe0 100644 --- a/FMS.Domain/Repositories/IPhoneRepository.cs +++ b/FMS.Domain/Repositories/IPhoneRepository.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; namespace FMS.Domain.Repositories diff --git a/FMS.Domain/Repositories/IReportingRepository.cs b/FMS.Domain/Repositories/IReportingRepository.cs index 33063048..66ac4ab1 100644 --- a/FMS.Domain/Repositories/IReportingRepository.cs +++ b/FMS.Domain/Repositories/IReportingRepository.cs @@ -1,9 +1,4 @@ using FMS.Domain.Dto; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IScoreRepository.cs b/FMS.Domain/Repositories/IScoreRepository.cs index 36d47af8..fa2d899b 100644 --- a/FMS.Domain/Repositories/IScoreRepository.cs +++ b/FMS.Domain/Repositories/IScoreRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; namespace FMS.Domain.Repositories diff --git a/FMS.Domain/Repositories/ISoilStatusRepository.cs b/FMS.Domain/Repositories/ISoilStatusRepository.cs index 687cc751..893d20b4 100644 --- a/FMS.Domain/Repositories/ISoilStatusRepository.cs +++ b/FMS.Domain/Repositories/ISoilStatusRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/ISourceStatusRepository.cs b/FMS.Domain/Repositories/ISourceStatusRepository.cs index 1caae1ca..f50ccec8 100644 --- a/FMS.Domain/Repositories/ISourceStatusRepository.cs +++ b/FMS.Domain/Repositories/ISourceStatusRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/IStatusRepository.cs b/FMS.Domain/Repositories/IStatusRepository.cs index eb2b3f0c..2aeaac14 100644 --- a/FMS.Domain/Repositories/IStatusRepository.cs +++ b/FMS.Domain/Repositories/IStatusRepository.cs @@ -1,6 +1,4 @@ -using System; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Repositories/ISubstanceRepository.cs b/FMS.Domain/Repositories/ISubstanceRepository.cs index 0d179b2c..f351e361 100644 --- a/FMS.Domain/Repositories/ISubstanceRepository.cs +++ b/FMS.Domain/Repositories/ISubstanceRepository.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using FMS.Domain.Dto; using FMS.Domain.Entities; -using FMS.Domain.Entities.Base; -using FMS.Domain.Dto; namespace FMS.Domain.Repositories { diff --git a/FMS.Domain/Services/IUserService.cs b/FMS.Domain/Services/IUserService.cs index 3e510f07..59233c30 100644 --- a/FMS.Domain/Services/IUserService.cs +++ b/FMS.Domain/Services/IUserService.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity; namespace FMS.Domain.Services { diff --git a/FMS.Domain/Services/UserView.cs b/FMS.Domain/Services/UserView.cs index 9b4717ee..97137318 100644 --- a/FMS.Domain/Services/UserView.cs +++ b/FMS.Domain/Services/UserView.cs @@ -1,6 +1,4 @@ -using System; -using FMS.Domain.Entities.Users; -using System.Linq; +using FMS.Domain.Entities.Users; namespace FMS.Domain.Services { diff --git a/FMS.Domain/Utils/Prevent.cs b/FMS.Domain/Utils/Prevent.cs index 7726273e..010c2d1b 100644 --- a/FMS.Domain/Utils/Prevent.cs +++ b/FMS.Domain/Utils/Prevent.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; diff --git a/FMS.Infrastructure/Contexts/FmsDbContext.cs b/FMS.Infrastructure/Contexts/FmsDbContext.cs index 73a324d6..3200a516 100644 --- a/FMS.Infrastructure/Contexts/FmsDbContext.cs +++ b/FMS.Infrastructure/Contexts/FmsDbContext.cs @@ -1,7 +1,3 @@ -using System; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using FMS.Domain.Data; using FMS.Domain.Dto; using FMS.Domain.Entities; diff --git a/FMS.Infrastructure/DbScripts/GetNearbyFacilities.cs b/FMS.Infrastructure/DbScripts/GetNearbyFacilities.cs index b9224555..ca3cc465 100644 --- a/FMS.Infrastructure/DbScripts/GetNearbyFacilities.cs +++ b/FMS.Infrastructure/DbScripts/GetNearbyFacilities.cs @@ -1,5 +1,4 @@ -using System.Threading.Tasks; -using FMS.Infrastructure.Contexts; +using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; namespace FMS.Infrastructure.DbScripts diff --git a/FMS.Infrastructure/GlobalUsings.cs b/FMS.Infrastructure/GlobalUsings.cs new file mode 100644 index 00000000..9a06a0b6 --- /dev/null +++ b/FMS.Infrastructure/GlobalUsings.cs @@ -0,0 +1 @@ +global using File = FMS.Domain.Entities.File; diff --git a/FMS.Infrastructure/Repositories/AbandonedInactiveRepository.cs b/FMS.Infrastructure/Repositories/AbandonedInactiveRepository.cs index 5929a11f..5a7e204d 100644 --- a/FMS.Infrastructure/Repositories/AbandonedInactiveRepository.cs +++ b/FMS.Infrastructure/Repositories/AbandonedInactiveRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/ActionTakenRepository.cs b/FMS.Infrastructure/Repositories/ActionTakenRepository.cs index cf282727..6d9c1bb5 100644 --- a/FMS.Infrastructure/Repositories/ActionTakenRepository.cs +++ b/FMS.Infrastructure/Repositories/ActionTakenRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/AllowedActionTakenRepository.cs b/FMS.Infrastructure/Repositories/AllowedActionTakenRepository.cs index bb64ed0e..e774685b 100644 --- a/FMS.Infrastructure/Repositories/AllowedActionTakenRepository.cs +++ b/FMS.Infrastructure/Repositories/AllowedActionTakenRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/BudgetCodeRepository.cs b/FMS.Infrastructure/Repositories/BudgetCodeRepository.cs index 0d623549..eb0e1032 100644 --- a/FMS.Infrastructure/Repositories/BudgetCodeRepository.cs +++ b/FMS.Infrastructure/Repositories/BudgetCodeRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Repositories; using FMS.Domain.Utils; diff --git a/FMS.Infrastructure/Repositories/CabinetRepository.cs b/FMS.Infrastructure/Repositories/CabinetRepository.cs index e589cd88..63b69194 100644 --- a/FMS.Infrastructure/Repositories/CabinetRepository.cs +++ b/FMS.Infrastructure/Repositories/CabinetRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Repositories; using FMS.Domain.Utils; diff --git a/FMS.Infrastructure/Repositories/ChemicalRepository.cs b/FMS.Infrastructure/Repositories/ChemicalRepository.cs index b148b33d..d852445f 100644 --- a/FMS.Infrastructure/Repositories/ChemicalRepository.cs +++ b/FMS.Infrastructure/Repositories/ChemicalRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Repositories; using FMS.Domain.Utils; diff --git a/FMS.Infrastructure/Repositories/Common.cs b/FMS.Infrastructure/Repositories/Common.cs index 6ff66fdf..bb790755 100644 --- a/FMS.Infrastructure/Repositories/Common.cs +++ b/FMS.Infrastructure/Repositories/Common.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; diff --git a/FMS.Infrastructure/Repositories/ComplianceOfficerRepository.cs b/FMS.Infrastructure/Repositories/ComplianceOfficerRepository.cs index ab463696..a29fa5e3 100644 --- a/FMS.Infrastructure/Repositories/ComplianceOfficerRepository.cs +++ b/FMS.Infrastructure/Repositories/ComplianceOfficerRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Repositories; using FMS.Domain.Utils; diff --git a/FMS.Infrastructure/Repositories/ContactRepository.cs b/FMS.Infrastructure/Repositories/ContactRepository.cs index 055eecf3..d8e33569 100644 --- a/FMS.Infrastructure/Repositories/ContactRepository.cs +++ b/FMS.Infrastructure/Repositories/ContactRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Repositories; using FMS.Domain.Utils; diff --git a/FMS.Infrastructure/Repositories/ContactTypeRepository.cs b/FMS.Infrastructure/Repositories/ContactTypeRepository.cs index 80a72fe1..2f22c179 100644 --- a/FMS.Infrastructure/Repositories/ContactTypeRepository.cs +++ b/FMS.Infrastructure/Repositories/ContactTypeRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/EventContractorRepository.cs b/FMS.Infrastructure/Repositories/EventContractorRepository.cs index 9f700dae..f983fbb9 100644 --- a/FMS.Infrastructure/Repositories/EventContractorRepository.cs +++ b/FMS.Infrastructure/Repositories/EventContractorRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/EventRepository.cs b/FMS.Infrastructure/Repositories/EventRepository.cs index bc5fb923..2bc54e64 100644 --- a/FMS.Infrastructure/Repositories/EventRepository.cs +++ b/FMS.Infrastructure/Repositories/EventRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Repositories; using FMS.Domain.Utils; diff --git a/FMS.Infrastructure/Repositories/EventTypeRepository.cs b/FMS.Infrastructure/Repositories/EventTypeRepository.cs index 1dfd86ba..f9a6ade6 100644 --- a/FMS.Infrastructure/Repositories/EventTypeRepository.cs +++ b/FMS.Infrastructure/Repositories/EventTypeRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/FacilityRepository.cs b/FMS.Infrastructure/Repositories/FacilityRepository.cs index 8cfd8874..40b2cafc 100644 --- a/FMS.Infrastructure/Repositories/FacilityRepository.cs +++ b/FMS.Infrastructure/Repositories/FacilityRepository.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Threading.Tasks; using Dapper; using FMS.Domain.Data; using FMS.Domain.Dto; @@ -12,7 +7,7 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using Microsoft.IdentityModel.Tokens; +using System.Data; namespace FMS.Infrastructure.Repositories { @@ -22,8 +17,8 @@ public class FacilityRepository : IFacilityRepository public FacilityRepository(FmsDbContext context) => _context = context; public Task FacilityExistsAsync(Guid id) => - _context.Facilities.AnyAsync(e => e.Id == id); - + _context.Facilities.AnyAsync(e => e.Id == id); + public async Task GetFacilityAsync(Guid id) { var facility = await _context.Facilities.AsNoTracking() @@ -44,142 +39,142 @@ public async Task GetFacilityAsync(Guid id) .ThenBy(e => e.EndYear) .ThenBy(e => e.BoxNumber).ToList(); - if (facility.FacilityType.Name == "HSI") - { - facility.HsrpFacilityProperties = await _context.HsrpFacilityProperties - .AsNoTracking() - .Include(e => e.OrganizationalUnit) - .Include(e => e.ComplianceOfficer) - .Where(e => e.FacilityId == id) - .FirstOrDefaultAsync(); - facility.HsrpFacilityProperties ??= new HsrpFacilityProperties(facility.Id); - - facility.LocationDetails = await _context.Locations - .AsNoTracking() - .Include(e => e.LocationClass) - .Where(e => e.FacilityId == id) - .FirstOrDefaultAsync(); - facility.LocationDetails ??= new Location(facility.Id); - + if (facility.FacilityType.Name == "HSI") + { + facility.HsrpFacilityProperties = await _context.HsrpFacilityProperties + .AsNoTracking() + .Include(e => e.OrganizationalUnit) + .Include(e => e.ComplianceOfficer) + .Where(e => e.FacilityId == id) + .FirstOrDefaultAsync(); + facility.HsrpFacilityProperties ??= new HsrpFacilityProperties(facility.Id); + + facility.LocationDetails = await _context.Locations + .AsNoTracking() + .Include(e => e.LocationClass) + .Where(e => e.FacilityId == id) + .FirstOrDefaultAsync(); + facility.LocationDetails ??= new Location(facility.Id); + facility.Parcels = await _context.Parcels - .AsNoTracking() - .Where(e => e.FacilityId == id) - .Include(e => e.ParcelType) - .OrderByDescending(e => e.Active) - .ThenBy(e => e.ListDate) - .ThenBy(e => e.DeListDate) - .ToListAsync(); - - facility.Contacts = await _context.Contacts - .AsNoTracking() - .Where(e => e.FacilityId == id) - .Include(e => e.ContactType) - .Include(e => e.Phones.OrderByDescending(p => p.Active)) - .OrderByDescending(e => e.Active) - .ThenBy(e => e.FamilyName) - .ThenBy(e => e.GivenName) - .ToListAsync(); - - facility.ScoreDetails = await _context.Scores - .AsNoTracking() - .Where(e => e.FacilityId == id) - .FirstOrDefaultAsync(); - if (facility.ScoreDetails == null) - { - facility.ScoreDetails = new Score(facility.Id); - await _context.Scores.AddAsync(facility.ScoreDetails); - await _context.SaveChangesAsync(); - } - - facility.Substances = await _context.Substances - .AsNoTracking() - .Include(e => e.Chemical) - .Where(e => e.FacilityId == id) - .OrderByDescending(e => e.Active) - .ThenByDescending(e => e.Chemical.Active) - .ThenBy(e => e.Chemical.CommonName) - .ToListAsync(); - + .AsNoTracking() + .Where(e => e.FacilityId == id) + .Include(e => e.ParcelType) + .OrderByDescending(e => e.Active) + .ThenBy(e => e.ListDate) + .ThenBy(e => e.DeListDate) + .ToListAsync(); + + facility.Contacts = await _context.Contacts + .AsNoTracking() + .Where(e => e.FacilityId == id) + .Include(e => e.ContactType) + .Include(e => e.Phones.OrderByDescending(p => p.Active)) + .OrderByDescending(e => e.Active) + .ThenBy(e => e.FamilyName) + .ThenBy(e => e.GivenName) + .ToListAsync(); + + facility.ScoreDetails = await _context.Scores + .AsNoTracking() + .Where(e => e.FacilityId == id) + .FirstOrDefaultAsync(); + if (facility.ScoreDetails == null) + { + facility.ScoreDetails = new Score(facility.Id); + await _context.Scores.AddAsync(facility.ScoreDetails); + await _context.SaveChangesAsync(); + } + + facility.Substances = await _context.Substances + .AsNoTracking() + .Include(e => e.Chemical) + .Where(e => e.FacilityId == id) + .OrderByDescending(e => e.Active) + .ThenByDescending(e => e.Chemical.Active) + .ThenBy(e => e.Chemical.CommonName) + .ToListAsync(); + facility.GroundwaterScoreDetails = await _context.GroundwaterScores - .AsNoTracking() - .Where(e => e.FacilityId == id) - .Include(e => e.Substance) - .Include(e => e.Substance.Chemical) - .FirstOrDefaultAsync(); - if (facility.GroundwaterScoreDetails == null) - { - facility.GroundwaterScoreDetails = new GroundwaterScore(facility.Id); - await _context.GroundwaterScores.AddAsync(facility.GroundwaterScoreDetails); - await _context.SaveChangesAsync(); - } - - facility.OnsiteScoreDetails = await _context.OnsiteScores - .AsNoTracking() - .Where(e => e.FacilityId == id) - .Include(e => e.Substance) - .Include(e => e.Substance.Chemical) - .FirstOrDefaultAsync(); - if (facility.OnsiteScoreDetails == null) - { - facility.OnsiteScoreDetails = new OnsiteScore(facility.Id); - await _context.OnsiteScores.AddAsync(facility.OnsiteScoreDetails); - await _context.SaveChangesAsync(); - } - - facility.StatusDetails = await _context.Statuses - .AsNoTracking() - .Include(e => e.SourceStatus) - .Include(e => e.SoilStatus) - .Include(e => e.GroundwaterStatus) - .Include(e => e.OverallStatus) - .Include(e => e.FundingSource) - .Include(e => e.GAPSAssessment) - .Include(e => e.AbandonedInactive) - .Where(e => e.FacilityId == id) - .FirstOrDefaultAsync(); - if (facility.StatusDetails == null) - { - facility.StatusDetails = new Status(facility.Id); - await _context.Statuses.AddAsync(facility.StatusDetails); + .AsNoTracking() + .Where(e => e.FacilityId == id) + .Include(e => e.Substance) + .Include(e => e.Substance.Chemical) + .FirstOrDefaultAsync(); + if (facility.GroundwaterScoreDetails == null) + { + facility.GroundwaterScoreDetails = new GroundwaterScore(facility.Id); + await _context.GroundwaterScores.AddAsync(facility.GroundwaterScoreDetails); + await _context.SaveChangesAsync(); + } + + facility.OnsiteScoreDetails = await _context.OnsiteScores + .AsNoTracking() + .Where(e => e.FacilityId == id) + .Include(e => e.Substance) + .Include(e => e.Substance.Chemical) + .FirstOrDefaultAsync(); + if (facility.OnsiteScoreDetails == null) + { + facility.OnsiteScoreDetails = new OnsiteScore(facility.Id); + await _context.OnsiteScores.AddAsync(facility.OnsiteScoreDetails); + await _context.SaveChangesAsync(); + } + + facility.StatusDetails = await _context.Statuses + .AsNoTracking() + .Include(e => e.SourceStatus) + .Include(e => e.SoilStatus) + .Include(e => e.GroundwaterStatus) + .Include(e => e.OverallStatus) + .Include(e => e.FundingSource) + .Include(e => e.GAPSAssessment) + .Include(e => e.AbandonedInactive) + .Where(e => e.FacilityId == id) + .FirstOrDefaultAsync(); + if (facility.StatusDetails == null) + { + facility.StatusDetails = new Status(facility.Id); + await _context.Statuses.AddAsync(facility.StatusDetails); } } - if (facility.FacilityType.Name == "VRP" || facility.FacilityType.Name == "HSI" || facility.FacilityStatus.Name == "COMPLAINT" || facility.FacilityStatus.Name == "Event Tracking On") - { - facility.Events = await _context.Events - .AsNoTracking() - .Include(e => e.EventType) - .Include(e => e.ActionTaken) - .Include(e => e.ComplianceOfficer) - .Include(e => e.EventContractor) - .Where(e => e.FacilityId == id) - .ToListAsync(); - - facility.Events = facility.Events - .OrderBy(e => e.StartDate) - .ThenBy(e => e.CompletionDate) - .GroupBy(e => e.ParentId?.ToString() ?? string.Empty) - .SelectMany(g => g) - .ToList(); - } - + if (facility.FacilityType.Name == "VRP" || facility.FacilityType.Name == "HSI" || facility.FacilityStatus.Name == "COMPLAINT" || facility.FacilityStatus.Name == "Event Tracking On") + { + facility.Events = await _context.Events + .AsNoTracking() + .Include(e => e.EventType) + .Include(e => e.ActionTaken) + .Include(e => e.ComplianceOfficer) + .Include(e => e.EventContractor) + .Where(e => e.FacilityId == id) + .ToListAsync(); + + facility.Events = facility.Events + .OrderBy(e => e.StartDate) + .ThenBy(e => e.CompletionDate) + .GroupBy(e => e.ParentId?.ToString() ?? string.Empty) + .SelectMany(g => g) + .ToList(); + } + var facilityDetail = new FacilityDetailDto(facility); if (!string.IsNullOrEmpty(facilityDetail.FileLabel)) { facilityDetail.Cabinets = (await _context.GetCabinetListAsync(false)) .GetCabinetsForFile(facilityDetail.FileLabel); - } - + } + return facilityDetail; - } - + } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S3776:Cognitive Complexity of methods should not be too high", Justification = "")] private IQueryable QueryFacilities(FacilitySpec spec) => _context.Facilities.AsNoTracking() .Where(e => string.IsNullOrEmpty(spec.Name) || e.Name.Contains(spec.Name)) .Where(e => !spec.CountyId.HasValue || e.County.Id == spec.CountyId.Value) .Where(e => spec.ShowDeleted || e.Active) - .Where(e => !spec.ShowPendingOnly || !e.DeterminationLetterDate.HasValue) + .Where(e => !spec.ShowPendingOnly || !e.DeterminationLetterDate.HasValue) .Where(e => string.IsNullOrEmpty(spec.FacilityNumber) || e.FacilityNumber.Contains(spec.FacilityNumber)) .Where(e => !spec.FacilityStatusId.HasValue || e.FacilityStatus.Id.Equals(spec.FacilityStatusId)) .Where(e => !spec.FacilityTypeId.HasValue || e.FacilityType.Id.Equals(spec.FacilityTypeId)) @@ -214,9 +209,9 @@ private static IOrderedQueryable OrderFacilityQuery( .ThenBy(e => e.Name), FacilitySort.FileLabelDesc => included.OrderByDescending(e => e.File.FileLabel) .ThenByDescending(e => e.Name), - FacilitySort.RNDateReceived => included.OrderBy(e => e.RNDateReceived) + FacilitySort.RNDateReceived => included.OrderBy(e => e.RNDateReceived) .ThenBy(e => e.FacilityNumber), - FacilitySort.RNDateReceivedDesc => included.OrderByDescending(e => e.RNDateReceived) + FacilitySort.RNDateReceivedDesc => included.OrderByDescending(e => e.RNDateReceived) .ThenByDescending(e => e.FacilityNumber), // FacilitySort.Name _ => included.OrderBy(e => e.Name) @@ -252,10 +247,10 @@ public async Task> GetFacilityPaginatedListAsy var cabinets = await _context.GetCabinetListAsync(false); foreach (var item in items) { - if (!string.IsNullOrEmpty(item.FileLabel)) - { - item.Cabinets = cabinets.GetCabinetsForFile(item.FileLabel); - } + if (!string.IsNullOrEmpty(item.FileLabel)) + { + item.Cabinets = cabinets.GetCabinetsForFile(item.FileLabel); + } } var totalCount = await queried.CountAsync(); @@ -278,21 +273,21 @@ public async Task> GetFacilityDetailListAsync(F var ordered = OrderFacilityQuery(included, spec.SortBy); - var items = await ordered.Select(e => new FacilityDetailDto(e)).ToListAsync(); - - var cabinets = await _context.GetCabinetListAsync(false); - - foreach (var item in items) - { - if (!string.IsNullOrEmpty(item.FileLabel)) - { - item.Cabinets = cabinets.GetCabinetsForFile(item.FileLabel); - } - if(loadHSI) - { - var hsrpProperties = await _context.GetHsrpPropertiesAsync(item.Id); - item.HsrpFacilityPropertyDetails = hsrpProperties; - } + var items = await ordered.Select(e => new FacilityDetailDto(e)).ToListAsync(); + + var cabinets = await _context.GetCabinetListAsync(false); + + foreach (var item in items) + { + if (!string.IsNullOrEmpty(item.FileLabel)) + { + item.Cabinets = cabinets.GetCabinetsForFile(item.FileLabel); + } + if(loadHSI) + { + var hsrpProperties = await _context.GetHsrpPropertiesAsync(item.Id); + item.HsrpFacilityPropertyDetails = hsrpProperties; + } } return items; @@ -305,8 +300,8 @@ public async Task> GetFacilityListAsync(Fac return (await conn.QueryAsync("dbo.getNearbyFacilities", new { Active = !spec.ShowDeleted, spec.Latitude, spec.Longitude, spec.Radius, spec.FacilityTypeId }, commandType: CommandType.StoredProcedure)).ToList(); - } - + } + public async Task> GetRetentionRecordsListAsync(FacilitySpec spec) { var queried = QueryFacilities(spec); @@ -314,13 +309,13 @@ public async Task> GetRetentionRecordsList var included = queried .Include(e => e.RetentionRecords); - var ordered = OrderFacilityQuery(included, spec.SortBy); - - // create a List - var retentionRecordsList = await ordered.SelectMany(e => e.RetentionRecords).ToListAsync(); - - // convert the List to IEnumerable - var returnList = from retentionRecord in retentionRecordsList + var ordered = OrderFacilityQuery(included, spec.SortBy); + + // create a List + var retentionRecordsList = await ordered.SelectMany(e => e.RetentionRecords).ToListAsync(); + + // convert the List to IEnumerable + var returnList = from retentionRecord in retentionRecordsList select new RetentionRecordDetailDto(retentionRecord); return returnList; @@ -349,9 +344,9 @@ private async Task CreateFacilityInternalAsync(FacilityCreateDto newFacili throw new ArgumentException($"Facility Number '{newFacility.FacilityNumber}' already exists."); } - if (string.IsNullOrEmpty(newFacility.FacilityNumber) && newFacility.FacilityTypeName == "RN" && newFacility.FacilityStatusName != "COMPLAINT") - { - newFacility.FacilityNumber = await CreateRNFacilityNumberInternalAsync(); + if (string.IsNullOrEmpty(newFacility.FacilityNumber) && newFacility.FacilityTypeName == "RN" && newFacility.FacilityStatusName != "COMPLAINT") + { + newFacility.FacilityNumber = await CreateRNFacilityNumberInternalAsync(); } File file; @@ -390,17 +385,17 @@ private async Task CreateFacilityInternalAsync(FacilityCreateDto newFacili return newFac.Id; } - private async Task CreateRNFacilityNumberInternalAsync() - { - var prefix = "RN"; - var nextInSequence = 1; + private async Task CreateRNFacilityNumberInternalAsync() + { + var prefix = "RN"; + var nextInSequence = 1; var NextNumber = await _context.Facilities.AsNoTracking() .Where(e => e.FacilityNumber.StartsWith(prefix)) .Select(e => int.Parse(e.FacilityNumber.Substring(2, 4))) - .ToListAsync(); - nextInSequence = NextNumber.Count == 0 ? 1 : NextNumber.Max() + 1; - var NewFacilityNumber = string.Concat(prefix, nextInSequence); - return NewFacilityNumber; + .ToListAsync(); + nextInSequence = NextNumber.Count == 0 ? 1 : NextNumber.Max() + 1; + var NewFacilityNumber = string.Concat(prefix, nextInSequence); + return NewFacilityNumber; } public Task UpdateFacilityAsync(Guid id, FacilityEditDto facilityUpdates) @@ -472,7 +467,7 @@ private async Task UpdateFacilityInternalAsync(Guid id, FacilityEditDto facility facility.ImageChecked = facilityUpdates.ImageChecked; facility.DeferredOnSiteScoring = facilityUpdates.DeferredOnSiteScoring; facility.AdditionalDataRequested = facilityUpdates.AdditionalDataRequested; - facility.VRPReferral = facilityUpdates.VRPReferral; + facility.VRPReferral = facilityUpdates.VRPReferral; facility.RNDateReceived = facilityUpdates.RNDateReceived; // ****************** facility.IsRetained = facilityUpdates.IsRetained; @@ -528,11 +523,11 @@ public async Task UndeleteFacilityAsync(Guid id) public Task FacilityNumberExists(string facilityNumber, Guid? ignoreId = null) => _context.Facilities.AnyAsync(e => e.FacilityNumber == facilityNumber - && (!ignoreId.HasValue || e.Id != ignoreId.Value)); - + && (!ignoreId.HasValue || e.Id != ignoreId.Value)); + public Task DuplicateFacilityNumberExists(string newFacilityNumber, Guid oldFacilityId, Guid facilityTypeId) => _context.Facilities.AnyAsync( - e => e.FacilityNumber == newFacilityNumber - && e.Id != oldFacilityId + e => e.FacilityNumber == newFacilityNumber + && e.Id != oldFacilityId && e.FacilityTypeId == facilityTypeId); public Task FileLabelExists(string fileLabel) => diff --git a/FMS.Infrastructure/Repositories/FacilityStatusRepository.cs b/FMS.Infrastructure/Repositories/FacilityStatusRepository.cs index ae561563..28dbe61d 100644 --- a/FMS.Infrastructure/Repositories/FacilityStatusRepository.cs +++ b/FMS.Infrastructure/Repositories/FacilityStatusRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/FacilityTypeRepository.cs b/FMS.Infrastructure/Repositories/FacilityTypeRepository.cs index 342a3229..0fc89d7b 100644 --- a/FMS.Infrastructure/Repositories/FacilityTypeRepository.cs +++ b/FMS.Infrastructure/Repositories/FacilityTypeRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { @@ -35,19 +31,19 @@ public async Task GetFacilityTypeAsync(Guid id) return facilityType == null ? null : new FacilityTypeEditDto(facilityType); } - public async Task GetFacilityTypeNameAsync(Guid? id) - { + public async Task GetFacilityTypeNameAsync(Guid? id) + { var facilityType = await _context.FacilityTypes.AsNoTracking() - .SingleOrDefaultAsync(e => e.Id == id); - - return facilityType?.Name; + .SingleOrDefaultAsync(e => e.Id == id); + + return facilityType?.Name; } public async Task> GetFacilityTypeListAsync() => - await _context.FacilityTypes.AsNoTracking() - .OrderByDescending(e => e.Active) - .ThenBy(e => e.Name) - .Select(e => new FacilityTypeSummaryDto(e)) + await _context.FacilityTypes.AsNoTracking() + .OrderByDescending(e => e.Active) + .ThenBy(e => e.Name) + .Select(e => new FacilityTypeSummaryDto(e)) .ToListAsync(); public Task CreateFacilityTypeAsync(FacilityTypeCreateDto facilityType) diff --git a/FMS.Infrastructure/Repositories/FileRepository.cs b/FMS.Infrastructure/Repositories/FileRepository.cs index a4caeb15..c2904690 100644 --- a/FMS.Infrastructure/Repositories/FileRepository.cs +++ b/FMS.Infrastructure/Repositories/FileRepository.cs @@ -1,9 +1,5 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Dto.PaginatedList; -using FMS.Domain.Entities; using FMS.Domain.Repositories; using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; diff --git a/FMS.Infrastructure/Repositories/FundingSourceRepository.cs b/FMS.Infrastructure/Repositories/FundingSourceRepository.cs index 3c1832be..f0470dd6 100644 --- a/FMS.Infrastructure/Repositories/FundingSourceRepository.cs +++ b/FMS.Infrastructure/Repositories/FundingSourceRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/GapsAssessmentRepository.cs b/FMS.Infrastructure/Repositories/GapsAssessmentRepository.cs index e5f78d26..947587c1 100644 --- a/FMS.Infrastructure/Repositories/GapsAssessmentRepository.cs +++ b/FMS.Infrastructure/Repositories/GapsAssessmentRepository.cs @@ -4,11 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/GroundwaterScoreRepository.cs b/FMS.Infrastructure/Repositories/GroundwaterScoreRepository.cs index a506d0fa..9546711d 100644 --- a/FMS.Infrastructure/Repositories/GroundwaterScoreRepository.cs +++ b/FMS.Infrastructure/Repositories/GroundwaterScoreRepository.cs @@ -1,7 +1,4 @@ -using System; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Repositories; using FMS.Domain.Utils; diff --git a/FMS.Infrastructure/Repositories/GroundwaterStatusRepository.cs b/FMS.Infrastructure/Repositories/GroundwaterStatusRepository.cs index 0d2e9e2d..4fd0347b 100644 --- a/FMS.Infrastructure/Repositories/GroundwaterStatusRepository.cs +++ b/FMS.Infrastructure/Repositories/GroundwaterStatusRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/HsrpFacilityPropertiesRepository.cs b/FMS.Infrastructure/Repositories/HsrpFacilityPropertiesRepository.cs index bb9b7aec..c54d1463 100644 --- a/FMS.Infrastructure/Repositories/HsrpFacilityPropertiesRepository.cs +++ b/FMS.Infrastructure/Repositories/HsrpFacilityPropertiesRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/ItemsListRepository.cs b/FMS.Infrastructure/Repositories/ItemsListRepository.cs index 7623ad5a..d66456c9 100644 --- a/FMS.Infrastructure/Repositories/ItemsListRepository.cs +++ b/FMS.Infrastructure/Repositories/ItemsListRepository.cs @@ -3,10 +3,6 @@ using FMS.Domain.Repositories; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/LocationClassRepository.cs b/FMS.Infrastructure/Repositories/LocationClassRepository.cs index f993badc..35673476 100644 --- a/FMS.Infrastructure/Repositories/LocationClassRepository.cs +++ b/FMS.Infrastructure/Repositories/LocationClassRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/LocationRepository.cs b/FMS.Infrastructure/Repositories/LocationRepository.cs index 102901fd..be8e1516 100644 --- a/FMS.Infrastructure/Repositories/LocationRepository.cs +++ b/FMS.Infrastructure/Repositories/LocationRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/OnsiteScoreRepository.cs b/FMS.Infrastructure/Repositories/OnsiteScoreRepository.cs index 20c402ec..c0190469 100644 --- a/FMS.Infrastructure/Repositories/OnsiteScoreRepository.cs +++ b/FMS.Infrastructure/Repositories/OnsiteScoreRepository.cs @@ -4,9 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/OrganizationalUnitRepository.cs b/FMS.Infrastructure/Repositories/OrganizationalUnitRepository.cs index 98fe8b0e..b33f251f 100644 --- a/FMS.Infrastructure/Repositories/OrganizationalUnitRepository.cs +++ b/FMS.Infrastructure/Repositories/OrganizationalUnitRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/OverallStatusRepository.cs b/FMS.Infrastructure/Repositories/OverallStatusRepository.cs index 9c138fb4..374c5879 100644 --- a/FMS.Infrastructure/Repositories/OverallStatusRepository.cs +++ b/FMS.Infrastructure/Repositories/OverallStatusRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/ParcelRepository.cs b/FMS.Infrastructure/Repositories/ParcelRepository.cs index 3b67a5db..3e9477b2 100644 --- a/FMS.Infrastructure/Repositories/ParcelRepository.cs +++ b/FMS.Infrastructure/Repositories/ParcelRepository.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Repositories; using FMS.Domain.Utils; diff --git a/FMS.Infrastructure/Repositories/ParcelTypeRepository.cs b/FMS.Infrastructure/Repositories/ParcelTypeRepository.cs index bad0039a..18f3e5e5 100644 --- a/FMS.Infrastructure/Repositories/ParcelTypeRepository.cs +++ b/FMS.Infrastructure/Repositories/ParcelTypeRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/PhoneRepository.cs b/FMS.Infrastructure/Repositories/PhoneRepository.cs index bcb414dd..8091ffb3 100644 --- a/FMS.Infrastructure/Repositories/PhoneRepository.cs +++ b/FMS.Infrastructure/Repositories/PhoneRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/ReportingRepository.cs b/FMS.Infrastructure/Repositories/ReportingRepository.cs index b19776de..10b22f63 100644 --- a/FMS.Infrastructure/Repositories/ReportingRepository.cs +++ b/FMS.Infrastructure/Repositories/ReportingRepository.cs @@ -2,11 +2,6 @@ using FMS.Domain.Repositories; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/ScoreRepository.cs b/FMS.Infrastructure/Repositories/ScoreRepository.cs index 27faf3e3..81017a29 100644 --- a/FMS.Infrastructure/Repositories/ScoreRepository.cs +++ b/FMS.Infrastructure/Repositories/ScoreRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/SoilStatusRepository.cs b/FMS.Infrastructure/Repositories/SoilStatusRepository.cs index 3348c9b1..2aaad95f 100644 --- a/FMS.Infrastructure/Repositories/SoilStatusRepository.cs +++ b/FMS.Infrastructure/Repositories/SoilStatusRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/SourceStatusRepository.cs b/FMS.Infrastructure/Repositories/SourceStatusRepository.cs index 962e126b..d493f7a2 100644 --- a/FMS.Infrastructure/Repositories/SourceStatusRepository.cs +++ b/FMS.Infrastructure/Repositories/SourceStatusRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/StatusRepository.cs b/FMS.Infrastructure/Repositories/StatusRepository.cs index 583527e1..454dce38 100644 --- a/FMS.Infrastructure/Repositories/StatusRepository.cs +++ b/FMS.Infrastructure/Repositories/StatusRepository.cs @@ -4,10 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories { diff --git a/FMS.Infrastructure/Repositories/SubstanceRepository.cs b/FMS.Infrastructure/Repositories/SubstanceRepository.cs index 9cb2cccd..fc50a88a 100644 --- a/FMS.Infrastructure/Repositories/SubstanceRepository.cs +++ b/FMS.Infrastructure/Repositories/SubstanceRepository.cs @@ -4,11 +4,6 @@ using FMS.Domain.Utils; using FMS.Infrastructure.Contexts; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Infrastructure.Repositories diff --git a/FMS.Infrastructure/Services/UserService.cs b/FMS.Infrastructure/Services/UserService.cs index c68a3c05..e9666b00 100644 --- a/FMS.Infrastructure/Services/UserService.cs +++ b/FMS.Infrastructure/Services/UserService.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using FMS.Domain.Entities.Users; +using FMS.Domain.Entities.Users; using FMS.Domain.Services; using FMS.Infrastructure.Contexts; using Microsoft.AspNetCore.Http; diff --git a/FMS/Api/ChemicalSearchController.cs b/FMS/Api/ChemicalSearchController.cs index de42ac68..be9c2b79 100644 --- a/FMS/Api/ChemicalSearchController.cs +++ b/FMS/Api/ChemicalSearchController.cs @@ -2,9 +2,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Linq; namespace FMS.Api diff --git a/FMS/Api/eventActionController.cs b/FMS/Api/eventActionController.cs index 0b291f8f..da5a6f66 100644 --- a/FMS/Api/eventActionController.cs +++ b/FMS/Api/eventActionController.cs @@ -1,7 +1,5 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using System; -using System.Threading.Tasks; namespace FMS.Api { diff --git a/FMS/Helpers/AllowedActionTakenHelper.cs b/FMS/Helpers/AllowedActionTakenHelper.cs index 5df000f2..713916dc 100644 --- a/FMS/Helpers/AllowedActionTakenHelper.cs +++ b/FMS/Helpers/AllowedActionTakenHelper.cs @@ -1,10 +1,6 @@ using FMS.Domain.Dto; using FMS.Domain.Entities; using FMS.Domain.Repositories; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS { diff --git a/FMS/Helpers/EmailHelper.cs b/FMS/Helpers/EmailHelper.cs index 128d52ca..fd5311d8 100644 --- a/FMS/Helpers/EmailHelper.cs +++ b/FMS/Helpers/EmailHelper.cs @@ -1,5 +1,4 @@ -using System; -using System.Globalization; +using System.Globalization; using System.Text.RegularExpressions; namespace FMS.Helpers diff --git a/FMS/Helpers/EventSortHelper.cs b/FMS/Helpers/EventSortHelper.cs index 1e5eaf38..80e3d060 100644 --- a/FMS/Helpers/EventSortHelper.cs +++ b/FMS/Helpers/EventSortHelper.cs @@ -1,7 +1,4 @@ using FMS.Domain.Dto; -using System; -using System.Collections.Generic; -using System.Linq; namespace FMS.Helpers { diff --git a/FMS/Helpers/EventSummaryDtoScalar.cs b/FMS/Helpers/EventSummaryDtoScalar.cs index 98d1c1ce..421e74e0 100644 --- a/FMS/Helpers/EventSummaryDtoScalar.cs +++ b/FMS/Helpers/EventSummaryDtoScalar.cs @@ -1,6 +1,5 @@ using ClosedXML.Attributes; using FMS.Domain.Dto; -using System; namespace FMS.Helpers { diff --git a/FMS/Helpers/ExportHelper.cs b/FMS/Helpers/ExportHelper.cs index 4caefd41..64f72a5f 100644 --- a/FMS/Helpers/ExportHelper.cs +++ b/FMS/Helpers/ExportHelper.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using ClosedXML.Excel; using FMS.Domain.Dto; using FMS.Domain.Services; diff --git a/FMS/Helpers/FacilityDetailDtoScalar.cs b/FMS/Helpers/FacilityDetailDtoScalar.cs index b7f56b57..36f1738f 100644 --- a/FMS/Helpers/FacilityDetailDtoScalar.cs +++ b/FMS/Helpers/FacilityDetailDtoScalar.cs @@ -1,5 +1,4 @@ using ClosedXML.Attributes; -using System; using System.ComponentModel.DataAnnotations; namespace FMS.Domain.Dto @@ -21,12 +20,12 @@ public FacilityDetailDtoScalar(FacilityDetailDto facility) State = facility.State; PostalCode = facility.PostalCode; Latitude = facility.Latitude; - Longitude = facility.Longitude; - Location = facility.Location; - RNDateReceived = facility.RNDateReceived; - DeterminationLetterDate = facility.DeterminationLetterDate; - ImageChecked = facility.ImageChecked; - Comments = facility.Comments; + Longitude = facility.Longitude; + Location = facility.Location; + RNDateReceived = facility.RNDateReceived; + DeterminationLetterDate = facility.DeterminationLetterDate; + ImageChecked = facility.ImageChecked; + Comments = facility.Comments; HSInumber = facility.HSInumber; PreRQSMcleanup = facility.PreRQSMcleanup; DeferredOnSiteScoring = facility.DeferredOnSiteScoring; @@ -89,43 +88,43 @@ public FacilityDetailDtoScalar(FacilityDetailDto facility) [XLColumn(Header = "Location Description")] public string Location { get; } - [XLColumn(Header = "Date Received")] + [XLColumn(Header = "Date Received")] public DateOnly? RNDateReceived { get; set; } - - [XLColumn(Header = "Determination Letter Date")] - public DateOnly? DeterminationLetterDate { get; set; } - - [XLColumn(Header = "Image Checked")] - public bool ImageChecked { get; set; } - - [XLColumn(Header = "Comments")] - public string Comments { get; set; } - - [XLColumn(Header = "HSI Number")] - public string HSInumber { get; set; } - - [XLColumn(Header = "Pre-RQSM Cleanup")] - public bool PreRQSMcleanup { get; set; } - - [XLColumn(Header = "Brownfield Deferral")] - public bool DeferredOnSiteScoring { get; set; } - - [XLColumn(Header = "Additional Data Requested")] - public bool AdditionalDataRequested { get; set; } - - [XLColumn(Header = "VRP Deferral")] - public bool VRPReferral { get; set; } - + + [XLColumn(Header = "Determination Letter Date")] + public DateOnly? DeterminationLetterDate { get; set; } + + [XLColumn(Header = "Image Checked")] + public bool ImageChecked { get; set; } + + [XLColumn(Header = "Comments")] + public string Comments { get; set; } + + [XLColumn(Header = "HSI Number")] + public string HSInumber { get; set; } + + [XLColumn(Header = "Pre-RQSM Cleanup")] + public bool PreRQSMcleanup { get; set; } + + [XLColumn(Header = "Brownfield Deferral")] + public bool DeferredOnSiteScoring { get; set; } + + [XLColumn(Header = "Additional Data Requested")] + public bool AdditionalDataRequested { get; set; } + + [XLColumn(Header = "VRP Deferral")] + public bool VRPReferral { get; set; } + [XLColumn(Header = "Budget Code")] - public string BudgetCode { get; } - - [XLColumn(Header = "Historical Unit")] - public string HistoricalUnit { get; set; } - - [XLColumn(Header = "Historical C.O.")] - public string HistoricalComplianceOfficer { get; set; } - - [XLColumn(Header = "Has Electronic Records")] + public string BudgetCode { get; } + + [XLColumn(Header = "Historical Unit")] + public string HistoricalUnit { get; set; } + + [XLColumn(Header = "Historical C.O.")] + public string HistoricalComplianceOfficer { get; set; } + + [XLColumn(Header = "Has Electronic Records")] public bool HasERecord { get; set; } [XLColumn(Header = "Is Retained Onsite")] @@ -135,8 +134,8 @@ public FacilityDetailDtoScalar(FacilityDetailDto facility) public string Cabinets { get; } [XLColumn(Header = "Retention Records")] - public string RetentionRecords { get; } - + public string RetentionRecords { get; } + [XLColumn(Header = "Active Site")] public bool Active { get; } } diff --git a/FMS/Helpers/FacilityDetailHSIScalarDto.cs b/FMS/Helpers/FacilityDetailHSIScalarDto.cs index d276b07a..2e14324b 100644 --- a/FMS/Helpers/FacilityDetailHSIScalarDto.cs +++ b/FMS/Helpers/FacilityDetailHSIScalarDto.cs @@ -1,11 +1,5 @@ using ClosedXML.Attributes; -using DocumentFormat.OpenXml.Bibliography; -using DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing; -using DocumentFormat.OpenXml.Wordprocessing; -using FMS.Domain.Entities; -using System; using System.ComponentModel.DataAnnotations; -using System.Numerics; namespace FMS.Domain.Dto { diff --git a/FMS/Helpers/FacilityPendingDtoScalar.cs b/FMS/Helpers/FacilityPendingDtoScalar.cs index fe1d84cd..0e45dc7c 100644 --- a/FMS/Helpers/FacilityPendingDtoScalar.cs +++ b/FMS/Helpers/FacilityPendingDtoScalar.cs @@ -1,6 +1,5 @@ using ClosedXML.Attributes; using FMS.Domain.Dto; -using System; namespace FMS.Helpers { diff --git a/FMS/Helpers/FacilityValidationDtoScalar.cs b/FMS/Helpers/FacilityValidationDtoScalar.cs index 13ddbc9e..518bcd4e 100644 --- a/FMS/Helpers/FacilityValidationDtoScalar.cs +++ b/FMS/Helpers/FacilityValidationDtoScalar.cs @@ -1,5 +1,4 @@ using FMS.Domain.Dto; -using System; namespace FMS.Helpers { diff --git a/FMS/Helpers/FormValidationHelper.cs b/FMS/Helpers/FormValidationHelper.cs index 81b5953d..27dbb31b 100644 --- a/FMS/Helpers/FormValidationHelper.cs +++ b/FMS/Helpers/FormValidationHelper.cs @@ -1,6 +1,5 @@ using FMS.Domain.Dto; using Microsoft.AspNetCore.Mvc.ModelBinding; -using System; using System.Text.RegularExpressions; namespace FMS.Helpers diff --git a/FMS/Helpers/GeoCoordHelper.cs b/FMS/Helpers/GeoCoordHelper.cs index 5595d404..317b9b3e 100644 --- a/FMS/Helpers/GeoCoordHelper.cs +++ b/FMS/Helpers/GeoCoordHelper.cs @@ -1,6 +1,4 @@ -using System; -using System.ComponentModel; -using System.Linq; +using System.ComponentModel; using System.Reflection; namespace FMS diff --git a/FMS/Helpers/SelectListHelper.cs b/FMS/Helpers/SelectListHelper.cs index 06f9bb1b..59c1f115 100644 --- a/FMS/Helpers/SelectListHelper.cs +++ b/FMS/Helpers/SelectListHelper.cs @@ -1,8 +1,5 @@ using FMS.Domain.Repositories; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS { diff --git a/FMS/Helpers/URLHelper.cs b/FMS/Helpers/URLHelper.cs index 995de20a..07586d82 100644 --- a/FMS/Helpers/URLHelper.cs +++ b/FMS/Helpers/URLHelper.cs @@ -1,5 +1,4 @@ using FMS.Platform.Extensions; -using Microsoft.IdentityModel.Tokens; namespace FMS.Helpers { diff --git a/FMS/Helpers/UserDomainValidation.cs b/FMS/Helpers/UserDomainValidation.cs index e2d69fc8..89f5826d 100644 --- a/FMS/Helpers/UserDomainValidation.cs +++ b/FMS/Helpers/UserDomainValidation.cs @@ -1,5 +1,3 @@ -using System; - namespace FMS.Helpers; public static class UserDomainValidation diff --git a/FMS/Pages/Account/ExternalLogin.cshtml.cs b/FMS/Pages/Account/ExternalLogin.cshtml.cs index 8855cbb6..12aac593 100644 --- a/FMS/Pages/Account/ExternalLogin.cshtml.cs +++ b/FMS/Pages/Account/ExternalLogin.cshtml.cs @@ -7,19 +7,12 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; using Microsoft.Identity.Web; -using System; -using System.Linq; using System.Security.Claims; -using System.Text.RegularExpressions; -using System.Threading.Tasks; namespace FMS.Pages.Account { diff --git a/FMS/Pages/Account/Index.cshtml.cs b/FMS/Pages/Account/Index.cshtml.cs index 78adeb44..797f01c7 100644 --- a/FMS/Pages/Account/Index.cshtml.cs +++ b/FMS/Pages/Account/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; diff --git a/FMS/Pages/Account/Logout.cshtml.cs b/FMS/Pages/Account/Logout.cshtml.cs index 0f62cd82..88bc6001 100644 --- a/FMS/Pages/Account/Logout.cshtml.cs +++ b/FMS/Pages/Account/Logout.cshtml.cs @@ -3,11 +3,9 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using System.Threading.Tasks; namespace FMS.Pages.Account { diff --git a/FMS/Pages/Cabinets/Add.cshtml.cs b/FMS/Pages/Cabinets/Add.cshtml.cs index 12aadbf7..b7f11924 100644 --- a/FMS/Pages/Cabinets/Add.cshtml.cs +++ b/FMS/Pages/Cabinets/Add.cshtml.cs @@ -1,5 +1,4 @@ -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; using FMS.Platform.Extensions; diff --git a/FMS/Pages/Cabinets/Details.cshtml.cs b/FMS/Pages/Cabinets/Details.cshtml.cs index 084e41ef..41afa9e9 100644 --- a/FMS/Pages/Cabinets/Details.cshtml.cs +++ b/FMS/Pages/Cabinets/Details.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Platform.Extensions; diff --git a/FMS/Pages/Cabinets/Edit.cshtml.cs b/FMS/Pages/Cabinets/Edit.cshtml.cs index 926429d3..86ec45b8 100644 --- a/FMS/Pages/Cabinets/Edit.cshtml.cs +++ b/FMS/Pages/Cabinets/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Cabinets/Index.cshtml.cs b/FMS/Pages/Cabinets/Index.cshtml.cs index 358f6745..fd2561dc 100644 --- a/FMS/Pages/Cabinets/Index.cshtml.cs +++ b/FMS/Pages/Cabinets/Index.cshtml.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Repositories; using Microsoft.AspNetCore.Mvc; diff --git a/FMS/Pages/Contact/Add.cshtml b/FMS/Pages/Contact/Add.cshtml index 29d996a1..2daaa684 100644 --- a/FMS/Pages/Contact/Add.cshtml +++ b/FMS/Pages/Contact/Add.cshtml @@ -1,6 +1,5 @@ @page "{id:Guid?}" @using FMS.Pages.Contact -@using FMS.Domain.Entities.Users @model FMS.Pages.Contact.AddModel @section Scripts diff --git a/FMS/Pages/Contact/Add.cshtml.cs b/FMS/Pages/Contact/Add.cshtml.cs index 69e110b1..ec724c20 100644 --- a/FMS/Pages/Contact/Add.cshtml.cs +++ b/FMS/Pages/Contact/Add.cshtml.cs @@ -7,8 +7,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Threading.Tasks; namespace FMS.Pages.Contact { diff --git a/FMS/Pages/Contact/Edit.cshtml b/FMS/Pages/Contact/Edit.cshtml index dcae15bb..4ff944c5 100644 --- a/FMS/Pages/Contact/Edit.cshtml +++ b/FMS/Pages/Contact/Edit.cshtml @@ -1,6 +1,5 @@ @page "{id:Guid?}" @using FMS.Pages.Contact -@using FMS.Domain.Entities.Users @model FMS.Pages.Contact.EditModel @section Scripts { diff --git a/FMS/Pages/Contact/Edit.cshtml.cs b/FMS/Pages/Contact/Edit.cshtml.cs index 82057462..0a0707c6 100644 --- a/FMS/Pages/Contact/Edit.cshtml.cs +++ b/FMS/Pages/Contact/Edit.cshtml.cs @@ -7,8 +7,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Threading.Tasks; namespace FMS.Pages.Contact { diff --git a/FMS/Pages/Error.cshtml.cs b/FMS/Pages/Error.cshtml.cs index 5c06182a..8f2d8664 100644 --- a/FMS/Pages/Error.cshtml.cs +++ b/FMS/Pages/Error.cshtml.cs @@ -1,7 +1,7 @@ -using System.Diagnostics; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using System.Diagnostics; namespace FMS.Pages { diff --git a/FMS/Pages/Event/Add.cshtml b/FMS/Pages/Event/Add.cshtml index 75b85e5b..c5f273ac 100644 --- a/FMS/Pages/Event/Add.cshtml +++ b/FMS/Pages/Event/Add.cshtml @@ -1,7 +1,5 @@ @page "{id:Guid?}" @using FMS.Domain.Dto -@using FMS.Pages.Event -@using FMS.Domain.Entities.Users @model FMS.Pages.Event.AddModel @section Scripts diff --git a/FMS/Pages/Event/Add.cshtml.cs b/FMS/Pages/Event/Add.cshtml.cs index 20c349cc..5d242e2a 100644 --- a/FMS/Pages/Event/Add.cshtml.cs +++ b/FMS/Pages/Event/Add.cshtml.cs @@ -7,9 +7,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; namespace FMS.Pages.Event { diff --git a/FMS/Pages/Event/Delete.cshtml.cs b/FMS/Pages/Event/Delete.cshtml.cs index fd4a58f2..5d05f51e 100644 --- a/FMS/Pages/Event/Delete.cshtml.cs +++ b/FMS/Pages/Event/Delete.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Event/Edit.cshtml b/FMS/Pages/Event/Edit.cshtml index 407c7500..ee4e57b5 100644 --- a/FMS/Pages/Event/Edit.cshtml +++ b/FMS/Pages/Event/Edit.cshtml @@ -1,7 +1,5 @@ @page "{id:Guid?}" @using FMS.Domain.Dto -@using FMS.Pages.Event -@using FMS.Domain.Entities.Users @model FMS.Pages.Event.EditModel @section Scripts diff --git a/FMS/Pages/Event/Edit.cshtml.cs b/FMS/Pages/Event/Edit.cshtml.cs index f9c1beed..7b2e6432 100644 --- a/FMS/Pages/Event/Edit.cshtml.cs +++ b/FMS/Pages/Event/Edit.cshtml.cs @@ -7,10 +7,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Pages.Event { diff --git a/FMS/Pages/Facilities/Add.cshtml b/FMS/Pages/Facilities/Add.cshtml index a994f89d..94d8712e 100644 --- a/FMS/Pages/Facilities/Add.cshtml +++ b/FMS/Pages/Facilities/Add.cshtml @@ -1,6 +1,5 @@ @page @using FMS.Pages.Facilities -@using FMS.Domain.Entities.Users @model FMS.Pages.Facilities.AddModel @section Scripts diff --git a/FMS/Pages/Facilities/Add.cshtml.cs b/FMS/Pages/Facilities/Add.cshtml.cs index 3f26c307..538edb74 100644 --- a/FMS/Pages/Facilities/Add.cshtml.cs +++ b/FMS/Pages/Facilities/Add.cshtml.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Data; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; @@ -77,18 +75,18 @@ public async Task OnPostAsync() return Page(); } - Facility.TrimAll(); - - // Validate User input based on Business Logic - // Populate FacilityTypeName to use for User Input validity - Facility.FacilityTypeName = await _repositoryType.GetFacilityTypeNameAsync(Facility.FacilityTypeId); - Facility.FacilityStatusName = await _repositoryStatus.GetFacilityStatusNameAsync(Facility.FacilityStatusId); - - ModelErrorCollection errors = FormValidationHelper.ValidateFacilityAddForm(Facility); - + Facility.TrimAll(); + + // Validate User input based on Business Logic + // Populate FacilityTypeName to use for User Input validity + Facility.FacilityTypeName = await _repositoryType.GetFacilityTypeNameAsync(Facility.FacilityTypeId); + Facility.FacilityStatusName = await _repositoryStatus.GetFacilityStatusNameAsync(Facility.FacilityStatusId); + + ModelErrorCollection errors = FormValidationHelper.ValidateFacilityAddForm(Facility); + if (errors.Count > 0) { - foreach (ModelError error in errors) + foreach (ModelError error in errors) { string[] errMsg = error.ErrorMessage.Split("^"); ModelState.AddModelError(errMsg[0].ToString(), errMsg[1].ToString()); @@ -131,7 +129,7 @@ public async Task OnPostAsync() if (NearbyFacilities != null && NearbyFacilities.Count > 0) { - ConfirmedFacilityFileLabel = string.IsNullOrEmpty(Facility.FileLabel) ? "Choose" : Facility.FileLabel; + ConfirmedFacilityFileLabel = string.IsNullOrEmpty(Facility.FileLabel) ? "Choose" : Facility.FileLabel; await PopulateSelectsAsync(); ConfirmFacility = true; return Page(); @@ -151,38 +149,38 @@ public async Task OnPostConfirmAsync() return Page(); } - if (ConfirmedFacilityFileLabel == "Choose") - { - var mapSearchSpec = new FacilityMapSpec - { - Latitude = Facility.Latitude, - Longitude = Facility.Longitude, - Radius = 0.5m, - }; - - NearbyFacilities = await _repository.GetFacilityListAsync(mapSearchSpec); - - if (NearbyFacilities != null && NearbyFacilities.Count > 0) - { - ConfirmedFacilityFileLabel = string.IsNullOrEmpty(Facility.FileLabel) ? "Choose" : Facility.FileLabel; - await PopulateSelectsAsync(); - ConfirmFacility = true; - return Page(); - } + if (ConfirmedFacilityFileLabel == "Choose") + { + var mapSearchSpec = new FacilityMapSpec + { + Latitude = Facility.Latitude, + Longitude = Facility.Longitude, + Radius = 0.5m, + }; + + NearbyFacilities = await _repository.GetFacilityListAsync(mapSearchSpec); + + if (NearbyFacilities != null && NearbyFacilities.Count > 0) + { + ConfirmedFacilityFileLabel = string.IsNullOrEmpty(Facility.FileLabel) ? "Choose" : Facility.FileLabel; + await PopulateSelectsAsync(); + ConfirmFacility = true; + return Page(); + } } Facility.FileLabel = ConfirmedFacilityFileLabel; Facility.TrimAll(); - // Validate User input based on Business Logic - // Populate FacilityTypeName to use for User Input validity - Facility.FacilityTypeName = await _repositoryType.GetFacilityTypeNameAsync(Facility.FacilityTypeId); - Facility.FacilityStatusName = await _repositoryStatus.GetFacilityStatusNameAsync(Facility.FacilityStatusId); - ModelErrorCollection errors = FormValidationHelper.ValidateFacilityAddForm(Facility); + // Validate User input based on Business Logic + // Populate FacilityTypeName to use for User Input validity + Facility.FacilityTypeName = await _repositoryType.GetFacilityTypeNameAsync(Facility.FacilityTypeId); + Facility.FacilityStatusName = await _repositoryStatus.GetFacilityStatusNameAsync(Facility.FacilityStatusId); + ModelErrorCollection errors = FormValidationHelper.ValidateFacilityAddForm(Facility); if (errors.Count > 0) { - foreach (ModelError error in errors) + foreach (ModelError error in errors) { string[] errMsg = error.ErrorMessage.Split("^"); ModelState.AddModelError(errMsg[0].ToString(), errMsg[1].ToString()); diff --git a/FMS/Pages/Facilities/Delete.cshtml.cs b/FMS/Pages/Facilities/Delete.cshtml.cs index f60439a6..ffc586a6 100644 --- a/FMS/Pages/Facilities/Delete.cshtml.cs +++ b/FMS/Pages/Facilities/Delete.cshtml.cs @@ -1,6 +1,4 @@ -using System; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; using FMS.Platform.Extensions; diff --git a/FMS/Pages/Facilities/Details.cshtml b/FMS/Pages/Facilities/Details.cshtml index c9217c96..b99d6947 100644 --- a/FMS/Pages/Facilities/Details.cshtml +++ b/FMS/Pages/Facilities/Details.cshtml @@ -1,7 +1,6 @@ @page "{id:Guid?}" @using FMS.Domain.Dto @using FMS.Domain.Entities.Users -@using FMS.Platform.Extensions @model FMS.Pages.Facilities.DetailsModel @section Scripts { diff --git a/FMS/Pages/Facilities/Details.cshtml.cs b/FMS/Pages/Facilities/Details.cshtml.cs index 0ab4b1de..77168552 100644 --- a/FMS/Pages/Facilities/Details.cshtml.cs +++ b/FMS/Pages/Facilities/Details.cshtml.cs @@ -5,10 +5,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using NUglify.Helpers; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Pages.Facilities { @@ -81,20 +77,20 @@ public async Task OnGetAsync(Guid? id, Guid? hr, string tab, Eve HighlightRecord = hr.Value; } - if(FacilityDetail.FacilityType.Name == "HSI") - { - HSIFolderLink = UrlHelper.GetHSIFolderLink(FacilityDetail.FacilityNumber); - } - - if (FacilityDetail.FacilityType.Name == "RN") - { + if(FacilityDetail.FacilityType.Name == "HSI") + { + HSIFolderLink = UrlHelper.GetHSIFolderLink(FacilityDetail.FacilityNumber); + } + + if (FacilityDetail.FacilityType.Name == "RN") + { if (FacilityDetail.DeterminationLetterDate.HasValue && string.IsNullOrEmpty(FacilityDetail.HSInumber)) - { - NotificationFolderLink = UrlHelper.GetNotificationFolderLink(FacilityDetail.FacilityNumber); - } - else if (string.IsNullOrEmpty(FacilityDetail.HSInumber) && FacilityDetail.FacilityStatus.Name != "COMPLAINT") - { - PendingNotificationFolderLink = UrlHelper.GetPendingNotificationFolderLink(FacilityDetail.FacilityNumber); + { + NotificationFolderLink = UrlHelper.GetNotificationFolderLink(FacilityDetail.FacilityNumber); + } + else if (string.IsNullOrEmpty(FacilityDetail.HSInumber) && FacilityDetail.FacilityStatus.Name != "COMPLAINT") + { + PendingNotificationFolderLink = UrlHelper.GetPendingNotificationFolderLink(FacilityDetail.FacilityNumber); } if (FacilityDetail.FacilityStatus.Name == "COMPLAINT") { diff --git a/FMS/Pages/Facilities/Edit.cshtml b/FMS/Pages/Facilities/Edit.cshtml index 3744ddaf..e0b4aaed 100644 --- a/FMS/Pages/Facilities/Edit.cshtml +++ b/FMS/Pages/Facilities/Edit.cshtml @@ -1,9 +1,8 @@ @page "{id:Guid?}" @using FMS.Pages.Facilities -@using FMS.Domain.Entities.Users @model FMS.Pages.Facilities.EditModel -@section Scripts +@section Scripts { @@ -33,7 +32,7 @@ - @if (Model.IsNotSiteMaintenanceUser) + @if (Model.IsNotSiteMaintenanceUser) { Only Users with Site Maintenance role are able to edit existing Facility Numbers. } @@ -212,11 +211,11 @@

* denotes a required field

- @if (Model.IsNotSiteMaintenanceUser) + @if (Model.IsNotSiteMaintenanceUser) {

Only Users with Site Maintenance role are able to edit existing File Labels and Facility Numbers.

} - @if (Model.ConfirmFacility) + @if (Model.ConfirmFacility) {

Confirm Facility Update

@@ -233,7 +232,7 @@ - @foreach (var item in Model.NearbyFacilities) + @foreach (var item in Model.NearbyFacilities) { @if (!string.IsNullOrEmpty(item.FileLabel)) { @@ -262,14 +261,14 @@ } - @if (string.IsNullOrEmpty(Model.Facility.FileLabel)) + @if (string.IsNullOrEmpty(Model.Facility.FileLabel)) { - } - else + } + else {
- } - else + } + else { OnGetAsync(Guid? id) IsNotSiteMaintenanceUser = !User.IsInRole(UserRoles.SiteMaintenance); Id = id.Value; - Facility = new FacilityEditDto(facilityDetail); + Facility = new FacilityEditDto(facilityDetail); await PopulateSelectsAsync(); return Page(); } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S3776:Cognitive Complexity of methods should not be too high", Justification = "")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S3776:Cognitive Complexity of methods should not be too high", Justification = "")] public async Task OnPostAsync() { // jQuery Validation of Edit Form @@ -108,22 +105,22 @@ public async Task OnPostAsync() { TempData?.SetDisplayMessage(Context.Danger, "Facility has been deleted by another user."); return RedirectToPage("./Details", new { Id }); - } - - // Validate User input based on Business Logic - // Populate FacilityTypeName to use for User Input validity - Facility.FacilityTypeName = await _repositoryType.GetFacilityTypeNameAsync(Facility.FacilityTypeId); - Facility.FacilityStatusName = await _repositoryStatus.GetFacilityStatusNameAsync(Facility.FacilityStatusId); - ModelErrorCollection errors = FormValidationHelper.ValidateFacilityEditForm(Facility); + } + + // Validate User input based on Business Logic + // Populate FacilityTypeName to use for User Input validity + Facility.FacilityTypeName = await _repositoryType.GetFacilityTypeNameAsync(Facility.FacilityTypeId); + Facility.FacilityStatusName = await _repositoryStatus.GetFacilityStatusNameAsync(Facility.FacilityStatusId); + ModelErrorCollection errors = FormValidationHelper.ValidateFacilityEditForm(Facility); if (errors.Count > 0) { - foreach (ModelError error in errors) + foreach (ModelError error in errors) { string[] errMsg = error.ErrorMessage.Split("^"); ModelState.AddModelError(errMsg[0].ToString(), errMsg[1].ToString()); } - } - + } + // If new File Label is provided, make sure it exists if (!string.IsNullOrWhiteSpace(Facility.FileLabel)) { @@ -138,9 +135,9 @@ public async Task OnPostAsync() } //for RN and HSI facilities, check for duplicate Facility Numbers - if ((Facility.FacilityTypeName == "RN" || Facility.FacilityTypeName == "HSI") && (await _repository.DuplicateFacilityNumberExists(Facility.FacilityNumber, Id, (Guid)Facility.FacilityTypeId))) - { - ModelState.AddModelError("Facility.FacilityNumber", "Facility Number entered already exists for a different Facility"); + if ((Facility.FacilityTypeName == "RN" || Facility.FacilityTypeName == "HSI") && (await _repository.DuplicateFacilityNumberExists(Facility.FacilityNumber, Id, (Guid)Facility.FacilityTypeId))) + { + ModelState.AddModelError("Facility.FacilityNumber", "Facility Number entered already exists for a different Facility"); } if (!ModelState.IsValid) @@ -149,24 +146,24 @@ public async Task OnPostAsync() return Page(); } - if (!IsNotSiteMaintenanceUser || string.IsNullOrEmpty(Facility.FileLabel)) - { - var mapSearchSpec = new FacilityMapSpec - { - Latitude = Facility.Latitude, - Longitude = Facility.Longitude, - Radius = 0.5m, - }; - - NearbyFacilities = await _repository.GetFacilityListAsync(mapSearchSpec); - - if (NearbyFacilities != null && NearbyFacilities.Count > 0) - { - ConfirmedFacilityFileLabel = string.IsNullOrEmpty(Facility.FileLabel) ? "Choose" : Facility.FileLabel; - await PopulateSelectsAsync(); - ConfirmFacility = true; - return Page(); - } + if (!IsNotSiteMaintenanceUser || string.IsNullOrEmpty(Facility.FileLabel)) + { + var mapSearchSpec = new FacilityMapSpec + { + Latitude = Facility.Latitude, + Longitude = Facility.Longitude, + Radius = 0.5m, + }; + + NearbyFacilities = await _repository.GetFacilityListAsync(mapSearchSpec); + + if (NearbyFacilities != null && NearbyFacilities.Count > 0) + { + ConfirmedFacilityFileLabel = string.IsNullOrEmpty(Facility.FileLabel) ? "Choose" : Facility.FileLabel; + await PopulateSelectsAsync(); + ConfirmFacility = true; + return Page(); + } } try @@ -176,12 +173,12 @@ public async Task OnPostAsync() catch (DbUpdateConcurrencyException) { if (!await _repository.FacilityExistsAsync(Id)) - { - // Facility not found in DB - TempData?.SetDisplayMessage(Context.Danger, "Unable to update Facility. Does not exist in Database or connection issues."); + { + // Facility not found in DB + TempData?.SetDisplayMessage(Context.Danger, "Unable to update Facility. Does not exist in Database or connection issues."); return RedirectToPage("./Index"); - } - // Facility found in DB, but unable to update + } + // Facility found in DB, but unable to update TempData?.SetDisplayMessage(Context.Danger, "Unable to update Facility. Database connection or data issue. Check connection and try again."); return RedirectToPage("./Details", new { Id }); } @@ -198,39 +195,39 @@ public async Task OnPostConfirmAsync() return Page(); } - if (ConfirmedFacilityFileLabel == "Choose") - { - var mapSearchSpec = new FacilityMapSpec - { - Latitude = Facility.Latitude, - Longitude = Facility.Longitude, - Radius = 0.5m, - }; - - NearbyFacilities = await _repository.GetFacilityListAsync(mapSearchSpec); - - if (NearbyFacilities != null && NearbyFacilities.Count > 0) - { - ConfirmedFacilityFileLabel = string.IsNullOrEmpty(Facility.FileLabel) ? "Choose" : Facility.FileLabel; - await PopulateSelectsAsync(); - ConfirmFacility = true; - return Page(); - } + if (ConfirmedFacilityFileLabel == "Choose") + { + var mapSearchSpec = new FacilityMapSpec + { + Latitude = Facility.Latitude, + Longitude = Facility.Longitude, + Radius = 0.5m, + }; + + NearbyFacilities = await _repository.GetFacilityListAsync(mapSearchSpec); + + if (NearbyFacilities != null && NearbyFacilities.Count > 0) + { + ConfirmedFacilityFileLabel = string.IsNullOrEmpty(Facility.FileLabel) ? "Choose" : Facility.FileLabel; + await PopulateSelectsAsync(); + ConfirmFacility = true; + return Page(); + } } Facility.FileLabel = ConfirmedFacilityFileLabel; Facility.TrimAll(); - // Validate User input based on Business Logic - // Populate FacilityTypeName to use for User Input validity - Facility.FacilityTypeName = await _repositoryType.GetFacilityTypeNameAsync(Facility.FacilityTypeId); - Facility.FacilityStatusName = await _repositoryStatus.GetFacilityStatusNameAsync(Facility.FacilityStatusId); - - ModelErrorCollection errors = FormValidationHelper.ValidateFacilityEditForm(Facility); + // Validate User input based on Business Logic + // Populate FacilityTypeName to use for User Input validity + Facility.FacilityTypeName = await _repositoryType.GetFacilityTypeNameAsync(Facility.FacilityTypeId); + Facility.FacilityStatusName = await _repositoryStatus.GetFacilityStatusNameAsync(Facility.FacilityStatusId); + + ModelErrorCollection errors = FormValidationHelper.ValidateFacilityEditForm(Facility); if (errors.Count > 0) { - foreach (ModelError error in errors) + foreach (ModelError error in errors) { string[] errMsg = error.ErrorMessage.Split("^"); ModelState.AddModelError(errMsg[0].ToString(), errMsg[1].ToString()); diff --git a/FMS/Pages/Facilities/EditRetentionRecord.cshtml.cs b/FMS/Pages/Facilities/EditRetentionRecord.cshtml.cs index e1f502fa..31264958 100644 --- a/FMS/Pages/Facilities/EditRetentionRecord.cshtml.cs +++ b/FMS/Pages/Facilities/EditRetentionRecord.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Facilities/Index.cshtml.cs b/FMS/Pages/Facilities/Index.cshtml.cs index c8383266..457df4b9 100644 --- a/FMS/Pages/Facilities/Index.cshtml.cs +++ b/FMS/Pages/Facilities/Index.cshtml.cs @@ -8,10 +8,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Pages.Facilities { diff --git a/FMS/Pages/Facilities/Map.cshtml.cs b/FMS/Pages/Facilities/Map.cshtml.cs index 5e2c00d5..982a26f2 100644 --- a/FMS/Pages/Facilities/Map.cshtml.cs +++ b/FMS/Pages/Facilities/Map.cshtml.cs @@ -4,10 +4,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Pages.Facilities { @@ -39,80 +35,80 @@ public class MapModel : PageModel [BindProperty] public FacilityMapSpec ExportSpec { get; set; } - public MapModel( - IFacilityRepository repository, - ISelectListHelper listHelper) - { - _repository = repository; - _listHelper = listHelper; + public MapModel( + IFacilityRepository repository, + ISelectListHelper listHelper) + { + _repository = repository; + _listHelper = listHelper; } public async Task OnGet(Guid? id) { - if (id != null) - { - var map = await _repository.GetFacilityAsync(id.Value); - Spec = new FacilityMapSpec(map); - Spec.Radius = 3m; - Spec.Output = "1"; + if (id != null) + { + var map = await _repository.GetFacilityAsync(id.Value); + Spec = new FacilityMapSpec(map); + Spec.Radius = 3m; + Spec.Output = "1"; } - await PopulateSelectsAsync(); + await PopulateSelectsAsync(); return Page(); } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S3776:Cognitive Complexity of methods should not be too high", Justification = "")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S3776:Cognitive Complexity of methods should not be too high", Justification = "")] public async Task OnGetSearchAsync(FacilityMapSpec spec) { - if (!ModelState.IsValid) - { - await PopulateSelectsAsync(); - return Page(); + if (!ModelState.IsValid) + { + await PopulateSelectsAsync(); + return Page(); } - // Make sure GeoCoordinates are withing the State of Georgia or both Zero - GeoCoordHelper.CoordinateValidation EnumVal = GeoCoordHelper.ValidateCoordinatesMap(spec.Latitude, spec.Longitude); - string ValidationString = GeoCoordHelper.GetDescription(EnumVal); - - if (EnumVal != GeoCoordHelper.CoordinateValidation.Valid) - { - if (EnumVal == GeoCoordHelper.CoordinateValidation.LongNotInGeorgia) - { - ModelState.AddModelError("spec.Longitude", ValidationString); - } + // Make sure GeoCoordinates are withing the State of Georgia or both Zero + GeoCoordHelper.CoordinateValidation EnumVal = GeoCoordHelper.ValidateCoordinatesMap(spec.Latitude, spec.Longitude); + string ValidationString = GeoCoordHelper.GetDescription(EnumVal); + + if (EnumVal != GeoCoordHelper.CoordinateValidation.Valid) + { + if (EnumVal == GeoCoordHelper.CoordinateValidation.LongNotInGeorgia) + { + ModelState.AddModelError("spec.Longitude", ValidationString); + } else { - ModelState.AddModelError("spec.Latitude", ValidationString); - } - } - - //Radius is limited to values in Select list. - if (!new[] { 0.25m, 0.5m, 1m, 3m, 5m }.Contains(spec.Radius)) spec.Radius = 0.25m; - + ModelState.AddModelError("spec.Latitude", ValidationString); + } + } + + //Radius is limited to values in Select list. + if (!new[] { 0.25m, 0.5m, 1m, 3m, 5m }.Contains(spec.Radius)) spec.Radius = 0.25m; + if (ModelState.IsValid) - { - if (!string.IsNullOrEmpty(spec.GeocodeLat) && !string.IsNullOrEmpty(spec.GeocodeLng)) - { - spec.Latitude = decimal.Parse(spec.GeocodeLat); - spec.Longitude = decimal.Parse(spec.GeocodeLng); - } - - if (spec.Latitude > 0 && spec.Longitude < 0) - { - FacilityList = await _repository.GetFacilityListAsync(spec); - - if (FacilityList == null || FacilityList.Count == 0) - { - ShowNone = true; - } - - if (spec.Output == "1") - { - ShowMap = true; - } - - if (spec.Output == "2" && FacilityList is { Count: > 0 }) - { - ShowTable = true; + { + if (!string.IsNullOrEmpty(spec.GeocodeLat) && !string.IsNullOrEmpty(spec.GeocodeLng)) + { + spec.Latitude = decimal.Parse(spec.GeocodeLat); + spec.Longitude = decimal.Parse(spec.GeocodeLng); + } + + if (spec.Latitude > 0 && spec.Longitude < 0) + { + FacilityList = await _repository.GetFacilityListAsync(spec); + + if (FacilityList == null || FacilityList.Count == 0) + { + ShowNone = true; + } + + if (spec.Output == "1") + { + ShowMap = true; + } + + if (spec.Output == "2" && FacilityList is { Count: > 0 }) + { + ShowTable = true; } } else @@ -149,9 +145,9 @@ public async Task OnPostAsync() return File(facilityMapDetail.ExportExcelAsByteArray(ExportHelper.ReportType.Map), "application/vnd.ms.excel", fileName); } - private async Task PopulateSelectsAsync() - { - FacilityTypes = await _listHelper.FacilityTypesSelectListAsync(); + private async Task PopulateSelectsAsync() + { + FacilityTypes = await _listHelper.FacilityTypesSelectListAsync(); } } } \ No newline at end of file diff --git a/FMS/Pages/Facilities/Undelete.cshtml.cs b/FMS/Pages/Facilities/Undelete.cshtml.cs index 6078e5d5..ed8daff5 100644 --- a/FMS/Pages/Facilities/Undelete.cshtml.cs +++ b/FMS/Pages/Facilities/Undelete.cshtml.cs @@ -1,6 +1,4 @@ -using System; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; using FMS.Platform.Extensions; diff --git a/FMS/Pages/Files/Details.cshtml.cs b/FMS/Pages/Files/Details.cshtml.cs index cb3b4ebb..2992372c 100644 --- a/FMS/Pages/Files/Details.cshtml.cs +++ b/FMS/Pages/Files/Details.cshtml.cs @@ -1,5 +1,4 @@ -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Repositories; using FMS.Platform.Extensions; using Microsoft.AspNetCore.Mvc; diff --git a/FMS/Pages/Files/Index.cshtml.cs b/FMS/Pages/Files/Index.cshtml.cs index 0a91a806..3d334d24 100644 --- a/FMS/Pages/Files/Index.cshtml.cs +++ b/FMS/Pages/Files/Index.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Data; using FMS.Domain.Dto; using FMS.Domain.Dto.PaginatedList; diff --git a/FMS/Pages/GroundwaterScore/Edit.cshtml b/FMS/Pages/GroundwaterScore/Edit.cshtml index ef81cd4c..7366499c 100644 --- a/FMS/Pages/GroundwaterScore/Edit.cshtml +++ b/FMS/Pages/GroundwaterScore/Edit.cshtml @@ -1,6 +1,4 @@ @page "{id:Guid?}" -@using FMS.Pages.GroundwaterScore -@using FMS.Domain.Entities.Users @model FMS.Pages.GroundwaterScore.EditModel @section Scripts diff --git a/FMS/Pages/GroundwaterScore/Edit.cshtml.cs b/FMS/Pages/GroundwaterScore/Edit.cshtml.cs index 62ea3415..570f747c 100644 --- a/FMS/Pages/GroundwaterScore/Edit.cshtml.cs +++ b/FMS/Pages/GroundwaterScore/Edit.cshtml.cs @@ -6,8 +6,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using System; -using System.Threading.Tasks; namespace FMS.Pages.GroundwaterScore { diff --git a/FMS/Pages/HsrpFacilityProperties/Edit.cshtml b/FMS/Pages/HsrpFacilityProperties/Edit.cshtml index 4cf01a94..d34256a4 100644 --- a/FMS/Pages/HsrpFacilityProperties/Edit.cshtml +++ b/FMS/Pages/HsrpFacilityProperties/Edit.cshtml @@ -1,6 +1,4 @@ @page "{id:Guid?}" -@using FMS.Pages.HsrpFacilityProperties -@using FMS.Domain.Entities.Users @model FMS.Pages.HsrpFacilityProperties.EditModel @section Scripts diff --git a/FMS/Pages/HsrpFacilityProperties/Edit.cshtml.cs b/FMS/Pages/HsrpFacilityProperties/Edit.cshtml.cs index 696ff7e7..dca35a78 100644 --- a/FMS/Pages/HsrpFacilityProperties/Edit.cshtml.cs +++ b/FMS/Pages/HsrpFacilityProperties/Edit.cshtml.cs @@ -6,8 +6,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Threading.Tasks; namespace FMS.Pages.HsrpFacilityProperties { diff --git a/FMS/Pages/Location/Edit.cshtml b/FMS/Pages/Location/Edit.cshtml index 6f44ac49..a1d2f907 100644 --- a/FMS/Pages/Location/Edit.cshtml +++ b/FMS/Pages/Location/Edit.cshtml @@ -1,6 +1,4 @@ @page "{id:Guid?}" -@using FMS.Pages.Location -@using FMS.Domain.Entities.Users @model FMS.Pages.Location.EditModel @section Scripts diff --git a/FMS/Pages/Location/Edit.cshtml.cs b/FMS/Pages/Location/Edit.cshtml.cs index 2e218c5a..991d2cb6 100644 --- a/FMS/Pages/Location/Edit.cshtml.cs +++ b/FMS/Pages/Location/Edit.cshtml.cs @@ -6,8 +6,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Threading.Tasks; namespace FMS.Pages.Location { diff --git a/FMS/Pages/Maintenance/AbandonedInactive/Add.cshtml.cs b/FMS/Pages/Maintenance/AbandonedInactive/Add.cshtml.cs index da29aabc..02a22648 100644 --- a/FMS/Pages/Maintenance/AbandonedInactive/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/AbandonedInactive/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/AbandonedInactive/Edit.cshtml.cs b/FMS/Pages/Maintenance/AbandonedInactive/Edit.cshtml.cs index 00841850..821aa610 100644 --- a/FMS/Pages/Maintenance/AbandonedInactive/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/AbandonedInactive/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/AbandonedInactive/Index.cshtml.cs b/FMS/Pages/Maintenance/AbandonedInactive/Index.cshtml.cs index 984379d0..32bd8ecc 100644 --- a/FMS/Pages/Maintenance/AbandonedInactive/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/AbandonedInactive/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/ActionTaken/Add.cshtml.cs b/FMS/Pages/Maintenance/ActionTaken/Add.cshtml.cs index b7326361..3dc6890c 100644 --- a/FMS/Pages/Maintenance/ActionTaken/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/ActionTaken/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/ActionTaken/Edit.cshtml.cs b/FMS/Pages/Maintenance/ActionTaken/Edit.cshtml.cs index 2447b8bc..c06a4c40 100644 --- a/FMS/Pages/Maintenance/ActionTaken/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/ActionTaken/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/ActionTaken/Index.cshtml.cs b/FMS/Pages/Maintenance/ActionTaken/Index.cshtml.cs index 4f98279a..4be415c3 100644 --- a/FMS/Pages/Maintenance/ActionTaken/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/ActionTaken/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/AllowedActionTaken/Edit.cshtml.cs b/FMS/Pages/Maintenance/AllowedActionTaken/Edit.cshtml.cs index 84543758..8a8b3e8f 100644 --- a/FMS/Pages/Maintenance/AllowedActionTaken/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/AllowedActionTaken/Edit.cshtml.cs @@ -6,10 +6,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Pages.Maintenance.AllowedActionTaken { diff --git a/FMS/Pages/Maintenance/AllowedActionTaken/Index.cshtml.cs b/FMS/Pages/Maintenance/AllowedActionTaken/Index.cshtml.cs index fddad732..61ba7bc9 100644 --- a/FMS/Pages/Maintenance/AllowedActionTaken/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/AllowedActionTaken/Index.cshtml.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/BudgetCode/Add.cshtml.cs b/FMS/Pages/Maintenance/BudgetCode/Add.cshtml.cs index b480b838..ebc42df4 100644 --- a/FMS/Pages/Maintenance/BudgetCode/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/BudgetCode/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml.cs b/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml.cs index 931396e3..fb122710 100644 --- a/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/BudgetCode/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/BudgetCode/Index.cshtml.cs b/FMS/Pages/Maintenance/BudgetCode/Index.cshtml.cs index b242be99..aad5fbc8 100644 --- a/FMS/Pages/Maintenance/BudgetCode/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/BudgetCode/Index.cshtml.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; using FMS.Platform.Extensions; diff --git a/FMS/Pages/Maintenance/Chemical/Add.cshtml.cs b/FMS/Pages/Maintenance/Chemical/Add.cshtml.cs index d5add865..573cfd35 100644 --- a/FMS/Pages/Maintenance/Chemical/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/Chemical/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/Chemical/Edit.cshtml.cs b/FMS/Pages/Maintenance/Chemical/Edit.cshtml.cs index df59aeeb..c6d95f58 100644 --- a/FMS/Pages/Maintenance/Chemical/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/Chemical/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/Chemical/Index.cshtml.cs b/FMS/Pages/Maintenance/Chemical/Index.cshtml.cs index fdb4e555..04371328 100644 --- a/FMS/Pages/Maintenance/Chemical/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/Chemical/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml.cs b/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml.cs index 487fe01e..bd07b059 100644 --- a/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/ComplianceOfficer/Index.cshtml.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; using FMS.Platform.Extensions; diff --git a/FMS/Pages/Maintenance/ContactType/Add.cshtml.cs b/FMS/Pages/Maintenance/ContactType/Add.cshtml.cs index 6f727cff..1b89ab31 100644 --- a/FMS/Pages/Maintenance/ContactType/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/ContactType/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/ContactType/Edit.cshtml.cs b/FMS/Pages/Maintenance/ContactType/Edit.cshtml.cs index 157b58c9..72da1f76 100644 --- a/FMS/Pages/Maintenance/ContactType/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/ContactType/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/ContactType/Index.cshtml.cs b/FMS/Pages/Maintenance/ContactType/Index.cshtml.cs index 9dc00877..e3de8959 100644 --- a/FMS/Pages/Maintenance/ContactType/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/ContactType/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/EventContractor/Add.cshtml.cs b/FMS/Pages/Maintenance/EventContractor/Add.cshtml.cs index 5ac1b7e5..7e0b26b2 100644 --- a/FMS/Pages/Maintenance/EventContractor/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/EventContractor/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/EventContractor/Edit.cshtml.cs b/FMS/Pages/Maintenance/EventContractor/Edit.cshtml.cs index 9dfcc703..9968c47e 100644 --- a/FMS/Pages/Maintenance/EventContractor/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/EventContractor/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/EventContractor/Index.cshtml.cs b/FMS/Pages/Maintenance/EventContractor/Index.cshtml.cs index fbd00eb5..6f4bc940 100644 --- a/FMS/Pages/Maintenance/EventContractor/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/EventContractor/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/EventType/Add.cshtml.cs b/FMS/Pages/Maintenance/EventType/Add.cshtml.cs index 05a66ebb..ffc6aa7d 100644 --- a/FMS/Pages/Maintenance/EventType/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/EventType/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/EventType/Edit.cshtml.cs b/FMS/Pages/Maintenance/EventType/Edit.cshtml.cs index aaaad63b..fba572bf 100644 --- a/FMS/Pages/Maintenance/EventType/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/EventType/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/EventType/Index.cshtml.cs b/FMS/Pages/Maintenance/EventType/Index.cshtml.cs index f9ef7e37..492e15ac 100644 --- a/FMS/Pages/Maintenance/EventType/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/EventType/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml.cs b/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml.cs index 50e93068..44dc726d 100644 --- a/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/FacilityStatus/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml.cs b/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml.cs index 5bd80d1c..6f333f62 100644 --- a/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/FacilityStatus/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml.cs b/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml.cs index c446c65f..c0ca89fb 100644 --- a/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/FacilityStatus/Index.cshtml.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; using FMS.Platform.Extensions; diff --git a/FMS/Pages/Maintenance/FacilityType/Add.cshtml.cs b/FMS/Pages/Maintenance/FacilityType/Add.cshtml.cs index 0d0ea0a4..d8b30435 100644 --- a/FMS/Pages/Maintenance/FacilityType/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/FacilityType/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/FacilityType/Edit.cshtml.cs b/FMS/Pages/Maintenance/FacilityType/Edit.cshtml.cs index 83731bcd..3f6c4766 100644 --- a/FMS/Pages/Maintenance/FacilityType/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/FacilityType/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/FacilityType/Index.cshtml.cs b/FMS/Pages/Maintenance/FacilityType/Index.cshtml.cs index c0a08e30..e48f73f8 100644 --- a/FMS/Pages/Maintenance/FacilityType/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/FacilityType/Index.cshtml.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; using FMS.Platform.Extensions; diff --git a/FMS/Pages/Maintenance/FundingSource/Add.cshtml.cs b/FMS/Pages/Maintenance/FundingSource/Add.cshtml.cs index b74e6a8f..6cab3489 100644 --- a/FMS/Pages/Maintenance/FundingSource/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/FundingSource/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/FundingSource/Edit.cshtml.cs b/FMS/Pages/Maintenance/FundingSource/Edit.cshtml.cs index 1c7c7a6a..2aefa238 100644 --- a/FMS/Pages/Maintenance/FundingSource/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/FundingSource/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/FundingSource/Index.cshtml.cs b/FMS/Pages/Maintenance/FundingSource/Index.cshtml.cs index 612ad556..ffa0d3c0 100644 --- a/FMS/Pages/Maintenance/FundingSource/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/FundingSource/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/GapsAssessment/Add.cshtml.cs b/FMS/Pages/Maintenance/GapsAssessment/Add.cshtml.cs index e522bccc..dd43149b 100644 --- a/FMS/Pages/Maintenance/GapsAssessment/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/GapsAssessment/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/GapsAssessment/Edit.cshtml.cs b/FMS/Pages/Maintenance/GapsAssessment/Edit.cshtml.cs index 70218ebe..c539b5cb 100644 --- a/FMS/Pages/Maintenance/GapsAssessment/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/GapsAssessment/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/GapsAssessment/Index.cshtml.cs b/FMS/Pages/Maintenance/GapsAssessment/Index.cshtml.cs index 211bffe3..3fed2cce 100644 --- a/FMS/Pages/Maintenance/GapsAssessment/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/GapsAssessment/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/GroundwaterStatus/Add.cshtml.cs b/FMS/Pages/Maintenance/GroundwaterStatus/Add.cshtml.cs index 38b13c0a..b8d3ae63 100644 --- a/FMS/Pages/Maintenance/GroundwaterStatus/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/GroundwaterStatus/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/GroundwaterStatus/Edit.cshtml.cs b/FMS/Pages/Maintenance/GroundwaterStatus/Edit.cshtml.cs index 71a5c07a..5192b73e 100644 --- a/FMS/Pages/Maintenance/GroundwaterStatus/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/GroundwaterStatus/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/GroundwaterStatus/Index.cshtml.cs b/FMS/Pages/Maintenance/GroundwaterStatus/Index.cshtml.cs index 55fe8521..f2daa5b6 100644 --- a/FMS/Pages/Maintenance/GroundwaterStatus/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/GroundwaterStatus/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/LocationClass/Add.cshtml.cs b/FMS/Pages/Maintenance/LocationClass/Add.cshtml.cs index d875da49..740a5984 100644 --- a/FMS/Pages/Maintenance/LocationClass/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/LocationClass/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/LocationClass/Edit.cshtml.cs b/FMS/Pages/Maintenance/LocationClass/Edit.cshtml.cs index aea89150..8bb473e6 100644 --- a/FMS/Pages/Maintenance/LocationClass/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/LocationClass/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/LocationClass/Index.cshtml.cs b/FMS/Pages/Maintenance/LocationClass/Index.cshtml.cs index 4122846d..fdd41618 100644 --- a/FMS/Pages/Maintenance/LocationClass/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/LocationClass/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml.cs b/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml.cs index b3bfb8de..e2b82837 100644 --- a/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/OrganizationalUnit/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/OrganizationalUnit/Edit.cshtml.cs b/FMS/Pages/Maintenance/OrganizationalUnit/Edit.cshtml.cs index ee402393..284d1e50 100644 --- a/FMS/Pages/Maintenance/OrganizationalUnit/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/OrganizationalUnit/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/OrganizationalUnit/Index.cshtml.cs b/FMS/Pages/Maintenance/OrganizationalUnit/Index.cshtml.cs index 5c3c2c68..32427264 100644 --- a/FMS/Pages/Maintenance/OrganizationalUnit/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/OrganizationalUnit/Index.cshtml.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using FMS.Domain.Dto; +using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; using FMS.Platform.Extensions; diff --git a/FMS/Pages/Maintenance/OverallStatus/Add.cshtml.cs b/FMS/Pages/Maintenance/OverallStatus/Add.cshtml.cs index 1fc6921b..21428708 100644 --- a/FMS/Pages/Maintenance/OverallStatus/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/OverallStatus/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/OverallStatus/Edit.cshtml.cs b/FMS/Pages/Maintenance/OverallStatus/Edit.cshtml.cs index d9e95341..810d3822 100644 --- a/FMS/Pages/Maintenance/OverallStatus/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/OverallStatus/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/OverallStatus/Index.cshtml.cs b/FMS/Pages/Maintenance/OverallStatus/Index.cshtml.cs index 5aefcfd9..e206da5a 100644 --- a/FMS/Pages/Maintenance/OverallStatus/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/OverallStatus/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/ParcelType/Add.cshtml.cs b/FMS/Pages/Maintenance/ParcelType/Add.cshtml.cs index b50a811b..2d457dd4 100644 --- a/FMS/Pages/Maintenance/ParcelType/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/ParcelType/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/ParcelType/Edit.cshtml.cs b/FMS/Pages/Maintenance/ParcelType/Edit.cshtml.cs index 4a7f4f21..fa965d52 100644 --- a/FMS/Pages/Maintenance/ParcelType/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/ParcelType/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/ParcelType/Index.cshtml.cs b/FMS/Pages/Maintenance/ParcelType/Index.cshtml.cs index 4c85fb10..847da110 100644 --- a/FMS/Pages/Maintenance/ParcelType/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/ParcelType/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/SoilStatus/Add.cshtml.cs b/FMS/Pages/Maintenance/SoilStatus/Add.cshtml.cs index 1435180a..bee85451 100644 --- a/FMS/Pages/Maintenance/SoilStatus/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/SoilStatus/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/SoilStatus/Edit.cshtml.cs b/FMS/Pages/Maintenance/SoilStatus/Edit.cshtml.cs index 74f46275..49635161 100644 --- a/FMS/Pages/Maintenance/SoilStatus/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/SoilStatus/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/SoilStatus/Index.cshtml.cs b/FMS/Pages/Maintenance/SoilStatus/Index.cshtml.cs index 1666d9be..ab68eaee 100644 --- a/FMS/Pages/Maintenance/SoilStatus/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/SoilStatus/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/SourceStatus/Add.cshtml.cs b/FMS/Pages/Maintenance/SourceStatus/Add.cshtml.cs index 03e9efa0..b08b2fee 100644 --- a/FMS/Pages/Maintenance/SourceStatus/Add.cshtml.cs +++ b/FMS/Pages/Maintenance/SourceStatus/Add.cshtml.cs @@ -1,4 +1,3 @@ -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/SourceStatus/Edit.cshtml.cs b/FMS/Pages/Maintenance/SourceStatus/Edit.cshtml.cs index 5351fe52..7586d32e 100644 --- a/FMS/Pages/Maintenance/SourceStatus/Edit.cshtml.cs +++ b/FMS/Pages/Maintenance/SourceStatus/Edit.cshtml.cs @@ -1,5 +1,3 @@ -using System; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/Maintenance/SourceStatus/Index.cshtml.cs b/FMS/Pages/Maintenance/SourceStatus/Index.cshtml.cs index f9e2e396..485585f3 100644 --- a/FMS/Pages/Maintenance/SourceStatus/Index.cshtml.cs +++ b/FMS/Pages/Maintenance/SourceStatus/Index.cshtml.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; using FMS.Domain.Dto; using FMS.Domain.Entities.Users; using FMS.Domain.Repositories; diff --git a/FMS/Pages/OnsiteScore/Edit.cshtml b/FMS/Pages/OnsiteScore/Edit.cshtml index 6dca8ab4..a613b12c 100644 --- a/FMS/Pages/OnsiteScore/Edit.cshtml +++ b/FMS/Pages/OnsiteScore/Edit.cshtml @@ -1,6 +1,4 @@ @page "{id:Guid?}" -@using FMS.Pages.OnsiteScore -@using FMS.Domain.Entities.Users @model FMS.Pages.OnsiteScore.EditModel @section Scripts diff --git a/FMS/Pages/OnsiteScore/Edit.cshtml.cs b/FMS/Pages/OnsiteScore/Edit.cshtml.cs index b0372efe..af533fc7 100644 --- a/FMS/Pages/OnsiteScore/Edit.cshtml.cs +++ b/FMS/Pages/OnsiteScore/Edit.cshtml.cs @@ -6,8 +6,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using System; -using System.Threading.Tasks; namespace FMS.Pages.OnsiteScore { diff --git a/FMS/Pages/Parcel/Add.cshtml b/FMS/Pages/Parcel/Add.cshtml index d9330213..5a5d9e83 100644 --- a/FMS/Pages/Parcel/Add.cshtml +++ b/FMS/Pages/Parcel/Add.cshtml @@ -1,6 +1,4 @@ @page "{id:Guid?}" -@using FMS.Pages.Parcel -@using FMS.Domain.Entities.Users @model FMS.Pages.Parcel.AddModel @section Scripts diff --git a/FMS/Pages/Parcel/Add.cshtml.cs b/FMS/Pages/Parcel/Add.cshtml.cs index d6a8c342..877f8ccb 100644 --- a/FMS/Pages/Parcel/Add.cshtml.cs +++ b/FMS/Pages/Parcel/Add.cshtml.cs @@ -6,8 +6,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Threading.Tasks; namespace FMS.Pages.Parcel { diff --git a/FMS/Pages/Parcel/Edit.cshtml b/FMS/Pages/Parcel/Edit.cshtml index d0e7e0fe..ee3ac8fd 100644 --- a/FMS/Pages/Parcel/Edit.cshtml +++ b/FMS/Pages/Parcel/Edit.cshtml @@ -1,6 +1,4 @@ @page "{id:Guid?}" -@using FMS.Pages.Parcel -@using FMS.Domain.Entities.Users @model FMS.Pages.Parcel.EditModel @section Scripts { diff --git a/FMS/Pages/Parcel/Edit.cshtml.cs b/FMS/Pages/Parcel/Edit.cshtml.cs index c96467fc..d19e16ff 100644 --- a/FMS/Pages/Parcel/Edit.cshtml.cs +++ b/FMS/Pages/Parcel/Edit.cshtml.cs @@ -6,8 +6,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Threading.Tasks; namespace FMS.Pages.Parcel { diff --git a/FMS/Pages/Phone/Add.cshtml b/FMS/Pages/Phone/Add.cshtml index bcd40712..8fcb6f8a 100644 --- a/FMS/Pages/Phone/Add.cshtml +++ b/FMS/Pages/Phone/Add.cshtml @@ -1,6 +1,4 @@ @page "{id:Guid?}" -@using FMS.Pages.Phone -@using FMS.Domain.Entities.Users @model FMS.Pages.Phone.AddModel @section Scripts diff --git a/FMS/Pages/Phone/Add.cshtml.cs b/FMS/Pages/Phone/Add.cshtml.cs index ddce0633..1323079a 100644 --- a/FMS/Pages/Phone/Add.cshtml.cs +++ b/FMS/Pages/Phone/Add.cshtml.cs @@ -7,8 +7,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Threading.Tasks; namespace FMS.Pages.Phone { diff --git a/FMS/Pages/Phone/Edit.cshtml b/FMS/Pages/Phone/Edit.cshtml index 1b819703..2ebedfd4 100644 --- a/FMS/Pages/Phone/Edit.cshtml +++ b/FMS/Pages/Phone/Edit.cshtml @@ -1,6 +1,4 @@ @page "{id:Guid?}" -@using FMS.Pages.Phone -@using FMS.Domain.Entities.Users @model FMS.Pages.Phone.EditModel @section Scripts { diff --git a/FMS/Pages/Phone/Edit.cshtml.cs b/FMS/Pages/Phone/Edit.cshtml.cs index 82b95189..dc5b968e 100644 --- a/FMS/Pages/Phone/Edit.cshtml.cs +++ b/FMS/Pages/Phone/Edit.cshtml.cs @@ -7,8 +7,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; -using System; -using System.Threading.Tasks; namespace FMS.Pages.Phone { diff --git a/FMS/Pages/Reporting/AssignmentList/Index.cshtml b/FMS/Pages/Reporting/AssignmentList/Index.cshtml index 952a2878..6408a098 100644 --- a/FMS/Pages/Reporting/AssignmentList/Index.cshtml +++ b/FMS/Pages/Reporting/AssignmentList/Index.cshtml @@ -1,5 +1,4 @@ @page -@using FMS.Pages.Reporting.AssignmentList @model FMS.Pages.Reporting.AssignmentList.IndexModel @{ diff --git a/FMS/Pages/Reporting/AssignmentList/Index.cshtml.cs b/FMS/Pages/Reporting/AssignmentList/Index.cshtml.cs index c7c8bca1..818500eb 100644 --- a/FMS/Pages/Reporting/AssignmentList/Index.cshtml.cs +++ b/FMS/Pages/Reporting/AssignmentList/Index.cshtml.cs @@ -1,12 +1,7 @@ using FMS.Domain.Dto; using FMS.Domain.Repositories; -using FMS.Domain.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace FMS.Pages.Reporting.AssignmentList { diff --git a/FMS/Pages/Reporting/Delisted/Index.cshtml b/FMS/Pages/Reporting/Delisted/Index.cshtml index 58791bb6..71af7f77 100644 --- a/FMS/Pages/Reporting/Delisted/Index.cshtml +++ b/FMS/Pages/Reporting/Delisted/Index.cshtml @@ -1,5 +1,4 @@ @page -@using FMS.Pages.Reporting.Delisted @model FMS.Pages.Reporting.Delisted.IndexModel @{ diff --git a/FMS/Pages/Reporting/Delisted/Index.cshtml.cs b/FMS/Pages/Reporting/Delisted/Index.cshtml.cs index fc73918c..56c82683 100644 --- a/FMS/Pages/Reporting/Delisted/Index.cshtml.cs +++ b/FMS/Pages/Reporting/Delisted/Index.cshtml.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; namespace FMS.Pages.Reporting.Delisted diff --git a/FMS/Pages/Reporting/Events/Index.cshtml b/FMS/Pages/Reporting/Events/Index.cshtml index 00bb6d8e..b4b05e37 100644 --- a/FMS/Pages/Reporting/Events/Index.cshtml +++ b/FMS/Pages/Reporting/Events/Index.cshtml @@ -1,5 +1,4 @@ @page -@using FMS.Pages.Reporting.Events @model FMS.Pages.Reporting.Events.IndexModel @{ diff --git a/FMS/Pages/Reporting/Events/Index.cshtml.cs b/FMS/Pages/Reporting/Events/Index.cshtml.cs index bc477566..1f34dca1 100644 --- a/FMS/Pages/Reporting/Events/Index.cshtml.cs +++ b/FMS/Pages/Reporting/Events/Index.cshtml.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; namespace FMS.Pages.Reporting.Events diff --git a/FMS/Pages/Reporting/Index.cshtml.cs b/FMS/Pages/Reporting/Index.cshtml.cs index 5c77f108..f3e5cdfe 100644 --- a/FMS/Pages/Reporting/Index.cshtml.cs +++ b/FMS/Pages/Reporting/Index.cshtml.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; namespace FMS.Pages.Reporting diff --git a/FMS/Pages/Reporting/PAF/Index.cshtml b/FMS/Pages/Reporting/PAF/Index.cshtml index c92984ae..3301bad3 100644 --- a/FMS/Pages/Reporting/PAF/Index.cshtml +++ b/FMS/Pages/Reporting/PAF/Index.cshtml @@ -1,5 +1,4 @@ @page -@using FMS.Pages.Reporting.PAF @model FMS.Pages.Reporting.PAF.IndexModel @{ diff --git a/FMS/Pages/Reporting/PAF/Index.cshtml.cs b/FMS/Pages/Reporting/PAF/Index.cshtml.cs index eb8d85ac..06be1e02 100644 --- a/FMS/Pages/Reporting/PAF/Index.cshtml.cs +++ b/FMS/Pages/Reporting/PAF/Index.cshtml.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; namespace FMS.Pages.Reporting.PAF diff --git a/FMS/Pages/Reporting/SiteSummary/Index.cshtml b/FMS/Pages/Reporting/SiteSummary/Index.cshtml index df08b5af..0da9d63d 100644 --- a/FMS/Pages/Reporting/SiteSummary/Index.cshtml +++ b/FMS/Pages/Reporting/SiteSummary/Index.cshtml @@ -1,5 +1,4 @@ @page -@using FMS.Pages.Reporting.SiteSummary @model FMS.Pages.Reporting.SiteSummary.IndexModel @{ diff --git a/FMS/Pages/Reporting/SiteSummary/Index.cshtml.cs b/FMS/Pages/Reporting/SiteSummary/Index.cshtml.cs index 85b2f8d3..7cced8b2 100644 --- a/FMS/Pages/Reporting/SiteSummary/Index.cshtml.cs +++ b/FMS/Pages/Reporting/SiteSummary/Index.cshtml.cs @@ -1,4 +1,3 @@ -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; namespace FMS.Pages.Reporting.SiteSummary diff --git a/FMS/Pages/Score/Edit.cshtml b/FMS/Pages/Score/Edit.cshtml index 7255c3b3..d7b00186 100644 --- a/FMS/Pages/Score/Edit.cshtml +++ b/FMS/Pages/Score/Edit.cshtml @@ -1,6 +1,4 @@ @page "{id:Guid?}" -@using FMS.Pages.Score -@using FMS.Domain.Entities.Users @model FMS.Pages.Score.EditModel @section Scripts diff --git a/FMS/Pages/Score/Edit.cshtml.cs b/FMS/Pages/Score/Edit.cshtml.cs index 25941265..25712397 100644 --- a/FMS/Pages/Score/Edit.cshtml.cs +++ b/FMS/Pages/Score/Edit.cshtml.cs @@ -4,8 +4,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -using System; -using System.Threading.Tasks; namespace FMS.Pages.Score { diff --git a/FMS/Pages/Shared/_HSIMenuPartial.cshtml b/FMS/Pages/Shared/_HSIMenuPartial.cshtml index cfb3227f..cbb80600 100644 --- a/FMS/Pages/Shared/_HSIMenuPartial.cshtml +++ b/FMS/Pages/Shared/_HSIMenuPartial.cshtml @@ -1,6 +1,4 @@ -@using FMS.Domain.Entities.Users - -