Bugs eingepflegt oder Karte erstellt inkl. Hinweis in Bugs

areas/templates/areas/areas_management.html

@@ -11,8 +11,7 @@
       <a class="btn btn-primary" href="{% url 'areas-addarea' %} ">Neuen Bereich anlegen</a>
     </div>
   </div>
-  <hr>
-  <div class="row">
+  <div class="row mt-3">
     <table class="table">
           <thead>
           <tr>

news/templates/news/news_management.html

@@ -4,15 +4,15 @@
   <h3>News</h3>  
   <hr>
   <p>
-    Newsbereich verwalten
+    Hier können aktuelle Nachrichten für die Agentur erstellt und verwaltet werden.
   </p>
   <div class="row">
     <div class="content-section col-4">
       <a class="btn btn-primary" href="{% url 'news-add' %} ">News erstellen</a>
     </div>
   </div>
-  <hr>
-  <div class="row">
+  
+  <div class="row mt-3">
     <table class="table">
           <thead>
           <tr>
@@ -37,6 +37,7 @@
                     </a>
                     <div class="dropdown-menu dropdown-menu-right shadow animated--fade-in" aria-labelledby="dropdownMenuLink">
                       <a class="dropdown-item" href="{% url 'news-update' news_single.pk %}" class="btn">Bearbeiten</a>
+                      <div class="dropdown-divider"></div>       
                       <a class="dropdown-item text-danger" href="{% url 'news-delete' news_single.pk %}">Löschen</a>
                     </div>
                   </div>

news/views.py

@@ -17,7 +17,7 @@ class NewsManagement(LoginRequiredMixin, ListView):
 	# Change context and return for template-data
 	def get_context_data(self, **kwargs):		
 		filterdate = datetime.now()
-		news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk)
+		news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('-created_date')
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'newsmanagement', 'news' : news})
 		return context

orga/templates/orga/orga_main.html

@@ -3,7 +3,7 @@
 <div class="content-section">
   <h3>{{request.user.profile.agency.name}}</h3>
   <hr>
-  <h4>Agenturübersicht</h4>
+  <h4>Organigramm</h4>
   <table class="table borderless">
   <tbody>
     <tr>
@@ -20,19 +20,27 @@
       </a>
       </td>      
     </tr>
-    <tr>      
+    <tr> 
+      
+
+      {%if external|length > 0%}
       <td class="text-center"><h4>Außendienst</h4></td>
+      {%endif%}
+      {%if indoor|length > 0%}
       <td class="text-center"><h4>Innendienst</h4></td>
+      {%endif%}
+      {%if trainee|length > 0%}
       <td class="text-center"><h4>Auszubildende</h4></td>
+      {%endif%}
     </tr>
     <tr>
-    	
+    	{% if external|length > 0 %}
     	<td class="text-center">
     	{% for us in external %}  
 	    <a href="{% url 'orga-single' us.pk %}">
 	    	<div class="mb-4">  	
 		    	<div>
-		      		<img class="img-profile mb-2 " width="30%" src="{{ us.profile.image.url }}">
+		      		<img class="img-profile mb-2 " width="25%" src="{{ us.profile.image.url }}">
 		      	</div>
 		      	<h5>{{ us.first_name }} {{ us.last_name }}</h5>
 		      	<span>{{ us.profile.get_func_display }}</span>
@@ -40,13 +48,15 @@
 	      </a>
     	{% endfor %}     
       	</td>
+      {%endif%}
 
+      {%if indoor|length > 0%}
       	<td class="text-center">
       	{% for us in indoor %}  
       	<a href="{% url 'orga-single' us.pk %}">
 	    	<div class="mb-4">  	
 		    	<div>
-		      		<img class="img-profile mb-2 " width="30%" src="{{ us.profile.image.url }}">
+		      		<img class="img-profile mb-2 " width="25%" src="{{ us.profile.image.url }}">
 		      	</div>
 		      	<h5>{{ us.first_name }} {{ us.last_name }}</h5>
 		      	<span>{{ us.profile.get_func_display }}</span>
@@ -54,12 +64,14 @@
 	      	</a>
     	{% endfor %}     
       	</td>
+      {% endif %}
+    {%if trainee|length > 0%}
 		<td class="text-center">
       	{% for us in trainee %}  
       	<a href="{% url 'orga-single' us.pk %}">
 	    	<div class="mb-4">  	
 		    	<div>
-		      		<img class="img-profile mb-2 " width="30%" src="{{ us.profile.image.url }}">
+		      		<img class="img-profile mb-2 " width="25%" src="{{ us.profile.image.url }}">
 		      	</div>
 		      	<h5>{{ us.first_name }} {{ us.last_name }}</h5>
 		      	<span>{{ us.profile.get_func_display }}</span>
@@ -67,23 +79,11 @@
 	      	</a>
     	{% endfor %}     
       	</td>
+    {% endif %}
     </tr>
   </tbody>
 </table>
 
 
 </div>
-{% endblock content %}
-
-<!--
-
-	context = {		
-		'active_link' : 'orga',
-		'leader' : leader,
-		'indoor' : indoor,
-		'external' : external,
-		'trainee' : trainee
-	}
-
-
-	-->
+{% endblock content %}

orga/templates/orga/orga_single.html

@@ -44,7 +44,7 @@
     <thead>
     <tr >  
         {% for area in areas %}            
-          <td class="text-center" style="background-color: rgba({{area.color.0}},{{area.color.1}},{{area.color.2}}, 0.3); color: #ffffff"><h4 style="color: rgba(0,0,0, 1);"><b>{{area.name}}</b></h4></td>
+          <td class="text-center" style="background-color: rgba({{area.color.0}},{{area.color.1}},{{area.color.2}}, 0.3);"><h5 style="color: rgba(0,0,0, 1);"><b ><a style=" color: #000000;"href="{% url 'standard-area' area.pk %}">{{area.name}}</a></b></h5></td>
         {% endfor %}            
     </tr>
   </thead>
@@ -56,7 +56,7 @@
            {%for prio in prios %}             
               {% if prio.task.area.pk == area.pk and prio.task.visible %}
               <div style="background-color: rgba({{area.color.0}},{{area.color.1}},{{area.color.2}}, 1)" class="mb-2 pt-3 pb-1">
-               <span style=" color: #FFFFFF;"><h6>{{prio.task.name}}</h6></span>
+               <span ><h6 ><a style=" color: #FFFFFF;"href="{% url 'standard-task' prio.task.pk %}">{{prio.task.name}}</a></h6></span>
               </div>
               {% endif %}
             {% endfor %}

standards/templates/standards/standards_management.html

@@ -2,7 +2,7 @@
 {% block content %}
 <div class="content-section col-12">
   <h3>Standards</h3>
-  <small>Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards. Nicht veröffentlichte sind gelb markiert.</small>
+  <small>Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards.</small>
   <hr>
   <p>
     Standards dokumentieren und erläutern verschiedenen Verfahren, strukturiert nach Bereichen und Aufgaben.

users/templates/users/dashboard.html

@@ -22,7 +22,7 @@
           <tr>
               <td><a href="{% url 'news-single' news_single.pk %}">{{news_single.name }}</a></td>
               <td>{{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}</td>
-              <td>{{ news_single.created_date|date:"d.m.Y, H:i" }}</td>                             
+              <td>{{ news_single.go_online_on|date:"d.m.Y, H:i" }}</td>                             
           </tr>
         {% endfor %}     
       </table>

users/templates/users/users_prio.html

@@ -2,7 +2,7 @@
 {% load crispy_forms_tags %}
 {% block content %}
 <div class="content-section">
-  <h3>Priorisierung von {{ user_first_name }} {{ user_last_name }} verändern</h3>
+  <h3>Reihenfolge im Organigramm von {{ user_first_name }} {{ user_last_name }}</h3>
   <small>Elemente mit einer größeren Zahl werden im Organigramm weiter oben angezeigt. Die Änderungen werden sofort gespeichert.</small>
   <hr>
   <div class="col-12">

users/views.py

@@ -72,7 +72,7 @@ def dashboard(request):
 	standards_of_agency = Standards.objects.filter(agency__pk=request.user.profile.agency.pk).filter(public=True).order_by('-created_standard_date')[:10] 
 	
 	filterdate = datetime.now()
-	news = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate)
+	news = News.objects.filter(agency__pk=request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-go_online_on')[:4]
 
 	context.update({'active_link' : 'dashboard', 'standards_of_agency' : standards_of_agency, 'news' : news})
 	#return context