From 166288c7022a4c4cb683d623abd438a1b0e992be Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Wed, 4 Dec 2019 17:37:12 +0100 Subject: [PATCH] =?UTF-8?q?-=20Aufgaben=20fertig=20-=20Bug=20bei=20den=20A?= =?UTF-8?q?ufgaben=20behoben,=20dass=20auch=20Bereiche=20anderer=20Agentur?= =?UTF-8?q?en=20ausgew=C3=A4hlt=20werden=20k=C3=B6nnen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tasks/templates/tasks/tasks_add.html | 7 +- .../templates/tasks/tasks_confirm_delete.html | 22 +++ tasks/templates/tasks/tasks_management.html | 18 +-- tasks/templates/tasks/tasks_update.html | 131 ++++++++++++++++++ 4 files changed, 163 insertions(+), 15 deletions(-) create mode 100644 tasks/templates/tasks/tasks_confirm_delete.html create mode 100644 tasks/templates/tasks/tasks_update.html diff --git a/tasks/templates/tasks/tasks_add.html b/tasks/templates/tasks/tasks_add.html index 17a46b5..3ad92f6 100644 --- a/tasks/templates/tasks/tasks_add.html +++ b/tasks/templates/tasks/tasks_add.html @@ -7,15 +7,10 @@
{% csrf_token %} {{ form|crispy }} - {% for field in form %} - {% if field.name == 'visible' %} - CHECKBOX! - {% endif %} - {% endfor %}

Nachdem Erstellen der Aufgabe können Mitarbeiter zugewiesen werden.


  Abbrechen
-{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/tasks/templates/tasks/tasks_confirm_delete.html b/tasks/templates/tasks/tasks_confirm_delete.html new file mode 100644 index 0000000..317bcd2 --- /dev/null +++ b/tasks/templates/tasks/tasks_confirm_delete.html @@ -0,0 +1,22 @@ +{% extends "users/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +
+
+
+ +
+ +
+
+ +
+ {% csrf_token %} +

Alle unter dieser Aufgabe erstellten Standards werden gelöscht!

+
+   + Abbrechen +
+
+
+{% 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 f38449b..9d0404c 100644 --- a/tasks/templates/tasks/tasks_management.html +++ b/tasks/templates/tasks/tasks_management.html @@ -27,9 +27,9 @@ @@ -54,14 +54,14 @@
Erstellt am

{{ item.created_area_date }} -

+

-
-
Beschreibung
-

- {{ item.desc }} -

-
+
+
Beschreibung
+

+ {{ item.desc }} +

+
diff --git a/tasks/templates/tasks/tasks_update.html b/tasks/templates/tasks/tasks_update.html new file mode 100644 index 0000000..00854b0 --- /dev/null +++ b/tasks/templates/tasks/tasks_update.html @@ -0,0 +1,131 @@ +{% extends "users/base.html" %} +{% load static %} +{% load crispy_forms_tags %} +{% block content %} +
+

Aufgabe aktualisieren

+
+
+ {% csrf_token %} + {{ form|crispy }} +
Mitarbeiter hinzufügen
+
+ +
+ + +
+ + {% for us in possible_users %} + + {% endfor %} + + +
+
+
Zugewiesene Mitarbeiter
+
+ {% if added_users|length > 0 %} + + {% for us in added_users %} + {{ us.first_name }} {{ us.last_name }}   + + {% endfor %} + {% else %} +

Dieser Aufgabe sind noch keine Mitarbeiter zugewiesen.

+ {% endif %} +
+
+ +   + Abbrechen +
+
+ +{% endblock content %}