diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 5c91747..1da520b 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc index 10f6c3a..c6ad04a 100644 Binary files a/standards/__pycache__/views.cpython-38.pyc and b/standards/__pycache__/views.cpython-38.pyc differ diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index e879be7..e9c09ee 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -14,29 +14,96 @@
-
+ +{% endblock content %} \ No newline at end of file diff --git a/standards/views.py b/standards/views.py index 051e032..f80eb5c 100644 --- a/standards/views.py +++ b/standards/views.py @@ -20,8 +20,11 @@ class StandardsManagement(LoginRequiredMixin, ListView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) # # Get all Users of the Same Agency as logged user + areas = Areas.objects.filter(agency__pk=self.request.user.profile.agency.pk) + standards_of_user = Standards.objects.filter(agency__pk=self.request.user.profile.agency.pk, created_standard_by=self.request.user.pk) standards_of_agency = Standards.objects.filter(agency__pk=self.request.user.profile.agency.pk) - context.update({'active_link' : 'standards', 'standards_of_agency' : standards_of_agency}) + tasks = Tasks.objects.filter(agency__pk=self.request.user.profile.agency.pk) + context.update({'active_link' : 'standards', 'tasks': tasks, 'standards_of_agency' : standards_of_agency, 'areas' : areas, 'standards_of_user' : standards_of_user}) return context diff --git a/tasks/templates/tasks/tasks_management.html b/tasks/templates/tasks/tasks_management.html index 9d0404c..abe3669 100644 --- a/tasks/templates/tasks/tasks_management.html +++ b/tasks/templates/tasks/tasks_management.html @@ -13,59 +13,40 @@
- {% for item in tasks_of_agency %} - -
-
- -
-
{{item.name }}
- -
- -
-
Aufgabeninfo
- Bearbeiten -
- Löschen + + + + + + + + + + + + {% for item in tasks_of_agency %} + + + + + + + + + {% endfor %} +
NameBereichErstellt vonErstellt am 
{{item.name }}{{ item.area.name }}{{ item.created_area_by.first_name }} {{ item.created_area_by.last_name }}{{ item.created_area_date }}{{standard.created_standard_by.first_name}} {{standard.created_standard_by.last_name}} +
+ +
+
Aufgabeninfo
+ Bearbeiten +
+ Löschen +
+
- - - -
-
-
-
Name
-

- {{ item.name }} -

-
Erstellt von
-

- {{ item.created_area_by.first_name }} {{ item.created_area_by.last_name }} -

-
-
-
Übergeordneter Bereich
-

- {{ item.area.name }} -

-
Erstellt am
-

- {{ item.created_area_date }} -

-
-
-
Beschreibung
-

- {{ item.desc }} -

-
-
-
- - - {% endfor%} +
{% endblock content %} diff --git a/tasks/templates/tasks/tasks_management_OLD.html b/tasks/templates/tasks/tasks_management_OLD.html new file mode 100644 index 0000000..9d0404c --- /dev/null +++ b/tasks/templates/tasks/tasks_management_OLD.html @@ -0,0 +1,71 @@ +{% extends "users/base.html" %} +{% block content %} +
+

Aufgabenverwaltung

+
+

+ Aufgaben unterteilen die Agentur in verschiedene Aufgabenbereiche innerhalb der Bereiche. +

+
+
+ Neue Aufgabe anlegen +
+
+
+
+ {% for item in tasks_of_agency %} + +
+
+ +
+
{{item.name }}
+ +
+ +
+
Aufgabeninfo
+ Bearbeiten +
+ Löschen +
+
+
+ +
+
+
+
Name
+

+ {{ item.name }} +

+
Erstellt von
+

+ {{ item.created_area_by.first_name }} {{ item.created_area_by.last_name }} +

+
+
+
Übergeordneter Bereich
+

+ {{ item.area.name }} +

+
Erstellt am
+

+ {{ item.created_area_date }} +

+
+
+
Beschreibung
+

+ {{ item.desc }} +

+
+
+
+
+
+ {% endfor%} +
+{% endblock content %} diff --git a/users/static/users/css/custom.css b/users/static/users/css/custom.css index 6e4d29d..f78b5db 100644 --- a/users/static/users/css/custom.css +++ b/users/static/users/css/custom.css @@ -1,4 +1,33 @@ -html h1, h2, h3, h4, h5, h6, b, a { +html { font-family: 'Roboto' !important; - font-size: 1em !important; + +} +html h6 { + font-family: 'Roboto' !important; + font-size: 1.0em; +} + +html h5 { + font-family: 'Roboto' !important; + font-size: 1.1em; +} + +html h4 { + font-family: 'Roboto' !important; + font-size: 1.3em; +} + +html h3 { + font-family: 'Roboto' !important; + font-size: 1.5em; +} + +html h2 { + font-family: 'Roboto' !important; + font-size: 1.7em; +} + +html h1 { + font-family: 'Roboto' !important; + font-size: 2em; } \ No newline at end of file diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 51a4265..8d1325c 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -1,6 +1,6 @@ {% load static %} - + @@ -26,7 +26,7 @@ - + @@ -155,7 +155,9 @@
- +
+ Version 0.5.0 +
@@ -250,23 +252,27 @@ - + + + - +

- + @@ -281,7 +287,7 @@ - + diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index 5a514aa..95bcca8 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -9,18 +9,37 @@
Neueste Standards
-
- {% for item in standards_of_agency %} - as - - {% endfor %} +
+ + + + + + + + + + + {% for standard in standards_of_agency %} + + + + + + + + + + {% endfor %} +
TitelErstellt amErstellt vonGeändert amGeändert von
{{standard.name}}{{standard.created_standard_date}}{{standard.created_standard_by.first_name}} {{standard.created_standard_by.last_name}}{{standard.last_modified_on}}{{standard.last_modified_by.first_name}} {{standard.last_modified_by.last_name}}
-
- +
+
-
+
+ {% endblock content %} \ No newline at end of file diff --git a/users/templates/users/logout.html b/users/templates/users/logout.html index d071559..e535dc9 100644 --- a/users/templates/users/logout.html +++ b/users/templates/users/logout.html @@ -3,8 +3,8 @@ {% load crispy_forms_tags %} {% block content %} - -

Erfolgreich abgemeldet!

+ +

Erfolgreich abgemeldet!

 Wieder zurück? diff --git a/users/templates/users/publicbase.html b/users/templates/users/publicbase.html index 4134a2e..6822154 100644 --- a/users/templates/users/publicbase.html +++ b/users/templates/users/publicbase.html @@ -1,6 +1,6 @@ {% load static %} - + @@ -24,6 +24,7 @@ + @@ -94,7 +95,8 @@ - + + diff --git a/users/templates/users/users_management.html b/users/templates/users/users_management.html index 6f374c3..1bb92f4 100644 --- a/users/templates/users/users_management.html +++ b/users/templates/users/users_management.html @@ -1,3 +1,7 @@ + + + + {% extends "users/base.html" %} {% block content %}
@@ -6,22 +10,34 @@

Erstellen Sie weitere Mitarbeiter ihrer Agentur. Die neuen Benutzer erhalten eine E-Mail mit einem entsprechenden Link, um ihr Passwort zu generieren.

-
+
- Neuer Benutzer + Neuer Benutzer
-
- {% for item in users_of_agency %} - -
-
- -
-
{{item.first_name }} {{ item.last_name }} ({{item.username}})
- -
+ + + + + + + + + + + + + {% for item in users_of_agency %} + + + + + + + + + + {% endfor %} +
NameE-MailAgenturfunktionTätigkeitTelefonMobil 
{{item.first_name }} {{ item.last_name }}{{ item.email }}{{ item.profile.get_func_display }}{{ item.profile.compfunc }}{{ item.profile.phoneland }}{{ item.profile.phonemobile }} +
@@ -39,45 +55,11 @@ {% endif %}
- - -
- -
-
-
Name
-

- {{ item.first_name }} {{ item.last_name }} -

-
E-Mail
-

- {{ item.email }} -

-
Agenturfunktion
-

- {{ item.profile.get_func_display }} -

-
-
-
Tätigkeit
-

- {{ item.profile.compfunc }} -

-
Festznetz
-

- {{ item.profile.phoneland }} -

-
Mobil
-

- {{ item.profile.phonemobile }} -

-
-
-
- - - {% endfor%} - +
+
{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/users_management_ALT.html b/users/templates/users/users_management_ALT.html new file mode 100644 index 0000000..7b8fe60 --- /dev/null +++ b/users/templates/users/users_management_ALT.html @@ -0,0 +1,84 @@ +{% extends "users/base.html" %} +{% block content %} +
+

Benutzerverwaltung

+
+

+ Erstellen Sie weitere Mitarbeiter ihrer Agentur. Die neuen Benutzer erhalten eine E-Mail mit einem entsprechenden Link, um ihr Passwort zu generieren. +

+
+
+ Neuer Benutzer +
+
+
+
+ + {% for item in users_of_agency %} + +
+
+ +
+
{{item.first_name }} {{ item.last_name }} ({{item.username}})
+ +
+ +
+
Benutzerdaten
+ Bearbeiten + Priorisierung +
+ Rechte + + Zuständigkeitenn + {% if item != request.user %} +
+ Löschen + {% endif %} +
+
+
+ +
+ +
+
+
Name
+

+ {{ item.first_name }} {{ item.last_name }} +

+
E-Mail
+

+ {{ item.email }} +

+
Agenturfunktion
+

+ {{ item.profile.get_func_display }} +

+
+
+
Tätigkeit
+

+ {{ item.profile.compfunc }} +

+
Festznetz
+

+ {{ item.profile.phoneland }} +

+
Mobil
+

+ {{ item.profile.phonemobile }} +

+
+
+
+
+
+ {% endfor%} +
+ +
+{% endblock content %} \ No newline at end of file