From 0c946831116e0663e7867dc9ff254dbd448c8ab9 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Fri, 29 Jan 2021 10:33:45 +0100
Subject: [PATCH] =?UTF-8?q?Organigramml=C3=B6schfehler=20behoben=20bzw=20d?=
 =?UTF-8?q?er=20Nutzer=20wird=20informiert,=20was=20er=20tun=20muss=20um?=
 =?UTF-8?q?=20den=20User=20l=C3=B6schen=20zu=20k=C3=B6nnen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 23275 -> 23275 bytes
 standards/templatetags/counter_tag.py         |   4 +
 .../timemanagement_singleview.html            | 265 ++++++++----------
 .../timemanagement_teamview_single.html       | 161 +++++------
 users/templates/users/base.html               |   2 +-
 .../templates/users/user_confirm_delete.html  |  22 +-
 users/views.py                                |  20 +-
 7 files changed, 233 insertions(+), 241 deletions(-)

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index ea266a4f7a436a649b88301ab4508dc989bd4205..b53cf1205d178f78db2c8ae32076850c0c9b770d 100644
GIT binary patch
delta 163
zcmaF8mGSjfM&3|fUM>b8P`E6dV7`&JF_`hz<o@7!OxcW+8O?<!pAS);oE{Q9**sKk
zvUi9K7kg%Mabix6eo@Zke<7Ak`7l+Slftwn*N2KR=1!g#>cdooByP!Dz{tR$$yy`~
rw5BL`vRha%W69=OVSAXwvVjssc_1PmL==ID62{2^?Bbi7BQqEQcGNIv

delta 150
zcmaF8mGSjfM&3|fUM>b8aGETXV7!sHF_<xGa)0nVrYy$EjON0V&xfc^P7euY%7t<D
z7_%q;3$dKMD@1NmnAYU_P%*}w$<so8m<nMkI46Z!^5!!#Fle$C2?I?o%9-pI7R*?@
hc~;mSCb2A_L{Tn?$O93DAflLYasa#d=H|!@MgXTDE9U?J

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 04d9fdd..cbad929 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -1039,3 +1039,7 @@ def getBaseURLIcsExAll(agency):
 
 
 
+
+
+
+
diff --git a/timemanagement/templates/timemanagement/timemanagement_singleview.html b/timemanagement/templates/timemanagement/timemanagement_singleview.html
index 0db1cd7..b3e4a52 100644
--- a/timemanagement/templates/timemanagement/timemanagement_singleview.html
+++ b/timemanagement/templates/timemanagement/timemanagement_singleview.html
@@ -1,24 +1,20 @@
 {% load counter_tag %}
 
-<div class="btn-group" role="group" aria-label="" style="min-width: 100% !important">
+<div class="btn-group" role="group" aria-label="" style="min-width: 100% !important;">
             <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' prev_month prev_year %}" ><i class="fas fa-arrow-circle-left"></i></a>
             <button type="button" class="btn btn-primary mr-1" style="min-width: 150px !important;" onclick="javascript:fastChangeModal()">{{active_month}} {{active_year}}</button>
             <a type="button" class="btn btn-primary mr-1" href="{% url 'tm-management' next_month next_year %}"><i class="fas fa-arrow-circle-right"></i></a>
-
-
-<span style="float: right !important; text-align: right; min-width: 82%; margin-bottom: -20px; margin-top: -10px; ">
-  {% loadmonthwork next_month user as monthwork %}
-
-
-  Gesamtarbeitszeit dieser Monat: {{monthwork}} Stunden<br />
-  {% loadaccounttime user as actualaccounttime %}
-  Gleitzeitkonto: 
-  {% if actualaccounttime.1 == 0 %}
-    <b><span style="color: green">+{{actualaccounttime.0}}&nbsp;Stunden</span></b>
-  {% else %}
-    <b><span style="color: red">-{{actualaccounttime.0}}&nbsp;Stunden</span></b>
-  {% endif %}
-</span>
+  <span style="text-align: right !important; width: 100%">
+    {% loadmonthwork next_month user as monthwork %}
+    Gesamtarbeitszeit dieser Monat: {{monthwork}} Stunden<br />
+    {% loadaccounttime user as actualaccounttime %}
+    Gleitzeitkonto: 
+    {% if actualaccounttime.1 == 0 %}
+      <b><span style="color: green">+{{actualaccounttime.0}}&nbsp;Stunden</span></b>
+    {% else %}
+      <b><span style="color: red">-{{actualaccounttime.0}}&nbsp;Stunden</span></b>
+    {% endif %}
+  </span>
 
 </div>
 
@@ -31,9 +27,9 @@
           <th scope="col"></th>
           <th scope="col">Start</th>
           <th scope="col">Ende</th>
-          <th scope="col">Gesamtzeit</th>
-          <th scope="col">Pausen</th>
           <th scope="col">Arbeitszeit</th>
+          <th scope="col">Pausen</th>
+          <th scope="col">Gesamtzeit</th>
           <th scope="col">Gleitzeit</th>
           <!--<th scope="col">Gleitzeitstand</th>-->
           <th scope="col">&nbsp;</th>
@@ -41,9 +37,7 @@
       </thead>
       <tbody id="table_contacts" >
       {% for da in days_this_month %}
-
-      {% getabscenceday request.user request.user da as abday %}
-
+        {% getabscenceday request.user request.user da as abday %}
         <tr id="da_{{da|date:"d-m-y"}}"
             {% if da.weekday == 5 or da.weekday == 6 %}
               style="background-color: #d3d3d3;"
@@ -59,12 +53,15 @@
                   {% endif %}
                 {% endfor %}
             {% endif %}>
+            <!-- Datum Wochentag -->
             <td>
              {{da|date:"l"}}
             </td>
+            <!-- Komplettes Datum -->
             <td>
               {{da|date:"d.m.y"}}
             </td>
+            <!-- START -->
             <td {% if abday != False %} colspan="3" {% endif %}>
               {% if abday != False %}
                 {{abday.reason}}
@@ -218,7 +215,8 @@
               {% endif %}
             </td>
             {% if abday == False %}
-             <td>
+            <!-- ENDE -->
+            <td>
               {% counterWDreset %}
                {% for workday in workdays %}
                  {% if workday.end|date:"d-m-y" == da|date:"d-m-y" %}
@@ -235,8 +233,44 @@
                    {{workday.end|date:"H:i"}}
                  {% endif %}
                {% endfor %}
-
             </td>
+            <!-- ARBEITSZEIT -->
+            <td>
+              {% counterWDreset %}
+              {% for workday in workdays %}
+                {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+                  {% getCounterWD as wd_counter %}
+
+                  {% if wd_counter > 0 %}
+                    <br />
+                  {% endif %}
+                  {% counterWDUp %}
+                  {% getsumworkday workday as sumwd %}
+                  {{sumwd}}
+                {% endif %}
+              {% endfor %}
+            </td>
+            <!-- PAUSEN -->
+            <td>
+                {% counterWDreset %}
+                {% for workday in workdays %}
+                  {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+                    {% getCounterWD as wd_counter %}
+
+                    {% if wd_counter > 0 %}
+                      <br />
+                    {% endif %}
+
+                    {% counterWDUp %}
+
+                    {% getsumbreak workday as sumbreakofday %}
+                    {{sumbreakofday}} min. ({{workday.breaks.all|length}})
+                  {% endif %}
+                {% endfor %}
+            </td>
+            <!-- GESAMT -->
             <td>
                 {% counterWDreset %}
                   {% for workday in workdays %}
@@ -255,146 +289,91 @@
                       {{ sumworkday }}
                     {% endif %}
                   {% endfor %}
-
             </td>
+            <!-- Gleitzeit -->
             <td>
-                {% counterWDreset %}
+              {% counterWDreset %}
               {% for workday in workdays %}
                 {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
 
-                {% getCounterWD as wd_counter %}
+                  {% getCounterWD as wd_counter %}
 
-                {% if wd_counter > 0 %}
-                <br />
-                {% endif %}
-
-                {% counterWDUp %}
-
-              {% getsumbreak workday as sumbreakofday %}
-                {{sumbreakofday}} min. ({{workday.breaks.all|length}})
+                  {% if wd_counter > 0 %}
+                  <br />
+                  {% endif %}
+                  {% counterWDUp %}
+                  {% gettimeoveralldiff workday user as erg%}
+                  {% if erg.1 == 0 %}
+                    <span style="color: green">+{{erg.0}}</span>
+                  {% elif erg.1 == 1 %}
+                    <span>{{erg.0}}</span>
+                  {% else %}
+                    <span style="color: red">-{{erg.0}}</span>
+                  {% endif %}
                 {% endif %}
               {% endfor %}
-
-            </td>
-            <td>
-
-                {% counterWDreset %}
-              {% for workday in workdays %}
-                {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
-                {% getCounterWD as wd_counter %}
-
-                {% if wd_counter > 0 %}
-                <br />
-                {% endif %}
-
-
-                {% counterWDUp %}
-
-              {% getsumworkday workday as sumwd %}
-                {{sumwd}}
-                {% endif %}
-              {% endfor %}
-
-            </td>
-            <td>
-
-                {% counterWDreset %}
-              {% for workday in workdays %}
-                {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
-                {% getCounterWD as wd_counter %}
-
-                {% if wd_counter > 0 %}
-                <br />
-                {% endif %}
-                {% counterWDUp %}
-              {% gettimeoveralldiff workday user as erg%}
-                {% if erg.1 == 0 %}
-                  <span style="color: green">+{{erg.0}}</span>
-                {% elif erg.1 == 1 %}
-                  <span>{{erg.0}}</span>
-                {% else %}
-                  <span style="color: red">-{{erg.0}}</span>
-                {% endif %}
-                {% endif %}
-              {% endfor %}
-
             </td>
            <!-- <td style="text-align: center;">
-              
             </td>-->
+            <!-- BUTTONS -->
             <td style="text-align: right;">
-
                 {% counterWDreset %}
-              {% for workday in workdays %}
-                {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
-                {% getCounterWD as wd_counter %}
-
-                {% if wd_counter > 0 %}
-                <br />
-                {% endif %}
-
-
-                {% counterWDUp %}
-
-                 {% getWorkDayHistory workday as wd_history %}
-
-                  {% if wd_history.history_user != None %}
-                    
-                    <a href="#/" onclick="javascript:$('#wd_history_{{workday.pk}}').modal('toggle');"><i class="fas fa-user-edit"></i></a>
-                    <div class="modal fade" id="wd_history_{{workday.pk}}" tabindex="-1" role="dialog" data-backdrop="static">
-                      <div class="modal-dialog" role="document">
-                        <div class="modal-content">
-                          <div class="modal-header">
-                            <h5 class="modal-title">Manuelle Änderung vom {{workday.start|date:"d.m.Y"}}</h5>
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                              <span aria-hidden="true">&times;</span>
-                            </button>
-                          </div>
-                          <div class="modal-body" style="text-align: left;">
-                            <p>Geändert am {{wd_history.history_date|date:"d.m.Y, H:i"}} von {{wd_history.history_user.first_name}} {{wd_history.history_user.last_name}}</p>
-                          </div>
-                          <div class="modal-footer">
-                            <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+                {% for workday in workdays %}
+                  {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+                    {% getCounterWD as wd_counter %}
+                    {% if wd_counter > 0 %}
+                      <br />
+                    {% endif %}
+                    {% counterWDUp %}
+                    {% getWorkDayHistory workday as wd_history %}
+                    {% if wd_history.history_user != None %}
+                      <a href="#/" onclick="javascript:$('#wd_history_{{workday.pk}}').modal('toggle');"><i class="fas fa-user-edit"></i></a>
+                      <div class="modal fade" id="wd_history_{{workday.pk}}" tabindex="-1" role="dialog" data-backdrop="static">
+                        <div class="modal-dialog" role="document">
+                          <div class="modal-content">
+                            <div class="modal-header">
+                              <h5 class="modal-title">Manuelle Änderung vom {{workday.start|date:"d.m.Y"}}</h5>
+                              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                <span aria-hidden="true">&times;</span>
+                              </button>
+                            </div>
+                            <div class="modal-body" style="text-align: left;">
+                              <p>Geändert am {{wd_history.history_date|date:"d.m.Y, H:i"}} von {{wd_history.history_user.first_name}} {{wd_history.history_user.last_name}}</p>
+                            </div>
+                            <div class="modal-footer">
+                              <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+                            </div>
                           </div>
                         </div>
                       </div>
-                    </div>
-                  {% endif %}
-                
-
-                  {% if workday.freefield != "" %}
-                    
-                    <a href="#/" onclick="javascript:$('#wd_freefield_{{workday.pk}}').modal('toggle');"><i class="fas fa-eye"></i></a>
-                    <div class="modal fade" id="wd_freefield_{{workday.pk}}" tabindex="-1" role="dialog" data-backdrop="static">
-                      <div class="modal-dialog" role="document">
-                        <div class="modal-content">
-                          <div class="modal-header">
-                            <h5 class="modal-title">Notiz zum Arbeitstag {{workday.start|date:"d.m.Y"}}</h5>
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                              <span aria-hidden="true">&times;</span>
-                            </button>
-                          </div>
-                          <div class="modal-body" style="text-align: left;">
-                            <p>{{workday.freefield}}</p>
-                          </div>
-                          <div class="modal-footer">
-                            <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+                    {% endif %}
+                    {% if workday.freefield != "" %}
+                      <a href="#/" onclick="javascript:$('#wd_freefield_{{workday.pk}}').modal('toggle');"><i class="fas fa-eye"></i></a>
+                      <div class="modal fade" id="wd_freefield_{{workday.pk}}" tabindex="-1" role="dialog" data-backdrop="static">
+                        <div class="modal-dialog" role="document">
+                          <div class="modal-content">
+                            <div class="modal-header">
+                              <h5 class="modal-title">Notiz zum Arbeitstag {{workday.start|date:"d.m.Y"}}</h5>
+                              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                <span aria-hidden="true">&times;</span>
+                              </button>
+                            </div>
+                            <div class="modal-body" style="text-align: left;">
+                              <p>{{workday.freefield}}</p>
+                            </div>
+                            <div class="modal-footer">
+                              <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+                            </div>
                           </div>
                         </div>
                       </div>
-                    </div>
-
+                    {% endif %}
+                    {% if breakmonthline < da %}
+                      <button  class="btn btn-secondary btn-sm ml-2" onclick="window.location.href='{% url 'tm-update' workday.pk %}'"><small><i class="fas fa-pen"></i></small></button>
+                      <button  class="btn btn-secondary btn-sm " onclick="javascript:$('#confirm-delete_{{workday.pk}}').modal('toggle')"><small><i class="fas fa-trash"></i></small></button>
+                    {% endif %}
                   {% endif %}
-
-                  {% if breakmonthline < da %}
-                  <button  class="btn btn-secondary btn-sm ml-2" onclick="window.location.href='{% url 'tm-update' workday.pk %}'"><small><i class="fas fa-pen"></i></small></button>
-                  <button  class="btn btn-secondary btn-sm " onclick="javascript:$('#confirm-delete_{{workday.pk}}').modal('toggle')"><small><i class="fas fa-trash"></i></small></button>
-                  {% endif %}
-                {% endif %}
-              {% endfor %}
+                {% endfor %}
             </td>
             {% else %}
             <td></td><td></td><td></td><td></td><td style="display: none;"></td><td style="display: none;"></td>
diff --git a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html
index 88cbac6..6b0652b 100644
--- a/timemanagement/templates/timemanagement/timemanagement_teamview_single.html
+++ b/timemanagement/templates/timemanagement/timemanagement_teamview_single.html
@@ -31,9 +31,9 @@
           <th scope="col"></th>
           <th scope="col">Start</th>
           <th scope="col">Ende</th>
-          <th scope="col">Gesamtzeit</th>
-          <th scope="col">Pausen</th>
           <th scope="col">Arbeitszeit</th>
+          <th scope="col">Pausen</th>
+          <th scope="col">Gesamtzeit</th>
           <th scope="col">Gleitzeit</th>
           <th scope="col">&nbsp;</th>
         </tr>
@@ -58,13 +58,17 @@
                   {% endif %}
                 {% endfor %}
             {% endif %}>
+            <!-- Wochentag -->
             <td>
              {{da|date:"l"}}
             </td>
+            <!-- Komplettes Datum -->
             <td>
               {{da|date:"d.m.y"}}
             </td>
+            <!-- START -->
             <td {% if abday != False %} colspan="3" {% endif %}>
+
               {% if abday != False %}
                 {{abday.reason}}
                 {% if abday.start == da%}
@@ -215,112 +219,89 @@
               {% endif %}
             </td>
             {% if abday == False %}
-             <td>
-              {% counterWDreset %}
-               {% for workday in workdays %}
-                 {% if workday.end|date:"d-m-y" == da|date:"d-m-y" %}
-
-                 {% getCounterWD as wd_counter %}
-
-                 {% if wd_counter > 0 %}
-                 <br />
-                 {% endif %}
-
-
-                 {% counterWDUp %}
-
-                   {{workday.end|date:"H:i"}}
-                 {% endif %}
-               {% endfor %}
-
-            </td>
+            <!-- ENDE -->
             <td>
                 {% counterWDreset %}
-                  {% for workday in workdays %}
-                    {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
+                {% for workday in workdays %}
+                  {% if workday.end|date:"d-m-y" == da|date:"d-m-y" %}
                     {% getCounterWD as wd_counter %}
-
                     {% if wd_counter > 0 %}
-                    <br />
+                      <br />
                     {% endif %}
-
-
                     {% counterWDUp %}
-
-                      {% getsumworkdayexcludebreak workday as sumworkday %}
-                      {{ sumworkday }}
+                    {{workday.end|date:"H:i"}}
+                  {% endif %}
+                {% endfor %}
+            </td>
+            <!-- Arbeitszeit -->
+            <td>  
+              {% counterWDreset %}
+              {% for workday in workdays %}
+                {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+                  {% getCounterWD as wd_counter %}
+                  {% if wd_counter > 0 %}
+                    <br />
+                  {% endif %}
+                  {% counterWDUp %}
+                  {% getsumworkday workday as sumwd %}
+                  {{sumwd}}
+                {% endif %}
+              {% endfor %}
+            </td>
+            <!-- PAUSEN -->
+            <td>
+              {% counterWDreset %}
+              {% for workday in workdays %}
+                {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+                  {% getCounterWD as wd_counter %}
+                    {% if wd_counter > 0 %}
+                      <br />
                     {% endif %}
-                  {% endfor %}
-
-            </td>
-            <td>
-                {% counterWDreset %}
-              {% for workday in workdays %}
-                {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
-                {% getCounterWD as wd_counter %}
-
-                {% if wd_counter > 0 %}
-                <br />
-                {% endif %}
-
-                {% counterWDUp %}
-
-              {% getsumbreak workday as sumbreakofday %}
-                {{sumbreakofday}} min. ({{workday.breaks.all|length}})
+                  {% counterWDUp %}
+                  {% getsumbreak workday as sumbreakofday %}
+                  {{sumbreakofday}} min. ({{workday.breaks.all|length}})
                 {% endif %}
               {% endfor %}
-
             </td>
+            <!-- GESAMTZEIT -->
             <td>
-
                 {% counterWDreset %}
+                {% for workday in workdays %}
+                  {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+                    {% getCounterWD as wd_counter %}
+                    {% if wd_counter > 0 %}
+                      <br />
+                    {% endif %}
+                    {% counterWDUp %}
+                    {% getsumworkdayexcludebreak workday as sumworkday %}
+                    {{ sumworkday }}
+                  {% endif %}
+                {% endfor %}
+            </td>
+            <!-- Gleitzeit -->
+            <td>
+              {% counterWDreset %}
               {% for workday in workdays %}
                 {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
-                {% getCounterWD as wd_counter %}
-
-                {% if wd_counter > 0 %}
-                <br />
-                {% endif %}
-
-
-                {% counterWDUp %}
-
-              {% getsumworkday workday as sumwd %}
-                {{sumwd}}
+                  {% getCounterWD as wd_counter %}
+                  {% if wd_counter > 0 %}
+                    <br />
+                  {% endif %}
+                  {% counterWDUp %}
+                  {% gettimeoveralldiff workday user as erg%}
+                  {% if erg.1 == 0 %}
+                    <span style="color: green">+{{erg.0}}</span>
+                  {% elif erg.1 == 1 %}
+                    <span>{{erg.0}}</span>
+                  {% else %}
+                    <span style="color: red">-{{erg.0}}</span>
+                  {% endif %}
                 {% endif %}
               {% endfor %}
-
-            </td>
-            <td>
-
-                {% counterWDreset %}
-              {% for workday in workdays %}
-                {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
-                {% getCounterWD as wd_counter %}
-
-                {% if wd_counter > 0 %}
-                <br />
-                {% endif %}
-                {% counterWDUp %}
-              {% gettimeoveralldiff workday user as erg%}
-                {% if erg.1 == 0 %}
-                  <span style="color: green">+{{erg.0}}</span>
-                {% elif erg.1 == 1 %}
-                  <span>{{erg.0}}</span>
-                {% else %}
-                  <span style="color: red">-{{erg.0}}</span>
-                {% endif %}
-                {% endif %}
-              {% endfor %}
-
             </td>
+            <!-- BUTTONS -->
             <td style="text-align: right;">
-
-                {% counterWDreset %}
+              {% counterWDreset %}
               {% for workday in workdays %}
                 {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
 
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 2e33dcc..0400979 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -488,7 +488,7 @@
               <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span class="mr-2 d-none d-lg-inline text-gray-600 small">{{request.user.first_name}} {{request.user.last_name}}
                 </span>
-                <img id="userbaseprofilepicture" class="img-profile roundimg_base ml-2" src="{{ user.profile.get_photo_url }}">
+                <img id="userbaseprofilepicture" class="img-profile roundimg_base ml-2" src="{{ request.user.profile.get_photo_url }}">
               </a>
               <!-- Dropdown - User Information -->
               <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="userDropdown">
diff --git a/users/templates/users/user_confirm_delete.html b/users/templates/users/user_confirm_delete.html
index de9882f..9dcd168 100644
--- a/users/templates/users/user_confirm_delete.html
+++ b/users/templates/users/user_confirm_delete.html
@@ -1,18 +1,24 @@
 {% extends "users/base.html" %}
 {% load crispy_forms_tags %}
+{% load counter_tag %}
 {% block content %}
     <div class="content-section">
       <div class="media">        
         <div class="media-body">
-          <h2 class="account-heading">Benutzer {{ user.first_name }} {{ user.last_name }} löschen?</h2>
-          <hr>
-          
+          <h2 class="account-heading">
+            {% if orgaerror == True %}
+              Benutzer {{ user.first_name }} {{ user.last_name }} löschen?
+            {% else %}
+              Benutzer {{ user.first_name }} {{ user.last_name }} kann nicht gelöscht werden - Organigrammfehler
+            {% endif %}
+          </h2>
+          <hr>      
       </div>
     </div>
       <!-- Für das Speichern der Bilder enctype -->
-      <!-- TASK: Hinzufügen von Zeiterfassung und Urlaub! -->
       <form method="POST">
         {% csrf_token %}
+        {% if orgaerror == True %}
         <p>Alle vom Benutzer erstellen Informationen (Standards, Dateien usw.) bleiben bestehen, jedoch werden die Verweise auf einen Nutzer entfernt. Alle Chat-Nachrichten werden unwiederruflich gelöscht! Soeben wurden alle Vertragsdaten (Abwesenheit und Zeiterfassung), wenn vorhanden, als CSV heruntergeladen. Diese können Sie archivieren und entsprechend Ihrer agenturinternen Gegebenheiten bzgl. Datenspeicherung aufbewahren.<br /></p>
         <a href="{% url 'users-delete-getdata' user.pk %}" id="downloadFileAction" download>Daten erneut herunterladen</a>
         <hr>
@@ -20,12 +26,20 @@
           <button type="submit" class="btn btn-primary">Benutzer löschen</button>&nbsp;
           <a href="{% url 'dasettings' %}" class="btn">Abbrechen</a>
         </div>
+        {% else %}
+        <p>Achtung! Dieser Nutzer kann nicht gelöscht werden, da im Organigramm andere Mitarbeiter diesem untergeordnet ist. Bitte prüfen Sie die Einstellungen Ihrer Mitarbeiter unter Einstellungen, Mitarbeiter im Bereich <b>Übergeordneter Mitarbeiter</b>. <br /><br /><b>Es können nur ein Mitarbeiter gelöscht werden, wenn diesem kein Mitarbeiter untergeordnet sind.</b></p>
+        <div class="form-group">
+          <a href="{% url 'dasettings' %}" class="btn">Abbrechen</a>
+        </div>
+        {% endif %}
       </form>
     </div>
     <script type="text/javascript">
       //Auto-Download the file
+      {% if orgaerror == True %}
       $(document).ready(function(){
         location.href = "{% url 'users-delete-getdata' user.pk %}"
       })
+      {% endif %}
     </script>    
 {% endblock content %}
\ No newline at end of file
diff --git a/users/views.py b/users/views.py
index c27744e..0aa7b17 100644
--- a/users/views.py
+++ b/users/views.py
@@ -958,17 +958,27 @@ def getDataFromToDelUser(request, pk):
 		pass
 
 
+# Gibt zurück, ob übergebener Nutzer einem anderen Nutzer im Organigramm als Parent zugeordnet ist
+# TRUE - User hat keinen Parent und kann gelöscht werden
+# FALSE - User hat Parent und kann nicht direkt gelöscht werden
+def checkOrgaParent(user):
+	returnvalue = True
+	for u in User.objects.filter(profile__agency=user.profile.agency):
+		if u.profile.parent == user:
+			returnvalue = False
+
+	return returnvalue
+
 class ProfileDeleteView(LoginRequiredMixin, DeleteView):
 	model = User
 	success_url = '/dasettings/main'
 	template_name = 'users/user_confirm_delete.html'
 
 	# Adding active_link
-	def get_context_data(self, **kwargs):
+	def get_context_data(self, *args, **kwargs):
 		context = super().get_context_data(**kwargs)
-		
 		# Hier Daten zusammenstellen, damit alle Daten bzgl Vertrag nicht verloren gehen (Zeiterfassung, Urlaub und Abwesenheiten)
-
+		'''
 		response = HttpResponse(content_type='text/csv')  
 		response['Content-Disposition'] = 'attachment; filename="file.csv"'  
 		writer = csv.writer(response)  
@@ -976,6 +986,10 @@ class ProfileDeleteView(LoginRequiredMixin, DeleteView):
 		writer.writerow(['1002', 'Amit', 'Mukharji', 'LA', '"Testing"'])  
 		context.update({"response" : response})
 		#print(response)
+		'''
+		# Prüft, ob der Nutzer ein Parent im Organigramm ist. Gibt True oder False zurück. Das Template verhindert dann das löschen und informiert den Nutzer.
+
+		context.update({"orgaerror" : checkOrgaParent(kwargs["object"])})
 		return context