Better display

Author: perki

dr-controler.js

@@ -44,7 +44,7 @@ async function setPatientList() {
   }
 
   // --- patients
-  const patients = await drLib.getPatientsList();
+  const patients = await drLib.getPatientsList(100);
   for (const patient of Object.values(patients)) {
     const row = table.insertRow(-1);
     const cellStatus = row.insertCell(-1);

dr-lib.js

@@ -51,10 +51,33 @@ function showLoginButton (loginSpanId, stateChangeCallBack) {
 
 const patients = {};
 
-async function getPatientsList () {
-  const res = await drConnection.api([{ method: 'events.get', params: { types: ['credentials/pryv-api-endpoint'] } }]);
+async function getPatientsList (limit = 100) {
+  const res = await drConnection.api([{ method: 'events.get', params: { types: ['credentials/pryv-api-endpoint'], limit } }]);
   const patientApiEndpointEvents = res[0].events;
+
+  // -- remove duplicates
+  const duplicateEventId = [];
+  const uniques = {};
   for (const patientEvent of patientApiEndpointEvents) {
+    if (patientEvent.type === 'credentials/pryv-api-endpoint') {
+      const apiEndpoint = patientEvent.content;
+      if (uniques[apiEndpoint]) {
+        // -- duplicate
+        duplicateEventId.push(patientEvent.id);
+        console.log('## Duplicate patient event', patientEvent);
+      } else {
+        uniques[apiEndpoint] = patientEvent;
+      }
+    }
+  }
+  if (duplicateEventId.length > 0) {
+    const removeDuplicatesApiCalls = duplicateEventId.map(id => ({ method: 'events.delete', params: { id} }));
+    const removeDuplicates = await drConnection.api(removeDuplicatesApiCalls);
+    console.log('## Removed duplicates', removeDuplicates);
+  }
+
+  // -- get the patients
+  for (const patientEvent of Object.values(uniques)) {
     const patient = await getPatientDetails(patientEvent);
     if (patient) {
       patients[patient.apiEndpoint] = patient;

patient-home-controler.js

@@ -34,13 +34,18 @@ function getRequestFrormApiEndPoint() {
 // --------- Update form list --------- //
 async function showFormList(formsInfo) {
   console.log('## showFormList', formsInfo);
+
+
+  // -- table
   const table = document.getElementById('questionnary-table');
+
+
   for (const formInfo of formsInfo) {
 
     // fill the table row
     const row = table.insertRow(-1);
     const cellQuestionnary = row.insertCell(-1);
-    cellQuestionnary.innerHTML = formInfo.questionaryId;
+    cellQuestionnary.innerHTML = `<button type="button" class="btn btn-secondary mb-sm">${formInfo.questionaryId}</button>`;
     cellQuestionnary.onclick = function () {
       showFormDetails(formInfo);
     };
@@ -61,10 +66,21 @@ async function showFormDetails(formInfo) {
   if (!show) return;
   const formDetails = await patientHomeLib.getQuestionnaryDetails(formInfo);
   console.log('## showFormDetails', formDetails);
+
+  // - form title
+  const formTitle = document.getElementById('card-questionnary-details-title');
+  formTitle.innerHTML = formInfo.questionaryId;
+
   // - permissions
-  const table = document.getElementById('access-request');
+  const tbody = document.getElementById('access-request').getElementsByTagName('tbody')[0];;
+
+  // clear previous content
+  while (tbody.firstChild) {
+    tbody.removeChild(tbody.firstChild);
+  }
+
   for (const permission of formDetails.permissions) {
-    const row = table.insertRow(-1);
+    const row = tbody.insertRow(-1);
     const cellStream = row.insertCell(-1);
     cellStream.innerHTML = permission.name;
     const cellLevel = row.insertCell(-1);
@@ -92,6 +108,6 @@ async function showFormDetails(formInfo) {
   }
 
   // - json
-  const jsonContent = document.getElementById('card-questionnary-details-content');
-  jsonContent.innerHTML = '<pre>' + JSON.stringify(formInfo.formEvent, null, 2) + '<pre>';
+  // const jsonContent = document.getElementById('card-questionnary-details-content');
+  // jsonContent.innerHTML = '<pre>' + JSON.stringify(formInfo.formEvent, null, 2) + '<pre>';
 }

patient-profile-controler.js

@@ -10,7 +10,9 @@ window.onload = async (event) => {
   console.log('## patientApiEndpoint:', patientApiEndpoint);
   await connect(patientApiEndpoint, questionaryId);
   updateFormContent('profile');
-  document.getElementById('submit-button-profile').addEventListener("click", function () { submitForm('profile'); });
+  document.getElementById('submit-button-profile').addEventListener("click", function () { 
+    submitForm('profile'); 
+  });
 }
 
 
@@ -86,4 +88,5 @@ async function submitForm(formKey) {
     }    
   }
   await patientLib.handleFormSubmit(formKey, values);
+  alert('Form submitted successfully');
 };

patient.html

@@ -15,7 +15,6 @@
 <script src="common-data-defs.js"></script>
 <script src="patient-home-controler.js"></script>
 <script src="patient-home-lib.js"></script>
-<script src="patient-lib.js"></script>
 
 <body>
   <div class="container">
@@ -55,9 +54,10 @@ <h2>Questionnary details</h2>
       <div id="card-questionnary-details">
         <span id="card-questionnary-details-nothing">
           <h3>Nothing selected</h3>
-          <p>Please select a questionnary to see its details.</p>
+          <p>Please select a questionnary on the list above.</p>
         </span>
         <div id="card-questionnary-details-something" style="display: none;">
+          <h3> Questionnary: <span id="card-questionnary-details-title"></span></h3>
           <table>
             <tr>
               <td>
@@ -67,11 +67,12 @@ <h3>Permission request</h3>
                     <th><B>Stream</B></th>
                     <th><B>Level</B></th>
                   </thead>
-                  <tbody>
+                  <tbody id="access-request-body">
                     <!-- will be filled by getQuestionaireDetails-->
                   </tbody>
                 </table>
               </td>
+              <td>&nbsp; &nbsp;</td>
               <td>
                 <button type="button" id="grant-access-button" class="btn btn-primary mb-2">Open</button>
               </td>