Correct ordering

Author: perki

patient-history-controler.js

@@ -55,6 +55,7 @@ async function refreshAll(date) {
 
 async function refreshDataTable(date) {
   const currentDateStr = date.toISOString().split("T")[0]; // format YYYY-MM-DD;
+  let currentValue = {};
   const { questionaryId, formKey } = navData;
   const tableData = await patientLib.getHistoricalContent(
     questionaryId,
@@ -73,14 +74,15 @@ async function refreshDataTable(date) {
     headerCell.innerHTML = th.label;
     headerRow.appendChild(headerCell);
   }
-  for (const [dateStr, data] of Object.entries(tableData.valuesByDate)) {
+  for (const data of tableData.valuesByDate) {
     const row = table.insertRow(-1);
-    if (currentDateStr === dateStr) {
+    if (currentDateStr === data.dateStr) {
+      currentValue = data;
       row.style.backgroundColor = 'grey';
     } 
 
     const cellDate = row.insertCell(-1);
-    cellDate.innerHTML = dateStr;
+    cellDate.innerHTML = data.dateStr;
     for (const th of tableData.tableHeaders) {
       const cell = row.insertCell(-1);
       const v = data[th.fieldId]?.value;
@@ -89,7 +91,7 @@ async function refreshDataTable(date) {
   }
 
   console.log("## tabledata", tableData);
-  return tableData.valuesByDate[currentDateStr] || {};
+  return currentValue;
 }
 
 // ------- Form -------- //

patient-lib.js

@@ -149,12 +149,15 @@ async function getHistoricalContent(questionaryId, formKey) {
     type: field.type
   }));
 
-  const valuesByDate = {};
+  const valuesByDateStr = {};
   function addEntry (field, time, event) {
     const dateStr = (new Date(time * 1000)).toISOString().split('T')[0];
-    if (valuesByDate[dateStr] == null) valuesByDate[dateStr] = {};
+    if (valuesByDateStr[dateStr] == null) valuesByDateStr[dateStr] = {
+      dateNum: (new Date(dateStr)).getTime() / 100,
+      dateStr,
+    };
     const fieldId = field.streamId + ':' + field.eventType;
-    valuesByDate[dateStr][fieldId] = {
+    valuesByDateStr[dateStr][fieldId] = {
       value: valueForField(event.content, field),
       eventId: event.id
     }
@@ -180,6 +183,8 @@ async function getHistoricalContent(questionaryId, formKey) {
     } 
   }
 
+  // order by date
+  const valuesByDate = Object.values(valuesByDateStr).sort((a, b) => b.dateNum - a.dateNum);
   return { tableHeaders, valuesByDate };
 }