formKeys

Author: perki

patient-history-controler.js

@@ -1,4 +1,5 @@
 import { patientLib } from './patient-lib.js';
+import { navControler } from './patient-nav-controler.js'
 /**
  * UI management code. 
  * Relies on patientLib for API calls and data management
@@ -7,18 +8,14 @@ import { patientLib } from './patient-lib.js';
  */
 
 window.onload = async (event) => {
-  const navData = patientLib.navGetData();
+  const navData = await navControler.setNavComponents();
   console.log('## navData', navData);
   const { patientApiEndpoint, questionaryId } = navData;
   console.log('## patientApiEndpoint:', patientApiEndpoint);
   await patientLib.connect(patientApiEndpoint, questionaryId);
    // - form title
    const formTitle = document.getElementById('card-questionnary-details-title');
    formTitle.innerHTML = patientLib.getFormTitle(questionaryId);
-  // -- navigation
-  document.getElementById('nav-profile').onclick = () => {
-    document.location.href = 'patient-profile.html';
-  };
 
   // -- connection
   updateFormContent(questionaryId, 'history');

patient-history.html

@@ -20,13 +20,7 @@
     <h1>Demo Form - Patient's page</h1>
     <div class="card">
       <div class="card-header">
-        <table> 
-          <tr>
-            <td><A HREF="patient.html" class="btn btn-primary">Home</A></td>
-            <td>&nbsp;</td>
-            <td><button id="nav-profile" class="btn btn-primary">Profile</button></td>
-          </tr>
-        </table>
+        <div id="card-nav"></div>
       </div>
     </div>
     <div class="card" id="card-content" >

patient-home-controler.js

@@ -113,10 +113,11 @@ async function showFormDetails(formInfo) {
 
   if (formDetails.status === 'accepted') {
     buttonOpen.innerHTML = 'Open';
+    const nextPage = (await patientLib.navGetPages(formInfo.questionaryId))[1].url;
     buttonOpen.onclick = async function () {
       // -- hack publish access anyway (this should be done just once)
       await patientHomeLib.publishAccess(formDetails);
-      document.location.href = 'patient-profile.html';
+      document.location.href = nextPage;
     };
     buttonRevoke.innerHTML = 'Revoke';
     buttonRevoke.onclick = async function () {
@@ -129,7 +130,7 @@ async function showFormDetails(formInfo) {
     buttonOpen.innerHTML = 'Grant access and Open';
     buttonOpen.onclick = async function () {
       await patientHomeLib.grantAccess(formInfo, formDetails);
-      document.location.href = 'patient-profile.html';
+      document.location.href = nextPage;
     };
     buttonRevoke.innerHTML = 'Refuse';
     buttonRevoke.onclick = async function () {

patient-lib.js

@@ -1,14 +1,17 @@
 import { dataDefs } from './common-data-defs.js';
 import { CookieUtils } from './CookieUtils.js';
 
+
+
 export const patientLib = {
   handleFormSubmit,
   getFormTitle,
   getFormContent,
   connect,
-  getNavigationQueryParams,
   navSetData,
-  navGetData
+  navGetData,
+  getForms,
+  navGetPages
 }
 
 
@@ -22,10 +25,6 @@ async function connect (apiEndpoint, questionaryId) {
   return accessInfo;
 }
 
-function getNavigationQueryParams() {
-  return `?patientApiEndpoint=${connection.apiEndpoint}&questionaryId=${_questionaryId}`
-}
-
 // --------------- navigation - to be replaced if built-in framework ------- //
 
 const COOKIE_KEY = 'hds-' + dataDefs.appId;
@@ -35,7 +34,34 @@ function navSetData(data) {
 }
 
 function navGetData() {
-  return CookieUtils.get(COOKIE_KEY);
+  const cookieContent = CookieUtils.get(COOKIE_KEY);
+  const formKey = (new URLSearchParams(window.location.search)).get('formKey');
+  return Object.assign({ formKey }, cookieContent);
+}
+
+const pagesByTypes = {
+  home: 'patient.html',
+  permanent: 'patient-profile.html',
+  recurring: 'patient-history.html'
+};
+
+async function navGetPages(questionaryId) {
+  const pages = [{
+    type: 'home',
+    url: pagesByTypes.home,
+    label: 'Home',
+    formKey: null
+  }];
+  const forms = await patientLib.getForms(questionaryId);
+  for (const [formKey, form] of Object.entries(forms)) {
+    pages.push({
+      type: form.type,
+      label: form.name,
+      url: pagesByTypes[form.type] + '?formKey=' + formKey,
+      formKey
+    });
+  }
+  return pages;
 }
 
 
@@ -45,6 +71,11 @@ function getFormTitle (questionaryId) {
   return dataDefs.questionnaires[questionaryId].title;
 }
 
+async function getForms (questionaryId) {
+  return dataDefs.questionnaires[questionaryId].forms;
+}
+
+
 async function getFormContent (questionaryId, formKey) {
   const form = dataDefs.questionnaires[questionaryId].forms[formKey];
   console.log('## getFormContent', form, questionaryId, formKey);

patient-nav-controler.js

@@ -0,0 +1,17 @@
+import { patientLib } from './patient-lib.js';
+
+export const navControler = {
+  setNavComponents
+}
+
+async function setNavComponents() {
+  const navData = patientLib.navGetData();
+  const {questionaryId, formKey} = navData;
+  const navTable = document.getElementById('card-nav');
+  navTable.innerHTML = '';
+  for (const page of await patientLib.navGetPages(questionaryId)) {
+    if (page.formKey === formKey) continue;
+    navTable.innerHTML += `&nbsp;<A HREF="${page.url}" class="btn btn-primary">${page.label}</A>` ;
+  }
+  return navData;
+}

patient-profile-controler.js

@@ -1,4 +1,5 @@
 import { patientLib } from './patient-lib.js';
+import { navControler } from './patient-nav-controler.js'
 /**
  * UI management code. 
  * Relies on patientLib for API calls and data management
@@ -7,18 +8,14 @@ import { patientLib } from './patient-lib.js';
  */
 
 window.onload = async (event) => {
-  const navData = patientLib.navGetData();
+  const navData = await navControler.setNavComponents();
   console.log('## navData', navData);
   const { patientApiEndpoint, questionaryId } = navData;
   console.log('## patientApiEndpoint:', patientApiEndpoint);
   await patientLib.connect(patientApiEndpoint, questionaryId);
   // - form title
   const formTitle = document.getElementById('card-questionnary-details-title');
   formTitle.innerHTML = patientLib.getFormTitle(questionaryId);
-  // -- navigation
-  document.getElementById('nav-history').onclick = () => {
-    document.location.href = 'patient-history.html';
-  };
   // -- content
   updateFormContent(questionaryId, 'profile');
   document.getElementById('submit-button-profile').addEventListener("click", function () { 

patient-profile.html

@@ -20,13 +20,7 @@
     <h1>Demo Form - Patient's page</h1>
     <div class="card">
       <div class="card-header">
-        <table> 
-          <tr>
-            <td><A HREF="patient.html" class="btn btn-primary">Home</A></td>
-            <td>&nbsp;</td>
-            <td><button id="nav-history" class="btn btn-primary">History</button></td>
-          </tr>
-        </table>
+        <div id="card-nav"></div>
       </div>
     </div>
     <div class="card" id="card-content">