Merge pull request #214 from cmu-delphi/development

Development

Author: dmytrotsko

src/.DS_Store

@@ -74,7 +74,7 @@ class GeographyUnitAdmin(admin.ModelAdmin):
     Admin interface for GeographyUnit model.
     """
 
-    list_display = ["name", "display_name"]
+    list_display = ["name", "display_name", "geo_id", "geo_level"]
     search_fields = ["name", "display_name"]
     ordering = ["name"]
     list_per_page = 20

src/base/admin.py

@@ -9,7 +9,7 @@
         "display_order_number": 2,
         "short_name": "HHS",
     },
-    "hhs-region": {
+    "hhs": {
         "display_name": "U.S. HHS Region",
         "display_order_number": 2,
         "short_name": "HHS",
@@ -39,7 +39,7 @@
         "display_order_number": 7,
         "short_name": "ADM 3",
     },
-    "hsa": {
+    "hsa_nci": {
         "display_name": "Health Service Area (HSA-NCI)",
         "display_order_number": 8,
         "short_name": "HSA-NCI",

src/base/resources.py

@@ -14,7 +14,7 @@
         "model": "base.Geography",
         "pk": 2,
         "fields": {
-            "name": "hhs-region",
+            "name": "hhs",
             "display_name": "U.S. HHS Region",
             "display_order_number": 2,
             "used_in": "indicatorsets",
@@ -80,7 +80,7 @@
         "model": "base.Geography",
         "pk": 14,
         "fields": {
-            "name": "hsa",
+            "name": "hsa_nci",
             "display_name": "Health Service Area (HSA-NCI)",
             "display_order_number": 8,
             "used_in": "indicatorsets",