Merge pull request #33 from mad-lab-fau/dev

fix: focus does not jump to incorrect inputs when an entry is made
mad-lab-fau · Apr 29, 2024 · 438404f · 438404f
2 parents 148584e + a9f8832
commit 438404f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/lib/components/preparation/BarcodeForm.svelte b/src/lib/components/preparation/BarcodeForm.svelte
@@ -30,7 +30,7 @@
 			for(let id of idList) {
 				let element = document.getElementById(id);
 				if(element instanceof HTMLInputElement){
-					if(!(element.reportValidity())){
+					if(!element.checkValidity()){
 						return false;
 					}
 				}

diff --git a/src/lib/components/preparation/QrCodeForm.svelte b/src/lib/components/preparation/QrCodeForm.svelte
@@ -75,7 +75,7 @@
 		}
 		for (let id of idList) {
 			let element = document.getElementById(id);
-			if (element instanceof HTMLInputElement && !element.reportValidity()) {
+			if (element instanceof HTMLInputElement && !element.checkValidity()) {
 				return false;
 			}
 		}
@@ -216,7 +216,8 @@
 										id="distance{i}"
 										type="number"
 										bind:value={salivaDistances[i]}
-										on:input={salivaListChanged}/>
+										on:input={salivaListChanged}
+										required />
 									<div class="input-group-shim">min</div>
 								</div>
 							{/each}
@@ -232,7 +233,8 @@
 										id="time{i}"
 										type="time"
 										bind:value={salivaTimes[i]}
-										on:input={salivaListChanged}/>
+										on:input={salivaListChanged}
+										required />
 								</div>
 							{/each}
 						</div>

diff --git a/src/lib/components/preparation/StudyForm.svelte b/src/lib/components/preparation/StudyForm.svelte
@@ -17,7 +17,7 @@
     $: $studyProps, studyPropsValid.set(isValid());
 
     function isValid(){
-      let permanentIdList = ["study_name", "num_days", "num_samples", "pref_bio"]
+      let permanentIdList = ["study_name", "num_days", "num_samples", "prefix_bio"]
       let optionalIdList = ["num_participants"]
       if (!validateInputsFromList(permanentIdList)){
         return false;
@@ -41,7 +41,7 @@
       for(let id of list) {
           let element = document.getElementById(id);
           if(element instanceof HTMLInputElement){
-            if(!(element.reportValidity())){
+            if(!(element.checkValidity())) {
               return false;
             }
           }