diff --git a/src/Survey/AreaCount/Area/NewLocationModal/config.tsx b/src/Survey/AreaCount/Area/NewLocationModal/config.tsx index 844cdf95..41c23f9e 100644 --- a/src/Survey/AreaCount/Area/NewLocationModal/config.tsx +++ b/src/Survey/AreaCount/Area/NewLocationModal/config.tsx @@ -33,8 +33,8 @@ export const habitatAttr = { { title: 'Lawn', data_name: '23581' }, { title: 'Flowering strip', data_name: '23583' }, { title: 'Built-up area', data_name: '23585' }, - { title: 'Fallow land, abandonned area (urban)', data_name: '23587' }, - { title: 'Fallow land, abandonned fieldĀ  (rural)', data_name: '23589' }, + { title: 'Fallow land, abandoned area (urban)', data_name: '23587' }, + { title: 'Fallow land, abandoned fieldĀ  (rural)', data_name: '23589' }, { title: 'Field edge', data_name: '23591' }, { title: 'Arable field', data_name: '23593' }, { title: 'Grassland / Meadow / Pasture', data_name: '23595' }, @@ -260,8 +260,7 @@ export const landNumberAttr = { export const landscapeFeaturesAttr = { id: 'locAttr:364', type: 'choice_input', - title: - 'What landscape features are located in your observation location and/or within a radius of 50 meters?', + title: 'Landscape features', multiple: true, appearance: 'button', choices: [ diff --git a/src/Survey/AreaCount/Area/NewLocationModal/index.tsx b/src/Survey/AreaCount/Area/NewLocationModal/index.tsx index ddf73370..be9a6161 100644 --- a/src/Survey/AreaCount/Area/NewLocationModal/index.tsx +++ b/src/Survey/AreaCount/Area/NewLocationModal/index.tsx @@ -4,7 +4,14 @@ import clsx from 'clsx'; import { Trans as T, useTranslation } from 'react-i18next'; import { z } from 'zod'; import { Capacitor } from '@capacitor/core'; -import { Block, Location, Main, PhotoPicker, captureImage } from '@flumens'; +import { + Block, + InfoMessage, + Location, + Main, + PhotoPicker, + captureImage, +} from '@flumens'; import { isPlatform } from '@ionic/core'; import { IonButton, @@ -221,95 +228,120 @@ const NewLocationModal = (
-
- - - {(isAgroecologyTRANSECT || - isCAP4GI || - isVielFalterGarten || - isUNPplus) && } - - {(isVielFalterGarten || isUNPplus) && ( - - )} -
- - {(isAgroecologyTRANSECT || isCAP4GI) && ( -
- - - - - - - - - - - - - - - - - - - - - - - +
+
+ + + {(isAgroecologyTRANSECT || + isCAP4GI || + isVielFalterGarten || + isUNPplus) && ( + <> + + + Approximate size of your observation site. + + + )} + + {(isVielFalterGarten || isUNPplus) && ( + + )}
- )} -
{(isAgroecologyTRANSECT || isCAP4GI) && ( - <> - - - - )} - - {(isVielFalterGarten || isUNPplus) && ( - <> - - - +
+

+ Habitats/land uses (total should be 100%) +

+
+ + + + + + + + + + + + + + + + + + + + + + + +
+
)} - {(isAgroecologyTRANSECT || - isCAP4GI || - isVielFalterGarten || - isUNPplus) && ( - <> - - - - - - - )} - - {(isVielFalterGarten || isUNPplus) && ( - <> - - - - - )} - - -
+
+ {(isAgroecologyTRANSECT || isCAP4GI) && ( + <> + + + Features located within a 50-meter radius. + + + + )} + + {(isVielFalterGarten || isUNPplus) && ( + <> + + + + )} + + {(isAgroecologyTRANSECT || + isCAP4GI || + isVielFalterGarten || + isUNPplus) && ( + <> + + + + + + + )} + + {(isVielFalterGarten || isUNPplus) && ( + <> + + + + + )} + + +
-
- +
+

+ Site photos +

+
+ + + Optimally in the direction to North, East, South and West. + +
+