Multiple forms now supported

Author: perki

CookieUtils.js

@@ -16,12 +16,13 @@ function set (cookieKey, value, expireInDays = 365, path) {
   expireInDays = expireInDays;
   const myDate = new Date();
   const hostName = window.location.hostname;
-  const cookiePath = window.location.pathname;
+  const cookiePath = path || window.location.pathname;
   myDate.setDate(myDate.getDate() + expireInDays);
   let cookieStr = encodeURIComponent(cookieKey) + '=' +
     encodeURIComponent(JSON.stringify(value)) +
+    ';path=' + cookiePath +
     ';expires=' + myDate.toGMTString() +
-    ';domain=.' + hostName + ';path=' + cookiePath;
+    ';domain=' + hostName ;
   // do not add SameSite when removing a cookie
   if (expireInDays >= 0) cookieStr += ';SameSite=Strict';
   document.cookie = cookieStr;
@@ -46,6 +47,6 @@ function get (cookieKey) {
  * @memberof CookieUtils
  * @param cookieKey - The key
  */
-function del (cookieKey) {
-  set(cookieKey, { deleted: true }, -1);
+function del (cookieKey, path) {
+  set(cookieKey, { deleted: true }, -1, path);
 }

common-data-defs.js

@@ -15,23 +15,33 @@ const patientBaseStreams = [
   {id: 'fertility-miscarriages', name: 'Miscarriages', parentId: 'fertility'},
   {id: 'fertility-traings', name: 'Trainings', parentId: 'fertility'},
   {id: 'fertility-cycles', name: 'Cycles', parentId: 'fertility'},
-  {id: 'fertility-cycles-charted-extimation', name: 'Cycles charted estimation', parentId: 'fertility'},
+  {id: 'fertility-cycles-charted-extimation', 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'}
 ];
 
-const patientBasePermissions = [
+const patientBasePermissionsX = [
   {id: 'profile', name: 'Profile'},
   {id: 'family', name: 'Family'},
   {id: 'fertility', name: 'Fertility'},
   {id: 'body-height', name: 'Body height'},
   {id: 'body-weight', name: 'Body weight'},
+];
+
+const patientBasePermissionsB = [
+  {id: 'profile', name: 'Profile'},
+  {id: 'fertility-cycles', name: 'Fertility Cycles'},
+  {id: 'body-vulva', name: 'Vulva'}
 ]
 
-const formProfileContent = [
+const formProfileContentBase = [
   {
     streamId: 'profile-name',
     eventType: 'contact/name',
@@ -44,6 +54,15 @@ const formProfileContent = [
     type: 'text',
     label: 'Surname',
   },
+  {
+    streamId: 'profile-date-of-birth',
+    eventType: 'date/iso-8601',
+    type: 'date',
+    label: 'Date of Birth',
+  }];
+
+const formProfileContentX = [
+  ...formProfileContentBase,
   {
     streamId: 'profile-nationality',
     eventType: 'contact/nationality',
@@ -57,12 +76,6 @@ const formProfileContent = [
     options: [{ value: 'male', label: 'Male' }, { value: 'female', label: 'Female'}],
     label: 'Sex',
   },
-  {
-    streamId: 'profile-date-of-birth',
-    eventType: 'date/iso-8601',
-    type: 'date',
-    label: 'Date of Birth',
-  },
   {
     streamId: 'family-children',
     eventType: 'count/generic',
@@ -83,8 +96,7 @@ const formProfileContent = [
   }
 ];
 
-// -- fields lists -- //
-const formHistoricalContent = [
+const formHistoricalContentX = [
   {
     streamId: 'ttc-tta',
     eventType: 'fertility-intention/ttc-tta',
@@ -141,10 +153,16 @@ const formHistoricalContent = [
   }
 ]
 
+const formHistoricalContentB = [
+]
+
+//
+
+
 const questionnaires = {
-  'demo-dr-forms-questionary-x': {
+  'questionary-x': {
     title: 'Demo with Profile and TTC-TTA',
-    permissions: patientBasePermissions.map(perm => ({
+    permissions: patientBasePermissionsX.map(perm => ({
       streamId: perm.id,
       level: 'read',
       name: perm.name,
@@ -155,18 +173,42 @@ const questionnaires = {
         type: 'permanent',
         key: 'profile-x',
         name: 'Profile',
-        content: formProfileContent
+        content: formProfileContentX
       },
       history: {
         type: 'recurring',
         key: 'recurring-x',
         name: 'History',
-        content: formHistoricalContent
+        content: formHistoricalContentX
+      }
+    }
+  },
+  'questionnary-basic': {
+    title: 'Basic Profile and Cycle Information',
+    permissions: patientBasePermissionsB.map(perm => ({
+      streamId: perm.id,
+      level: 'read',
+      name: perm.name,
+    })),
+    patientBaseStreams,
+    forms: {
+      profile: {
+        type: 'permanent',
+        key: 'profile-b',
+        name: 'Profile',
+        content: formProfileContentBase
+      },
+      history: {
+        type: 'recurring',
+        key: 'recurring-b',
+        name: 'History',
+        content: formHistoricalContentB
       }
     }
   }
 }
 
 export const dataDefs = {
-  questionnaires
+  appId: 'demo-dr-forms',
+  questionnaires,
 };

dr-controler.js

@@ -14,7 +14,6 @@ window.onload = (event) => {
 };
 
 async function stateChange(state) {
-  const questionaryId = 'demo-dr-forms-questionary-x';
   if (state === 'loggedIN') {
     document.getElementById('please-login').style.visibility = 'hidden';
     document.getElementById('data-view').style.visibility = 'visible';
@@ -52,6 +51,7 @@ async function setQuestionnaries() {
 }
 
 async function showQuestionnary(questionaryId) {
+  console.log('## showQuestionnary', questionaryId);
   if (questionaryId == null) {
     document.getElementById('questionnary-view').style.visibility = 'hidden';
     return;