diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 88b4872515d87a71fa9e97cf5ee1885c9edc9076..13d52333415c571c1ddd903680022ee3951c85af 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_. Unreleased ---------- +Changed +~~~~~~~ + +* Use home email as fallback in SchILD NRW template if a teachers' work email is empty + `2.2.1` - 2022-02-03 -------------------- diff --git a/README.rst b/README.rst index 3d82f6fe1981ce081e17903cdc459b9d37de75d0..d961cff7d9c244949f419b80f8adcc0c99e9ca0c 100644 --- a/README.rst +++ b/README.rst @@ -28,6 +28,7 @@ Licence Copyright © 2020, 2021 Jonathan Weth <dev@jonathanweth.de> Copyright © 2019 mirabilos <thorsten.glaser@teckids.org> Copyright © 2019 Tom Teichler <tom.teichler@teckids.org> + Copyright © 2022 magicfelix <felix@felix-zauberer.de> Licenced under the EUPL, version 1.2 or later, by Teckids e.V. (Bonn, Germany). diff --git a/aleksis/apps/csv_import/apps.py b/aleksis/apps/csv_import/apps.py index d58695a4af7ee58c13eee9a015a5f9da3b9dfa2a..98d2a50304cf4280df7996f5d762a62a2ddddd9a 100644 --- a/aleksis/apps/csv_import/apps.py +++ b/aleksis/apps/csv_import/apps.py @@ -18,6 +18,7 @@ class CSVImportConfig(AppConfig): ([2020, 2021], "Jonathan Weth", "dev@jonathanweth.de"), ([2019], "mirabilos", "thorsten.glaser@teckids.org"), ([2019], "Tom Teichler", "tom.teichler@teckids.org"), + ([2022], "magicfelix", "felix@felix-zauberer.de"), ) def ready(self): diff --git a/aleksis/apps/csv_import/default_templates.yaml b/aleksis/apps/csv_import/default_templates.yaml index c98191f813f6da1d9524ad8ce8a78437399360f5..4be2c97133c524f92df16d9e0877e087c199c0d9 100644 --- a/aleksis/apps/csv_import/default_templates.yaml +++ b/aleksis/apps/csv_import/default_templates.yaml @@ -223,12 +223,18 @@ schild_nrw_teachers: - ignore - ignore - ignore - - field_type: email + - field_type: ignore + column_name: email_work priority: 10 - field_type: phone_number db_field: mobile_number - phone_number - - ignore + - field_type: ignore + column_name: email_home - street_housenumber - postal_code - place + - field_type: email + virtual: true + template: | + {{ email_work|default:email_home }} diff --git a/pyproject.toml b/pyproject.toml index 890e31c2ddc863a9bb2f39de745028b119173355..2bd1d6f3045b5277ee1642ba896ddbd1c43af3ad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ tqdm = "^4.62.3" chardet = "^4.0.0" [tool.poetry.dev-dependencies] -aleksis-builddeps = "^6" +aleksis-builddeps = "*" [tool.poetry.plugins."aleksis.app"] csv_import = "aleksis.apps.csv_import.apps:CSVImportConfig"