From 6ea3aabbb6bac68bfde23a75a5c17bca5ce6e344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Wed, 9 Aug 2023 20:25:34 +0200
Subject: [PATCH] Move AKAddSlotForm from AKSubmission to AKScheduling
I think, that makes sense since it is supposed to be used by the graphical scheduling view
---
AKScheduling/forms.py | 15 +++++++++++++++
AKScheduling/views.py | 3 +--
AKSubmission/forms.py | 11 -----------
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/AKScheduling/forms.py b/AKScheduling/forms.py
index d1739eba..00a9b5bc 100644
--- a/AKScheduling/forms.py
+++ b/AKScheduling/forms.py
@@ -1,4 +1,5 @@
from django import forms
+from django.utils.translation import gettext_lazy as _
from AKModel.models import AK
@@ -11,3 +12,17 @@ class AKInterestForm(forms.ModelForm):
fields = ['interest',
'notes',
]
+
+
+class AKAddSlotForm(forms.Form):
+ """
+ Form to create a new slot for an existing AK directly from scheduling view
+ """
+ start = forms.CharField(label=_("Start"), disabled=True)
+ end = forms.CharField(label=_("End"), disabled=True)
+ duration = forms.CharField(label=_("Duration"), disabled=True)
+ room = forms.IntegerField(label=_("Room"), disabled=True)
+
+ def __init__(self, event):
+ super().__init__()
+ self.fields['ak'] = forms.ModelChoiceField(event.ak_set.all(), label=_("AK"))
diff --git a/AKScheduling/views.py b/AKScheduling/views.py
index 7174287f..2c8f275f 100644
--- a/AKScheduling/views.py
+++ b/AKScheduling/views.py
@@ -7,8 +7,7 @@ from django.views.generic import ListView, DetailView, UpdateView
from AKModel.models import AKSlot, AKTrack, Event, AK, AKCategory
from AKModel.metaviews.admin import EventSlugMixin, FilterByEventSlugMixin, AdminViewMixin, IntermediateAdminView
-from AKScheduling.forms import AKInterestForm
-from AKSubmission.forms import AKAddSlotForm
+from AKScheduling.forms import AKInterestForm, AKAddSlotForm
class UnscheduledSlotsAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView):
diff --git a/AKSubmission/forms.py b/AKSubmission/forms.py
index 3f324bd4..96e0419d 100644
--- a/AKSubmission/forms.py
+++ b/AKSubmission/forms.py
@@ -164,14 +164,3 @@ class AKOrgaMessageForm(forms.ModelForm):
'event': forms.HiddenInput,
'text': forms.Textarea,
}
-
-
-class AKAddSlotForm(forms.Form):
- start = forms.CharField(label=_("Start"), disabled=True)
- end = forms.CharField(label=_("End"), disabled=True)
- duration = forms.CharField(label=_("Duration"), disabled=True)
- room = forms.IntegerField(label=_("Room"), disabled=True)
-
- def __init__(self, event):
- super().__init__()
- self.fields['ak'] = forms.ModelChoiceField(event.ak_set.all(), label=_("AK"))
--
GitLab