Mouse end of life form

lib/forms/CoBrALab-Mouse-End-Of-Life-Form/index.ts

@@ -1,9 +1,9 @@
 /* eslint-disable perfectionist/sort-objects */
 
-const { defineInstrument } = await import('/runtime/v1/@opendatacapture/runtime-core/index.js');
-const { z } = await import('/runtime/v1/zod@3.23.x/index.js');
+import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core'
+import { z } from '/runtime/v1/zod@3.23.x'
 
-function createDependentField<T>(field: T, fn: (terminationType: string) => boolean) {
+function createDependentField<const T>(field: T, fn: (terminationType: string) => boolean) {
   return {
     kind: 'dynamic' as const,
     deps: ['terminationType'] as const,
@@ -100,33 +100,26 @@ export default defineInstrument({
     },
       (type) => type === 'Cardiac puncture'
     ),
-    embryoPresent: createDependentField({
-      kind: 'boolean',
-      variant: "radio",
-      label: "Embryo present"
-    },
-      (type) => type === 'Cervical dislocation'
-    ),
     gestationalDay: createDependentField({
       kind: 'date',
       label: "Gestational day"
     },
       (type) => type === 'Cervical dislocation'
     ),
-    perfusionType: createDependentField({
+    perfusionAnestheticType: createDependentField({
       kind: "string",
       variant: "select",
-      label: "Type of perfusion",
+      label: "Type of anesthetic used for perfusion",
       options: {
         "Ip Injection":"Ip Injection (Ketamine)",
         "Gas": "Gas (Isoflurane)"
       }
     }, (type) => type === "Perfusion" ),
-    perfusionDose: {
+    ipAnestheticDose: {
       kind: 'dynamic',
-      deps: ["perfusionType"],
+      deps: ["perfusionAnestheticType"],
       render(data){
-        if(data.perfusionType === 'Ip Injection'){
+        if(data.perfusionAnestheticType === 'Ip Injection'){
           return {
             kind: 'number',
             variant: "input",
@@ -136,32 +129,17 @@ export default defineInstrument({
         return null
       }
     },
-    perfusionFlushingDone: createDependentField({
-      kind: "boolean",
-      variant: "radio",
-      label: "Flushing done"
-    },
-    (type) => type === "Perfusion"),
 
-  perfusionFlushingSolution: {
-    kind: "dynamic",
-    deps: ["perfusionFlushingDone"],
-    render(data){
-      if(data.perfusionFlushingDone){
-        return { 
-          kind: "string",
-          variant: "radio",
-          label: "Perfusion flushing solution",
-          options: {
-            "PBS+Heparin":"PBS and Heparin",
-            "4% Isoflurane": "4% Isoflurane"
-          }
-        }
-      }
-      return null
-    }
+    perfusionFlushingSolution: createDependentField({
+            kind: "string",
+            variant: "radio",
+            label: "Perfusion flushing solution",
+            options: {
+              "PBS+Heparin":"PBS and Heparin",
+              "4% Isoflurane": "4% Isoflurane"
+            }
+    }, (type) => type === 'Perfusion'),
 
-  },
     anesthesiaUsed: {
       kind: 'boolean',
       variant: 'radio',
@@ -320,30 +298,20 @@ export default defineInstrument({
       label: "Blood collected (ml)",
       ref: "bloodCollected"
     },
-    embryoPresent: {
-      kind: "const",
-      label: "Embryo present",
-      ref: "embryoPresent"
-    },
     gestationalDay: {
       kind: "const",
       label: "Gestational day",
       ref: "gestationalDay"
     },
-    perfusionType: {
+    perfusionAnestheticType: {
       kind: "const",
       label: "Type of perfusion",
-      ref: "perfusionType"
+      ref: "perfusionAnestheticType"
     },
-    perfusionDose: {
+    ipAnestheticDose: {
       kind: "const",
       label: "Injection dose (ml)",
-      ref: "perfusionDose"
-    },
-    perfusionFlushingDone: {
-      kind: "const",
-      label: "Flushing done",
-      ref: "perfusionFlushingDone"
+      ref: "ipAnestheticDose"
     },
     perfusionFlushingSolution: {
       kind: "const",
@@ -384,11 +352,9 @@ export default defineInstrument({
     terminationType: z.string().optional(),
     surgeryDeathCause: z.string().optional(),
     bloodCollected: z.number().optional(),
-    embryoPresent: z.boolean().optional(),
     gestationalDay: z.date().optional(),
-    perfusionType: z.string().optional(),
-    perfusionDose: z.number().optional(),
-    perfusionFlushingDone: z.boolean().optional(),
+    perfusionAnestheticType: z.string().optional(),
+    ipAnestheticDose: z.number().optional(),
     perfusionFlushingSolution: z.string().optional(),
     anesthesiaUsed: z.boolean(),
     bodyExtractionDone: z.boolean(),