From dad207c2969cb8b13f81c478d9cc229739f518b6 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 25 Oct 2020 22:03:20 +0100
Subject: [PATCH] yt-links aktualisiert

---
 adm/templates/adm/adm_base.html        |  7 ++--
 adm/templates/adm/adm_user_single.html | 10 ++---
 adm/views.py                           |  2 +-
 users/templates/users/dashboard.html   | 55 ++++++++++++++------------
 4 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/adm/templates/adm/adm_base.html b/adm/templates/adm/adm_base.html
index 9ef62ee..d0c471b 100644
--- a/adm/templates/adm/adm_base.html
+++ b/adm/templates/adm/adm_base.html
@@ -8,7 +8,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="description" content="">
   <meta name="author" content="">
-  <link rel="shortcut icon" type="image/x-icon" href="{% static 'users/img/favicon.ico' %}">
+  <link rel="shortcut icon" type="image/x-icon" href="{% static 'users/img/favicon_neu.ico' %}">
   <title>Digitale Agentur - Administrativer Bereich</title>
 
   <!-- Custom fonts for this template-->
@@ -68,8 +68,9 @@
 
       <!-- Sidebar - Brand -->
       <a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% url 'users-dashboard' %}">
-        <i class="fas fa-laptop"></i>
-        <div class="sidebar-brand-text mx-2" style="">Digitale Agentur</div>
+        <!--<i class="fas fa-laptop"></i>
+        <div class="sidebar-brand-text mx-2" style="">Digitale Agentur</div>-->
+        <img src="{% static 'users/img/logo_neu.png' %}" width="100%">
       </a>
       <!-- Divider -->
       <hr class="sidebar-divider my-0">
diff --git a/adm/templates/adm/adm_user_single.html b/adm/templates/adm/adm_user_single.html
index 17deb7a..89ea8b5 100644
--- a/adm/templates/adm/adm_user_single.html
+++ b/adm/templates/adm/adm_user_single.html
@@ -3,20 +3,20 @@
 {% load adm_tags %}
 <!-- Mitarbeier ist immer der angemeledete!!! -->
 <div class="content-section col-12">
-<h4>{{user.get_full_name}} aus {{user.profile.agency.name}}</h4>
+<h4>{{userdata.get_full_name}} aus {{userdata.profile.agency.name}}</h4>
 <hr>
 <table>
 	<tr>
 		<td style="min-width: 120px;">Name</td>
-		<td>{{user.get_full_name}}</td>
+		<td>{{userdata.get_full_name}}</td>
 	</tr>
 	<tr>
 		<td>E-Mail</td>
-		<td>{{user.email}}</td>
+		<td>{{userdata.email}}</td>
 	</tr>
 	<tr>
 		<td>Letzter Login</td>
-		<td>{{user.last_login|default:"-"}}</td>
+		<td>{{userdata.last_login|default:"-"}}</td>
 	</tr>
 </table>
 <hr>
@@ -32,7 +32,7 @@
   </tr>
 </thead>
 <tbody >
-	{% for g in user.groups.all %}
+	{% for g in userdata.groups.all %}
 	{% getAgencyGroupName g as aggdata %}
 	<tr>
 		<td>{{aggdata.agencygroupname}}</td>
diff --git a/adm/views.py b/adm/views.py
index 877297b..3d3b7cd 100644
--- a/adm/views.py
+++ b/adm/views.py
@@ -154,7 +154,7 @@ class AdmUserSingle(TemplateView):
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : "adm-users"})
-		context.update({'users' : User.objects.get(pk=kwargs['uspk'])})
+		context.update({'userdata' : User.objects.get(pk=kwargs['uspk'])})
 		return context
 
 
diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html
index 5566788..ad007e3 100644
--- a/users/templates/users/dashboard.html
+++ b/users/templates/users/dashboard.html
@@ -79,39 +79,42 @@
     {% endif %}
 
 
-      {% if not request.user.profile.agency.module_news %}    
+      {% if not request.user.profile.agency.module_timemanagement %}    
       <div class="card d-block mb-3" style="width: 60%">
       {% else %}
       <div class="card d-block mb-3" style="width: 38%">
       {% endif %}
+
+      {% if request.user.profile.agency.module_timemanagement %} 
         <div class="card-body">
           <h5 class="card-title">Heutige Abwesenheiten</h5>
           {% if acutal_absences|length > 0 %}
-          <table class="table table-hover" id="table_timemanagement" >
-        <thead>
-        <tr>
-          <th scope="col">Mitarbeiter</th>
-          <th scope="col">Abwesend bis</th>
-          <th scope="col">Vertreter</th>
-          <th scope="col">&nbsp;</th>          
-        </tr>
-      </thead>
-      <tbody id="" >
-        {% for ab in acutal_absences %}
-          <tr>
-            <td> 
-              <!--<img class="commentimg mr-2" src="{{ ab.user.profile.get_photo_url }}">
-              <span class="us_fullname">{{ab.user.get_full_name}}</span>-->
-              {{ab.user.get_full_name}}
-            </td>
-            <td>{{ab.end|date:"d.m.Y"}}</td>
-            <td>{{ab.representator.get_full_name}}</td>
-          </tr>
-        {% endfor %}
-      </tbody>
-    </table>
-    {% else %}
-    Für heute ist keine Abwesenheit eingetragen.
+              <table class="table table-hover" id="table_timemanagement" >
+            <thead>
+            <tr>
+              <th scope="col">Mitarbeiter</th>
+              <th scope="col">Abwesend bis</th>
+              <th scope="col">Vertreter</th>
+              <th scope="col">&nbsp;</th>          
+            </tr>
+          </thead>
+          <tbody id="" >
+            {% for ab in acutal_absences %}
+              <tr>
+                <td> 
+                  <!--<img class="commentimg mr-2" src="{{ ab.user.profile.get_photo_url }}">
+                  <span class="us_fullname">{{ab.user.get_full_name}}</span>-->
+                  {{ab.user.get_full_name}}
+                </td>
+                <td>{{ab.end|date:"d.m.Y"}}</td>
+                <td>{{ab.representator.get_full_name}}</td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+        {% else %}
+        Für heute ist keine Abwesenheit eingetragen.
+        {% endif %}
     {% endif %}