Support grouping on non numeric field.

onadata/apps/api/tests/viewsets/test_charts_viewset.py

@@ -369,8 +369,9 @@ def test_nan_not_json_response(self):
         res = renderer.render(response.data)
 
         expected = ('{"field_type":"calculate","data_type":"numeric",'
-                    '"field_xpath":"networth_calc","data":[{"sum":150000.0,'
-                    '"pizza_fan":["No"],"mean":75000.0},{"sum":null,'
+                    '"field_xpath":"networth_calc","data":[{"count":2,'
+                    '"sum":150000.0,'
+                    '"pizza_fan":["No"],"mean":75000.0},{"count":2,"sum":null,'
                     '"pizza_fan":["Yes"],"mean":null}],"grouped_by":'
                     '"pizza_fan","field_label":"Networth Calc","field_name":'
                     '"networth_calc","xform":' + str(self.xform.pk) + '}')

onadata/libs/data/query.py

@@ -119,17 +119,20 @@ def _postgres_aggregate_group_by(field, name, xform, group_by, data_view=None):
         group_by_group_by = "%(group_by)s"
 
     restricted_string = _restricted_query(xform)
-    query = "SELECT " + group_by_select + \
-            "SUM((%(json)s)::numeric) AS sum, " \
-            "AVG((%(json)s)::numeric) AS mean  " \
+    aggregation_string = "COUNT(%(json)s) AS count "
+    if field in get_numeric_fields(xform) or not isinstance(group_by, list):
+        aggregation_string += ", SUM((%(json)s)::numeric) AS sum, " \
+            "AVG((%(json)s)::numeric) AS mean "
+    else:
+        group_by_select = "%(json)s AS %(name)s, " + group_by_select
+        group_by_group_by = "%(json)s, " + group_by_group_by
+    query = "SELECT " + group_by_select + aggregation_string + \
             "FROM %(table)s WHERE " + restricted_string + \
             " AND deleted_at IS NULL " + additional_filters + \
             " GROUP BY " + group_by_group_by + \
             " ORDER BY " + group_by_group_by
 
-    query = query % string_args
-
-    return query
+    return query % string_args
 
 
 def _postgres_select_key(field, name, xform):

onadata/libs/tests/utils/test_chart_tools.py

@@ -134,6 +134,7 @@ def test_build_chart_data_for_numeric_field_group_by_category_field(self):
         self.assertEqual(data['grouped_by'], 'pizza_type')
         self.assertEqual(data['data_type'], 'numeric')
         self.assertEqual(data['data'], [{
+            'count': 2,
             'sum': 150000.0,
             'pizza_type': [],
             'mean': 75000.0
@@ -151,6 +152,7 @@ def test_build_chart_data_calculate_field_group_by_category_field(self):
         self.assertEqual(data['grouped_by'], 'pizza_fan')
         self.assertEqual(data['data_type'], 'numeric')
         self.assertEqual(data['data'], [{
+            'count': 2,
             'sum': 150000.0,
             'pizza_fan': [u'No'],
             'mean': 75000.0
@@ -475,6 +477,7 @@ def test_select_one_choices_group_by(self):
             'field_xpath':
             u'toexppc',
             'data': [{
+                'count': 1,
                 'sum': Decimal('3.357142857142857'),
                 'name_I': [u'Aynalem Tenaw'],
                 'mean': Decimal('3.3571428571428570')
@@ -520,11 +523,13 @@ def test_build_chart_data_for_numeric_field_group_by_two_fields(self):
         self.assertEqual(data['grouped_by'], group_by_field)
         self.assertEqual(data['data_type'], 'numeric')
         self.assertEqual(data['data'], [{
+            'count': 1,
             'date': u'2014-01-09',
             'mean': 100000.0,
             'pizza_fan': u'no',
             'sum': 100000.0
         }, {
+            'count': 1,
             'date': u'2014-01-10',
             'mean': 50000.0,
             'pizza_fan': u'no',
@@ -534,9 +539,25 @@ def test_build_chart_data_for_numeric_field_group_by_two_fields(self):
     def test_build_chart_data_for_non_numeric_field_group_by_two_fields(self):
         field = find_field_by_name(self.xform, 'name')
         group_by_field = ['pizza_fan', 'date']
-        with self.assertRaises(ParseError):
-            build_chart_data_for_field(
-                self.xform, field, group_by=group_by_field)
+        data = build_chart_data_for_field(
+            self.xform, field, group_by=group_by_field)
+
+        self.assertEqual(data['field_name'], 'name')
+        self.assertEqual(data['field_xpath'], 'name')
+        self.assertEqual(data['field_type'], 'text')
+        self.assertEqual(data['grouped_by'], group_by_field)
+        self.assertEqual(data['data_type'], 'categorized')
+        self.assertEqual(data['data'], [{
+            'date': u'2014-01-09',
+            'pizza_fan': u'no',
+            'count': 1,
+            'name': ['Efgh']
+        }, {
+            'date': u'2014-01-10',
+            'pizza_fan': u'no',
+            'count': 1,
+            'name': ['Ghi']
+        }])
 
 
 class TestChartUtilFunctions(unittest.TestCase):

onadata/libs/utils/chart_tools.py

@@ -169,8 +169,9 @@ def _use_labels_from_field_name(field_name,
                 choices = field.children
 
             for item in data:
-                item[truncated_name] = get_choice_label(choices,
-                                                        item[truncated_name])
+                if truncated_name in item:
+                    item[truncated_name] = get_choice_label(
+                        choices, item[truncated_name])
 
     # replace truncated field names in the result set with the field name key
     field_name = field_name.encode('utf-8')
@@ -244,10 +245,6 @@ def build_chart_data_for_field(xform,
     field_name = field.name if not isinstance(field, basestring) else field
 
     if group_by and isinstance(group_by, list):
-        if field.type not in common_tags.NUMERIC_LIST:
-            raise ParseError(u'field_name %s should be a numeric field' %
-                             field_name)
-
         group_by_name = [
             g.get_abbreviated_xpath() if not isinstance(g, basestring) else g
             for g in group_by