better error checking

utahrobotics · Feb 5, 2025 · 42a32f0 · 42a32f0
1 parent d96a164
commit 42a32f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/usr-backend/src/attendance.rs b/usr-backend/src/attendance.rs
@@ -22,7 +22,7 @@ async fn add_attendance(
     State(state): State<&'static UsrState>,
     Form(CheckIn { uid }): Form<CheckIn>,
 ) -> (StatusCode, &'static str) {
-    let Some(uid) = uid.strip_prefix('u') else {
+    let Some(uid) = uid.strip_prefix('u').or_else(|| uid.strip_prefix('U')) else {
         return (StatusCode::BAD_REQUEST, "");
     };
     let Ok(uid) = uid.parse::<u32>() else {

diff --git a/usr-web/src/routes/(apps)/attendance/+page.svelte b/usr-web/src/routes/(apps)/attendance/+page.svelte
@@ -1,5 +1,6 @@
 <script lang=ts>
 	import { PUBLIC_API_ENDPOINT } from '$env/static/public';
+    let uid = $state("");
 </script>
 
 <!-- This iframe prevents redirection -->
@@ -9,10 +10,12 @@
 <form method="POST" action="{PUBLIC_API_ENDPOINT}/api/attendance/add/attendance" target="dummyframe">
 	<label>
 		uID
-		<input name="uid" placeholder="u1234567" pattern="u[0-9]+" />
+		<input name="uid" placeholder="u1234567" pattern="^[uU][0-9]+$" bind:value={uid} />
 	</label>
 	<button onclick={() => {
-        alert("Checked In");
+        if (/^[uU][0-9]+$/.test(uid)) {
+            alert("Checked In");
+        }
     }}>Check in</button>
 </form>