Compare commits

..

No commits in common. "c96f195b00b8e85068d4d87fe0f82a13601c7c87" and "4e7a0372c710f5b6f9369b081601817b42255d8f" have entirely different histories.

4 changed files with 10 additions and 22 deletions

View File

@ -15,8 +15,7 @@ class ProjectForm(ModelForm):
class VolunteerForm(ModelForm): class VolunteerForm(ModelForm):
choice = ChoiceField(choices=TYPE_CHOICES, widget=RadioSelect, choice = ChoiceField(choices=TYPE_CHOICES, widget=RadioSelect)
label='Was möchtest Du beantragen?')
class Meta: class Meta:
model = Volunteer model = Volunteer

View File

@ -1,20 +1,20 @@
{{data}}
Hallo Team Ideenförderung, Hallo Team Ideenförderung,
es gab einen neuen Antrag von {{data.realname}}. es gab einen neuen Antrag von {{data.realname}}.
Der Nutzer mit dem Username {{data.username}} fragt ein {% if data.choice == 'LIT' %} Literaturstipendium Username {{data.username}} fragt ein
{% if data.choice == 'LIT' %} Literaturstipendium
{% elif data.choice == 'BIB' %} Bibliotheksstipendium {% elif data.choice == 'BIB' %} Bibliotheksstipendium
{% elif data.choice == 'IFG' %} IFG {% elif data.choice == 'IFG' %} IFG
{% elif data.choice == 'ELIT' %} eLiteraturstipendium {% elif data.choice == 'ELIT' %} eLiteraturstipendium
{% elif data.choice == 'SOFT' %} Softwarestipendium {% elif data.choice == 'SOFT' %} Softwarestipendium
{% elif data.choice == 'VIS' %} Visitenkarten, Mailingliste oder E-Mail-Adresse {% elif data.choice == 'VIS' %} Visitenkarten, Mailingliste oder E-Mail-Adresse
{% else %} ERROR UNKNOWN FORMTYPE {% endif %} an. {% else %} ERROR UNKNOWN FORMTYPE
{% endif %}
an.
Genehmigen: http://127.0.0.1:8000/authorize/{{data.id}} Genehmigen: INSERT Link here
Ablehnen: http://127.0.0.1:8000/deny/{{data.id}} Ablehnen: INSERT Link here
{% comment %} {% comment %}

View File

@ -1,6 +1,6 @@
from django.urls import path from django.urls import path
from .views import project, accreditation, travel, certificate, ExternView, done, authorize, deny from .views import project, accreditation, travel, certificate, ExternView, done
urlpatterns = [ urlpatterns = [
path('project', project, name='project'), path('project', project, name='project'),
@ -8,7 +8,5 @@ urlpatterns = [
path('travel', travel, name='travel'), path('travel', travel, name='travel'),
path('certificate', certificate, name='certificate'), path('certificate', certificate, name='certificate'),
path('extern', ExternView.as_view(), name='extern'), path('extern', ExternView.as_view(), name='extern'),
path('saved', done, name='done'), path('saved', done, name='done')
path('authorize/<int:pk>', authorize, name='authorize'),
path('deny/<int:pk>', deny, name='deny')
] ]

View File

@ -10,12 +10,6 @@ from django.template import Context
from .forms import ProjectForm, VolunteerForm, LibraryForm, IFGForm from .forms import ProjectForm, VolunteerForm, LibraryForm, IFGForm
from .models import Project, TYPE_CHOICES from .models import Project, TYPE_CHOICES
def authorize(request):
print('AUTHORIZE!')
def deny(request):
print('DENY!')
def project(request): def project(request):
# return HttpResponse("Hello, world. You're at the input form") # return HttpResponse("Hello, world. You're at the input form")
# ProjectFormSet = modelformset_factory(Project, fields='__all__') # ProjectFormSet = modelformset_factory(Project, fields='__all__')
@ -106,9 +100,6 @@ class ExternView(CookieWizardView):
form.type = data['choice'] form.type = data['choice']
form.save() form.save()
# add primary key to context
data['id'] = 100
# we need to send the following mails here: # we need to send the following mails here:
context = { 'data': data } context = { 'data': data }
try: try: