Paul/korrekturmanagementsystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: status transition and allowed fields consolidated

Browse Source
This commit is contained in:
Paul
2025-06-02 22:12:56 +02:00
parent a9e32034a7
commit 5205f4051c
3 changed files with 75 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
ticketsystem/forms.py
View File

@@ -15,6 +15,19 @@ class CommentForm(forms.ModelForm):
class TicketForm(forms.ModelForm):
# Zentrale Definition der Status-Übergänge
STATUS_TRANSITIONS = {
'new': ['in_progress'],
'in_progress': ['resolved', 'closed'],
'resolved': ['closed'],
'closed': [], # Keine weiteren Übergänge
}
# Zentrale Definition welche Felder wann required sind
REQUIRED_FIELDS_BY_STATUS = {
'resolved': ['answer'], # Answer required when resolving
}
class Meta:
model = Ticket
fields = ["title", "description", "status", "priority", "course", "answer", "material"]
@@ -26,25 +39,30 @@ class TicketForm(forms.ModelForm):
}
def __init__(self, *args, **kwargs):
# User und ticket aus kwargs holen (werden von der View übergeben)
self.user = kwargs.pop('user', None)
self.ticket = kwargs.pop('ticket', None)
super().__init__(*args, **kwargs)
# Status-Choices basierend auf aktueller Situation einschränken
if self.ticket and self.user:
self._limit_status_choices()
self._set_field_permissions()
self._configure_form_based_on_permissions()
def _set_field_permissions(self):
"""Setzt welche Felder bearbeitet werden dürfen"""
def _configure_form_based_on_permissions(self):
"""Konfiguriert das Formular basierend auf Benutzerrechten"""
is_creator = self.user == self.ticket.created_by
is_tutor = self.user == self.ticket.assigned_to
is_superuser = self.user.is_superuser
# Status-Choices einschränken
self._limit_status_choices(is_tutor, is_creator)
# Feld-Berechtigungen setzen
self._set_field_permissions(is_tutor, is_creator, is_superuser)
def _set_field_permissions(self, is_tutor, is_creator, is_superuser):
"""Setzt welche Felder bearbeitet werden dürfen"""
if is_tutor and not is_superuser:
# Tutor darf nur Status und Answer ändern
readonly_fields = ['title', 'description', 'course', 'priority']
readonly_fields = ['title', 'description']
for field_name in readonly_fields:
if field_name in self.fields:
self.fields[field_name].disabled = True
@@ -53,80 +71,68 @@ class TicketForm(forms.ModelForm):
for field_name in self.fields:
self.fields[field_name].disabled = True
def _limit_status_choices(self):
"""Beschränkt die verfügbaren Status-Optionen basierend auf Rolle und aktuellem Status"""
def _limit_status_choices(self, is_tutor, is_creator):
"""Beschränkt verfügbare Status-Optionen basierend auf der zentralen Logik"""
current_status = self.ticket.status
is_creator = self.user == self.ticket.created_by
is_tutor = self.user == self.ticket.assigned_to
# Alle möglichen Status
all_choices = list(self.fields['status'].choices)
allowed_choices = []
if is_tutor:
if current_status == 'new':
allowed_choices = ['new', 'in_progress']
elif current_status == 'in_progress':
allowed_choices = ['in_progress', 'resolved', 'new']
elif current_status == 'resolved':
allowed_choices = ['resolved', 'closed']
elif current_status == 'closed':
allowed_choices = ['closed']
allowed_statuses = self._get_allowed_transitions(current_status)
else:
# Nicht-Tutoren sehen nur aktuellen Status
allowed_choices = [current_status]
allowed_statuses = [current_status]
# Filtern der erlaubten Choices
# Status-Choices filtern
all_choices = list(self.fields['status'].choices)
self.fields['status'].choices = [
choice for choice in all_choices
if choice[0] in allowed_choices
if choice[0] in allowed_statuses
]
def _get_allowed_transitions(self, from_status):
"""Gibt erlaubte Status-Übergänge zurück"""
return [from_status] + self.STATUS_TRANSITIONS.get(from_status, [])
def _is_transition_allowed(self, from_status, to_status):
"""Prüft ob ein Status-Übergang erlaubt ist"""
if from_status == to_status:
return True
return to_status in self.STATUS_TRANSITIONS.get(from_status, [])
def _get_required_fields_for_status(self, status):
"""Gibt zurück welche Felder für einen Status required sind"""
return self.REQUIRED_FIELDS_BY_STATUS.get(status, [])
def clean(self):
cleaned_data = super().clean()
status = cleaned_data.get('status')
answer = cleaned_data.get('answer')
# Wenn Status auf "resolved" gesetzt wird, muss eine Antwort vorhanden sein
if status == 'resolved' and not answer:
if not self.ticket or not status:
return cleaned_data
# Prüfe Status-Übergang
old_status = self.ticket.status
is_tutor = self.user == self.ticket.assigned_to
if is_tutor and not self._is_transition_allowed(old_status, status):
raise ValidationError({
'answer': 'Eine Antwort ist erforderlich, wenn der Status auf "Gelöst" gesetzt wird.'
'status': f'Übergang von "{self.ticket.get_status_display()}" zu "{dict(self.fields["status"].choices)[status]}" ist nicht erlaubt.'
})
# Zusätzliche Validierung: Status-Übergang erlaubt?
if self.ticket and status:
old_status = self.ticket.status
if not self._is_status_transition_allowed(old_status, status):
# Prüfe required fields für neuen Status
required_fields = self._get_required_fields_for_status(status)
for field_name in required_fields:
if not cleaned_data.get(field_name):
field_label = self.fields[field_name].label
raise ValidationError({
'status': f'Übergang von "{self.ticket.get_status_display()}" zu "{dict(self.fields["status"].choices)[status]}" ist nicht erlaubt.'
field_name: f'{field_label} ist erforderlich, wenn der Status auf "{dict(self.fields["status"].choices)[status]}" gesetzt wird.'
})
return cleaned_data
def _is_status_transition_allowed(self, old_status, new_status):
"""Prüft ob ein Status-Übergang erlaubt ist"""
if old_status == new_status:
return True
is_tutor = self.user == self.ticket.assigned_to
# Erlaubte Übergänge für Tutoren
allowed_transitions = {
'new': ['in_progress'],
'in_progress': ['resolved', 'new'],
'resolved': ['closed'],
'closed': [] # Keine Änderung von closed
}
if is_tutor and old_status in allowed_transitions:
return new_status in allowed_transitions[old_status]
return False
def save(self, commit=True):
ticket = super().save(commit=False)
# Automatische Tutor-Zuweisung basierend auf dem ausgewählten Kurs
# Automatische Tutor-Zuweisung
if ticket.course and ticket.course.tutor:
ticket.assigned_to = ticket.course.tutor

3
ticketsystem/models.py
View File

@@ -35,8 +35,7 @@ class Ticket(models.Model):
STATUS_CHOICES = [
("new", "Neu"),
("in_progress", "In Bearbeitung"),
("resolved", "Gelöst"),
("pending_close", "Wartend - Schließen"),
("resolved", "Lösungsvorschlag"),
("closed", "Geschlossen"),
]

21
ticketsystem/templates/ticketsystem/detail.html
View File

@@ -40,8 +40,8 @@
<label class="block text-sm font-medium mb-1">Kurs:</label>
<select name="course"
id="id_course"
{% if not view.can_edit %}disabled{% endif %}
class="w-full p-2 border border-gray-300 rounded shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 {% if not view.can_edit %}bg-gray-100{% endif %}">
{% if not view.can_edit or form.course.field.disabled %}disabled{% endif %}
class="w-full p-2 border border-gray-300 rounded shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 {% if not view.can_edit or form.course.field.disabled %}bg-gray-100{% endif %}">
{% for course in form.course.field.queryset %}
<option value="{{ course.pk }}"
{% if course.pk == ticket.course.pk %}selected{% endif %}>{{ course }}</option>
@@ -52,8 +52,8 @@
<label class="block text-sm font-medium mb-1">Material:</label>
<select name="material"
id="id_material"
{% if not view.can_edit %}disabled{% endif %}
class="w-full p-2 border border-gray-300 rounded shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 {% if not view.can_edit %}bg-gray-100{% endif %}">
{% if not view.can_edit or form.material.field.disabled %}disabled{% endif %}
class="w-full p-2 border border-gray-300 rounded shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 {% if not view.can_edit or form.material.field.disabled %}bg-gray-100{% endif %}">
{% for value, display in form.fields.material.choices %}
<option value="{{ value }}"
{% if form.material.value == value %}selected{% endif %}>{{ display }}</option>
@@ -65,19 +65,20 @@
<div>
<label class="block text-sm font-medium mb-1">Status:</label>
<select name="status"
{% if not view.can_edit %}disabled{% endif %}
class="w-full p-2 border border-gray-300 rounded shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 {% if not view.can_edit %}bg-gray-100{% endif %}">
{% if not view.can_edit or form.status.field.disabled %}disabled{% endif %}
class="w-full p-2 border border-gray-300 rounded shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 {% if not view.can_edit or form.status.field.disabled %}bg-gray-100{% endif %}">
{% for value, label in form.status.field.choices %}
<option value="{{ value }}"
{% if value == ticket.status %}selected{% endif %}>{{ label }}</option>
{% endfor %}
</select>
{% if form.status.errors %}<div class="text-red-600 text-sm mt-1">{{ form.status.errors }}</div>{% endif %}
</div>
<div>
<label class="block text-sm font-medium mb-1">Priorität:</label>
<select name="priority"
{% if not view.can_edit %}disabled{% endif %}
class="w-full p-2 border border-gray-300 rounded shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 {% if not view.can_edit %}bg-gray-100{% endif %}">
{% if not view.can_edit or form.priority.field.disabled %}disabled{% endif %}
class="w-full p-2 border border-gray-300 rounded shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 {% if not view.can_edit or form.priority.field.disabled %}bg-gray-100{% endif %}">
<option value="low" {% if ticket.priority == 'low' %}selected{% endif %}>Niedrig</option>
<option value="medium"
{% if ticket.priority == 'medium' %}selected{% endif %}>Normal</option>
@@ -123,7 +124,7 @@
class="w-full p-2 border border-gray-300 rounded shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 placeholder:text-black {% if not view.can_edit or ticket.status != 'resolved' %}bg-gray-100 cursor-not-allowed{% endif %}">{{ ticket.answer|default:'' }}</textarea>
{% if form.answer.errors %}<div class="text-red-600 text-sm mt-1">{{ form.answer.errors }}</div>{% endif %}
<p class="text-xs text-gray-500 mt-1">
{% if ticket.status != 'resolved' %}Eine Antwort ist erforderlich beim Setzen des Status auf "Gelöst"{% endif %}
{% if ticket.status != 'resolved' or ticket.status != 'closed' %}Eine Antwort ist erforderlich beim Setzen des Status auf "Gelöst"{% endif %}
</p>
{% endif %}
</div>
@@ -233,7 +234,7 @@
const answerLabel = answerField.previousElementSibling;
function toggleAnswerField() {
if (statusSelect.value === 'resolved') {
if (statusSelect.value === 'resolved' || statusSelect.value === 'closed') {
answerField.disabled = false;
answerField.classList.remove('bg-gray-100', 'cursor-not-allowed');
answerField.classList.add('bg-white');