Bug bei Zuständigkeiten behoben, diese werden nun nicht mehr doppelt angezeigt.

Version auf 0.7.2

areas/templates/areas/areas_management_OLD.html

@@ -1,71 +0,0 @@
-{% extends "users/base.html" %}
-{% block content %}
-<div class="content-section col-12">
-  <h3>Bereichsverwaltung</h3>  
-  <hr>
-  <p>
-    Bereiche unterteilen die Agentur in verschiedene Verantwortungsbereiche.
-  </p>
-  <div class="row">
-    <div class="content-section col-4">
-      <a class="btn btn-primary" href="{% url 'areas-addarea' %} ">Neuen Bereich anlegen</a>
-    </div>
-  </div>
-  <hr>
-  <div class="row">
-    {% for item in areas_of_agency %}    
-      <!-- Area Chart -->
-        <div class="col-xl-4 mb-4">
-          <div class="card shadow">
-            <!-- Card Header - Dropdown -->
-            <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">               
-              <h6 class="m-0 font-weight-bold text-primary">{{item.name }}</h6>
-              
-              <div class="dropdown no-arrow">
-                <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  <i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
-                </a>
-                <div class="dropdown-menu dropdown-menu-right shadow animated--fade-in" aria-labelledby="dropdownMenuLink">
-                  <div class="dropdown-header">Bereichsinfo</div>
-                  <a class="dropdown-item" href="{% url 'areas-manage' item.pk %}">Bearbeiten</a>  
-                  <div class="dropdown-divider"></div>                  
-                  <a class="dropdown-item text-danger" href="{% url 'areas-delete' item.pk %}" >Löschen</a>
-                </div>
-              </div>
-            </div>
-            <!-- Card Body -->
-            <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-6">
-                            <h6><b>Name</b></h6>
-                            <p>
-                                {{ item.name }}
-                            </p>                            
-                            <h6><b>Erstellt von</b></h6>
-                            <p>
-                                {{ item.created_area_by.first_name }} {{ item.created_area_by.last_name }}
-                            </p>
-                        </div>
-                        <div class="col-md-6">
-                            <h6><b>Farbe</b></h6>
-                            <p>
-                                <div style="width: 60px; height: 20px; background-color: {{ item.color }}"></div>
-                            </p>
-                            <h6><b>Erstellt am</b></h6>
-                            <p>
-                                {{ item.created_area_date }}
-                            </p>                                                        
-                        </div>  
-                        <div class="col-md-10">
-                        <h6><b>Beschreibung</b></h6>
-                            <p>
-                                {{ item.desc }}
-                            </p>    
-                          </div>                   
-                   </div>
-            </div>
-          </div>
-        </div>
-  {% endfor%}
-</div>
-{% endblock content %}

users/templates/users/base.html

@@ -187,7 +187,7 @@
         <button class="rounded-circle border-0" id="sidebarToggle"></button>
       </div>
       <div style="bottom: 10px; position: absolute;" class="sidebar-heading">
-        Version 0.7.1
+        Version 0.7.2
       </div>
     </ul>
     <!-- End of Sidebar -->

users/views.py

@@ -381,7 +381,7 @@ def UsersPrioUpdate(request):
 	tempuser = User.objects.get(pk=request.GET['userid'])
 	if request.method == 'GET' and tempuser.profile.agency.pk == request.user.profile.agency.pk:
 		prio = Prio.objects.filter(user__pk=request.GET['userid']).filter(task__pk=request.GET['taskid'])
-		prio = list(prio)[0]		 
+		prio = list(prio)[0]
 		prio.prio = request.GET['value']
 		prio.save()
 		return HttpResponse("udated...")
@@ -457,9 +457,11 @@ def UsersAreaTaskUpdate(request, pk):
 
 			for task in tasks:
 				if task.pk in task_ids:
-					prio = Prio(user=User.objects.get(pk=pk), task=task)
-					prio.save()
-					task.usersfield.add(user)
+					prio_check = Prio.objects.filter(user__pk=pk, task=task)
+					if(len(prio_check) == 0):
+						prio = Prio(user=User.objects.get(pk=pk), task=task)
+						prio.save()
+						task.usersfield.add(user)
 				else:
 					task.usersfield.remove(user)
 					Prio.objects.filter(user__pk=pk).filter(task__pk=task.pk).delete()