Merge pull request #1063 from medic/testing

v0.4.8 release

Author: mandric

Changes.md

@@ -1,5 +1,20 @@
 # Medic Mobile Release Notes
 
+## 0.4.8
+
+### Jul 14, 2015
+
+- Added SMS parser fixes from dev branch:
+   
+  - parse string fields with exlamation marks
+  - compact textforms format handles quotes in quotes
+
+- Fixed export bug when using lowercase form codes. Please re-upload your forms
+  so they are formatted correctly. #998
+
+- Fixed bug where exporting yields same result with or without date
+  filter. #1059, #1031
+
 ## 0.4.7
 
 ### Jun 16, 2015

Gruntfile.js

@@ -125,6 +125,7 @@ module.exports = function(grunt) {
           'outline-none': false,
           'qualified-headings': false,
           'unique-headings': false,
+          'selector-max-approaching': false
         }
       }
     },
@@ -402,4 +403,4 @@ module.exports = function(grunt) {
     ];
   };
 
-};
+};

kanso.json

@@ -1,7 +1,7 @@
 {
     "name": "medic",
     "display_name": "Medic Mobile",
-    "version": "0.4.7",
+    "version": "0.4.8",
     "description": "SMS data collection designed for rural environments.",
     "long_description" : "Medic Mobile is a web based SMS data collection and analytics tool focused on community health care workers in rural environments. We help large health organizations collect and analyze data sent from health care workers using ordinary mobile phones.",
     "url": "https://github.com/medic/medic-webapp",

lib/show-includes/configuration.js

@@ -345,7 +345,10 @@ exports.configuration = function (_doc, _req) {
                         json = JSON.parse(_ev.target.result);
                         json.forEach(function(form, idx) {
                             if (form.meta && form.meta.code) {
+                                // form codes are case insensitive and object
+                                // key and a form.meta.code should be the same.
                                 settings.forms[form.meta.code.toUpperCase()] = form;
+                                form.meta.code = form.meta.code.toUpperCase();
                             }
                         });
                     } catch(e) {

lib/shows.js

@@ -66,8 +66,6 @@ function onExportFormsSubmit(ev) {
     if (startVal !== '') {
         // update endkey for startdate as view is descending
         endkey.push(startDate.valueOf());
-    } else {
-        endkey.push(0);
     }
     if (endVal !== '') {
         // update startkey for enddate as view is descending
@@ -519,7 +517,7 @@ function renderDownloadForms() {
         keys = _.keys(titles).sort();
 
         var forms = _.reduce(data.rows, function(memo, row) {
-            var dh_id = row.key[0],
+            var dh_id = row.key[0] || 'null_district',
                 form = row.key[1],
                 dh_name = row.key[2],
                 title = '',
@@ -531,6 +529,8 @@ function renderDownloadForms() {
                 startkey: [true, dh_id, form],
                 endkey: [true, dh_id, form],
                 dh_name: dh_name,
+                include_docs: true,
+                descending: true,
                 tz: tz
             });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "medic",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "repository": {
     "type": "git",
     "url": "git://github.com/medic/medic-webapp.git"

packages/kujua-sms/kujua-sms/rewrites.js

@@ -55,14 +55,7 @@ exports.rules = [
     },
     {
         from: '/export/forms/:form',
-        to: '_list/export_data_records/data_records',
-        query: {
-            include_docs: 'true',
-            descending: 'true',
-            startkey: [true, ':form', {}],
-            endkey: [true, ':form'],
-            form: ':form'
-        }
+        to: '_list/export_data_records/data_records'
     },
     {
         from: '/:form/data_record/add/clinic/:phone',

packages/kujua-sms/kujua-sms/views.js

@@ -10,7 +10,7 @@ exports.data_records = {
         if (doc.type === 'data_record') {
             clinicId = objectpath.get(doc, 'related_entities.clinic._id');
             centerId = objectpath.get(doc, 'related_entities.clinic.parent._id');
-            districtId = objectpath.get(doc, 'related_entities.clinic.parent.parent._id');
+            districtId = objectpath.get(doc, 'related_entities.clinic.parent.parent._id') || 'null_district';
             valid = !doc.errors || doc.errors.length === 0;
 
             emit([doc.reported_date], 1);

packages/kujua-sms/tests/kujua-sms/smsparser.js

@@ -753,6 +753,40 @@ exports['parse string field mixed'] = function(test) {
     test.done();
 };
 
+exports['parse string field with exlamation mark!'] = function(test) {
+    test.expect(2);
+
+    // textforms
+    var doc = {
+        message: "0000 foo 16A!"
+    };
+    var def = {
+        meta: {
+            code: '0000'
+        },
+        fields: {
+            foo: {
+                type: 'string',
+                labels: {
+                    short: 'foo',
+                    tiny: 'foo'
+                }
+            }
+        }
+    };
+    var data = smsparser.parse(def, doc);
+    test.same(data, {foo: "16A!"});
+
+    // muvuku
+    doc = {
+        message: "1!0000!16A!"
+    };
+    data = smsparser.parse(def, doc);
+    test.same(data, {foo: "16A!"});
+
+    test.done();
+};
+
 exports['parse string field leading zero'] = function(test) {
     test.expect(2);
 

packages/kujua-sms/tests/kujua-sms/smsparser_compact_textform.js

@@ -95,7 +95,6 @@ exports['compact textforms format with hyphen separated form code'] = function(t
     test.done();
 };
 
-
 exports['compact textforms format uses quotes for multiple words'] = function(test) {
     var doc = {
         sent_timestamp: '1-13-12 15:35',
@@ -114,6 +113,25 @@ exports['compact textforms format uses quotes for multiple words'] = function(te
     test.done();
 };
 
+exports['compact textforms format handles quotes in quotes'] = function(test) {
+    var doc = {
+        sent_timestamp: '1-13-12 15:35',
+        from: '+15551212',
+        message: 'ANCR "Sarah "killer bee" Connor" 24 2012-03-12'
+    };
+
+    var expectedObj = {
+        name: 'Sarah \"killer bee\" Connor',
+        lmp: 24,
+        somedate: 1331510400000
+    };
+
+    debugger;
+    var obj = smsparser.parse(def, doc);
+    test.same(obj, expectedObj);
+    test.done();
+};
+
 exports['compact textforms handles too few fields'] = function(test) {
     var doc = {
         sent_timestamp: '1-13-12 15:35',

packages/kujua-sms/views/lib/mp_parser.js

@@ -23,6 +23,11 @@ var parse = exports.parse = function(def, doc) {
         name = header[1],
         vals = parts.slice(1);
 
+    var n = 3;
+    while (n < header.length) {
+        header[2] += '!' + header[n++];
+    }
+
     vals.unshift(header[2]);
 
     if(!def || !def.fields) {

packages/kujua-sms/views/lib/smsparser.js

@@ -285,7 +285,7 @@ exports.getFormCode = function(msg) {
     if (typeof msg !== 'string') { return; }
 
     // muvuku
-    if (msg.split('!').length === 3) {
+    if (msg.split('!').length >= 3) {
         return msg.split('!')[1].toUpperCase();
     }
     // textforms

packages/kujua-sms/views/lib/textforms_parser.js

@@ -219,6 +219,10 @@ exports.parseCompact = function(def, msg) {
     var values = msg.match(/"[^"]+"|[^"\s]+/g);
     var keys = _.keys(def.fields);
 
+    if (values.length > keys.length) {
+        values = msg.match(/".+"|[^"\s]+/g);
+    }
+
     var results = {};
     for (var i = 0; i < keys.length; i++) {
         if (values.length === 0) {
@@ -231,8 +235,11 @@ exports.parseCompact = function(def, msg) {
         } else {
             value = values.shift();
         }
+        if (value.charAt(0) === '"' && value.charAt(value.length - 1) === '"') {
+            value = value.substring(1, value.length - 1);
+        }
         if (typeof results[key] === 'undefined') {
-            results[key] = value.replace(/"/g, '');
+            results[key] = value;
         }
     }
     return results;