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 (/intern)
+# - same for HonoraryCertificate and accreditation
 #
 # - travel: mail 3 weeks after end of project.
 #

input/migrations/0016_project_account.py

@@ -1,18 +0,0 @@
-# Generated by Django 3.1.1 on 2020-10-21 11:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('input', '0015_auto_20201021_0721'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='project',
-            name='account',
-            field=models.CharField(choices=[('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')], max_length=5, null=True),
-        ),
-    ]

input/models.py

@@ -1,6 +1,5 @@
 from django.db import models
 
-from .settings import ACCOUNTS
 
 class Volunteer(models.Model):
     realname = models.CharField(max_length=200, null=True)
@@ -20,7 +19,6 @@ 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(), null=True)
 
     pid = models.IntegerField(null=True, blank=True) # automaticly generated
 
@@ -31,7 +29,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)

input/settings.py

@@ -8,19 +8,3 @@ 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',}