Adding history for form2

Author: perki

common-data-defs.js

@@ -102,6 +102,7 @@ const formHistoricalContentX = [
     eventType: 'fertility-intention/ttc-tta',
     label: 'Trying to conceive / Avoiding pregnancy',
     type: 'select',
+    parseValueToNum: true,
     options: [
       {
         value: 0,
@@ -154,6 +155,23 @@ const formHistoricalContentX = [
 ]
 
 const formHistoricalContentB = [
+  {
+    streamId: 'body-weight',
+    eventType: 'mass/kg',
+    type: 'number',
+    label: 'Body Weight (kg)',
+  },
+  {
+    label: 'Vulva Wetness feeling',
+    streamId: 'body-vulva-wetness-feeling',
+    eventType: 'ratio/generic',
+    type: 'select',
+    options: [
+      { value: 0, label: 'Dry' },
+      { value: 1, label: 'Wet' },
+      { value: 2, label: 'Very wet'}
+    ]
+  }
 ]
 
 //

patient-history-controler.js

@@ -83,7 +83,8 @@ async function refreshDataTable(date) {
     cellDate.innerHTML = dateStr;
     for (const th of tableData.tableHeaders) {
       const cell = row.insertCell(-1);
-      cell.innerHTML = data[th.fieldId]?.value || '';
+      const v = data[th.fieldId]?.value;
+      cell.innerHTML = v != null ? v : '' ;
     }
   }
 

patient-lib.js

@@ -193,22 +193,21 @@ function valueForField (eventContent, field) {
     console.error('## Error parsing date', eventContent);
     return '';
   }
+  if (field.eventType === 'ratio/generic' && eventContent != null ) {
+    return eventContent.value;
+  }
   return eventContent;
 }
 
 // ---------------- create / update data ---------------- //
 
-function parseValue (value, type) {
+function parseValue (value, field) {
+  const type = field.type;
   if (value === undefined || value === null || value === '') {
     return '';
   }
-  if (type === 'number') {
-    const parsedValue = parseFloat(value);
-    if (isNaN(parsedValue)) {
-      console.error('## Error parsing number', value);
-      return '';
-    }
-    return parsedValue;
+  if (type === 'number' || field.parseValueToNum) {
+    return parseFloatCustom(value);
   }
   if (type === 'boolean') {
     return value === 'true';
@@ -219,16 +218,35 @@ function parseValue (value, type) {
     }
     return value === '';
   }
+  if (type === 'select' && field.eventType === 'ratio/generic') {
+    const numValue = parseFloatCustom(value);
+    if (numValue === '') return '';
+    // relative to is the latest value of options
+    const relativeTo = field.options[field.options.length -1].value;
+    return {
+      value: numValue,
+      relativeTo
+    }
+  }
   return value;
 }
 
+function parseFloatCustom(value) {
+  const parsedValue = parseFloat(value);
+  if (isNaN(parsedValue)) {
+    console.error('## Error parsing number', value);
+    return '';
+  }
+  return parsedValue;
+}
+
 async function handleFormSubmit (formData, values, date) {
   const apiCalls = [];
   for (const field of formData) {
     const streamId = field.streamId;
     const eventType = field.eventType;
     const eventId = field.eventId;
-    const value = parseValue(values[field.id], field.type);
+    const value = parseValue(values[field.id], field);
     if (value === '' && eventId) {
       // delete the event
       apiCalls.push({