From b742fdc92e88ba1a61f629cb018c05513974deff Mon Sep 17 00:00:00 2001 From: Patrick Ackermann Date: Tue, 20 Sep 2022 17:43:40 +0200 Subject: [PATCH 1/4] Add option "Keine Angabe" for layer_striae --- .../profileAttributeList/profileAttributeList.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/client/src/commons/form/profile/components/profileAttributes/components/profileAttributeList/profileAttributeList.js b/src/client/src/commons/form/profile/components/profileAttributes/components/profileAttributeList/profileAttributeList.js index 04d4fba9c..754276d44 100644 --- a/src/client/src/commons/form/profile/components/profileAttributes/components/profileAttributeList/profileAttributeList.js +++ b/src/client/src/commons/form/profile/components/profileAttributes/components/profileAttributeList/profileAttributeList.js @@ -73,7 +73,7 @@ const ProfileAttributeList = props => { updateChange(item.value, true, item?.to)} @@ -86,6 +86,11 @@ const ProfileAttributeList = props => { label={t("no")} onChange={() => updateChange(item.value, false, item?.to)} /> + updateChange(item.value, null, item?.to)} + /> )} From 0b72c114a2587e883a6126c852726e7cd2c13c00 Mon Sep 17 00:00:00 2001 From: Michael Gysi <108096632+gysimichael@users.noreply.github.com> Date: Wed, 21 Sep 2022 08:39:26 +0200 Subject: [PATCH 2/4] Update common.json --- src/client/public/locale/de/common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/public/locale/de/common.json b/src/client/public/locale/de/common.json index e07f3f630..1a287e174 100644 --- 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ü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" -} \ No newline at end of file +} From af8450406405ef7843b5618ff743327e7fd88f4e Mon Sep 17 00:00:00 2001 From: Michael Gysi <108096632+gysimichael@users.noreply.github.com> Date: Wed, 21 Sep 2022 08:43:29 +0200 Subject: [PATCH 3/4] Update common.json --- src/client/public/locale/de/common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/public/locale/de/common.json b/src/client/public/locale/de/common.json index 1a287e174..b081e5327 100644 --- 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": "Hinterfü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.", From 7fa91ae241a400b506fc36537dd15c0f4fc35eaa Mon Sep 17 00:00:00 2001 From: Michael Gysi <108096632+gysimichael@users.noreply.github.com> Date: Wed, 21 Sep 2022 08:45:46 +0200 Subject: [PATCH 4/4] Update common.json --- src/client/public/locale/en/common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/public/locale/en/common.json b/src/client/public/locale/en/common.json index 1e8c6404e..b53a6efea 100644 --- 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.", @@ -338,4 +338,4 @@ "import_database": "Please import a zipped .gpkg file (swissforages exports only) of a workgroup or borehole.", "import": "Import", "to": "to" -} \ No newline at end of file +}