change LBAlpin url, add fields for termin, fix datepicker ui

jdav_web/jdav_web/urls.py

@@ -29,7 +29,7 @@ urlpatterns += i18n_patterns(
     url(r'^kompass/', admin.site.urls),
     url(r'^admin/', RedirectView.as_view(url='/kompass')),
     url(r'^newsletter/', include('mailer.urls', namespace="mailer")),
-    url(r'^ludwigsburgalpin/', include('ludwigsburgalpin.urls',
+    url(r'^LBAlpin/Programm/2020', include('ludwigsburgalpin.urls',
        namespace="ludwigsburgalpin")),
     url(r'^$', include('startpage.urls')),
 )

jdav_web/ludwigsburgalpin/admin.py

@@ -14,7 +14,7 @@ class GroupAdmin(admin.ModelAdmin):
 
 
 class TerminAdmin(admin.ModelAdmin):
-    list_display = ('title','start_date', 'end_date', 'group')
+    list_display = ('title','start_date', 'end_date', 'group', 'responsible')
     list_filter = ('group',)
     ordering = ('start_date','end_date')
     actions = ['make_overview']
@@ -28,11 +28,19 @@ class TerminAdmin(admin.ModelAdmin):
         worksheet.write(0, 1, "Von", bold)
         worksheet.write(0, 2, "Bis", bold)
         worksheet.write(0, 3, "Gruppe", bold)
+        worksheet.write(0, 4, "Organisator", bold)
+        worksheet.write(0, 5, "Telefonnummer", bold)
+        worksheet.write(0, 6, "Emailadresse", bold)
+        worksheet.write(0, 7, "Tourenbeschreibung/Anforderung", bold)
         for row, termin in enumerate(queryset):
             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, 4, termin.responsible)
+            worksheet.write(row+2, 5, termin.phone)
+            worksheet.write(row+2, 6, termin.email)
+            worksheet.write(row+2, 7, termin.description)
         workbook.close()
         with open(media_path(filename), 'rb') as xls:
             response = HttpResponse(FileWrapper(xls))

jdav_web/ludwigsburgalpin/models.py

@@ -19,6 +19,10 @@ class Termin(models.Model):
     end_date = models.DateField('Bis')
     group = models.ForeignKey('ludwigsburgalpin.Group',
                               verbose_name='Gruppe')
+    responsible = models.CharField('Organisator', max_length=100)
+    phone = models.CharField(max_length=20, verbose_name='Telefonnumer')
+    email = models.EmailField(max_length=100, verbose_name='Email')
+    description = models.TextField('Tourenbeschreibung/Anforderung')
 
     def __str__(self):
         return "{} {}".format(self.title, str(self.group))

jdav_web/ludwigsburgalpin/static/ludwigsburgalpin/termine.css

@@ -2,7 +2,7 @@ table.termine {
     text-align: left;
 }
 
-td {
+table.termine td {
     padding-left: 50px;
     display: block;
     float: left;

jdav_web/ludwigsburgalpin/templates/ludwigsburgalpin/base.html

@@ -29,7 +29,7 @@
     <ul class="navbar">
 
         <li><a href="/">Jugendgruppen</a></li>
-        <li class="current"><a href="/ludwigsburgalpin">Ludwigsburg Alpin</a></li>
+        <li class="current"><a href="{% url "ludwigsburgalpin:index" %}">Ludwigsburg Alpin</a></li>
         <li><a href="/kompass">Kompass</a></li>
 
     </ul>

jdav_web/ludwigsburgalpin/templates/ludwigsburgalpin/published.html

@@ -3,5 +3,5 @@
 {% block content %}
 <p><b>Termin erfolgreich eingereicht</b></p>
 
-<p><a href="/ludwigsburgalpin">Hier</a> kannst du einen neuen Termin hinzufügen.</p>
+<p><a href="{% url "ludwigsburgalpin:index" %}">Hier</a> kannst du einen neuen Termin hinzufügen.</p>
 {% endblock %}

jdav_web/ludwigsburgalpin/templates/ludwigsburgalpin/termine.html

@@ -8,7 +8,7 @@
 
 <h1>Ludwigsburg Alpin Termine</h1>
 
-<p>Hier kannst du einen Termin für deine Gruppe hinzufügen</p>
+<p>Hier kannst du einen Termin für deine Gruppe hinzufügen. Pass bitte auf, du kannst ihn danach nicht mehr ändern!</p>
 
 {% if error_message %}
     <p><b>{{ error_message }}</b></p>

jdav_web/ludwigsburgalpin/views.py

@@ -15,6 +15,11 @@ class TerminForm(forms.Form):
                                widget=datepicker)
     group = forms.ModelChoiceField(label='Gruppe',
                                    queryset=Group.objects.all())
+    responsible = forms.CharField(label='Organisator', max_length=100)
+    phone = forms.CharField(max_length=20, label='Telefonnumer')
+    email = forms.EmailField(max_length=100, label='Email')
+    description = forms.CharField(label='Tourenbeschreibung/Anforderung',
+                                  widget=forms.Textarea)
 
 
 # Create your views here.
@@ -25,7 +30,11 @@ def index(request):
             termin = Termin(title=form.cleaned_data["title"],
                             start_date=form.cleaned_data["start_date"],
                             end_date=form.cleaned_data["end_date"],
-                            group=form.cleaned_data["group"])
+                            group=form.cleaned_data["group"],
+                            responsible=form.cleaned_data["responsible"],
+                            phone=form.cleaned_data["phone"],
+                            email=form.cleaned_data["email"],
+                            description=form.cleaned_data["description"])
             termin.save()
             return published(request)
     else: