Merge branch 'feature/228_warning_user_without_worker' into 'master'

Feature/228 warning user without worker

Closes #228 and #239

See merge request NCER-PD/scheduling-system!165

smash/web/models/worker.py

@@ -193,19 +193,6 @@ class Worker(models.Model):
         return Worker.objects.filter(roles__study_id=study_id,
                                      roles__role__in=roles_by_worker_type(worker_type))
 
-    @staticmethod
-    def get_details(the_user):
-        persons = Worker.objects.filter(user=the_user)
-
-        if len(persons) == 0:
-            return the_user.get_full_name(), '<No worker information>'
-        else:
-            person = persons[0]
-            role = "N/A"
-            if person.roles.filter(study=GLOBAL_STUDY_ID).count() > 0:
-                role = person.roles.filter(study=GLOBAL_STUDY_ID)[0].get_role_display()
-            return unicode(person), role
-
     def __str__(self):
         if self.name != '':
             if self.first_name == '':

smash/web/static/AdminLTE/css/AdminLTE.css

@@ -270,6 +270,33 @@ a:focus {
 .main-header .sidebar-toggle .icon-bar {
   display: none;
 }
+
+.main-header .no_worker_warning {
+  float: left;
+  color: white;
+  font-weight: 600;
+  letter-spacing: 0.25px;
+  border-bottom: #dd4b39 solid 2px;
+  margin-top: 12px;
+  padding: 3px 3px 3px 5px;
+  transition: 1s;
+}
+
+.main-header .no_worker_warning:hover {
+  color: red;
+  background-color: black;
+  opacity: 1;
+  border-bottom: black none 2px;
+  border-radius: 5px;
+  transition: 1s;
+}
+
+.main-header .no_worker_warning > i.fa {
+  padding: 2px 5px 2px 2px;
+  color: #dd4b39;
+  text-shadow: 0 0 1px #000000;
+}
+
 .main-header .navbar .nav > li.user > a > .fa,
 .main-header .navbar .nav > li.user > a > .glyphicon,
 .main-header .navbar .nav > li.user > a > .ion {

smash/web/templates/_base.html

@@ -71,6 +71,9 @@ desired effect
             <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
                 <span class="sr-only">Toggle navigation</span>
             </a>
+            {% if user.is_authenticated and role == '<No worker information>' %}
+                <span class="no_worker_warning"><i class="fa fa-exclamation-triangle"></i>Some features might not work, <b>{{ user.get_username }}</b> has no worker associated.</span>
+            {% endif %}
 
             <!-- Navbar Right Menu -->
             <div class="navbar-custom-menu">
@@ -379,7 +382,6 @@ desired effect
         };
 
         activate({% block ui_active_tab %}{% endblock ui_active_tab %});
-
     </script>
 
     {% comment "TODO: Check, and add if works %}

smash/web/views/__init__.py

@@ -41,7 +41,14 @@ def wrap_response(request, template, params):
 
 
 def extend_context(params, request):
-    person, role = Worker.get_details(request.user)
+    person = Worker.get_by_user(request.user) # None if AnonymousUser or no Worker associated
+    if person is not None:
+        role = person.role
+        person = unicode(person)
+    else:
+        #use full name if available, username otherwise
+        person = request.user.get_full_name() if len(request.user.get_full_name()) > 1 else request.user.get_username()
+        role   = '<No worker information>'
     notifications = get_notifications(request.user)
     final_params = params.copy()
     final_params.update({