Merge branch 'main' into gysimichael-patch-4

swisstopo · Sep 21, 2022 · 12549c4 · 12549c4
2 parents 8f1f7fd + 2bd4ad5
commit 12549c4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/client/public/locale/de/common.json b/src/client/public/locale/de/common.json
@@ -208,7 +208,7 @@
   "mainStratigraphy": "Dies ist die Hauptstratigraphie",
   "map": "Karte",
   "materialCasingLayer": "Verrohrungsmaterial",
-  "materialFilling": "Hinerfüllungsmaterial",
+  "materialFilling": "Hinterfüllungs-/Verfüllungsmaterial",
   "meter": "Meter",
   "msgCasingEmpty": "Für ein Verrohrungsprofil bitte das Plus-Symbol oben rechts klicken",
   "msgDeleteUser": "Der ausgewählte Benutzer kann für immer gelöscht werden, da derzeit keine Aktivitäten in der Datenbank vorhanden sind.",
@@ -338,4 +338,4 @@
   "import_database": "Bitte importieren Sie eine gezippte .gpkg-Datei (nur swissforages-Exporte) einer Arbeitsgruppe oder Bohrung.",
   "import": "Importieren",
   "to": "bis"
-}
+}
diff --git a/src/client/public/locale/en/common.json b/src/client/public/locale/en/common.json
@@ -208,7 +208,7 @@
   "mainStratigraphy": "This is the main stratigraphy",
   "map": "Map",
   "materialCasingLayer": "Casing material",
-  "materialFilling": "Backfill material",
+  "materialFilling": "Backfill/Sealing material",
   "meter": "Meter",
   "msgCasingEmpty": "For a casing profile please click the plus symbol at the top left",
   "msgDeleteUser": "The selected user can be deleted permanantly because currently there is no trace of activity in the database.",

diff --git a/...file/components/profileAttributes/components/profileAttributeList/profileAttributeList.js b/...file/components/profileAttributes/components/profileAttributeList/profileAttributeList.js
@@ -73,7 +73,7 @@ const ProfileAttributeList = props => {
                 <Form.Group style={{ display: "flex", paddingTop: "5px" }}>
                   <Form.Radio
                     checked={
-                      _.isNil(layer?.[item.value]) ? true : layer[item.value]
+                      _.isNil(layer?.[item.value]) ? false : layer[item.value]
                     }
                     label={t("yes")}
                     onChange={() => updateChange(item.value, true, item?.to)}
@@ -86,6 +86,11 @@ const ProfileAttributeList = props => {
                     label={t("no")}
                     onChange={() => updateChange(item.value, false, item?.to)}
                   />
+                  <Form.Radio
+                    checked={_.isNil(layer?.[item.value])}
+                    label={t("np")}
+                    onChange={() => updateChange(item.value, null, item?.to)}
+                  />
                 </Form.Group>
               )}