Supporting new Cycle

Author: perki

common-data-defs.js

@@ -13,8 +13,10 @@ const patientBaseStreams = [
   // fertility
   {id: 'fertility', name: 'Fertility'},
   {id: 'fertility-miscarriages', name: 'Miscarriages', parentId: 'fertility'},
-  {id: 'fertility-traings', name: 'Trainings', parentId: 'fertility'},
+  {id: 'fertility-trainings', name: 'Trainings', parentId: 'fertility'},
   {id: 'fertility-cycles', name: 'Cycles', parentId: 'fertility'},
+  {id: 'fertility-cycles-start', name: 'New Cycle', parentId: 'fertility-cycles'},
+  {id: 'fertility-cycles-ovulation', name: 'Ovulation Day', parentId: 'fertility-cycles'},
   {id: 'fertility-cycles-charted-estimation', name: 'Cycles charted estimation', parentId: 'fertility-cycles'},
   {id: 'fertility-ttc-tta', name: 'Trying to conceive / Avoiding pregnancy', parentId: 'fertility'},
   // body
@@ -197,6 +199,12 @@ const formHistoricalContentB = [
       { value: 1, label: 'Short' },
       { value: 2, label: 'Long'}
     ]
+  },
+  {
+    streamId: 'fertility-cycles-start',
+    eventType: 'activity/plain',
+    type: 'checkbox',
+    label: 'New Cycle'
   }
 ]
 

patient-history-controler.js

@@ -145,6 +145,9 @@ async function updateFormContent(formData) {
       fieldHTML += `</select>`;
     } else if (fieldType === "date") {
       fieldHTML += `<input type="date" id="${fieldId}" value="${fieldValue}" class="form-control"/>`;
+    } else if (fieldType === "checkbox") {
+      const checkedStr = fieldValue != '' ? 'checked' : '';
+      fieldHTML += `<input type="checkbox" id="${fieldId}" class="form-control" ${checkedStr}/>`;
     }
 
     document.getElementById("inputs-list").innerHTML += fieldHTML;
@@ -163,6 +166,8 @@ async function submitForm(formData, date) {
     // Store the value in the values object
     if (field.type === "date") {
       values[field.id] = formField.valueAsDate;
+    } else if (field.type === "checkbox") {
+      values[field.id] = formField.checked ? 'x' : '';
     } else {
       values[field.id] = formField.value.trim();
     }

patient-lib.js

@@ -193,6 +193,10 @@ async function getHistoricalContent(questionaryId, formKey) {
 }
 
 function valueAndTxtForField (eventContent, field) {
+  if (field.eventType === 'activity/plain' ) {
+    console.log('>> activity plain')
+    return { value: 'x', txt:  'X'};
+  }
   if (field.type === 'date' && eventContent != null ) {
     // convert the date to a Date object
     const date = new Date(eventContent);
@@ -251,6 +255,11 @@ function parseValue (value, field) {
       relativeTo
     }
   }
+  if (type === 'checkbox' && field.eventType === 'activity/plain') {
+    console.log('>> checkbox', value);
+    if (value === 'x') return null; // will be handled as a value
+    return '';
+  }
   return value;
 }