add new route for user, so he can see, when he has jobs

geruecht/controller/databaseController.py

@@ -56,10 +56,12 @@ class DatabaseController(metaclass=Singleton):
 
     def _convertGroupToString(self, groups):
         retVal = ''
-        for group in groups:
+        print('groups: {}'.format(groups))
-            if len(retVal) != 0:
+        if groups:
-                retVal += ','
+            for group in groups:
-            retVal += group
+                if len(retVal) != 0:
+                    retVal += ','
+                retVal += group
         return retVal
 
 
@@ -73,6 +75,7 @@ class DatabaseController(metaclass=Singleton):
 
     def updateUser(self, user):
         cursor = self.db.connection.cursor()
+        print('uid: {}; group: {}'.format(user.uid, user.group))
         groups = self._convertGroupToString(user.group)
         sql = "update user set dn='{}', firstname='{}', lastname='{}', gruppe='{}', lockLimit={}, locked={}, autoLock={}, mail='{}' where uid='{}'".format(
             user.dn, user.firstname, user.lastname, groups, user.limit, user.locked, user.autoLock, user.mail, user.uid)

geruecht/controller/ldapController.py

@@ -69,7 +69,7 @@ class LDAPController(metaclass=Singleton):
                     retVal.append(BAR)
             return retVal
         except Exception as err:
-            traceback.print_exception(err)
+            traceback.print_exc()
 
     def __isUserInList(self, list, username):
         help_list = []

geruecht/user/routes.py

@@ -4,6 +4,7 @@ import geruecht.controller.userController as uc
 from geruecht.model import USER
 from datetime import datetime
 import time
+import traceback
 
 user = Blueprint("user", __name__)
 
@@ -48,4 +49,28 @@ def _saveConfig(**kwargs):
             retVal['creditList'] = {credit.year: credit.toJSON() for credit in accToken.user.geruechte}
             return jsonify(retVal)
     except Exception as err:
-        return jsonify({"error": err}), 409
+        return jsonify({"error": err}), 409
+
+@user.route("/user/job", methods=['POST'])
+@login_required(groups=[USER])
+def _getJob(**kwargs):
+    try:
+        if 'accToken' in kwargs:
+            accToken = kwargs['accToken']
+            data = request.get_json()
+            date = datetime.utcfromtimestamp(int(data['date']))
+            test = userController.getWorker(date, username=accToken.user.uid)
+            if test == [None]:
+                job = False
+            else:
+                job = True
+            if job:
+                workers = userController.getWorker(date)
+                for worker in workers:
+                    if worker['user']['uid'] == accToken.user.uid:
+                        workers.remove(worker)
+                return jsonify({'job': job, 'workers': workers})
+            return jsonify({'job': job})
+    except Exception as err:
+        traceback.print_exc()
+        return jsonify({"error": str(err)}), 409