diff --git a/areas/templates/areas/areas_management.html b/areas/templates/areas/areas_management.html index 00ecbbc..a41b9ae 100644 --- a/areas/templates/areas/areas_management.html +++ b/areas/templates/areas/areas_management.html @@ -11,8 +11,7 @@ Neuen Bereich anlegen -
-
+
diff --git a/media/userprofilepics/Seinwill_Steffen.jpg b/media/userprofilepics/Seinwill_Steffen.jpg index 49972f2..391af70 100644 Binary files a/media/userprofilepics/Seinwill_Steffen.jpg and b/media/userprofilepics/Seinwill_Steffen.jpg differ diff --git a/media/userprofilepics/Valentiner_Sebastian_apbr5VU.jpg b/media/userprofilepics/Valentiner_Sebastian_apbr5VU.jpg index 0f86948..fd10296 100644 Binary files a/media/userprofilepics/Valentiner_Sebastian_apbr5VU.jpg and b/media/userprofilepics/Valentiner_Sebastian_apbr5VU.jpg differ diff --git a/news/__pycache__/views.cpython-38.pyc b/news/__pycache__/views.cpython-38.pyc index f23ea34..5498663 100644 Binary files a/news/__pycache__/views.cpython-38.pyc and b/news/__pycache__/views.cpython-38.pyc differ diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html index 372d7b2..9be9503 100644 --- a/news/templates/news/news_management.html +++ b/news/templates/news/news_management.html @@ -4,15 +4,15 @@

News

- Newsbereich verwalten + Hier können aktuelle Nachrichten für die Agentur erstellt und verwaltet werden.

News erstellen
-
-
+ +
@@ -37,6 +37,7 @@
Bearbeiten +
Löschen
diff --git a/news/views.py b/news/views.py index 92a0494..2f81499 100644 --- a/news/views.py +++ b/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 diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html index 6500efe..0e47ba1 100644 --- a/orga/templates/orga/orga_main.html +++ b/orga/templates/orga/orga_main.html @@ -3,7 +3,7 @@

{{request.user.profile.agency.name}}

-

Agenturübersicht

+

Organigramm

@@ -20,19 +20,27 @@ - + + + + {%if external|length > 0%} + {%endif%} + {%if indoor|length > 0%} + {%endif%} + {%if trainee|length > 0%} + {%endif%} - + {% if external|length > 0 %} + {%endif%} + {%if indoor|length > 0%} + {% endif %} + {%if trainee|length > 0%} + {% endif %}

Außendienst

Innendienst

Auszubildende

{% for us in external %}
- +
{{ us.first_name }} {{ us.last_name }}
{{ us.profile.get_func_display }} @@ -40,13 +48,15 @@ {% endfor %}
{% for us in indoor %}
- +
{{ us.first_name }} {{ us.last_name }}
{{ us.profile.get_func_display }} @@ -54,12 +64,14 @@ {% endfor %}
{% for us in trainee %}
- +
{{ us.first_name }} {{ us.last_name }}
{{ us.profile.get_func_display }} @@ -67,23 +79,11 @@ {% endfor %}
-{% endblock content %} - - \ No newline at end of file +{% endblock content %} \ No newline at end of file diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index 338094e..2be1693 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -44,7 +44,7 @@ {% for area in areas %} -

{{area.name}}

+
{{area.name}}
{% endfor %} @@ -56,7 +56,7 @@ {%for prio in prios %} {% if prio.task.area.pk == area.pk and prio.task.visible %}
-
{{prio.task.name}}
 +
{{prio.task.name}}
{% endif %} {% endfor %} diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index 3c288c5..f66d0e9 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -2,7 +2,7 @@ {% block content %}

Standards

- Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards. Nicht veröffentlichte sind gelb markiert. + Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards.

Standards dokumentieren und erläutern verschiedenen Verfahren, strukturiert nach Bereichen und Aufgaben. diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index bbe1500..3e4f567 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index 612b69c..f7fba51 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -22,7 +22,7 @@ {{news_single.name }} {{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }} - {{ news_single.created_date|date:"d.m.Y, H:i" }} + {{ news_single.go_online_on|date:"d.m.Y, H:i" }} {% endfor %} diff --git a/users/templates/users/users_prio.html b/users/templates/users/users_prio.html index 657a723..eb7bf2e 100644 --- a/users/templates/users/users_prio.html +++ b/users/templates/users/users_prio.html @@ -2,7 +2,7 @@ {% load crispy_forms_tags %} {% block content %}

-

Priorisierung von {{ user_first_name }} {{ user_last_name }} verändern

+

Reihenfolge im Organigramm von {{ user_first_name }} {{ user_last_name }}

Elemente mit einer größeren Zahl werden im Organigramm weiter oben angezeigt. Die Änderungen werden sofort gespeichert.
diff --git a/users/views.py b/users/views.py index 6184fa4..ac29b46 100644 --- a/users/views.py +++ b/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