Fix filter labeling (#1699)

Author: MiraGeowerkstatt

CHANGELOG.md

@@ -30,6 +30,7 @@
 - There was an internal error alert when navigating back from the borehole detail to the borehole table in anonymous mode.
 - The responsive design of the coordinate segment in the detail view was broken.
 - When clicking the select all checkbox in the borehole table, only the boreholes on the current page were selected.
+- Some filter chips were missing translations or where not displayed correctly.
 
 ## v2.1.870 - 2024-09-27
 

src/client/public/locale/de/common.json

@@ -212,6 +212,8 @@
   "from": "von",
   "fromDepthMasl": "Von Tiefe [m ü.M.]",
   "fromdepth": "Von Tiefe [m MD]",
+  "fromdepth_from": "Von Tiefe [m MD](von)",
+  "fromdepth_to": "Von Tiefe [m MD](bis)",
   "fromdiameter": "von Durchmesser",
   "fromelevation": "von Höhe",
   "general": "Generell",
@@ -368,10 +370,13 @@
   "publish": "Veröffentlichen",
   "purpose": "Bohrzweck",
   "qt_depth": "+/- Bohrlochlänge [m MD]",
+  "qt_reference_elevation": "+/- Referenz Ansatzhöhe [m]",
   "qt_total_depth_tvd": "+/- Bohrendteufe [m TVD]",
   "quantity": "Menge",
   "reference_elevation": "Referenz Ansatzhöhe [m ü.M.]",
+  "reference_elevation_from": "Referenz Ansatzhöhe (von)",
   "reference_elevation_qt": "+/- Referenz Ansatzhöhe [m]",
+  "reference_elevation_to": "Referenz Ansatzhöhe (bis)",
   "reference_elevation_type": "Typ der Referenz Ansatzhöhe",
   "refresh": "Aktualisieren",
   "registration": "Erfassung",
@@ -437,6 +442,8 @@
   "to": "bis",
   "toDepthMasl": "Bis Tiefe [m ü.M.]",
   "todepth": "Bis Tiefe [m MD]",
+  "todepth_from": "Bis Tiefe [m MD](von)",
+  "todepth_to": "Bis Tiefe [m MD](bis)",
   "todiameter": "bis Durchmesser",
   "toelevation": "bis Höhe",
   "topView": "Aufsicht",

src/client/public/locale/en/common.json

@@ -212,6 +212,8 @@
   "from": "from",
   "fromDepthMasl": "From depth [m a.s.l.]",
   "fromdepth": "From depth [m MD]",
+  "fromdepth_from": "From depth [m MD] (from)",
+  "fromdepth_to": "From depth [m MD] (to)",
   "fromdiameter": "from diameter",
   "fromelevation": "from elevation",
   "general": "General",
@@ -368,6 +370,7 @@
   "publish": "Publish",
   "purpose": "Drilling purpose",
   "qt_depth": "+/- Borehole length [m MD]",
+  "qt_reference_elevation": "+/- Reference Elevation [m]",
   "qt_top_bedrock": "Top bedrock (weathered) [m MD]",
   "qt_top_bedrock_from": "Top Bedrock (weathered) [m MD] (from)",
   "qt_top_bedrock_to": "Top Bedrock (weathered) [m MD] (to)",
@@ -376,7 +379,9 @@
   "qt_total_depth_tvd": "+/- Total Depth [m TVD]",
   "quantity": "Quantity",
   "reference_elevation": "Reference elevation [m a.s.l.]",
+  "reference_elevation_from": "Reference Elevation (from)",
   "reference_elevation_qt": "+/- Reference elevation [m]",
+  "reference_elevation_to": "Reference Elevation (to)",
   "reference_elevation_type": "Reference elevation type",
   "refresh": "Refresh",
   "registration": "Registration",
@@ -442,6 +447,8 @@
   "to": "to",
   "toDepthMasl": "To depth [m a.s.l.]",
   "todepth": "To depth [m MD]",
+  "todepth_from": "To depth [m MD] (from)",
+  "todepth_to": "To depth [m MD] (to)",
   "todiameter": "to diameter",
   "toelevation": "to elevation",
   "topView": "Top view",

src/client/public/locale/fr/common.json

@@ -212,6 +212,8 @@
   "from": "de",
   "fromDepthMasl": "De la profondeur [m s.m.]",
   "fromdepth": "De la profondeur [m MD]",
+  "fromdepth_from": "De la profondeur [m MD] (de)",
+  "fromdepth_to": "De la profondeur [m MD] (à)",
   "fromdiameter": "à partir du diamètre",
   "fromelevation": "de l'altitude",
   "general": "Général",
@@ -368,10 +370,13 @@
   "publish": "Publier",
   "purpose": "But du forage",
   "qt_depth": "+/- Longueur du forage [m MD]",
+  "qt_reference_elevation": "+/- Référence altitudinale [m]",
   "qt_total_depth_tvd": "+/- Profondeur totale [m TVD]",
   "quantity": "Quantité",
   "reference_elevation": "Référence altitudinale [m s.m.]",
+  "reference_elevation_from": "Référence altitudinale (de)",
   "reference_elevation_qt": "+/- Référence altitudinale [m]",
+  "reference_elevation_to": "Référence altitudinale (à)",
   "reference_elevation_type": "Type de référence altitudinale",
   "refresh": "Actualiser",
   "registration": "Enregistrement",
@@ -437,6 +442,8 @@
   "to": "à",
   "toDepthMasl": "À la profondeur [m s.m.]",
   "todepth": "À la profondeur [m MD]",
+  "todepth_from": "De la profondeur [m MD] (de)",
+  "todepth_to": "De la profondeur [m MD] (à)",
   "todiameter": "jusqu'au diamètre",
   "toelevation": "jusqu'à l'altitude",
   "topView": "Vue en plan",

src/client/public/locale/it/common.json

@@ -212,6 +212,8 @@
   "from": "da",
   "fromDepthMasl": "Dalla profondità [m s.l.m.]",
   "fromdepth": "Dalla profondità [m MD]",
+  "fromdepth_from": "Dalla profondità [m MD](da)",
+  "fromdepth_to": "Dalla profondità [m MD](a)",
   "fromdiameter": "a partire dal diametro",
   "fromelevation": "a partire dalla quota",
   "general": "Generale",
@@ -368,10 +370,13 @@
   "publish": "Pubblicare",
   "purpose": "Scopo della perforazione",
   "qt_depth": "+/- Lunghezza della perforazione [m MD]",
+  "qt_reference_elevation": "+/- Riferimento della quota [m]",
   "qt_total_depth_tvd": "+/- Profondità totale [m TVD]",
   "quantity": "Quantità",
   "reference_elevation": "Riferimento della quota [m s.l.m.]",
+  "reference_elevation_from": "Riferimento della quota (da)",
   "reference_elevation_qt": "+/- Riferimento della quota [m]",
+  "reference_elevation_to": "Riferimento della quota (a)",
   "reference_elevation_type": "Tipo di riferimento della quota",
   "refresh": "Attualizzare",
   "registration": "Cattura",
@@ -437,6 +442,8 @@
   "to": "fino a",
   "toDepthMasl": "Alla profondità [m s.l.m.]",
   "todepth": "Alla profondità [m MD]",
+  "todepth_from": "Alla profondità [m MD](da)",
+  "todepth_to": "Alla profondità [m MD](a)",
   "todiameter": "fino al diametro",
   "toelevation": "fino alla quota",
   "topView": "Vista dall'alto",

src/client/src/pages/overview/sidePanelContent/filter/FilterChips.tsx

@@ -29,7 +29,19 @@ const FilterChips = ({ activeFilters, setFilter }: FilterChipsProps) => {
   return (
     <Box sx={{ marginBottom: activeFilters.length > 0 ? "14px" : undefined }}>
       {activeFilters.map((filter, index) => {
-        const filterLabel = filter.key === "role" ? t("status") : t(filter.key);
+        const customFilterLabels: { [key: string]: string } = {
+          role: "status",
+          status: "boreholeStatus",
+          description_quality: "completeness",
+          layer_gradation: "gradation",
+          layer_depth_from_from: "fromdepth_from",
+          layer_depth_from_to: "fromdepth_to",
+          layer_depth_to_to: "todepth_to",
+          layer_depth_to_from: "todepth_from",
+        };
+
+        const filterLabel = t(customFilterLabels[filter.key] || filter.key);
+
         return (
           <Tooltip key={index} title={filterLabel.length > 15 && filterLabel}>
             <Chip

src/client/src/pages/overview/sidePanelContent/filter/filterComponent.jsx

@@ -115,7 +115,8 @@ class FilterComponent extends React.Component {
     const activeFilters = Object.entries(search.filter)
       .filter(
         ([key, value]) =>
-          value != null && value !== "" && value !== -1 && !["refresh"].includes(key) && value !== "all",
+          (value != null && value !== "" && value !== -1 && !["refresh"].includes(key) && value !== "all") ||
+          (["national_interest", "groundwater", "striae"].includes(key) && value === null),
       )
       .map(([key, value]) => ({ key: key, value: value }));
     this.context.setActiveFilterLength(activeFilters.length);