From 8458b456d9d2ef64d0baf0183b57d258e7fa9a6e Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Mon, 16 Dec 2019 20:10:59 +0100 Subject: [PATCH] =?UTF-8?q?Bentzer=20nach=20ALphabet=20Supprtfeld=20Email?= =?UTF-8?q?=20und=20Name=20nicht=20=C3=A4nderbar=20Support=20Imagefile=20w?= =?UTF-8?q?eg=20Wort=20AGENTUR=20im=20Organigramm=20weg=20ALLEN=20Tabellen?= =?UTF-8?q?=20sind=20jetzt=20Responsive=20Bei=20ALLEN=20Tabellen=20kann=20?= =?UTF-8?q?jetzt=20oben=20gesucht=20werden=20Es=20gibt=20bei=20Standards?= =?UTF-8?q?=20jetzt=20eine=20Zahl,=20wenn=20es=20mehr=20als=203=20gibt=20B?= =?UTF-8?q?ei=20Standards=20werden=20nur=203=20angezeigt=20Die=20Cards=20b?= =?UTF-8?q?ei=20Standards=20sind=20alle=20gleichgro=C3=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- areas/templates/areas/areas_management.html | 17 ++++++++ news/templates/news/news_management.html | 31 ++++++++++---- orga/templates/orga/orga_main.html | 2 +- .../standards/standards_management.html | 38 ++++++++++++++++-- tasks/templates/tasks/tasks_management.html | 20 ++++++++- users/__pycache__/usersforms.cpython-38.pyc | Bin 4801 -> 4818 bytes users/__pycache__/views.cpython-38.pyc | Bin 14925 -> 14941 bytes users/templates/users/dashboard.html | 8 +++- users/templates/users/users_management.html | 19 ++++++++- users/usersforms.py | 6 +-- users/views.py | 2 +- 11 files changed, 122 insertions(+), 21 deletions(-) diff --git a/areas/templates/areas/areas_management.html b/areas/templates/areas/areas_management.html index a41b9ae..8b4389c 100644 --- a/areas/templates/areas/areas_management.html +++ b/areas/templates/areas/areas_management.html @@ -12,6 +12,10 @@
+
+ +
+
@@ -22,6 +26,7 @@ + {% for item in areas_of_agency %} @@ -44,6 +49,18 @@ {% endfor %} +
 
{{ item.name }}
+
+ {% endblock content %} diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html index 9be9503..a622395 100644 --- a/news/templates/news/news_management.html +++ b/news/templates/news/news_management.html @@ -7,13 +7,17 @@ Hier können aktuelle Nachrichten für die Agentur erstellt und verwaltet werden.

-
News erstellen -
+
- -
- +
+
+ +
+ +
+
+
@@ -23,7 +27,8 @@ - {% for news_single in news %} + + {% for news_single in news %} @@ -45,7 +50,19 @@ - {% endfor %} + {% endfor %} +
Titel 
{{news_single.name }} {{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}
+
+ {% endblock content %} diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html index 952b1f9..6120fc5 100644 --- a/orga/templates/orga/orga_main.html +++ b/orga/templates/orga/orga_main.html @@ -18,7 +18,7 @@ {% endblock content %} \ No newline at end of file diff --git a/tasks/templates/tasks/tasks_management.html b/tasks/templates/tasks/tasks_management.html index 3bb6477..a1f2eb1 100644 --- a/tasks/templates/tasks/tasks_management.html +++ b/tasks/templates/tasks/tasks_management.html @@ -13,7 +13,10 @@
- +
+ +
+
@@ -24,6 +27,7 @@ + {% for item in tasks_of_agency %} @@ -45,7 +49,19 @@ - {% endfor %} + {% endfor %} +
 
{{item.name }}
+
+ {% endblock content %} diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index e00b4158f6ba439b959527626f10ad59ed8bec8b..89029e85fdbc8365bb501886818ffeac47d983f4 100644 GIT binary patch delta 145 zcmX@8dP$Wxl$V!_0SL6NeUCNS$lJ%yxM1=e{%WlhrW%GUwiH%LhAgfu?i4;72B-)- zk_baEgC_rEeSx_=w>XMY6I1f@aw;`>Cf^pY8vBg(l|<+A}h4UN0!b2mox1A&vk5 delta 128 zcmcbldQg=&l$V!_0SJtie~)F}$lJ%y*f)6&f3-vjOBPoOUkZOOV+}(VTZ(`ULkdGM zgQnnQM}fKgZkmim#z0L)YCuAhd-5v*Tb^57p1FzXscxC6IVqEk1x>{=fpW!sK!Smh ak5Pb8j8TG7gi&I0gP=Vl)8+$$LW}_C8630# diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index 5f81dba04f7eeecd3257ca98f3013d439c336745..3471dabe9606c5d66ce01ef6022d1dfaaf512e86 100644 GIT binary patch delta 111 zcmX?Ga<_yxl$V!_0SJy?_#XRsBQF~dqr+qo9(C&lTq#To8Ectqm=)9(99S<{G92Tq#U7%qh%sm=-cJGSn~y zGib8-tz^6nwMM|A779?xr|4Pk$dt&9*4=#c
-
News
+
News
+
@@ -29,6 +30,7 @@ {% endfor %}
+
@@ -39,7 +41,8 @@
-
Neueste Standards
+
Neueste Standards
+
@@ -57,6 +60,7 @@ {% endfor %}
+
diff --git a/users/templates/users/users_management.html b/users/templates/users/users_management.html index c991337..93055f2 100644 --- a/users/templates/users/users_management.html +++ b/users/templates/users/users_management.html @@ -16,6 +16,10 @@
+
+ +
+
@@ -29,6 +33,7 @@ + {% for item in users_of_agency %} @@ -59,8 +64,20 @@ - {% endfor %} + {% endfor %} +
 
{{item.first_name }} {{ item.last_name }}
+
+ {% endblock content %} \ No newline at end of file diff --git a/users/usersforms.py b/users/usersforms.py index 2ad4f5c..43c742b 100644 --- a/users/usersforms.py +++ b/users/usersforms.py @@ -100,8 +100,7 @@ class UserAreaTaskForm(forms.Form): self.fields['task_'+str(task.pk)] = forms.BooleanField(required=False, initial=False, label="
"+task.name+"
") -class SupportForm(forms.Form): - +class SupportForm(forms.Form): def __init__(self, user, *args, **kwargs): super().__init__(*args, **kwargs) user_name = user.first_name + " " + user.last_name @@ -109,4 +108,5 @@ class SupportForm(forms.Form): self.fields['mail'] = forms.EmailField(required=True, label="E-Mail", initial=user.email) self.fields['problemconc'] = forms.CharField(required=True, label="Problemzusammenfassung") self.fields['problem'] = forms.CharField(required=True, widget=forms.Textarea, label="Ausführliche Beschreibung") - self.fields['image'] = forms.ImageField(required=False) \ No newline at end of file + self.fields['name'].widget.attrs['readonly'] = True + self.fields['mail'].widget.attrs['readonly'] = True \ No newline at end of file diff --git a/users/views.py b/users/views.py index 8d0b955..6cb892f 100644 --- a/users/views.py +++ b/users/views.py @@ -89,7 +89,7 @@ class UsersManagement(LoginRequiredMixin, ListView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) # Get all Users of the Same Agency as logged user - users_of_agency = User.objects.filter(profile__agency__pk=self.request.user.profile.agency.pk) + users_of_agency = User.objects.filter(profile__agency__pk=self.request.user.profile.agency.pk).order_by('last_name') context.update({'active_link' : 'usersmanagement', 'users_of_agency':users_of_agency}) return context