Merge pull request #247 from American-Institutes-for-Research/HEA-196/sub-national-seasons

Support sub-national seasons using zone-specific aliases - see HEA-196

Author: rhunwicks

apps/metadata/admin.py

@@ -145,6 +145,7 @@ class SeasonAdmin(admin.ModelAdmin):
         *translation_fields("name"),
         "season_type",
         "purpose",
+        "aliases",
     )
     list_filter = (
         ("country", admin.RelatedOnlyFieldListFilter),

apps/metadata/lookups.py

@@ -62,7 +62,9 @@ def prepare_lookup_df(self) -> pd.DataFrame:
         extra_dfs = []
         for country in all_countries:
             country_df = df[df["country_id"] == country]
-            null_purpose_rows = country_df[country_df["purpose"].isnull()]
+            # Purpose isn't a foreign key, and has blank=True, null=True, so there may be rows with a null purpose
+            # and others with purpose=="".
+            null_purpose_rows = country_df[country_df["purpose"].isna() | (country_df["purpose"] == "")]
             for purpose in all_purposes:
                 # Only add duplicate rows for purposes that aren't already defined for this country
                 if purpose not in country_df["purpose"].unique():