From 910c6bd017a2fea0fcb6b7544e7ce347163f2d7d Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Mon, 9 Dec 2019 11:49:55 +0100 Subject: [PATCH] =?UTF-8?q?-=20Tabellarische=20Ansichten=20f=C3=BCr=20Aufg?= =?UTF-8?q?aben,=20Benutzer=20ge=C3=A4ndert=20-=20Dashboard=20angepasst=20?= =?UTF-8?q?und=20tabellarische=20Ansicht=20eingef=C3=BChrt=20-=20Standards?= =?UTF-8?q?=20Sortierung=20nach=20Bereichen=20und=20Aufgaben=20inkl.=20Sta?= =?UTF-8?q?ndard-Link=20-=20Public-Base=20angepasst=20-=20Schriften=20in?= =?UTF-8?q?=20der=20Custom.css=20angepasst?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/settings.cpython-38.pyc | Bin 4250 -> 4250 bytes standards/__pycache__/views.cpython-38.pyc | Bin 5641 -> 5801 bytes .../standards/standards_management.html | 109 ++++++++++++++---- standards/views.py | 5 +- tasks/templates/tasks/tasks_management.html | 87 ++++++-------- .../templates/tasks/tasks_management_OLD.html | 71 ++++++++++++ users/static/users/css/custom.css | 33 +++++- users/templates/users/base.html | 36 +++--- users/templates/users/dashboard.html | 35 ++++-- users/templates/users/logout.html | 4 +- users/templates/users/publicbase.html | 6 +- users/templates/users/users_management.html | 84 ++++++-------- .../templates/users/users_management_ALT.html | 84 ++++++++++++++ 13 files changed, 399 insertions(+), 155 deletions(-) create mode 100644 tasks/templates/tasks/tasks_management_OLD.html create mode 100644 users/templates/users/users_management_ALT.html diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 5c91747c57bf094aa0e1791d4e59271ff4c078de..1da520be2f9b47b05ee19fea7e826e98b3581276 100644 GIT binary patch delta 20 acmbQGI7^W`l$V!_0SF$mz1zs$F8}~CCTW=dh6!z>rzAU~aPC{xY5L!0$0)&>dq9JM8rVXV)6IW_Py4mh-opm;DG_xrR zavKoh0n|!JBM?GJgqKQ{ctLsK0rAj3fOy^?fDjT?ydo+w=Qzg2lxDSG&YT&~`Q|&{ z>__|W9x$t!Ofn(CVu%rYf7d7#iYDiI;uCM`UX&O4jAN(oEFVx>ncgM!jb@ z?(wAC(hcRm^B%cPZm3bJ`*)bvn$mXKlbc#oZOTo>Q@&KcCM406<`b5B{w|4=PR(z) zo3_2aYDx6Tx?mC)TvGk8aZs0#f5(s z*w?Pwt!-n~5nHi1_piAP=2I)fx8*@n;@`^?MVb+1X&=L^hJ?t!SfJ}?>ta` zA!HB#Su2w=f4@-TL;B#pqcHa@Kwdy>1kAqfgn>sb$c+IE3E*pb?dU5oIu0-i@G1cC ziFLN&x;|r6hLj}0(&#>jrvXmzj4?WL2*M7jaWRZj^Sf$KdtQZKFlNcQoi7ZZRGx#y z$n6+J-IaMcSs_z=GI=w3s=?hXIZN;B|PJe`*dN zhK=Y1K*ugE4?_-Wy(eA-)|IE6y7^KJ3HMU)BV*Ju-)BC#SB&}U=eE-u(YK}K-e}AXc?z7!!q4*+uYe! zNGeS<(P%<=I4?Y?fyX`((|^GD2blPJ9|+Ny_~X?l;{*4c?RH2d-N}4=?zwm7eD^!w zoz2(39yaE(*;GvaoWK8EIQr5LMj~#ga+r{JTHfIp493lkb>(5oRo3Hf{9EM_W3hFm z7Bkfgn@ptay4Q5>Sk_8IbcHRu>Dt^4O+}<_r{%ACR^T@qqPR0-E#I`-kC9RWjV{umUp{lxpvFuSy@^nmlu~jrxgkf=GDUog|@mPCp}XYYUl+wh1U4g=Jik{ zw;$zY_(`2BRpqlKq^?VdF+u0nTuhXX zWAwiQKc*^d9G<4`7W(D9nbV-`AJL`5$Js=8$X3Wn>~ZkK7>hx zDTHZ+-6dsC=(p_9lHL4-8@S{wR5CqF6Bx!3h_oUjGs$uHLh)Upcf^V)Udwy8{jlXX z>pM#F7pY@()R`kwOv3k>33eHN&G>8#&Swu*M51MfjnGVr`1Ir~KaV7O5pehXWw@X1 z8KXATa6F5!s{yHC*>){@%bJ`HH3=~#!%B=_fhXCI*@tk_Xq-Zk`G5p7&MO#SMX0tD zCdP*mXcJ^IDuXSiMW4f8#_^svad-sbC<6MQAA`~E>Sz_iw-6$FZLeYuYkekfGP}-H zycB*FzUlrVc~0i1_&Ahu{suWA)qXDtKzdxjR~QHv5y+rtG1}>y+!KjJ?Yo3i5esr@ zsndsvTXwVVeYCn5_|8{yVVIK;Qw*lb3;xS>vFo7aX9~!Q6CH(A+y4yq8B~}6 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