Added dates to bus rolls

busManager/coord/backup/backup_helpers.py

@@ -60,15 +60,11 @@ def get_export_dict():
         company_dict['buses'] = buses
         companies.append(company_dict)
 
-    ignore_fields = ['travel_start_date', 'travel_end_date', 'is_active', 'is_archived', 'bus_stops', 'fee_per_term']
+    ignore_fields = ['travel_start_date', 'travel_end_date', 'is_active', 'is_archived', 'bus_stops', 'fee_per_term', 'address']
 
     for traveller in Traveller.objects.all():
         traveller_dict = model_to_dict(traveller)
         traveller_dict['school'] = traveller.school.name
-        if traveller.residential_suburb is not None:
-            traveller_dict['residential_suburb'] = traveller.residential_suburb.name
-        if traveller.postal_suburb is not None:
-            traveller_dict['postal_suburb'] = traveller.postal_suburb.name
         traveller_dict['dob'] = _to_date(traveller.dob)
         traveller_dict['assessment_date'] = _to_date(traveller.assessment_date)
         traveller_dict['created_on'] = traveller.created_on.strftime("%Y-%m-%d %H:%M:%S %Z")
@@ -76,6 +72,17 @@ def get_export_dict():
         for field in ignore_fields:
             traveller_dict.pop(field)
 
+        families = []
+        for family in Family.objects.filter(traveller=traveller):
+            family_dict = model_to_dict(family)
+            family_dict.pop('traveller')
+            if family.residential_suburb is not None:
+                family_dict['residential_suburb'] = family.residential_suburb.name
+            if family.postal_suburb is not None:
+                family_dict['postal_suburb'] = family.postal_suburb.name
+            families.append(family_dict)
+        traveller_dict['families'] = families
+
         routes = []
         for route in TravellerRoute.objects.filter(traveller=traveller):
             route_dict = model_to_dict(route)