martin/blechreiz-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eventplanner

Browse Source 
- create
- delete

- added time and date picker
This commit is contained in:
Martin Bauer
2013-09-13 21:04:59 +02:00
parent e2d98d9962
commit d5f461181d
14 changed files with 2166 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eventplanner/locale/de/LC_MESSAGES/django.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-06-30 16:20+0200\n"
"POT-Creation-Date: 2013-06-30 16:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Uhrzeit"
#: models.py:23
msgid "meeting_time"
msgstr ""
msgstr "Treffen um"
#: models.py:25
msgid "participants"

61
eventplanner/templates/eventplanner/event_update_form.html
View File

@@ -1,5 +1,6 @@
{% extends "website/base.html" %}
{% load sekizai_tags staticfiles %}
{% load crispy_forms_tags %}
@@ -18,15 +19,65 @@
<div class="container">
<div class="row">
<div class="span12">
<form method="post">
{% csrf_token %}
{{ form|crispy }}
<input type="submit" class="btn btn-primary" value="Abschicken"></input>
<h3>Termin bearbeiten</h3>
<!--
<form action="/contact/" method="post">
{% csrf_token %} {{ form.as_p }} <input type="submit" value="Submit" />
</form>
-->
{% crispy form %}
</div>
</div>
</div>
<!-- Datepicker -->
{% addtoblock "css" strip %}<link rel="stylesheet" href="{{STATIC_URL}}/css/datepicker.css" type="text/css" media="screen" /> {% endaddtoblock %}
{% addtoblock "css" strip %}<link rel="stylesheet" href="{{STATIC_URL}}/css/timepicker.css" type="text/css" media="screen" /> {% endaddtoblock %}
{% addtoblock "js" %}
<script src="{{STATIC_URL}}/js/bootstrap-timepicker.js"></script>
<script src="{{STATIC_URL}}/js/bootstrap-datepicker.js"></script>
<script src="{{STATIC_URL}}/js/bootstrap-datepicker.de.js"></script>
<script>
$(document).ready(function(){
$('.dateinput').datepicker({
format: "dd.mm.yyyy",
weekStart: 1,
todayBtn: "linked",
language: "de",
todayHighlight: true,
startDate: "{% now "SHORT_DATE_FORMAT" %}",
});
$('.timeinput').addClass('input-small').wrap('<div class="input-append bootstrap-timepicker">')
$(".input-append").append( '<span class="add-on"><i class="icon-time"></i></span>' )
$('.timeinput').timepicker({
minuteStep: 15,
showMeridian: false,
defaultTime: false
});
} );
</script>
{% endaddtoblock %}
{% endblock %}

51
eventplanner/templates/eventplanner/events_grid.html
View File

@@ -89,9 +89,19 @@
});
$( ".deleteButton" ).click(function() {
if (confirm('Termin wirklich löschen?')) {
pk = $(this).data( "pk" )
window.location = pk + "/delete"
}
});
</script>
{% endaddtoblock %}
<div class="container">
<form>
<div class="row">
@@ -110,6 +120,8 @@
{% for name in musicianNames %}
<th> {{ name|capfirst }} </th>
{% endfor %}
<th> </th>
</tr>
</thead>
<tbody>
@@ -138,13 +150,18 @@
<span class="text">?</span>
</button>
{% endif %}
</td>
{% endfor %}
</tr>
{% endfor %}
</td> {% endfor %}
<td>
<a class="btn btn-mini btn-inverse deleteButton" data-pk="{{event.pk}}"><i class="icon-trash icon-white"></i> Löschen </a>
</td>
</tr>
{% endfor %}
<tr>
<td class="center"> <a href="add">Termin hinzufügen...</a> </td>
<tr>
</tbody>
</table>
@@ -152,18 +169,16 @@
</div><!--/span-->
</div><!--/row-->
{% if perms.eventplanner.change_others_participation %}
<div class="row">
<div class="span12">
<button id="saveButton" class="btn btn-primary" disabled="true" >Speichern</button>
</div>
</div>
{% endif %}
</form>
{% if perms.eventplanner.change_others_participation %}
<div class="row">
<div class="span12">
<button id="saveButton" class="btn btn-primary" disabled="true">Speichern</button>
</div>
</div>
{% endif %}</form>
</div>
</div>

18
eventplanner/urls.py Normal file
View File

@@ -0,0 +1,18 @@
from django.conf.urls import patterns, url
from django.contrib.auth.decorators import login_required, permission_required
from eventplanner.views import main_view, events_grid, eventplanning,event_api,EventUpdate,EventCreate,deleteEvent
urlpatterns = patterns('',
url(r'^$', main_view ),
url(r'^grid$', events_grid ),
url(r'^planning$', eventplanning ),
url(r'^(?P<pk>\d+)$', permission_required('eventmanager.events.edit')( EventUpdate.as_view() ) ),
url(r'^add$', permission_required('eventmanager.events.edit')( EventCreate.as_view() ) ),
url(r'^(?P<pk>\d+)/delete$', permission_required('eventmanager.events.edit')( deleteEvent ) ),
url(r'^api/', event_api, name="event_api" ),
url(r'^api/(\w+)/$', event_api, name="event_api_per_user" ),
url(r'^api/(\w+)/(\d+)$', event_api, name="event_api_per_user_event"),
)

67
eventplanner/views.py
View File

@@ -1,6 +1,10 @@
from django.shortcuts import render, get_object_or_404
from django.shortcuts import render, get_object_or_404, redirect
from django.http import HttpResponse
from django.contrib.auth.decorators import login_required
from django.utils.decorators import method_decorator
from django.forms.models import ModelForm
from django.forms import TextInput, DateInput, TimeInput
from models import Event, EventParticipation
from musicians.models import Musician
@@ -9,20 +13,16 @@ from serializers import ParticipationSerializer
import datetime
from rest_framework.decorators import api_view
from rest_framework.response import Response
from rest_framework import status
from django.forms.models import ModelForm
from django.conf.urls import patterns, url
from django.contrib.auth.decorators import login_required
from django.utils.decorators import method_decorator
from crispy_forms.helper import FormHelper
from crispy_forms.layout import Submit
from django.core import urlresolvers
from django.contrib.auth.decorators import permission_required
# ---------------------------------------- API ---------------------------------------------------------
@@ -105,46 +105,47 @@ def events_grid( request ):
@login_required
def deleteEvent( request, pk ):
Event.objects.get( pk = pk ).delete()
return redirect( events_grid )
# ------------------------------------ Detail Views ----------------------------------------------------
from django.views.generic.edit import UpdateView
from django.views.generic.edit import UpdateView, CreateView
class EventForm( ModelForm ):
def __init__(self, *args, **kwargs):
self.helper = FormHelper()
self.helper.form_class = 'form-horizontal'
self.helper.add_input(Submit('submit', 'Speichern'))
return super(EventForm, self).__init__(*args, **kwargs)
class Meta:
model = Event
fields= ['title', 'date','time','type']
fields= ['title', 'type', 'date','time', 'meeting_time', 'location', 'desc', ]
widgets = {
'location': TextInput(),
}
class EventUpdate( UpdateView ):
form_class = EventForm
model = Event
template_name_suffix = "_update_form"
success_url = '/events/grid'
@method_decorator(login_required)
def dispatch(self, request, *args, **kwargs):
return super(EventUpdate, self).dispatch(request, *args, **kwargs)
success_url = '.'
class EventCreate( CreateView ):
form_class = EventForm
model = Event
template_name_suffix = "_update_form"
success_url = '.'
# ------------------------------------ URLS ----------------------------------------------------
urls = patterns('',
url(r'^$', main_view ),
url(r'^grid$', events_grid ),
url(r'^planning$', eventplanning ),
url(r'^(?P<pk>\d+)$', EventUpdate.as_view() ),
url(r'^api/', event_api, name="event_api" ),
url(r'^api/(\w+)/$', event_api, name="event_api_per_user" ),
url(r'^api/(\w+)/(\d+)$', event_api, name="event_api_per_user_event"),
)