Merge branch 'schild-nrw-teachers-email' into 'master'

Schild nrw teachers email

See merge request AlekSIS/official/AlekSIS-App-CSVImport!100

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
 --------------------
 

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).
 

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):

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 }}

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"