Using questionnary to get form for patient

Author: perki

common-data-defs.js

@@ -151,7 +151,19 @@ questionnaires = {
       level: 'read',
       name: perm.name,
     })),
-    patientBaseStreams
+    patientBaseStreams,
+    forms: {
+      profile: {
+        type: 'permanent',
+        name: 'Profile',
+        content: formProfileContent
+      },
+      historical: {
+        type: 'recurring',
+        name: 'Historical',
+        content: formHistoricalContent
+      }
+    }
   }
 }
 

dr-controler.js

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

dr-lib.js

@@ -51,7 +51,7 @@ function showLoginButton (loginSpanId, stateChangeCallBack) {
 
 const patients = {};
 
-async function getPatientsList (limit = 100) {
+async function getPatientsList (questionnaryId, limit = 100) {
   const res = await drConnection.api([{ method: 'events.get', params: { types: ['credentials/pryv-api-endpoint'], limit } }]);
   const patientApiEndpointEvents = res[0].events;
 
@@ -78,7 +78,7 @@ async function getPatientsList (limit = 100) {
 
   // -- get the patients
   for (const patientEvent of Object.values(uniques)) {
-    const patient = await getPatientDetails(patientEvent);
+    const patient = await getPatientDetails(questionnaryId, patientEvent);
     if (patient) {
       patients[patient.apiEndpoint] = patient;
       console.log('## Patient details', patient);
@@ -92,7 +92,7 @@ async function getPatientsList (limit = 100) {
 /**
  * get patients details
  */
-async function getPatientDetails (patientEvent) {
+async function getPatientDetails (questionnaryId, patientEvent) {
   if (patientEvent.type !== 'credentials/pryv-api-endpoint') return null;
   const patient = {
     status: 'active',
@@ -123,7 +123,7 @@ async function getPatientDetails (patientEvent) {
     }
   }
 
-  // -- mark as revoked
+  // -- marked revoked
   if (patientEvent.streamIds.includes('patients-revoked')) {
     patient.status = 'revoked';
     const usernameFromApiEndpoint = patientEvent.content.split('/')[3];
@@ -133,6 +133,7 @@ async function getPatientDetails (patientEvent) {
 
 
   // -- get data
+  
   const profileEvents = await patientConnection.api([{ method: 'events.get', params: { limit: 100 } }]);
   for (const profileEvent of profileEvents[0].events) {
     const field = dataFieldFromEvent(profileEvent);

patient-lib.js

@@ -16,34 +16,35 @@ async function connect (apiEndpoint, questionaryId) {
 // ---------------- form content ---------------- //
 
 
-// local copy of formProfileContent + actual values
-let formProfileData = null;
-async function getFormContent (formKey) {
-  if (formKey === 'profile') {
-    return getFormProfileContent();
+
+async function getFormContent (questionaryId, formKey) {
+  const form = dataDefs.questionnaires[questionaryId].forms[formKey];
+  console.log('## getFormContent', form);
+  if (form.type === 'permanent') {
+    return getFormPermanentContent(form);
   }
-  if (formKey === 'historical') {
-    return getFormHistoricalContent();
+  if (formKey === 'recurring') {
+    return getFormRecurringContent(form);
   }
   return [];
 }
 
-async function getFormHistoricalContent () {
-  console.log('## getFormHistoricalContent');
-  const formHistoricalData = structuredClone(dataDefs.formHistoricalContent);
-  formHistoricalData.forEach(field => {
+async function getFormRecurringContent (form) {
+  const formReccuringData = structuredClone(form.content);
+  formReccuringData.forEach(field => {
     field.id = 'field-historical-' + field.dataFieldKey; 
   });
-  return formHistoricalData;
+  return formReccuringData;
 }
 
-
-async function getFormProfileContent () {
-  if (formProfileData) { return formProfileData; }
-  formProfileData = structuredClone(dataDefs.formProfileContent);
+// local copy of formProfileContent + actual values
+let formPermanentData = null;
+async function getFormPermanentContent (form) {
+  if (formPermanentData) { return formPermanentData; }
+  formPermanentData = structuredClone(form.content);
 
   // get the values from the API
-  const apiCalls = formProfileData.map(field => ({
+  const apiCalls = formPermanentData.map(field => ({
     method: 'events.get',
     params: {
       streams: [field.streamId],
@@ -55,7 +56,7 @@ async function getFormProfileContent () {
   const res = await connection.api(apiCalls);
   for (let i = 0; i < res.length; i++) {
     const e = res[i];
-    const field = formProfileData[i];
+    const field = formPermanentData[i];
     field.id = 'field-profile-' + field.dataFieldKey;
     console.log('## getFormContent ' + i, e);
     if (e.events && e.events.length > 0) {
@@ -75,7 +76,7 @@ async function getFormProfileContent () {
       field.eventId = event.id; // will allow t track if the event is to be updated
     } 
   }
-  return formProfileData;
+  return formPermanentData;
 };
 
 // ---------------- create / update data ---------------- //
@@ -104,9 +105,9 @@ function parseValue (value, type) {
   return value;
 }
 
-async function handleFormSubmit (formKey, values) {
+async function handleFormSubmit (questionaryId, formKey, values) {
   const apiCalls = [];
-  for (const field of formProfileData) {
+  for (const field of formPermanentData) {
     const streamId = field.streamId;
     const eventType = field.eventType;
     const eventId = field.eventId;

patient-profile-controler.js

@@ -9,9 +9,9 @@ window.onload = async (event) => {
   const { patientApiEndpoint, questionaryId } = getPatientApiEndpointAndFormId();
   console.log('## patientApiEndpoint:', patientApiEndpoint);
   await connect(patientApiEndpoint, questionaryId);
-  updateFormContent('profile');
+  updateFormContent(questionaryId, 'profile');
   document.getElementById('submit-button-profile').addEventListener("click", function () { 
-    submitForm('profile'); 
+    submitForm(questionaryId, 'profile'); 
   });
 }
 
@@ -38,8 +38,8 @@ function getPatientApiEndpointAndFormId() {
 /**
  * Take the from content from the definition and actual values and create the HTML
  */
-async function updateFormContent(formKey) {
-  const formData = await patientLib.getFormContent(formKey);
+async function updateFormContent(questionaryId, formKey) {
+  const formData = await patientLib.getFormContent(questionaryId, formKey);
   console.log('Form content:', formData);
 
   document.getElementById('inputs-' + formKey).innerHTML = ''; // Clear previous content
@@ -73,9 +73,9 @@ async function updateFormContent(formKey) {
 /**
  * Submit the form and send the data to the API
  */
-async function submitForm(formKey) {
+async function submitForm(questionaryId, formKey) {
   const values = {};
-  const formData = await patientLib.getFormContent(formKey);
+  const formData = await patientLib.getFormContent(questionaryId, formKey);
   for (let i = 0; i < formData.length; i++) {
     const field = formData[i];
     const fieldId = field.id;
@@ -87,6 +87,6 @@ async function submitForm(formKey) {
       values[field.id] = formField.value.trim(); 
     }    
   }
-  await patientLib.handleFormSubmit(formKey, values);
+  await patientLib.handleFormSubmit(questionaryId, formKey, values);
   alert('Form submitted successfully');
 };