Merge pull request CoBrALab#100 from david-roper/update-record-array-measures

Update record array measures

Author: david-roper

public/forms/CoBrALab-Histology-Form/index.ts

@@ -17,7 +17,7 @@ export default defineInstrument({
     "Antibodies"
   ],
   internal: {
-    edition: 2,
+    edition: 3,
     name: "HISTOLOGY_FORM",
   },
   content: {
@@ -255,22 +255,13 @@ export default defineInstrument({
       label: "Antibodies used info",
       visibility: "visible",
       value: (data) => {
-        const antibodyList = data.antibodiesUsedInfo.map((x) => x);
-        let antibodyInfoString = "";
-        if (antibodyList) {
-          for (const antibody of antibodyList) {
-            antibodyInfoString +=
-              "Antibody Type: " +
-              antibody.antibodyType +
-              " Antibody Name: " +
-              antibody.antibodyName +
-              " Antibody Concentration: " +
-              antibody.antibodyConcentration +
-              " μg/mL ";
-          }
-        }
-
-        return antibodyInfoString;
+        const antibodyList = data.antibodiesUsedInfo || []
+        const antiBodyListResults = antibodyList.map(antiBodyInfo => ({
+          "Antibody type": antiBodyInfo.antibodyType,
+          "Antibody name": antiBodyInfo.antibodyName,
+          "Antibody concentration μg/mL": antiBodyInfo.antibodyConcentration
+        }))
+        return antiBodyListResults
       },
     },
     serumUsed: {

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

@@ -23,7 +23,7 @@ export default defineInstrument({
   language: 'en',
   tags: ['End of Life', 'Mouse', 'Euthanasia', 'Termination'],
   internal: {
-    edition: 3,
+    edition: 4,
     name: 'MOUSE_END_OF_LIFE_FORM'
   },
   content: {
@@ -344,16 +344,17 @@ export default defineInstrument({
       label: "Body part extraction info",
       visibility: "visible",
       value: (data) => {
-        const val = data.bodyExtractionInfo?.map((x) => x);
-        let extractInfo = '';
-        if (val) {
-          for (const info of val) {
-            extractInfo += info.bodyPartExtracted + ' ' + info.bodyExtractionComments + ' ' + (info.extractionMotive ?? '') + ' ' + (info.pfaBatch ?? '') + ' ' 
-            + (info.pfaBatchExpiration ?? '') + ' ' + info.bodyExtractionComments + ' ' + info.bodyPartStorageSolution + ' ' + info.bodyPartStorageLocation + ' ' + 
-            + '\n';
-          }
-        }
-        return extractInfo;
+        const bodyExtractionValues = data.bodyExtractionInfo || []
+        const bodyExtractionResults = bodyExtractionValues.map(info => ({
+          "Body part extracted": info.bodyPartExtracted,
+          "Extraction motive": info.extractionMotive,
+          "Extraction reason comments": info.bodyExtractionComments,
+          "PFA batch": info.pfaBatch,
+          "PFA batch expiration": info.pfaBatchExpiration,
+          "Body part storage solution": info.bodyPartStorageSolution,
+          "Body part storage location": info.bodyPartStorageLocation,
+        }))
+        return bodyExtractionResults
       }
     },
     additionalComments: {

public/forms/CoBrALab-Mouse-MRI-Form/index.ts

@@ -26,7 +26,7 @@ export default defineInstrument({
   language: 'en',
   tags: ['Mouse', 'MRI', 'Structural', 'fMRI'],
   internal: {
-    edition: 2,
+    edition: 3,
     name: 'MOUSE_MRI_FORM'
   },
   content: {
@@ -526,17 +526,17 @@ export default defineInstrument({
       kind: "computed",
       label: "Scan record info",
       value: (data) => {
-        const val = data.scanRecordInfo?.map((x) => x)
-        let measureOutput = ''
-        if (val) {
-          for (const info of val) {
-            measureOutput += info.mriScanName + ' ' + (info.breathingStable ? 'breathing stable: ' + info.breathingStable : '') + ' ' +
-              (info.oxygenConcentration ? 'O_2 concentration: ' + info.oxygenConcentration + '%' : '') + ' ' + (info.oxygenSaturation ? 'O_2 saturation: ' + info.oxygenSaturation + '%' : '') +
-              ' ' + (info.respirationRate ? 'respiration rate: ' + info.respirationRate + 'breath/min' : '') + ' ' + (info.formOfMeasurement ? 'form of measurement: ' + info.formOfMeasurement : '') +
-              + (info.otherComments ? 'comments: ' + info.otherComments : '') + '\n';
-          }
-        }
-        return measureOutput
+        const scanResults = data.scanRecordInfo || []
+        const scanRecordResults = scanResults.map(scan => ({
+          "MRI scan name": scan.mriScanName,
+          "Breathing stable": scan.breathingStable,
+          "O_2 concentration %": scan.oxygenConcentration,
+          "O_2 saturation %": scan.oxygenSaturation,
+          "Respiration rate /min": scan.respirationRate,
+          "Form of measurement": scan.formOfMeasurement,
+          "Comments": scan.otherComments
+        }))
+        return scanRecordResults
       }
     }
   },
@@ -557,7 +557,7 @@ export default defineInstrument({
     exVivoCranioStatus: z.enum(['In-cranio', 'Ex-cranio']).optional(),
     exVivoScanningMedium: z.enum(["Dry", "Fluorinert", "Other"]).optional(),
     exVivoScanningMediumOther: z.string().optional(),
-    anestheticUsed: z.boolean(),
+    anestheticUsed: z.boolean().optional(),
     dexUsed: z.boolean().optional(),
     dexSolutionCreationDate: z.date().optional(),
     dexBottleSerialCode: z.string().optional(),
@@ -585,7 +585,7 @@ export default defineInstrument({
         "MGE_MTOff_Tw1_30deg",
         "T2star_FID_EPI_sat_dan_ver_original",
         "exvivoDanFLASH"
-      ]),
+      ]).optional(),
       mouseVitalsTracked: z.boolean().optional(),
       breathingStable: z.boolean().optional(),
       oxygenConcentration: z.number().min(0).max(100).optional(),

public/forms/CoBrALab-Physical-Intervention-Form/index.ts

@@ -1,7 +1,7 @@
 /* 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 { z }from '/runtime/v1/zod@3.23.x/index.js';
+import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 
 const interventionTypeList = [ "Blood extraction",
     "Teeth extraction",
@@ -32,7 +32,7 @@ export default defineInstrument({
   language: 'en',
   tags: ['Physical intervention','Blood extraction', 'Ear tagging', 'Genotyping', 'Vaginal cytology','Blood glucose','anesthesia'],
   internal: {
-    edition: 2,
+    edition: 3,
     name: 'PHYSICAL_INTERVENTION_FORM'
   },
   content: {
@@ -212,15 +212,11 @@ export default defineInstrument({
       label: "Tattoo Locations",
       visibility: "visible",
       value: (data) => {
-        const val = data.tattooLocationInfo?.map((x) => x)
-        let tattooText = ""
-        if(val){
-          for (const info of val){
-            tattooText += info.tattooLocation + " "
-          }
-          return tattooText
-        }
-        return undefined
+        const val = data.tattooLocationInfo || []
+        const tattooResults = val.map(tattoo => ({
+          "Tattoo Location": tattoo.tattooLocation
+        }))
+        return tattooResults
       }
     },
     teethExtractionNumber: {