History working

Author: perki

common-data-defs.js

@@ -98,7 +98,7 @@ const formProfileContentX = [
 
 const formHistoricalContentX = [
   {
-    streamId: 'ttc-tta',
+    streamId: 'fertility-ttc-tta',
     eventType: 'fertility-intention/ttc-tta',
     label: 'Trying to conceive / Avoiding pregnancy',
     type: 'select',

patient-history-controler.js

@@ -21,30 +21,40 @@ window.onload = async (event) => {
   dateInput.onfocusout = function () {
     const date = dateInput.valueAsDate;
     console.log("## Focus Out Date", date);
-    refreshForm(date);
+    refreshAll(date);
   };
 
-  refreshForm(dateInput.valueAsDate);
-  refreshDataTable();
+  refreshAll(dateInput.valueAsDate);
 };
 
-async function refreshForm(date) {
+async function refreshAll(date) {
   console.log("## Refresh Form Date:", date);
   const { questionaryId, formKey } = navData;
   // -- content
   console.log();
   const formData = await patientLib.getFormContent(
     questionaryId,
-    formKey,
-    date
+    formKey
   );
+  const tableRow = await refreshDataTable(date);
+  console.log('## tableRow', tableRow);
+
+  // HACKY WAY TO ADD EXISTNG CONTENT SHOULD BE DONE IN LIB
+  for (const field of formData) {
+    if (tableRow[field.id]) {
+      field.value = tableRow[field.id].value;
+      field.eventId = tableRow[field.id].eventId;
+    }
+  }
+
   updateFormContent(formData);
   document.getElementById("submit-button-list").onclick = function () {
     submitForm(formData, date);
   };
 }
 
 async function refreshDataTable(date) {
+  const currentDateStr = date.toISOString().split("T")[0]; // format YYYY-MM-DD;
   const { questionaryId, formKey } = navData;
   const tableData = await patientLib.getHistoricalContent(
     questionaryId,
@@ -65,15 +75,22 @@ async function refreshDataTable(date) {
   }
   for (const [dateStr, data] of Object.entries(tableData.valuesByDate)) {
     const row = table.insertRow(-1);
+    if (currentDateStr === dateStr) {
+      row.style.backgroundColor = 'grey';
+    } else {
+      row.onclick = 
+    }
+
     const cellDate = row.insertCell(-1);
     cellDate.innerHTML = dateStr;
     for (const th of tableData.tableHeaders) {
       const cell = row.insertCell(-1);
-      cell.innerHTML = data[th.fieldId] || '';
+      cell.innerHTML = data[th.fieldId]?.value || '';
     }
   }
 
   console.log("## tabledata", tableData);
+  return tableData.valuesByDate[currentDateStr] || {};
 }
 
 // ------- Form -------- //
@@ -89,7 +106,7 @@ async function updateFormContent(formData) {
   for (let i = 0; i < formData.length; i++) {
     const formField = formData[i];
     const fieldId = formField.id;
-    const fieldValue = formField.value != null ? formField.value : "";
+    const fieldValue = formField.value != null ? `${formField.value}` : '';
     const fieldType = formField.type;
     const fieldLabel = formField.label;
 
@@ -101,7 +118,7 @@ async function updateFormContent(formData) {
       fieldHTML += `<select id="${fieldId}" class="form-control">`;
       fieldHTML += `<option value="">--</option>`;
       for (const option of formField.options) {
-        const selected = option.value === fieldValue ? "selected" : "";
+        const selected = `${option.value}` === fieldValue ? "selected" : "";
         fieldHTML += `<option value="${option.value}" ${selected}>${option.label}</option>`;
       }
       fieldHTML += `</select>`;
@@ -131,4 +148,5 @@ async function submitForm(formData, date) {
   }
   await patientLib.handleFormSubmit(formData, values, date);
   alert("Form submitted successfully");
+  refreshAll(date);
 }

patient-history.html

@@ -36,6 +36,8 @@ <h3 class="card-title"> Set: <span id="card-questionnary-details-question-set">H
         </div>
         <button type="button" id="submit-button-list" class="btn btn-primary mb-2">Submit</button>
       </form>
+      <hr>
+      <h3>History:</h3>
       <table id="historical-data" class="table"></table>
     </div>
   </div>

patient-lib.js

@@ -100,7 +100,7 @@ async function getFormRecurringContent (form, date) {
 
   for (let i = 0; i < formReccuringData.length; i++) {
     const field = formReccuringData[i];
-    field.id = form.key + '-' + i;
+    field.id = field.streamId + ':' + field.eventType;
   }
   return formReccuringData;
 
@@ -129,7 +129,7 @@ async function getFormExistingContent (form, date) {
   for (let i = 0; i < res.length; i++) {
     const e = res[i];
     const field = formData[i];
-    field.id = form.key + '-' + i;
+    field.id = field.streamId + ':' + field.eventType;
     console.log('## getFormContent ' + i, e);
     if (e.events && e.events.length > 0) {
       const event = e.events[0];
@@ -150,11 +150,14 @@ async function getHistoricalContent(questionaryId, formKey) {
   }));
 
   const valuesByDate = {};
-  function addEntry (field, time, value) {
+  function addEntry (field, time, event) {
     const dateStr = (new Date(time * 1000)).toISOString().split('T')[0];
     if (valuesByDate[dateStr] == null) valuesByDate[dateStr] = {};
     const fieldId = field.streamId + ':' + field.eventType;
-    valuesByDate[dateStr][fieldId] = valueForField(value, field);
+    valuesByDate[dateStr][fieldId] = {
+      value: valueForField(event.content, field),
+      eventId: event.id
+    }
   }
 
   // get the values from the API
@@ -172,7 +175,7 @@ async function getHistoricalContent(questionaryId, formKey) {
     const field = formFields[i];
     if (e.events) {
       for (const event of e.events) {
-        addEntry(field, event.time, event.content);
+        addEntry(field, event.time, event);
       }
     } 
   }