Adapting to new lib

Author: perki

common-data-defs.js

@@ -1,7 +1,7 @@
 
 const v2 = {
   'questionary-x': {
-    title: 'Demo with Profile and TTC-TTA 3',
+    title: 'Demo with Profile and TTC-TTA 4',
     permissionsPreRequest: [
       {streamId: 'profile'},
       {streamId: 'fertility'},
@@ -17,7 +17,24 @@ const v2 = {
           'profile-sex',
           'family-children-count',
           'fertility-miscarriages-count'
-        ]
+        ],
+        customItems: {
+          'test-1': {
+            label: 'This is a checkbox',
+            type: 'checkbox',
+          },
+          'test-2': {
+            label: 'This is a multiple choice',
+            type: 'multiple',
+            options: [
+              { value: 'anemia', label: 'Anemia' }
+            ]
+          },
+          'test-3': {
+            label: 'This is question',
+            type: 'text'
+          }
+        }
       },
       history: {
         type: 'recurring',

dr-controler.js

@@ -84,24 +84,24 @@ async function showQuestionnary(questionaryId) {
   // TODO check if the following line is necessary 
   await collector.init(); // load controller data only when needed
   // show details
-  const status = collector.statusData;
+  const requestContent = collector.request.content;
 
-  document.getElementById('request-title').innerHTML = HDSLib.l(status.requestContent.title);
-  document.getElementById('request-requester').innerHTML = status.requestContent.requester.name;
-  document.getElementById('request-description').innerHTML = HDSLib.l(status.requestContent.description);
-  document.getElementById('request-consent').innerHTML = HDSLib.l(status.requestContent.consent);
-  const permissionsStr = status.requestContent.permissions.map(p =>  `- ${p.defaultName} => ${p.level}`).join('<BR>\n');
+  document.getElementById('request-title').innerHTML = HDSLib.l(requestContent.title);
+  document.getElementById('request-requester').innerHTML = requestContent.requester.name;
+  document.getElementById('request-description').innerHTML = HDSLib.l(requestContent.description);
+  document.getElementById('request-consent').innerHTML = HDSLib.l(requestContent.consent);
+  const permissionsStr = requestContent.permissions.map(p =>  `- ${p.defaultName} => ${p.level}`).join('<BR>\n');
   document.getElementById('request-permissions').innerHTML = permissionsStr;
-  document.getElementById('request-app-id').innerHTML = status.requestContent.app.id;
-  document.getElementById('request-app-url').innerHTML = status.requestContent.app.url;
+  document.getElementById('request-app-id').innerHTML = requestContent.app.id;
+  document.getElementById('request-app-url').innerHTML = requestContent.app.url;
 
   // document.getElementById('requestContent').innerHTML = JSON.stringify(status, null, 2);
   // forms sections
   const table = document.getElementById('forms-sections');
   table.innerHTML = '';
   const keyTitles = { type: 'Type', name: 'Name', itemKeys: 'ItemKeys'};
 
-  const forms = Object.values(status.requestContent.app.data.forms);
+  const forms = Object.values(requestContent.app.data.forms);
   console.log('## forms', forms);
   for (const [key, title] of Object.entries(keyTitles)) {
     const row = table.insertRow(-1);
@@ -118,7 +118,7 @@ async function showQuestionnary(questionaryId) {
     }
   }  
 
-  console.log('## showQuestionnary status:', status);
+  console.log('## showQuestionnary status:', requestContent);
 
   // set create sharing button
   document.getElementById('button-new-sharing').onclick = async () => {
@@ -184,7 +184,7 @@ async function refreshPatientList(collector) {
 
   const table = document.getElementById('patients-table');
 
-  const requestContent = collector.statusData.requestContent;
+  const requestContent = collector.request.content;
   console.log('## collector requestContent', requestContent);
 
   // clear table

dr-lib.js

@@ -117,18 +117,17 @@ async function initDemoAccount (appManaging) {
         } 
       }
     };
-    newCollector.statusData.requestContent = requestContent;
+    newCollector.request.setContent(requestContent);
     await newCollector.save(); // save the data (done when the form is edited)
-    await newCollector.publish();
-    console.log('##2 initDemoAccount published', newCollector);
+    // await newCollector.publish(); console.log('##2 initDemoAccount published', newCollector);
   }
   console.log('##2 initDemoAccount with ', collectors);
 }
 
 // -------- Fetch patient list --------
 
 async function getPatientsData (collector) {
-  const requestContent = collector.statusData.requestContent;
+  const requestContent = collector.request.content;
   console.log('## collector requestContent', requestContent);
   // static headers
   const headers = {