using itemDef.labl and localizing labels

Author: perki

dr-controler.js

@@ -110,7 +110,7 @@ async function showQuestionnary(questionaryId) {
       if (key === 'itemKeys') {
         content = content.map((itemKey) => {
           const itemDef = HDSLib.model.itemsDefs.forKey(itemKey);
-          return '- ' + HDSLib.l(itemDef.data.label);
+          return '- ' + itemDef.label;
         }).join('\n<br>');
       }
       row.insertCell(-1).innerHTML = content;

dr-lib.js

@@ -143,7 +143,7 @@ async function getPatientsData (collector) {
   for (const itemKey of firstForm.itemKeys) {
     const itemDef = HDSLib.model.itemsDefs.forKey(itemKey);
     itemDefs.push(itemDef);
-    headers[itemDef.key] = HDSLib.l(itemDef.data.label);
+    headers[itemDef.key] = itemDef.label;
   }
 
   // add lines (1 per patient)
@@ -218,7 +218,7 @@ function dataFieldFromEvent(event) {
   }
   const field = {
     key: itemDef.key,
-    label: itemDef.data.label.en,
+    label: itemDef.label,
     type: itemDef.data.type,
     value: event.content,
     event: event,

dr-patient-view-lib.js

@@ -49,7 +49,7 @@ function getLineForEvent (event) {
   if (itemDef) {
     line.streamId = event.streamIds[0];
     line.eventType = event.type;
-    line.formLabel = itemDef.data.label.en;
+    line.formLabel = itemDef.label;
     line.formType = itemDef.data.type;
     if (line.formType === 'date') {
       line.value = (new Date(event.time * 1000)).toISOString().split('T')[0];
@@ -61,7 +61,7 @@ function getLineForEvent (event) {
       }
 
       const selected = itemDef.data.options.find((o) => ( o.value === line.value ));
-      line.description = selected?.label.en;
+      line.description = selected != null ? HDSLib.l(selected.label) : '-';
     }
     if (line.formType === 'checkbox') {
       if (event.type === 'activity/plain') {

patient-history-controler.js

@@ -140,7 +140,7 @@ async function updateFormContent(formData) {
       fieldHTML += `<option value="">--</option>`;
       for (const option of formField.options) {
         const selected = `${option.value}` === fieldValue ? "selected" : "";
-        fieldHTML += `<option value="${option.value}" ${selected}>${option.label.en}</option>`;
+        fieldHTML += `<option value="${option.value}" ${selected}>${HDSLib.l(option.label)}</option>`;
       }
       fieldHTML += `</select>`;
     } else if (fieldType === "date") {

patient-lib.js

@@ -49,7 +49,7 @@ async function getFormHistorical (collectorClient, formKey) {
 
     return {
       id: itemDef.key,
-      label: itemDef.data.label.en,
+      label: itemDef.label,
       type: itemDef.data.type,
       options: itemDef.data.options,
       itemDef
@@ -91,7 +91,7 @@ async function getFormPermanentContent (collectorClient, formKey) {
     const content = {
       id: itemDef.key,
       type: itemDef.data.type,
-      label: itemDef.data.label.en,
+      label: itemDef.label,
       options: itemDef.data.options,
       itemDef,
     }
@@ -118,7 +118,7 @@ async function getHistoricalContent(collectorClient, formKey) {
   const itemDefs = form.itemKeys.map((itemKey) => (HDSLib.model.itemsDefs.forKey(itemKey)));
   const tableHeaders = itemDefs.map(itemDef => ({
     fieldId: itemDef.key,
-    label: itemDef.data.label.en,
+    label: itemDef.label,
     type: itemDef.data.type
   }));
 
@@ -189,7 +189,7 @@ function valueAndTxtForField (event, itemDef) {
     console.log({value, event})
     const selected = itemDef.data.options.find((o) => ( o.value === value ));
     if (selected) {
-      txt = selected?.label.en;
+      txt = selected != null ? HDSLib.l(selected.label) : ' - ';
     }
     return { value, txt };
   } 

patient-profile-controler.js

@@ -68,7 +68,7 @@ async function updateFormContent(formData) {
       fieldHTML += `<option value="">--</option>`;
       for (const option of formField.options) {
         const selected = (option.value === fieldValue) ? 'selected' : '';
-        fieldHTML += `<option value="${option.value}" ${selected}>${option.label.en}</option>`;
+        fieldHTML += `<option value="${option.value}" ${selected}>${HDSLib.l(option.label)}</option>`;
       }
       fieldHTML += `</select>`;
     } else if (fieldType === 'date') {