Removed base streams

Author: perki

common-data-defs.js

@@ -1,36 +1,4 @@
 
-const patientBaseStreams = [
-  // profile
-  {id: 'profile', name: 'Profile'},
-  {id: 'profile-name', name: 'Name', parentId: 'profile'},
-  {id: 'profile-address', name: 'Address', parentId: 'profile'},
-  {id: 'profile-date-of-birth', name: 'Date of Birth', parentId: 'profile'},
-  {id: 'profile-location', name: 'Location', parentId: 'profile'},
-  {id: 'profile-sex', name: 'Sex', parentId: 'profile'},
-  // family
-  {id: 'family', name: 'Family'},
-  {id: 'family-children', name: 'Children', parentId: 'family'},
-  // fertility
-  {id: 'fertility', name: 'Fertility'},
-  {id: 'fertility-miscarriages', name: 'Miscarriages', 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
-  {id: 'body', name: 'Body'},
-  {id: 'body-height', name: 'Body Height', parentId: 'body'},
-  {id: 'body-weight', name: 'Body Weight', parentId: 'body'},
-  // vulva
-  {id: 'body-vulva', name: 'Vulva', parentId: 'body'},
-  {id: 'body-vulva-wetness', name: 'Vulva Wetness', parentId: 'body-vulva'},
-  {id: 'body-vulva-wetness-feeling', name: 'Vulva Wetness Feeling', parentId: 'body-vulva-wetness'},
-  {id: 'body-vulva-mucus', name: 'Vulva Mucus', parentId: 'body-vulva'},
-  {id: 'body-vulva-mucus-inspect', name: 'Vulva Mucus Inspect', parentId: 'body-vulva-mucus'},
-  {id: 'body-vulva-mucus-stretch', name: 'Vulva Mucus Stretch', parentId: 'body-vulva-mucus'}
-];
 
 const patientBasePermissionsX = [
   {id: 'profile', name: 'Profile'},
@@ -47,174 +15,6 @@ const patientBasePermissionsB = [
   {id: 'body-weight', name: 'Body weight'},
 ]
 
-const formProfileContentBase = [
-  {
-    streamId: 'profile-name',
-    eventType: 'contact/name',
-    type: 'text',
-    label: 'First Name',
-  },
-  {
-    streamId: 'profile-name',
-    eventType: 'contact/surname',
-    type: 'text',
-    label: 'Last Name',
-  },
-  {
-    streamId: 'profile-date-of-birth',
-    eventType: 'date/iso-8601',
-    type: 'date',
-    label: 'Date of Birth',
-  }];
-
-const formProfileContentX = [
-  ...formProfileContentBase,
-  {
-    streamId: 'profile-address',
-    eventType: 'contact/country',
-    type: 'text',
-    label: 'Country',
-  },
-  {
-    streamId: 'profile-sex',
-    eventType: 'attributes/biological-sex',
-    type: 'select',
-    options: [{ value: 'male', label: 'Male' }, { value: 'female', label: 'Female'}],
-    label: 'Sex',
-  },
-  {
-    streamId: 'family-children',
-    eventType: 'count/generic',
-    type: 'number',
-    label: '# of children',
-  },
-  {
-    streamId: 'fertility-miscarriages',
-    eventType: 'count/generic',
-    type: 'number',
-    label: '# of miscarriages',
-  },
-  {
-    streamId: 'fertility-cycles-charted-estimation',
-    eventType: 'count/generic',
-    type: 'number',
-    label: '# of charted cycles',
-  }
-];
-
-const formHistoricalContentX = [
-  {
-    streamId: 'fertility-ttc-tta',
-    eventType: 'fertility-intention/ttc-tta',
-    label: 'Goal: Trying to conceive or avoid pregnancy',
-    type: 'select',
-    parseValueToNum: true,
-    options: [
-      {
-        value: 0,
-        label: 'TTA - Not taking risks. Would take all available measures to end a pregnancy.'
-      },
-      {
-        value: 1,
-        label: 'TTA - Not taking risks. Would strongly consider placing baby for adoption.'
-      },
-      {
-        value: 2,
-        label: 'TTA - Not taking risks. Would need some time, maybe counseling. Ultimately keeping the pregnancy.'
-      },
-      {
-        value: 4,
-        label: 'TTA - Not taking risks. Currently content with family size but a surprise pregnancy would be welcome.'
-      },
-      {
-        value: 5,
-        label: 'TTW/TTA - “Loosely TTA” known risks are taken in the fertile window. “OOPS” pregnancy would be welcome.'
-      },
-      {
-        value: 6,
-        label: 'TTW - Charting only for health/curiosity. Unprotected intercourse happens whenever. Pregnancy very welcome.'
-      },
-      {
-        value: 7,
-        label: 'TTW/TTC - Pregnancy very welcome (moving up the scale in very near future).'
-      },
-      {
-        value: 8,
-        label: 'TTC - “Excited to start/grow a family TTC” Intentional intercourse every cycle. Excited to start/grow a family. But would not use any fertility treatments if needed.'
-      },
-      {
-        value: 9,
-        label: 'TTC - “Highly hopeful TTC” Intentional intercourse every cycle. Would consider some but not all fertility treatments if needed.'
-      },
-      {
-        value: 10,
-        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)',
-  }
-]
-
-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'}
-    ]
-  },
-  {
-    streamId: 'body-vulva-mucus-inspect',
-    eventType: 'vulva-mucus-inspect/v0',
-    type: 'select',
-    label: 'Cervical Fluid Inspect',
-    options: [
-      { value: 'clear', label: 'Clear' },
-      { value: 'creamy', label: 'Creamy' },
-      { value: 'dry-sticky', label: 'Dry & Sticky' },
-      { value: 'egg-white', label: 'Egg White' },
-    ]
-  },
-  {
-    streamId: 'body-vulva-mucus-stretch',
-    eventType: 'ratio/generic',
-    type: 'select',
-    label: 'Cervical Fluid Stretch',
-    options: [
-      { value: 0, label: 'No Strech' },
-      { value: 1, label: 'Short' },
-      { value: 2, label: 'Long'}
-    ]
-  },
-  {
-    streamId: 'fertility-cycles-start',
-    eventType: 'activity/plain',
-    type: 'checkbox',
-    label: 'New Cycle'
-  },
-  {
-    streamId: 'fertility-cycles-ovulation',
-    eventType: 'activity/plain',
-    type: 'checkbox',
-    label: 'Ovulation Day'
-  }
-]
-
 
 const questionnaires = {
   'questionary-x': {
@@ -224,19 +24,16 @@ const questionnaires = {
       level: 'read',
       name: perm.name,
     })),
-    patientBaseStreams,
     forms: {
       profile: {
         type: 'permanent',
         key: 'profile-x',
         name: 'Profile',
-        content: formProfileContentX
       },
       history: {
         type: 'recurring',
         key: 'recurring-x',
         name: 'History',
-        content: formHistoricalContentX
       }
     }
   },
@@ -247,19 +44,16 @@ const questionnaires = {
       level: 'read',
       name: perm.name,
     })),
-    patientBaseStreams,
     forms: {
       profile: {
         type: 'permanent',
         key: 'profile-b',
-        name: 'Profile',
-        content: formProfileContentBase
+        name: 'Profile'
       },
       history: {
         type: 'recurring',
         key: 'recurring-b',
-        name: 'History',
-        content: formHistoricalContentB
+        name: 'History'
       }
     }
   }
@@ -322,8 +116,22 @@ const v2 = {
   }
 }
 
+/**
+ * get all itemKeys of a questionnary
+ * @param {*} questionaryId 
+ */
+function utilGetAllItemKeys (questionaryId) {
+  const questionary = v2[questionaryId];
+  const itemKeys = [];
+  for (const formContent of Object.values(questionary.forms)) {
+    itemKeys.push(...formContent.itemKeys);
+  }
+  return itemKeys;
+}
+
 export const dataDefs = {
   appId: 'demo-dr-forms',
   questionnaires,
-  v2questionnaires: v2
+  v2questionnaires: v2,
+  utilGetAllItemKeys
 };

patient-home-controler.js

@@ -129,8 +129,6 @@ async function showFormDetails(formInfo) {
   if (formDetails.status === 'accepted') {
     buttonOpen.innerHTML = 'Open';
     buttonOpen.onclick = async function () {
-      // -- hack publish access anyway (this should be done just once)
-      await patientHomeLib.publishAccess(formDetails);
       document.location.href = nextPage;
     };
     buttonRevoke.innerHTML = 'Revoke';

patient-home-lib.js

@@ -1,5 +1,5 @@
 import { dataDefs } from './common-data-defs.js';
-import { connectAPIEndpoint, serviceInfoUrl } from './common-lib.js';
+import { connectAPIEndpoint, hdsModel, serviceInfoUrl } from './common-lib.js';
 
 export const patientHomeLib = {
   getForms,
@@ -95,7 +95,8 @@ async function createsPatientAccountStreams (connection, streams) {
 // ---- if first connection to the app create a sharing for the Dr and submit it ---- //
 async function grantAccess (formInfo, formDetails) {
   // create needed base streams
-  const baseStreams = dataDefs.questionnaires[formInfo.questionaryId].patientBaseStreams;
+  const itemKeys = dataDefs.utilGetAllItemKeys(formInfo.questionaryId);
+  const baseStreams = hdsModel().streamsGetNecessaryListForItemKeys(itemKeys);
   await createsPatientAccountStreams(connection, baseStreams);
 
   // remove unecessary permissions details
@@ -127,9 +128,6 @@ async function grantAccess (formInfo, formDetails) {
 }
 
 async function publishAccess (formDetails) {
-  // create needed base streams
-  const baseStreams = dataDefs.questionnaires[formDetails.formInfo.questionaryId].patientBaseStreams;
-  await createsPatientAccountStreams(connection, baseStreams);
 
   // publishing access on Dr Account
   const apiCalls = [{