Returning to correct questionnary

Author: perki

dr-controler.js

@@ -40,14 +40,27 @@ async function setQuestionnaries() {
     select.add(option);
   }
 
-  // -- 
+  // -- on change
   select.onchange = function () {
     if (select.value === '') {
       showQuestionnary(null);
       return;
     }
     showQuestionnary(select.value);
   }
+  // -- on load
+  const selectedQuestionnary = getQuestionnaryFromUrl();
+  if (selectedQuestionnary) {
+    select.value = selectedQuestionnary;
+    showQuestionnary(selectedQuestionnary);
+  }
+}
+
+// ------- Get Dr's info -------- //
+function getQuestionnaryFromUrl() {
+  const params = new URLSearchParams(document.location.search);
+  const questionaryId = params.get('questionaryId');
+  return questionaryId
 }
 
 async function showQuestionnary(questionaryId) {
@@ -100,15 +113,12 @@ async function setPatientList(questionaryId) {
   for (const patient of Object.values(patients)) {
     const row = table.insertRow(-1);
     console.log('>> patient', patient);
-    row.onclick = function () {
-      document.location.href = `dr-patient-view.html?patientApiEndpoint=${patient.apiEndpoint}&questionaryId=${questionaryId}`
-    }
-
 
     const cellStatus = row.insertCell(-1);
     cellStatus.innerHTML = patient.status;
     const cellUsername = row.insertCell(-1);
-    cellUsername.innerHTML = patient.username;
+    const page = `dr-patient-view.html?patientApiEndpoint=${patient.apiEndpoint}&questionaryId=${questionaryId}`;
+    cellUsername.innerHTML = `<A HREF="${page}">${patient.username}</A>`;
     const patientData = {
       status: patient.status,
       username: patient.username

dr-lib.js

@@ -64,8 +64,8 @@ async function getQuestionnaires() {
 
 const patients = {};
 
-async function getPatientsList(questionnaryId, limit = 100) {
-  const qStreams = questionnaryStreams(questionnaryId);
+async function getPatientsList(questionaryId, limit = 100) {
+  const qStreams = questionnaryStreams(questionaryId);
   const res = await drConnection.api([
     {
       method: "events.get",
@@ -104,7 +104,7 @@ async function getPatientsList(questionnaryId, limit = 100) {
 
   // -- get the patients
   const patientPromises = Object.values(uniques).map((patientEvent) =>
-    getPatientDetails(questionnaryId, patientEvent)
+    getPatientDetails(questionaryId, patientEvent)
   );
   const patientsResults = await Promise.all(patientPromises);
 
@@ -123,9 +123,9 @@ async function getPatientsList(questionnaryId, limit = 100) {
 /**
  * get patients details
  */
-async function getPatientDetails(questionnaryId, patientEvent) {
+async function getPatientDetails(questionaryId, patientEvent) {
   // -- check if the event is a patient event
-  const qStreams = questionnaryStreams(questionnaryId);
+  const qStreams = questionnaryStreams(questionaryId);
   if (patientEvent.type !== "credentials/pryv-api-endpoint") return null;
   const patient = {
     status: "active",
@@ -170,7 +170,7 @@ async function getPatientDetails(questionnaryId, patientEvent) {
 
   // -- get data
   // get profile form data
-  const formProfile = dataDefs.questionnaires[questionnaryId].forms.profile;
+  const formProfile = dataDefs.questionnaires[questionaryId].forms.profile;
 
   // get the last value of each field
   const apiCalls = formProfile.content.map((field) => ({

dr-patient-view-controler.js

@@ -4,7 +4,7 @@ import { exportCSVFile } from "./exportToCSV.js";
  * Based on 
  * - drApiConnecion
  * - patientApiConnection
- * - questionnaryId
+ * - questionaryId
  * 
  * Display live update of data
  */
@@ -32,6 +32,9 @@ async function refresh () {
   const { patientApiEndpoint, questionaryId } = getRequestFrormApiEndPoint();
   const { infos, lines }  = await drPatientLib.getPatientData(patientApiEndpoint, questionaryId);
   console.log('>> zz', infos);
+  // -- home button
+  document.getElementById('home-button').href= 'dr.html?questionaryId=' + questionaryId;
+
   // -- set patient Id
   const username = infos.user.username;
   document.getElementById('patient-label').innerHTML = username;

dr-patient-view.html

@@ -18,7 +18,7 @@
   <div class="container">
     <img src="https://healthdatasafe.github.io/style/images/Horizontal/hds-logo-hz-1024x400-hz-color.png" alt="Logo" width="300px">
     <h1>Demo Form - Dr's Patient View</h1>
-    <a href="dr.html" class="btn btn-primary">HOME</a>
+    <a href="dr.html" class="btn btn-primary" id="home-button">HOME</a>
     <div class="card">
       <div class="card-patient">
         <h2> Patient: <span id="patient-label">Patient X</span></h2>