diff --git a/dasettings/views.py b/dasettings/views.py index e552c86..2777c0e 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -1610,8 +1610,7 @@ class BillPlanUpdate(UpdateView): voucher_date_today = date.today().strftime("%Y-%m-%d") - # TODO: Nachgebuchte Mitarbeiter - # TODO: Was passiert bei Änderungen der Agenturdaten? + # TASK: Was passiert bei Änderungen der Agenturdaten? # DataJSON monthword = "Monate" diff --git a/users/templates/users/support.html b/users/templates/users/support.html index 85b5317..eaca1cc 100644 --- a/users/templates/users/support.html +++ b/users/templates/users/support.html @@ -26,4 +26,8 @@ });*/ {% endblock content %} + diff --git a/users/usersforms.py b/users/usersforms.py index c4d1997..51740b5 100644 --- a/users/usersforms.py +++ b/users/usersforms.py @@ -151,7 +151,21 @@ class UserAreaTaskForm(forms.Form): self.fields['task_'+str(task.pk)] = forms.BooleanField(required=False, initial=True, label="
"+task.name+"
") else: self.fields['task_'+str(task.pk)] = forms.BooleanField(required=False, initial=False, label="
"+task.name+"
") +''' + TASK: DropDown hier einfügen + DropDown-Menü mit drei Optionen + 1. Technischer Support + 2. Abrechnung + 3. Lob Kritik Anregung + +''' +SUPPORT_DEP = ( + ('12', 'Technischer Support'), + ('13', 'Abrechnung'), + ('14', 'Lob, Kritik und Anregung'), + + ) class SupportForm(forms.Form): def __init__(self, user, *args, **kwargs): @@ -159,6 +173,7 @@ class SupportForm(forms.Form): user_name = user.first_name + " " + user.last_name self.fields['name'] = forms.CharField(required=True, label="Name", initial=user_name) self.fields['mail'] = forms.EmailField(required=True, label="E-Mail", initial=user.email) + self.fields['department'] = forms.ChoiceField(required=True, label="Bereich", choices=SUPPORT_DEP) self.fields['problemconc'] = forms.CharField(required=True, label="Problemzusammenfassung") self.fields['problem'] = forms.CharField(required=True, widget=forms.Textarea, label="Ausführliche Problembeschreibung") self.fields['name'].widget.attrs['readonly'] = True diff --git a/users/views.py b/users/views.py index 06adf93..008d024 100644 --- a/users/views.py +++ b/users/views.py @@ -857,9 +857,12 @@ def support(request): headers = {'X-API-Key': 'F025A238EB74914E3653BA2989BFF7C4'} subject = "Digitale Agentur: " + str(problemconc) + + # TASK: Hier die Auswahl des DropDown in die API mit einbauen, damit das Ticket in das entsprechende Department läuft + # DataJSON ostdata = { - "topicId" : '12', + "topicId" : str(supportdata['department'][0]), "name": name, "email": mail, "subject": 'Digitale Agentur: '+problemconc,