Merge pull request #1982 from unicef/staging

Staging

Author: domdinicola

.gitignore

@@ -97,6 +97,7 @@ deis
 env_dev
 
 .env
+.envrc
 
 frontend/
 

src/etools/applications/EquiTrack/data/groups.json

@@ -200,27 +200,24 @@
     "fields": {
       "name": "Country Office Administrator",
       "permissions": [
-        738,
+        744,
         756,
-        774,
+        768,
         753,
-        739,
+        745,
         757,
-        775,
+        769,
         754,
-        740,
+        746,
         758,
-        776,
+        770,
         755,
-        765,
-        766,
-        767,
-        569,
-        727,
+        570,
+        571,
         611,
         612,
         613,
-        733,
+        739,
         421,
         424,
         215,
@@ -229,12 +226,13 @@
         446,
         447,
         448,
+        326,
         209,
         210,
         211,
-        762,
-        763,
-        764,
+        765,
+        766,
+        767,
         452,
         453,
         454,
@@ -280,8 +278,9 @@
         281,
         282,
         283,
-        779,
-        770
+        783,
+        784,
+        785
       ]
     }
   }

src/etools/applications/EquiTrack/renderers.py

@@ -6,7 +6,26 @@ class CSVFlatRenderer(r.CSVRenderer):
 
 
 class FriendlyCSVRenderer(r.CSVRenderer):
+    """Mixin which allow to render boolean value in custom way"""
+
+    positive = 'Yes'
+    negative = ''
+
     def flatten_item(self, item):
         if isinstance(item, bool):
-            return {'': {True: 'Yes', False: ''}[item]}
+            return {'': {True: self.positive, False: self.negative}[item]}
         return super().flatten_item(item)
+
+
+class ListSeperatorCSVRenderMixin(object):
+    """Mixin which render list concatenating them usign the separator"""
+
+    separator = '\n\n'
+
+    def flatten_item(self, item):
+        if isinstance(item, list):
+            return {'': self.clean_list(item)}
+        return super().flatten_item(item)
+
+    def clean_list(self, list_item):
+        return self.separator.join(list_item)