remove group, replace with charfield, set fields as optional

jdav_web/ludwigsburgalpin/admin.py

@@ -4,15 +4,11 @@ from django.contrib import admin
 from wsgiref.util import FileWrapper
 from django.http import HttpResponse
 from django.conf import settings
-from .models import Group, Termin
+from .models import Termin
 
 import xlsxwriter
 
 
-class GroupAdmin(admin.ModelAdmin):
-    list_display = ('name',)
-
-
 class TerminAdmin(admin.ModelAdmin):
     list_display = ('title','start_date', 'end_date', 'group', 'responsible')
     list_filter = ('group',)
@@ -36,7 +32,7 @@ class TerminAdmin(admin.ModelAdmin):
             worksheet.write(row+2, 0, termin.title)
             worksheet.write(row+2, 1, termin.start_date.strftime('%d.%m.%Y'))
             worksheet.write(row+2, 2, termin.end_date.strftime('%d.%m.%Y'))
-            worksheet.write(row+2, 3, str(termin.group))
+            worksheet.write(row+2, 3, termin.group)
             worksheet.write(row+2, 4, termin.responsible)
             worksheet.write(row+2, 5, termin.phone)
             worksheet.write(row+2, 6, termin.email)
@@ -51,7 +47,6 @@ class TerminAdmin(admin.ModelAdmin):
     make_overview.short_description = "Termine in Excel Liste überführen"
 
 # Register your models here.
-admin.site.register(Group, GroupAdmin)
 admin.site.register(Termin, TerminAdmin)
 
 

jdav_web/ludwigsburgalpin/models.py

@@ -1,28 +1,16 @@
 from django.db import models
 
 
-class Group(models.Model):
-    name = models.CharField('Name', max_length=50)
-
-    class Meta:
-        verbose_name = 'Gruppe'
-        verbose_name_plural = 'Gruppen'
-
-    def __str__(self):
-        return self.name
-
-
 # Create your models here.
 class Termin(models.Model):
     title = models.CharField('Titel', max_length=100)
     start_date = models.DateField('Von')
     end_date = models.DateField('Bis')
-    group = models.ForeignKey('ludwigsburgalpin.Group',
+    group = models.CharField(verbose_name='Gruppe', max_length=100, default="", blank=True)
-                              verbose_name='Gruppe')
+    responsible = models.CharField('Organisator', max_length=100, blank=True)
-    responsible = models.CharField('Organisator', max_length=100)
+    phone = models.CharField(max_length=20, verbose_name='Telefonnumer', blank=True)
-    phone = models.CharField(max_length=20, verbose_name='Telefonnumer')
+    email = models.EmailField(max_length=100, verbose_name='Email', blank=True)
-    email = models.EmailField(max_length=100, verbose_name='Email')
+    description = models.TextField('Tourenbeschreibung/Anforderung', blank=True)
-    description = models.TextField('Tourenbeschreibung/Anforderung')
 
     def __str__(self):
         return "{} {}".format(self.title, str(self.group))

jdav_web/ludwigsburgalpin/views.py

@@ -2,7 +2,7 @@ from django.shortcuts import render
 from django import forms
 from django.http import HttpResponseRedirect
 from django.contrib.admin import widgets
-from .models import Group, Termin
+from .models import Termin
 
 datepicker = forms.TextInput(attrs={'class': 'datepicker'})
 
@@ -13,13 +13,17 @@ class TerminForm(forms.Form):
                                  widget=datepicker)
     end_date = forms.DateField(label='Bis',
                                widget=datepicker)
-    group = forms.ModelChoiceField(label='Gruppe',
+    group = forms.CharField(label='Gruppe',
-                                   queryset=Group.objects.all())
+                            required=False)
-    responsible = forms.CharField(label='Organisator', max_length=100)
+    responsible = forms.CharField(label='Organisator', max_length=100,
-    phone = forms.CharField(max_length=20, label='Telefonnumer')
+                                  required=False)
-    email = forms.EmailField(max_length=100, label='Email')
+    phone = forms.CharField(max_length=20, label='Telefonnumer',
+                            required=False)
+    email = forms.EmailField(max_length=100, label='Email',
+                             required=False)
     description = forms.CharField(label='Tourenbeschreibung/Anforderung',
-                                  widget=forms.Textarea)
+                                  widget=forms.Textarea,
+                                  required=False)
 
 
 # Create your views here.