beba
/
foerderbarometer
2
1
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

unfied CHOICES into one global list

This commit is contained in:
Benni Bärmann 2020-10-19 14:04:34 +02:00
parent 58924235ff
commit 7d38549c3d
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/forms.py
View File

@ -2,7 +2,7 @@ from django.db import models
from django.forms import ModelForm, DateField, ChoiceField, RadioSelect from django.forms import ModelForm, DateField, ChoiceField, RadioSelect
from django.contrib.admin.widgets import AdminDateWidget from django.contrib.admin.widgets import AdminDateWidget
from .models import Project, Volunteer, IFG, Library from .models import Project, Volunteer, IFG, Library, TYPE_CHOICES
class ProjectForm(ModelForm): class ProjectForm(ModelForm):
@ -15,13 +15,7 @@ class ProjectForm(ModelForm):
class VolunteerForm(ModelForm): class VolunteerForm(ModelForm):
CHOICES = [('BIB', 'Bibliotheksstipendium'), choice = ChoiceField(choices=TYPE_CHOICES, widget=RadioSelect)
('ELIT', 'eLiteraturstipendium'),
('SOFT', 'Softwarestipendium'),
('VIS', 'Visitenkarten, Mailingliste oder E-Mail-Adresse'),
('IFG', 'Kostenübernahme IFG-Anfrage'),
('LIT', 'Literaturstipendium'),]
choice = ChoiceField(choices=CHOICES, widget=RadioSelect)
class Meta: class Meta:
model = Volunteer model = Volunteer

9
input/models.py
View File

@ -41,9 +41,12 @@ class Grant(Volunteer):
# same model is used for Library, ELitStip and Software! # same model is used for Library, ELitStip and Software!
TYPE_CHOICES = [('BIB', 'Bibliotheksstipendium'), TYPE_CHOICES = [('BIB', 'Bibliotheksstipendium'),
('ELIT', 'eLiteraturstipendium'), ('ELIT', 'eLiteraturstipendium'),
('SOFT', 'Softwarestipendium')] ('SOFT', 'Softwarestipendium'),
('VIS', 'Visitenkarten, Mailingliste oder E-Mail-Adresse'),
('IFG', 'Kostenübernahme IFG-Anfrage'),
('LIT', 'Literaturstipendium'),]
class Library(Grant): class Library(Grant):
type = models.CharField( type = models.CharField(