feat: Add organisation for list import, fix bugs.

lib/import_user.py

@@ -18,7 +18,8 @@ class ImportUser:
             'Nachname': 'lastname',
             'Anrede': 'title',
             'Passwort': 'password',
-            'Gruppen': 'groups'
+            'LDAP-Gruppen': 'groups',
+            'Organisationseinheit': 'organisation'
         }
         persons = pd.read_excel(self.input_file, engine='odf', skiprows=self.skip_rows)
         persons.rename(columns=self.columnnames_map, inplace=True)
@@ -38,7 +39,8 @@ class ImportUser:
             sys.exit("! Found errors, please fix and rerun the script")
 
         for _, person in persons.iterrows():
-            person['organisation'] = person['email'].rpartition('@')[-1]
+            if 'organisation' not in person or not pd.isna(person['organisation']):
+                person['organisation'] = person['email'].rpartition('@')[-1]
             person['is_admin'] = False
             callback(person)
             if create_admins:

lib/ucs.py

@@ -9,6 +9,7 @@ import time
 import datetime
 import urllib.parse
 import logging
+import pandas as pd
 
 from pathlib import Path
 from requests.auth import HTTPBasicAuth
@@ -60,7 +61,7 @@ class Ucs:
             sys.exit(response.text)
 
     def __add_property(self, person, key, list = False):
-        if key in person:
+        if key in person and not pd.isna(person[key]):
             if list == True:
                 self.create_user_json["properties"][key] = [person[key]]
             else: