Merge pull request #195 from OpenBracketsCH/bugfixes/194-Change-level…

…-attribute-to-number Change level-attribute to number
OpenBracketsCH · Oct 22, 2024 · 7832c9c · 7832c9c
2 parents d83c0a9 + dbfab0e
commit 7832c9c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/app/src/components/TextForm.js b/app/src/components/TextForm.js
@@ -16,6 +16,7 @@ const TextForm = ({
   errors,
   errorMsg,
   disabled,
+  inputMode,
 }) => {
   const [switchValue, setSwitchValue] = useState(false);
   const [tempValue, setTempValue] = useState('');
@@ -65,6 +66,7 @@ const TextForm = ({
           editable={!switchValue}
           returnKeyType={multiline ? 'default' : 'done'}
           readOnly={disabled}
+          inputMode={inputMode ?? 'text'}
         />
       );
     }

diff --git a/app/src/config/createForm.js b/app/src/config/createForm.js
@@ -44,11 +44,13 @@ export default [
   },
   {
     name: 'level',
-    rules: { required: false },
+    rules: { required: false, pattern: /^[0-9]*$/ },
     type: 'Text',
     label: 'level',
     placeholder: 'placeholder_level',
     defaultValue: '',
+    errorMsg: 'error_level',
+    inputMode: 'numeric',
   },
   {
     name: 'description',

diff --git a/app/src/i18n/i18n.js b/app/src/i18n/i18n.js
@@ -33,6 +33,7 @@ const resources = {
       access: 'Accessible',
       error_default: 'Value is invalid',
       error_description: 'The maximum length is 200 characters',
+      error_level: 'The value must be a number',
       error_location: 'Location is required, maximum length 200 characters',
       error_openinghours: 'The entered opening hours do not match the required format.',
       error_operatorphone: 'The value must be a valid phone number.',
@@ -111,6 +112,7 @@ const resources = {
       access: 'Zugänglich',
       error_default: 'Wert ist ungültig',
       error_description: 'Die maximale Länge beträgt 200 Zeichen',
+      error_level: 'Der Wert muss eine Nummer sein',
       error_location: 'Der Standort wird benötigt, maximale Länge 200 Zeichen',
       error_openinghours: 'Die eingegebenen Öffnungzeiten entsprechen nicht dem geforderten Format.',
       error_operatorphone: 'Der Wert muss eine gültige Telefonummer sein.',
@@ -189,6 +191,7 @@ const resources = {
       access: 'Accessible',
       error_default: 'La valeur est invalide',
       error_description: 'La longueur maximale est de 200 caractères',
+      error_level: 'La valeur doit être un nombre',
       error_location: "L'emplacement est requis, longueur maximale 200 caractères",
       error_openinghours: "Les heures d'ouverture saisies ne correspondent pas au format requis.",
       error_operatorphone: 'La valeur doit être un numéro de téléphone valide.',
@@ -267,6 +270,7 @@ const resources = {
       access: 'Accessibile',
       error_default: 'Il valore non è valido',
       error_description: 'La lunghezza massima è di 200 caratteri',
+      error_level: 'Il valore deve essere un numero',
       error_location: 'La posizione è richiesta, lunghezza massima 200 caratteri',
       error_openinghours: 'Gli orari di apertura inseriti non corrispondono al formato richiesto.',
       error_operatorphone: 'Il valore deve essere un numero di telefono valido.',

diff --git a/app/src/screens/CreateScreen.js b/app/src/screens/CreateScreen.js
@@ -10,7 +10,6 @@ import TextForm from '../components/TextForm';
 import createForm from '../config/createForm';
 import { Context as DefibrillatorContext } from '../context/DefibrillatorContext';
 
-
 const CreateScreen = ({ navigation }) => {
   const insets = useSafeAreaInsets();
   const { state: defiState, addDefibrillator, resetError } = useContext(DefibrillatorContext);
@@ -67,6 +66,7 @@ const CreateScreen = ({ navigation }) => {
             useSwitch={formComp.useSwitch}
             placeholder={formComp.placeholder}
             disabled={defiState.creating}
+            inputMode={formComp.inputMode}
           />
         );
       } else if (formComp.type === 'Switch') {