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

fix: black formatting

Browse Source
This commit is contained in:
Paul
2025-06-11 21:57:28 +02:00
parent 8af0bbdb37
commit 272415d219
3 changed files with 85 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
ticketsystem/forms.py
View File

@@ -17,45 +17,55 @@ class CommentForm(forms.ModelForm):
class TicketForm(forms.ModelForm):
# Zentrale Definition der Status-Übergänge
STATUS_TRANSITIONS = {
'tutor': {
'new': ['in_progress'],
'in_progress': ['resolved', 'new'],
'resolved': ['closed'],
'closed': [],
"tutor": {
"new": ["in_progress"],
"in_progress": ["resolved", "new"],
"resolved": ["closed"],
"closed": [],
},
'creator': {
'new': [],
'in_progress': [],
'resolved': ['closed', 'new'],
'closed': [],
"creator": {
"new": [],
"in_progress": [],
"resolved": ["closed", "new"],
"closed": [],
},
'superuser': {
"superuser": {
# Superuser können alle Übergänge machen
'new': ['in_progress', 'resolved', 'closed'],
'in_progress': ['new', 'resolved', 'closed'],
'resolved': ['new', 'in_progress', 'closed'],
'closed': ['new', 'in_progress', 'resolved'],
}
"new": ["in_progress", "resolved", "closed"],
"in_progress": ["new", "resolved", "closed"],
"resolved": ["new", "in_progress", "closed"],
"closed": ["new", "in_progress", "resolved"],
},
}
# Zentrale Definition welche Felder wann required sind
REQUIRED_FIELDS_BY_STATUS = {
'resolved': ['answer'], # Answer required when resolving
"resolved": ["answer"], # Answer required when resolving
}
class Meta:
model = Ticket
fields = ["title", "description", "status", "mistake", "course", "answer", "material"]
fields = [
"title",
"description",
"status",
"mistake",
"course",
"answer",
"material",
]
widgets = {
'answer': forms.Textarea(attrs={
'rows': 4,
'placeholder': 'Beschreibe die Lösung des Problems...'
})
"answer": forms.Textarea(
attrs={
"rows": 4,
"placeholder": "Beschreibe die Lösung des Problems...",
}
)
}
def __init__(self, *args, **kwargs):
self.user = kwargs.pop('user', None)
self.ticket = kwargs.pop('ticket', None)
self.user = kwargs.pop("user", None)
self.ticket = kwargs.pop("ticket", None)
super().__init__(*args, **kwargs)
if self.ticket and self.user:
@@ -79,17 +89,17 @@ class TicketForm(forms.ModelForm):
if is_superuser:
return
if self.ticket.status == 'resolved' and is_creator:
if self.ticket.status == "resolved" and is_creator:
for field_name in self.fields:
if field_name == "answer":
self.fields[field_name].disabled = True
elif is_tutor:
# Tutor darf ändern:
readonly_fields = ['title', 'description', 'material']
readonly_fields = ["title", "description", "material"]
for field_name in readonly_fields:
if field_name in self.fields:
self.fields[field_name].disabled = True
elif is_creator and self.ticket.status != 'resolved':
elif is_creator and self.ticket.status != "resolved":
for field_name in self.fields:
self.fields[field_name].disabled = True
@@ -99,11 +109,11 @@ class TicketForm(forms.ModelForm):
# Superuser bekommen alle Status-Optionen
if is_superuser:
role = 'superuser'
role = "superuser"
elif is_tutor:
role = 'tutor'
role = "tutor"
elif is_creator:
role = 'creator'
role = "creator"
else:
role = None
@@ -114,10 +124,9 @@ class TicketForm(forms.ModelForm):
allowed_statuses = [current_status]
# 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_statuses
all_choices = list(self.fields["status"].choices)
self.fields["status"].choices = [
choice for choice in all_choices if choice[0] in allowed_statuses
]
def _get_allowed_transitions(self, from_status, role):
@@ -137,7 +146,7 @@ class TicketForm(forms.ModelForm):
def clean(self):
cleaned_data = super().clean()
status = cleaned_data.get('status')
status = cleaned_data.get("status")
if not self.ticket or not status:
return cleaned_data
@@ -150,27 +159,31 @@ class TicketForm(forms.ModelForm):
# Superuser dürfen alle Übergänge
if is_superuser:
role = 'superuser'
role = "superuser"
elif is_tutor:
role = 'tutor'
role = "tutor"
elif is_creator:
role = 'creator'
role = "creator"
else:
role = None
if role and not self._is_transition_allowed(old_status, status, role):
raise ValidationError({
'status': f'Übergang von "{self.ticket.get_status_display()}" zu "{dict(self.fields["status"].choices)[status]}" ist nicht erlaubt.'
})
raise ValidationError(
{
"status": f'Übergang von "{self.ticket.get_status_display()}" zu "{dict(self.fields["status"].choices)[status]}" ist nicht erlaubt.'
}
)
# 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({
field_name: f'{field_label} ist erforderlich, wenn der Status auf "{dict(self.fields["status"].choices)[status]}" gesetzt wird.'
})
raise ValidationError(
{
field_name: f'{field_label} ist erforderlich, wenn der Status auf "{dict(self.fields["status"].choices)[status]}" gesetzt wird.'
}
)
return cleaned_data
@@ -184,8 +197,9 @@ class TicketForm(forms.ModelForm):
# Setze answered_at wenn eine Antwort gegeben wird
if ticket.answer and not ticket.answered_at:
from django.utils import timezone
ticket.answered_at = timezone.now()
if commit:
ticket.save()
return ticket
return ticket