removing unsued dataFieldKey

Author: perki

common-data-defs.js

@@ -37,57 +37,49 @@ const formProfileContent = [
     eventType: 'contact/name',
     type: 'text',
     label: 'Name',
-    dataFieldKey: 'name',
   },
   {
     streamId: 'profile-name',
     eventType: 'contact/surname',
     type: 'text',
     label: 'Surname',
-    dataFieldKey: 'surname',
   },
   {
     streamId: 'profile-nationality',
     eventType: 'contact/nationality',
     type: 'text',
     label: 'Nationality',
-    dataFieldKey: 'nationality',
   },
   {
     streamId: 'profile-sex',
     eventType: 'attributes/biological-sex',
     type: 'select',
     options: [{ value: 'male', label: 'Male' }, { value: 'female', label: 'Female'}],
     label: 'Sex',
-    dataFieldKey: 'sex',
   },
   {
     streamId: 'profile-date-of-birth',
     eventType: 'date/iso-8601',
     type: 'date',
     label: 'Date of Birth',
-    dataFieldKey: 'date-of-birth',
   },
   {
     streamId: 'family-children',
     eventType: 'count/generic',
     type: 'number',
     label: 'Nb of children',
-    dataFieldKey: 'children-count',
   },
   {
     streamId: 'fertility-miscarriages',
     eventType: 'count/generic',
     type: 'number',
     label: 'Nb of miscarriages',
-    dataFieldKey: 'miscarriages-count',
   },
   {
     streamId: 'fertility-cycles-charted-extimation',
     eventType: 'count/generic',
     type: 'number',
     label: 'Nb of charted cycles',
-    dataFieldKey: 'charted-cycles-count',
   }
 ];
 
@@ -97,7 +89,6 @@ const formHistoricalContent = [
     streamId: 'ttc-tta',
     eventType: 'fertility-intention/ttc-tta',
     label: 'Trying to conceive / Avoiding pregnancy',
-    dataFieldKey: 'ttc-tta',
     type: 'select',
     options: [
       {
@@ -141,6 +132,12 @@ const formHistoricalContent = [
         label: 'TTC - “ Seriously TTC” Intentional intercourse every cycle. Would pursue any/ALL fertility treatments or procedures if needed.'
       }
     ]
+  },
+  {
+    streamId: 'body-weight',
+    eventType: 'mass/kg',
+    type: 'number',
+    label: 'Body Weight (kg)',
   }
 ]
 

dr-controler.js

@@ -52,7 +52,8 @@ async function setPatientList(questionaryId) {
     const cellUsername = row.insertCell(-1);
     cellUsername.innerHTML = patient.username;
     for (const field of fields) {
-      const value = patient.formData[field.dataFieldKey]?.value;
+      const formFieldId = field.streamId + ':' + field.eventType;
+      const value = patient.formData[formFieldId]?.value;
       row.insertCell(-1).innerHTML = (value != null) ? value : '';
     }
   }

dr-lib.js

@@ -195,8 +195,7 @@ function dataFieldFromEvent (formProfile, event) {
     return null;
   }
   const field = {
-    formFieldId,
-    key: dataField.dataFieldKey,
+    key: formFieldId,
     label: dataField.label,
     type: dataField.type,
     value: event.content,

patient-lib.js

@@ -35,9 +35,11 @@ async function getFormContent (questionaryId, formKey) {
 
 async function getFormRecurringContent (form) {
   const formReccuringData = structuredClone(form.content);
-  formReccuringData.forEach(field => {
-    field.id = 'field-historical-' + field.dataFieldKey; 
-  });
+
+  for (let i = 0; i < formReccuringData.length; i++) {
+    const field = formReccuringData[i];
+    field.id = form.key + '-' + i;
+  }
   return formReccuringData;
 }
 
@@ -61,7 +63,7 @@ async function getFormPermanentContent (form) {
   for (let i = 0; i < res.length; i++) {
     const e = res[i];
     const field = formPermanentData[i];
-    field.id = 'field-profile-' + field.dataFieldKey;
+    field.id = form.key + '-' + i;
     console.log('## getFormContent ' + i, e);
     if (e.events && e.events.length > 0) {
       const event = e.events[0];