Merge pull request #1388 from Artsdatabanken/test

Bugfix - filters
Artsdatabanken · Jan 26, 2024 · 2008960 · 2008960
2 parents 89e2d51 + bc785cf
commit 2008960
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/Assessments.Frontend.Web/Infrastructure/AlienSpecies/FilterItemHelpers.cs b/Assessments.Frontend.Web/Infrastructure/AlienSpecies/FilterItemHelpers.cs
@@ -1435,8 +1435,8 @@ public class SpeciesStatus
             },
             new()
             {
-                Name = AlienSpeciesAssessment2023SpeciesStatus.A.DisplayName(),
-                NameShort = nameof(AlienSpeciesAssessment2023SpeciesStatus.A)
+                Name = AlienSpeciesAssessment2023SpeciesStatus.Abroad.DisplayName(),
+                NameShort = nameof(AlienSpeciesAssessment2023SpeciesStatus.Abroad)
             }
         };
 

diff --git a/Assessments.Frontend.Web/Infrastructure/Helpers.cs b/Assessments.Frontend.Web/Infrastructure/Helpers.cs
@@ -421,7 +421,7 @@ public class AlienSpeciesSpeciesStatusComparer : IComparer<string>
             AlienSpeciesAssessment2023SpeciesStatus.C0.ToString(),
             AlienSpeciesAssessment2023SpeciesStatus.B2.ToString(),
             AlienSpeciesAssessment2023SpeciesStatus.B1.ToString(),
-            AlienSpeciesAssessment2023SpeciesStatus.A.ToString()
+            AlienSpeciesAssessment2023SpeciesStatus.Abroad.ToString()
         };
 
         public int Compare(string x, string y)

diff --git a/Assessments.Frontend.Web/Infrastructure/RedlistSpecies/FilterItemHelpers.cs b/Assessments.Frontend.Web/Infrastructure/RedlistSpecies/FilterItemHelpers.cs
@@ -294,8 +294,8 @@ public class RedlistSpeciesGroups
             },
             new()
             {
-                Name = "Larver",
-                NameShort = "Larver",
+                Name = "Laver",
+                NameShort = "Laver",
             },
             new()
             {

diff --git a/Assessments.Frontend.Web/Views/AlienSpecies/2023/AssessmentPartials/_KnowMore.cshtml b/Assessments.Frontend.Web/Views/AlienSpecies/2023/AssessmentPartials/_KnowMore.cshtml
@@ -27,7 +27,7 @@
     string GetSpeciesStatusText()
     {
         var text = $"Den vurderte {Helpers.FixSpeciesLevel("{art}en", Model.Assessment.ScientificName.ScientificNameRank)} ";
-        if (Model.Assessment.SpeciesStatus == AlienSpeciesAssessment2023SpeciesStatus.A)
+        if (Model.Assessment.SpeciesStatus == AlienSpeciesAssessment2023SpeciesStatus.Abroad)
             return $"{text} forekommer ikke {areaText}.";
         if (Model.Assessment.SpeciesStatus == AlienSpeciesAssessment2023SpeciesStatus.C3)
             return $"{text} {Model.Assessment.SpeciesStatus.Description()}. Etter introduksjon har {Helpers.FixSpeciesLevel("{art}en", Model.Assessment.ScientificName.ScientificNameRank)} selv spredd seg til minst ti forekomster der den er etablert.";

diff --git a/Assessments.Mapping/AlienSpecies/Model/Enums/AlienSpeciesAssessment2023SpeciesStatus.cs b/Assessments.Mapping/AlienSpecies/Model/Enums/AlienSpeciesAssessment2023SpeciesStatus.cs
@@ -11,7 +11,7 @@ public enum AlienSpeciesAssessment2023SpeciesStatus
 
         [Display(Name = "Ikke i Norge")]
         [Description("ikke forekommer i Norge")]
-        A,
+        Abroad,
 
         [Display(Name = "Innendørs")]
         [Description("forekommer innendørs eller i lukkede installasjoner")]

diff --git a/Assessments.Mapping/AlienSpecies/Profiles/AlienSpeciesAssessment2023Profile.cs b/Assessments.Mapping/AlienSpecies/Profiles/AlienSpeciesAssessment2023Profile.cs
@@ -233,7 +233,11 @@ public AlienSpeciesAssessment2023Profile()
                 .ForMember(dest => dest.AreaOfOccupancyInStronglyAlteredEcosystems, opt => opt.MapFrom(src => src.RiskAssessment.SpreadHistoryDomesticAreaInStronglyChangedNatureTypes.HasValue ? "Value" + src.RiskAssessment.SpreadHistoryDomesticAreaInStronglyChangedNatureTypes.ToString() : "Value0"))
                 .ForMember(dest => dest.AllSubTaxaAssessedSeparatelyDescription, opt => opt.MapFrom(src => src.AllSubTaxaAssessedSeparatelyDescription.StripUnwantedHtml()))
                 .ForMember(dest => dest.HybridWithoutOwnRiskAssessmentDescription, opt => opt.MapFrom(src => src.IsHybridWithoutOwnRiskAssessmentDescription.StripUnwantedHtml()))
-                .ForMember(dest => dest.SpeciesStatus, opt => opt.PreCondition(src => src.AlienSpeciesCategory != AlienSpeciecAssessment2023AlienSpeciesCategory.NotAlienSpecie.ToString() && src.SpeciesStatus is not null))
+                .ForMember(dest => dest.SpeciesStatus, opt =>
+                {
+                    opt.PreCondition(src => src.AlienSpeciesCategory != AlienSpeciecAssessment2023AlienSpeciesCategory.NotAlienSpecie.ToString() && src.SpeciesStatus is not null);
+                    opt.MapFrom(x => x.SpeciesStatus == "A" ? AlienSpeciesAssessment2023SpeciesStatus.Abroad.ToString() : x.SpeciesStatus);
+                })
                 .ForMember(dest => dest.CoastLineSections, opt => opt.PreCondition(src => src.AlienSpeciesCategory == AlienSpeciecAssessment2023AlienSpeciesCategory.AlienSpecie.ToString() && src.CoastLineSections.Any(x => x.Skagerrak || x.None || x.OpenCoastLine)))
                 .ForMember(dest => dest.CurrentBioClimateZones, opt => opt.PreCondition(src => src.AlienSpeciesCategory == AlienSpeciecAssessment2023AlienSpeciesCategory.AlienSpecie.ToString() && src.CurrentBioClimateZones.Any(x => x.StrongOceanic || x.ClearOceanic || x.WeakOceanic || x.TransferSection || x.WeakContinental) && src.Terrestrial))
                 .ForMember(dest => dest.ArcticBioClimateZones, opt => opt.PreCondition(src => src.AlienSpeciesCategory == AlienSpeciecAssessment2023AlienSpeciesCategory.AlienSpecie.ToString() && src.ArcticBioClimateZones.Any(x => x.WeakOceanic || x.TransferSection || x.WeakContinental || x.ClearContinental)))