partial need to parse values

Author: perki

common-data-defs.js

@@ -45,6 +45,27 @@ const formContent = [
     label: 'Nationality',
     dataFieldKey: 'nationality',
   },
+  {
+    streamId: 'family-children',
+    eventType: 'count/generic',
+    type: 'number',
+    label: 'Nb of children',
+    dataFieldKey: 'children-count',
+  },
+  {
+    streamId: 'fertility-miscarriages',
+    eventType: 'count/generic',
+    type: 'number',
+    label: 'Nb of miscarriages',
+    dataFieldKey: 'miscarriages-count',
+  },
+  {
+    streamId: 'fertility-cycles-charted-extimation',
+    eventType: 'count/generic',
+    type: 'number',
+    label: 'Nb of charted cycles',
+    dataFieldKey: 'charted-cycles-count',
+  }
 ];
 
 const dataDefs = {

dr-controler.js

@@ -28,13 +28,27 @@ const rowItems = ['name', 'surname', 'nationality'];
  */
 async function setPatientList() {
   const table = document.getElementById('patients-table');
+  const fields = drLib.getFields();
+  // --- headers
+  const headerRow = table.insertRow(-1);
+  const headerUserCell = document.createElement("TH");
+  headerUserCell.innerHTML = 'Username';
+  headerRow.appendChild(headerUserCell);
+  for (const field of fields) {
+    const headerCell = document.createElement("TH");
+    headerCell.innerHTML = field.label;
+    headerRow.appendChild(headerCell);
+  }
+
+  // --- patients
   const patients = await drLib.getPatientsList();
   for (const patient of Object.values(patients)) {
     const row = table.insertRow(-1);
     const cellUsername = row.insertCell(-1);
     cellUsername.innerHTML = patient.username;
-    for (const field of rowItems) {
-      row.insertCell(-1).innerHTML = patient.formData[field]?.value || '';
+    for (const field of fields) {
+      console.log('## field', field);
+      row.insertCell(-1).innerHTML = patient.formData[field.dataFieldKey]?.value || '';
     }
   }
 }

dr-lib.js

@@ -4,6 +4,7 @@ const drLib = {
   showLoginButton,
   getSharingToken,
   getPatientsList,
+  getFields
 }
 
 function showLoginButton (loginSpanId, stateChangeCallBack) {
@@ -80,8 +81,15 @@ async function getPatientsList () {
   return patients;
 }
 
+/**
+ * get the list of rows for the table
+ */
+function getFields () {
+  return dataDefs.formContent;
+};
+
 const dataFieldsCache = {};
-function initFieldsCache (event) {
+function initFieldsCache () {
   if (Object.keys(dataFieldsCache).length !== 0) return;
   for (const formField of dataDefs.formContent) {
     const dataFieldId = formField.streamId + ':' + formField.eventType;
@@ -112,7 +120,7 @@ function dataFieldFromEvent (event) {
   return field;
 }
 
-// -------- initualization functions --------
+// -------- init functions --------
 
 /**
  * Initialize the doctor account

dr.html

@@ -44,20 +44,13 @@ <h2 class="card-title">Sharing link</h2>
 
       </div>
       <div class="card-body">
-        <h2 class="card-title">Data</h2>
+        <h2 class="card-title">Patients</h2>
         <table id='patients-table' class="table">
           <thead>
-            <tr>
-              <th colspan="2"><b>Patients</b></td>
-            </tr>
-            <tr>
-              <th scope="col">Username</th>
-              <th scope="col">Name</th>
-              <th scope="col">Surname</th>
-              <th scope="col">Nationality</th>
-            </tr>
+            <!-- will be filled by setPatientList-->
           </thead>
           <tbody>
+            <!-- will be filled by setPatientList-->
           </tbody>
         </table>
       </div>

patient-lib.js

@@ -158,14 +158,25 @@ async function getFormContent () {
 };
 
 // ---------------- create / update data ---------------- //
+
+async function parseValue (value, type) {
+  if (type === 'number') {
+    return parseFloat(value);
+  }
+  if (type === 'boolean') {
+    return value === 'true';
+  }
+  return value;
+}
+
 async function handleFormSubmit (values) {
   const apiCalls = [];
  for (const field of formData) {
     const streamId = field.streamId;
     const eventType = field.eventType;
     const eventId = field.eventId;
     const value = values[field.id];
-
+    console.log('## Value', field.id, value);
     if (value === '' && eventId) {
       // delete the event
       apiCalls.push({