From d35775b1c43f008ab18186875e31ed55509abb9f Mon Sep 17 00:00:00 2001 From: Benni Baermann Date: Wed, 21 Oct 2020 13:00:44 +0200 Subject: [PATCH] added Accounts to project form --- input/management/commands/sendmails.py | 2 +- input/models.py | 4 +++- input/settings.py | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/input/management/commands/sendmails.py b/input/management/commands/sendmails.py index a2c2218..287cab6 100644 --- a/input/management/commands/sendmails.py +++ b/input/management/commands/sendmails.py @@ -5,7 +5,7 @@ from django.core.management.base import BaseCommand, CommandError # - two weeks after confirmation of support for volunteer (/extern) send link # with surveylink # -# - same for HonoraryCertificate and accreditation +# - same for HonoraryCertificate and accreditation (/intern) # # - travel: mail 3 weeks after end of project. # diff --git a/input/models.py b/input/models.py index 8f68a33..596eb96 100644 --- a/input/models.py +++ b/input/models.py @@ -1,5 +1,6 @@ from django.db import models +from .settings import ACCOUNTS class Volunteer(models.Model): realname = models.CharField(max_length=200, null=True) @@ -19,6 +20,7 @@ class Volunteer(models.Model): class Project(Volunteer): name = models.CharField(max_length=200) start = models.DateField('start date') + account = models.CharField(max_length=5, choices=ACCOUNTS.items()) pid = models.IntegerField(null=True, blank=True) # automaticly generated @@ -29,7 +31,7 @@ class Project(Volunteer): super().save(*args,*kwargs) def __str__(self): - return f"{self.pid} {self.name}" + return f"{self.pid} {self.name}" class HonoraryCertificate(Volunteer): request_url = models.CharField(max_length=2000) diff --git a/input/settings.py b/input/settings.py index f84ceef..9f1effe 100644 --- a/input/settings.py +++ b/input/settings.py @@ -8,3 +8,21 @@ URLPREFIX = 'http://127.0.0.1:8000' DATAPROTECTION = "https://www.wikimedia.de/datenschutz/" FOERDERRICHTLINIEN = "https://de.wikipedia.org/wiki/Wikipedia:Wikimedia_Deutschland/F%C3%B6rderrichtlinien" NUTZUNGSBEDINGUNGEN = 'TODO' + + +ACCOUNTS ={"21103": '21103 Willkommen', + "21111": '21111 Förderung', + "21112": '21112 WikiCon', + "21113": '21113 Wikimania/Unterstützung Ehrenamtliche', + "21115": '21115 Lokale Räume, Berlin', + "21116": '21116 Lokale Räume, Hamburg', + "21117": '21117 Lokale Räume, Hannover', + "21118": '21118 Lokale Räume, Köln', + "21119": '21119 Lokale Räume, München', + "21120": '21120 Lokale Räume, Fürth', + "21125": '21125 Lokale Räume, allgemein', + "21134": '21134 Größe', + "21137": '21137 Beitragen', + "21138": '21138 Vermittlung',} + +#ACCOUNTS_LIST = [(k, v) for k, v in ACCOUNTS_DICT.iteritems()]