diff --git a/korrekturmanagementsystem/settings.py b/korrekturmanagementsystem/settings.py index 837fdb8..4c773ca 100644 --- a/korrekturmanagementsystem/settings.py +++ b/korrekturmanagementsystem/settings.py @@ -119,6 +119,7 @@ USE_TZ = True # https://docs.djangoproject.com/en/5.2/howto/static-files/ STATIC_URL = "static/" +STATICFILES_DIRS = [BASE_DIR / "static"] # Default primary key field type # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field diff --git a/ticketsystem/static/css/style.css b/ticketsystem/static/css/style.css new file mode 100644 index 0000000..a461c50 --- /dev/null +++ b/ticketsystem/static/css/style.css @@ -0,0 +1 @@ +@import "tailwindcss"; \ No newline at end of file diff --git a/ticketsystem/templates/ticketsystem/base.html b/ticketsystem/templates/ticketsystem/base.html index 67b6806..54ffaf3 100644 --- a/ticketsystem/templates/ticketsystem/base.html +++ b/ticketsystem/templates/ticketsystem/base.html @@ -1,8 +1,10 @@ +{% load static %} {% block title %}TicketSystem{% endblock %} + - - -
-

🎫 Ticket #{{ ticket.id }} – {{ ticket.title }}

- -
- {% csrf_token %} - {{ form.non_field_errors }} - -
- - {{ form.title }} +
+ 🕒 Erstellt: {{ ticket.created_at|date:"d.m.Y H:i" }} | + 🔄 Aktualisiert: {{ ticket.updated_at|date:"d.m.Y H:i" }}
-
- - {{ form.description }} -
- -
- - {{ form.status }} -
- -
- - {{ form.priority }} -
- -
- - {{ form.assigned_to }} -
- - {% if view.can_edit %} - - {% else %} -

Du darfst dieses Ticket nicht bearbeiten.

- {% endif %} - - -
- 🕒 Erstellt am: {{ ticket.created_at|date:"d.m.Y H:i" }}
- 🔄 Aktualisiert: {{ ticket.updated_at|date:"d.m.Y H:i" }} -
-
- - -
-

💬 Kommentare

- - {% if ticket.comments.exists %} - {% for comment in ticket.comments.all %} -
-
- {{ comment.author.username }} am {{ comment.created_at|date:"d.m.Y H:i" }} -
-
{{ comment.text }}
-
- {% endfor %} - {% else %} -
- Keine Kommentare vorhanden. -
- {% endif %} - - {% if user.is_authenticated %} -
-

📝 Neuen Kommentar schreiben

-
+ {% csrf_token %} - {{ comment_form.as_p }} - + +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ +
+ + +
+ + {% if view.can_edit %} + + {% else %} +

Du kannst dieses Ticket nicht bearbeiten.

+ {% endif %}
- {% endif %} -
- -
-

🕓 Bearbeitungshistorie

+ +
+

💬 Kommentare ({{ ticket.comments.count }})

- {% if ticket.history.exists %} - {% for entry in ticket.history.all %} -
-
{{ entry.changed_by.username }}
-
- hat {{ entry.field }} geändert: + {% if ticket.comments.exists %} + {% for comment in ticket.comments.all %} +
+
+ {{ comment.author.username }} - {{ comment.created_at|date:"d.m.Y H:i" }} +
+
{{ comment.text|linebreaks }}
-
- {{ entry.old_value }} → {{ entry.new_value }} + {% endfor %} + {% else %} +

Keine Kommentare vorhanden.

+ {% endif %} + + {% if user.is_authenticated %} +
+

📝 Neuer Kommentar

+
+ {% csrf_token %} + + +
+
+ {% endif %} +
+ + +
+

🕓 Änderungen ({{ ticket.history.count }})

+ + {% if ticket.history.exists %} + {% for entry in ticket.history.all %} +
+
+ {{ entry.changed_by.username }} hat + {{ entry.field }} geändert +
+
+ {{ entry.old_value }} → + {{ entry.new_value }} +
+
{{ entry.changed_at|date:"d.m.Y H:i" }}
-
am {{ entry.changed_at|date:"d.m.Y H:i" }}
-
- {% endfor %} - {% else %} -
- Keine Änderungen bisher. -
- {% endif %} + {% endfor %} + {% else %} +

Keine Änderungen bisher.

+ {% endif %} +
+ + +
+ ← Zurück zur Übersicht +
{% endblock %} \ No newline at end of file diff --git a/ticketsystem/templates/ticketsystem/index.html b/ticketsystem/templates/ticketsystem/index.html index 38711a3..3ad1a6a 100644 --- a/ticketsystem/templates/ticketsystem/index.html +++ b/ticketsystem/templates/ticketsystem/index.html @@ -1,90 +1,196 @@ {% extends "ticketsystem/base.html" %} {% block content %} - - -
-

🎫 Alle Tickets

- -

- ➕ Neues Ticket -

- -
- - -
-
- - {% if selected_status %} - - {% endif %} - -
- - {% if search_query %} -

Ergebnisse für „{{ search_query }}“:

+ +{% if messages %} +
+ {% for message in messages %} +
+ {{ message }} +
+ {% endfor %} +
{% endif %} - {% for ticket in tickets %} -
- - #{{ ticket.id }} – {{ ticket.title }} - -
- Status: {{ ticket.get_status_display }} | - Priorität: {{ ticket.get_priority_display }} | - Angelegt am {{ ticket.created_at|date:"d.m.Y H:i" }} +
+ +
+
+

🎫 Ticket-Übersicht

+

Verwalte und verfolge alle deine Tickets

-
- {% empty %} -

Es sind derzeit keine Tickets vorhanden.

- {% endfor %} -
+
+ + ➕ Neues Ticket erstellen + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+ + {% if selected_status %} + + {% endif %} + +
+
+
+
+
+ + + {% if search_query %} +
+ Suchergebnisse für: „{{ search_query }}" + Suche zurücksetzen +
+ {% endif %} + + + {% if tickets %} +
+ + + + + + + + + + + + + {% for ticket in tickets %} + + + + + + + + + {% endfor %} + +
#TitelStatusPrioritätZugewiesen anErstellt
+ #{{ ticket.id }} + + + {{ ticket.title }} + + + {% if ticket.status == 'open' %} + + {{ ticket.get_status_display }} + + {% elif ticket.status == 'in_progress' %} + + {{ ticket.get_status_display }} + + {% elif ticket.status == 'closed' %} + + {{ ticket.get_status_display }} + + {% endif %} + + {% if ticket.priority == 'low' %} + + {{ ticket.get_priority_display }} + + {% elif ticket.priority == 'medium' %} + + {{ ticket.get_priority_display }} + + {% elif ticket.priority == 'high' %} + + {{ ticket.get_priority_display }} + + {% elif ticket.priority == 'urgent' %} + + {{ ticket.get_priority_display }} + + {% endif %} + + {% if ticket.assigned_to %} + {{ ticket.assigned_to.username }} + {% else %} + Nicht zugewiesen + {% endif %} + +
{{ ticket.created_at|date:"d.m.Y" }}
+
{{ ticket.created_at|date:"H:i" }}
+
+
+ + + {% if is_paginated %} +
+
+ Seite {{ page_obj.number }} von {{ page_obj.paginator.num_pages }} +
+
+ {% if page_obj.has_previous %} + Zurück + {% endif %} + {% if page_obj.has_next %} + Weiter + {% endif %} +
+
+ {% endif %} + + {% else %} + +
+
📋
+ {% if search_query %} +

Keine Tickets gefunden

+

+ Keine Tickets gefunden für die Suche „{{ search_query }}" +

+ + Alle Tickets anzeigen + + {% else %} +

Noch keine Tickets vorhanden

+

Erstelle dein erstes Ticket um loszulegen.

+ + Erstes Ticket erstellen + + {% endif %} +
+ {% endif %} +
+ {% endblock %} \ No newline at end of file diff --git a/ticketsystem/views.py b/ticketsystem/views.py index fe83c40..ca1137e 100644 --- a/ticketsystem/views.py +++ b/ticketsystem/views.py @@ -53,7 +53,7 @@ class TicketDetailUpdateView(UpdateView): comment_form_class = CommentForm def get_success_url(self): - return reverse('detail-update', kwargs={'pk': self.object.pk}) + return reverse('detail', kwargs={'pk': self.object.pk}) def dispatch(self, request, *args, **kwargs): self.ticket = self.get_object()