small fixes

VATMENA · Feb 2, 2024 · f676609 · f676609
1 parent dba8c0c
commit f676609
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/lib/components/CertificateBadge.svelte b/src/lib/components/CertificateBadge.svelte
@@ -16,6 +16,7 @@
     UserRound,
   } from "lucide-svelte";
   import * as HoverCard from "$lib/components/ui/hover-card";
+  import {page} from "$app/stores";
 
   export let cert: Certificate;
 
@@ -95,6 +96,7 @@
         valid_in = cert.issuedInId;
       }
     }
+    if (!valid_in) { valid_in = $page.data.vacc_id; }
   }
 </script>
 

diff --git a/src/routes/dashboard/vaccs/[id]/roster/cert-form.svelte b/src/routes/dashboard/vaccs/[id]/roster/cert-form.svelte
@@ -68,7 +68,7 @@
             <Form.SelectContent>
               {#each Object.entries(c_typ_e) as [k, v]}
                 <Form.SelectItem
-                  disabled={ctyp_req_perm.has(v) ? ctyp_req_perm.get(v) : true}
+                  disabled={ctyp_req_perm.has(v) ? !ctyp_req_perm.get(v) : true}
                   value={v}>
                   {k}
                 </Form.SelectItem>
@@ -86,7 +86,7 @@
             <Form.SelectContent>
               {#each Object.entries(p_typ_e) as [k, v]}
                 <Form.SelectItem
-                  disabled={ptyp_req_perm.has(v) ? ptyp_req_perm.get(v) : true}
+                  disabled={ptyp_req_perm.has(v) ? !ptyp_req_perm.get(v) : true}
                   value={v}>
                   {k}
                 </Form.SelectItem>