Merge pull request #1374 from IFRCGo/feature/deployments-csv-column-order-1358

CSV columns in a new order and naming

Author: szabozoltan69

deployments/drf_views.py

@@ -184,51 +184,70 @@ def get_renderer_context(self):
         # ser_cls = self.get_serializer_class()
         # instead of "ser_cls.Meta.fields if ser_cls else None":
         context['header'] = \
-            ['id'
-            ,'ongoing'
-            ,'start_date'
-            ,'end_date'
-            ,'role']
+            ['deployment.event_deployed_to.id'
+            ,'deployment.event_deployed_to.glide'
+            ,'deployment.event_deployed_to.name'
+            ,'deployment.event_deployed_to.ifrc_severity_level'
+            ,'deployment.event_deployed_to.dtype_name'
+            ,'deployment.event_deployed_to.countries.name'
+            ,'deployment.event_deployed_to.countries.iso3'
+            ,'deployment.event_deployed_to.countries.society_name'
+            ,'deployment.event_deployed_to.countries.region'
+            ,'role'
+            ,'type']
         if not self.request.user.is_anonymous:
             context['header'] += \
             ['name']
         context['header'] += \
-            ['country_from.iso3'
-            ,'country_from.name'
-            ,'country_from.region'
-            ,'country_from.society_name'
-            ,'country_to.iso3'
+            ['id'
             ,'country_to.name'
-            ,'country_to.region'
+            ,'country_to.iso3'
             ,'country_to.society_name'
-            ,'deployment.event_deployed_to.countries.iso3'
-            ,'deployment.event_deployed_to.countries.name'
-            ,'deployment.event_deployed_to.countries.region'
-            ,'deployment.event_deployed_to.countries.society_name'
-            ,'deployment.event_deployed_to.dtype_name'
-            ,'deployment.event_deployed_to.glide'
-            ,'deployment.event_deployed_to.id'
-            ,'deployment.event_deployed_to.ifrc_severity_level'
-            ,'deployment.event_deployed_to.name'
-            ,'molnix_id'
+            ,'country_to.region'
+            ,'country_from.name'
+            ,'country_from.iso3'
+            ,'country_from.society_name'
+            ,'country_from.region'
+            ,'start_date'
+            ,'end_date'
+            ,'ongoing'
+            ,'is_active']
+        if self.request.user.is_superuser:
+            context['header'] += \
+            ['molnix_status']
+        context['header'] += \
+            ['molnix_id'
+            ,'molnix_sector'
+            ,'molnix_role_profile'
             ,'molnix_language'
-            ,'molnix_modality'
-            ,'molnix_operation'
             ,'molnix_region'
-            ,'molnix_role_profile'
             ,'molnix_scope'
-            ,'molnix_sector']
+            ,'molnix_modality'
+            ,'molnix_operation']
         if self.request.user.is_superuser:
             context['header'] += \
-            ['molnix_status'
-            ,'inactive_status']
-        context['header'] += \
-            ['type'
-            ,'is_active']
-        context['labels'] = {i : i.replace('_','-') for i in context['header']}
+            ['inactive_status']
+
+        context['labels'] = {i : i for i in context['header']}
         # We can change the column titles (called "labels"):
-        context['labels']['deployment.event_deployed_to.dtype_name'] = 'disaster-type'
-        context['labels']['id'] = 'deployedperson-id'
+        context['labels']['deployment.event_deployed_to.id'] = 'event_id'
+        context['labels']['deployment.event_deployed_to.glide'] = 'event_glide_id'
+        context['labels']['deployment.event_deployed_to.name'] = 'event_name'
+        context['labels']['deployment.event_deployed_to.ifrc_severity_level'] = 'event_ifrc_severity_level'
+        context['labels']['deployment.event_deployed_to.dtype_name'] = 'event_disaster_type'
+        context['labels']['deployment.event_deployed_to.countries.name'] = 'event_country_name'
+        context['labels']['deployment.event_deployed_to.countries.iso3'] = 'event_country_iso3'
+        context['labels']['deployment.event_deployed_to.countries.society_name'] = 'event_country_nationalsociety'
+        context['labels']['deployment.event_deployed_to.countries.region'] = 'event_country_regionname'
+        context['labels']['id'] = 'deployed_id'
+        context['labels']['country_to.name'] = 'deployed_to_name'
+        context['labels']['country_to.iso3'] = 'deployed_to_iso3'
+        context['labels']['country_to.society_name'] = 'deployed_to_nationalsociety'
+        context['labels']['country_to.region'] = 'deployed_to_regionname'
+        context['labels']['country_from.name'] = 'deployed_from_name'
+        context['labels']['country_from.iso3'] = 'deployed_from_iso3'
+        context['labels']['country_from.society_name'] = 'deployed_from_nationalsociety'
+        context['labels']['country_from.region'] = 'deployed_from_regionname'
         return context
 
 

deployments/snapshots/snap_tests.py

@@ -7,17 +7,17 @@
 
 snapshots = Snapshot()
 
-snapshots['TestProjectAPI::test_personnel_csv_api 1'] = '''deployedperson-id,ongoing,start-date,end-date,role,name,country-from.iso3,country-from.name,country-from.region,country-from.society-name,country-to.iso3,country-to.name,country-to.region,country-to.society-name,deployment.event-deployed-to.countries.iso3,deployment.event-deployed-to.countries.name,deployment.event-deployed-to.countries.region,deployment.event-deployed-to.countries.society-name,disaster-type,deployment.event-deployed-to.glide,deployment.event-deployed-to.id,deployment.event-deployed-to.ifrc-severity-level,deployment.event-deployed-to.name,molnix-id,molnix-language,molnix-modality,molnix-operation,molnix-region,molnix-role-profile,molnix-scope,molnix-sector,type,is-active\r
-1,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
-2,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
-3,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
-4,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
-5,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
-6,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
-7,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
-8,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
-9,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
-10,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,True\r
+snapshots['TestProjectAPI::test_personnel_csv_api 1'] = '''event_id,event_glide_id,event_name,event_ifrc_severity_level,event_disaster_type,event_country_name,event_country_iso3,event_country_nationalsociety,event_country_regionname,role,type,name,deployed_id,deployed_to_name,deployed_to_iso3,deployed_to_nationalsociety,deployed_to_regionname,deployed_from_name,deployed_from_iso3,deployed_from_nationalsociety,deployed_from_regionname,start_date,end_date,ongoing,is_active,molnix_id,molnix_sector,molnix_role_profile,molnix_language,molnix_region,molnix_scope,molnix_modality,molnix_operation\r
+,,,,,,,,,,,,1,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,2,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,3,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,4,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,5,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,6,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,7,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,8,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,9,,,,,,,,,,,True,True,,,,,,,,\r
+,,,,,,,,,,,,10,,,,,,,,,,,True,True,,,,,,,,\r
 '''