Merge pull request #1080 from CodingPirates/1078-feature-vis-postnumm…

…er-og-kommune-i-oversigt-over-ventelister

Admin > Venteliste: Tilføjede Postnummer og Kommune til ventelisteoversigt

members/admin/waitinglist_admin.py

@@ -84,6 +84,8 @@ def get_form(self, request, obj=None, change=False, **kwargs):
         "person_link",
         "person_age_years",
         "person_gender_text",
+        "zipcode",
+        "municipality",
         "user_waiting_list_number",
         "user_created",
         "user_added_waiting_list",
@@ -99,6 +101,7 @@ def get_form(self, request, obj=None, change=False, **kwargs):
         "department__name",
         "department__union__name",
         "person__name",
+        "zipcode",
     ]
     search_help_text = mark_safe(
         """Du kan søge på forening, afdeling eller person.<br>
@@ -328,5 +331,17 @@ def user_added_waiting_list(self, item):
     def user_waiting_list_number(self, item):
         return item.number_on_waiting_list()
 
-    user_waiting_list_number.short_description = "Nummer på venteliste"
+    user_waiting_list_number.short_description = "Ventelistenummer"
     user_waiting_list_number.admin_order_field = "on_waiting_list_since"
+
+    def zipcode(self, item):
+        return item.person.zipcode
+
+    zipcode.short_description = "Post nr"
+    zipcode.admin_order_field = "person__zipcode"
+
+    def municipality(self, item):
+        return item.person.municipality
+
+    municipality.short_description = "Kommune"
+    municipality.admin_order_field = "person__municipality"