Most of the flow is working

Author: perki

dr-controler.js

@@ -57,7 +57,7 @@ async function setQuestionnaries() {
 // ------- Get Dr's info -------- //
 function getQuestionnaryFromUrl() {
   const params = new URLSearchParams(document.location.search);
-  const questionaryId = params.get('questionaryId');
+  const questionaryId = params.get('collectorId');
   return questionaryId
 }
 
@@ -175,7 +175,7 @@ async function refreshPatientList(collector) {
       }
       row.insertCell(-1).innerHTML = text;
     }
-    
+
   }
   // return this to be used by Excel Download
   return { headers, patientsData };

dr-lib.js

@@ -1,9 +1,6 @@
 import { dataDefs } from "./common-data-defs.js";
-import { hdsModel, serviceInfoUrl, initHDSModel } from "./common-lib.js"
+import { hdsModel, serviceInfoUrl, initHDSModel, stateSaveApp } from "./common-lib.js"
 
-// OLD
-const appDrStreamId = dataDefs.appId + "-dr"; // simply use the appId + '-dr'
-let drConnection = null;
 
 // NEW
 /** The "base" stream for this App */
@@ -67,11 +64,13 @@ function showLoginButton (loginSpanId, stateChangeCallBack) {
     if (state.id === HDSLib.pryv.Browser.AuthStates.AUTHORIZED) {
       await initHDSModel(); // hds model needs to be initialized 
       appManaging = await HDSLib.appTemplates.AppManagingAccount.newFromApiEndpoint(APP_MANAGING_STREAMID, state.apiEndpoint, APP_MANAGING_NAME);
+      stateSaveApp('managing', appManaging);
       await initDemoAccount(appManaging);
       stateChangeCallBack("loggedIN");
     }
     if (state.id === HDSLib.pryv.Browser.AuthStates.INITIALIZED) {
       appManaging = null;
+      stateSaveApp('managing', null);
       stateChangeCallBack("loggedOUT");
     }
   }

dr-patient-view-controler.js

@@ -1,6 +1,7 @@
+import { initHDSModel, stateGetApp } from "./common-lib.js";
 import { drPatientLib  } from "./dr-patient-view-lib.js";
 import { exportXLSFile } from './exporToXLS.js';
-import { patientLib } from "./patient-lib.js";
+
 /**
  * Based on 
  * - drApiConnecion
@@ -11,24 +12,29 @@ import { patientLib } from "./patient-lib.js";
  */
 
 
-let infos;
-let username;
-let qId;
+let invite;
 window.onload = async (event) => {
-  const { patientApiEndpoint, questionaryId } = getRequestFrormApiEndPoint();
-  infos = await drPatientLib.setRefresh(patientApiEndpoint, questionaryId, refresh)
+  await initHDSModel();
+  // get collectorId & inviteKey from URL
+  const params = new URLSearchParams(document.location.search);
+  const collectorId = params.get('collectorId');
+  const inviteKey = params.get('inviteKey');
+
+  // get app from state management
+  const appManaging = await stateGetApp('managing');
+  const collector = await appManaging.getCollectorById(collectorId);
+  invite = await collector.getInviteByKey(inviteKey);
+  console.log('# Loaded with invite', invite);
+
+  await drPatientLib.setRefresh(invite, refresh)
   // -- home button
-  document.getElementById('home-button').href= 'dr.html?questionaryId=' + questionaryId;
+  document.getElementById('home-button').href= 'dr.html?collectorId=' + collectorId;
 
   // - form title
   const formTitle = document.getElementById('card-questionnary-details-title');
-  formTitle.innerHTML = patientLib.getFormTitle(questionaryId);
-  
-  qId = questionaryId;
+  formTitle.innerHTML = collector.name;
 
-  // -- set patient Id
-  username = infos.user.username;
-  document.getElementById('patient-label').innerHTML = username;
+  document.getElementById('patient-label').innerHTML = invite.displayName;
 }
 
 const tableHeaders = {
@@ -48,7 +54,7 @@ const downloadHeaders = Object.assign({
 async function refresh (lines) {
   // -- set download button
   document.getElementById('button-download').onclick = async () => {
-    await exportXLSFile(downloadHeaders, lines, username + '-' + qId);
+    await exportXLSFile(downloadHeaders, lines, invite.displayName + '-' + invite.collector.name);
   };
 
   // -- update table
@@ -70,11 +76,3 @@ async function refresh (lines) {
     }
   }
 }
-
-// ------- Get Dr's info -------- //
-function getRequestFrormApiEndPoint() {
-  const params = new URLSearchParams(document.location.search);
-  const patientApiEndpoint = params.get('patientApiEndpoint');
-  const questionaryId = params.get('questionaryId');
-  return { patientApiEndpoint, questionaryId };
-}

dr-patient-view-lib.js

@@ -6,41 +6,37 @@ export const drPatientLib = {
   setRefresh
 }
 
-let connection;
-async function setRefresh(patientApiEndoint, questionaryId, refreshCallBack) {
-  connection = await connectAPIEndpoint(patientApiEndoint);
-  const infos = await connection.accessInfo();
+async function setRefresh(invite, refreshCallBack) {
 
   async function doRefresh () {
-    const lines = await getPatientData(questionaryId); 
+    const lines = await getPatientData(invite); 
     refreshCallBack(lines);
   }
 
-  await connection.socket.open();
-  connection.socket.on('eventsChanged', async () => {
+  await invite.connection.socket.open();
+  invite.connection.socket.on('eventsChanged', async () => {
     await doRefresh();
   });
 
   // do it once
   doRefresh();
-  return infos;
 }
 
 
-async function getPatientData (questionaryId) {
+async function getPatientData (invite) {
   const patientData = [];
   const queryParams = { limit: 10000};
   function forEachEvent(event) {
-    patientData.push(getLineForEvent (event, questionaryId));
+    patientData.push(getLineForEvent (event));
   }
 
 
-  await connection.getEventsStreamed(queryParams, forEachEvent);
+  await invite.connection.getEventsStreamed(queryParams, forEachEvent);
   return patientData;
 }
 
 
-function getLineForEvent (event, questionaryId) {
+function getLineForEvent (event) {
   const model = hdsModel();
   const line = {
     time: (new Date(event.time * 1000)).toISOString(),

dr-patient-view.html

@@ -11,9 +11,7 @@
   <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Inter:300,400">
   <title>Demo Form - Dr's page</title>
 </head>
-<script src="https://pryv.github.io/lib-js/pryv.js"></script>
-<script src="https://api.pryv.com/lib-js/pryv-socket.io.js"></script>
-<script src="https://healthdatasafe.github.io/hds-lib-js/hds-lib.js"></script>
+<script src="https://whatever.backloop.dev:5553/hds-lib.js"></script>
 <script type="module" src="dr-patient-view-controler.js"></script>
 
 <body style="background-color:powderblue;">

patient-home-lib.js

@@ -44,7 +44,7 @@ function showLoginButton (loginSpanId, stateChangeCallBack) {
        stateChangeCallBack('loggedIN');
      }
      if (state.id === HDSLib.pryv.Browser.AuthStates.INITIALIZED) {
-       stateSaveApp(null, 'client');
+       stateSaveApp('client', null);
        stateChangeCallBack('loggedOUT');
      }
    }