[contact-summary] allow structured card.fields

medic · Jun 11, 2018 · 65e03c5 · 65e03c5
1 parent 2e8c12b
commit 65e03c5
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.16.14
+* [contact-summary] allow structured card.fields
+* Fix __include_inline__() input trimming
+
 ## v1.16.13
 * Update ordering and content of README
 * Remove items from README which have been done

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medic-conf",
-  "version": "1.16.13",
+  "version": "1.16.14",
   "description": "Configure Medic Mobile deployments",
   "main": "index.js",
   "scripts": {

diff --git a/src/lib/compile-contact-summary.js b/src/lib/compile-contact-summary.js
@@ -59,31 +59,64 @@ var result = {
 };
 
 
+function addCard(card, r) {
+  if(!card.appliesIf(r)) return;
+
+  function addValue(src, dst, prop) {
+    switch(typeof src[prop]) {
+      case 'undefined': return;
+      case 'function': dst[prop] = src[prop](r); break;
+      default: dst[prop] = src[prop];
+    }
+  }
+
+  var fields = typeof card.fields === 'function' ?
+      card.fields(r) :
+      card.fields
+        .filter(function(f) {
+          switch(typeof f.appliesIf) {
+            case 'undefined': return true;
+            case 'function':  return f.appliesIf(r);
+            default:          return f.appliesIf;
+          }
+        })
+        .map(function(f) {
+          var ret = {};
+          addValue(f, ret, 'label');
+          addValue(f, ret, 'value');
+          addValue(f, ret, 'translate');
+          addValue(f, ret, 'filter');
+          addValue(f, ret, 'width');
+          addValue(f, ret, 'icon');
+          if(f.context) {
+            ret.context = {};
+            addValue(f.context, ret.context, 'count');
+            addValue(f.context, ret.context, 'total');
+          }
+          return ret;
+        });
+
+  result.cards.push({
+    label: card.label,
+    fields: fields,
+  });
+
+  if(card.modifyContext) card.modifyContext(context, r);
+}
+
 cards.forEach(function(card) {
   var idx1, r;
   switch(card.appliesToType) {
     case 'report':
       for(idx1=0; idx1<reports.length; ++idx1) {
         r = reports[idx1];
         if(!isReportValid(r)) continue;
-        if(card.appliesIf(r)) {
-          result.cards.push({
-            label: card.label,
-            fields: card.fields(r),
-          });
-          if(card.modifyContext) card.modifyContext(context);
-        }
+        addCard(card, r);
       }
       break;
     default:
       if(contact.type !== card.appliesToType) return;
-      if(card.appliesIf()) {
-        result.cards.push({
-          label: card.label,
-          fields: card.fields(),
-        });
-        if(card.modifyContext) card.modifyContext(context);
-      }
+      addCard(card);
   }
 });