Merge pull request #101 from vubo/event

Not allowing to create a post dated event

Author: tapaswenipathak

vms/event/templates/event/create.html

@@ -1,7 +1,22 @@
 {% extends "administrator/settings.html" %}
 
+
+
 {% block setting_content %}
-    <div class="spacer"></div>
+<br>
+{% if messages %}
+
+<div class="alert alert-dismissible alert-danger">
+  <button type="button" class="close" data-dismiss="alert">×</button>
+  <ul class="messages">
+    {% for message in messages %}
+    <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+    {% endfor %}
+</ul>
+</div>
+
+{% endif %}
+
     <div class="well">
         <form class="form-horizontal" action="{% url 'event:create' %}" method="post">
             {% csrf_token %}

vms/event/views.py

@@ -4,6 +4,7 @@
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
+from django.contrib import messages
 
 from event.forms import EventForm, EventDateForm
 from event.services import *
@@ -28,12 +29,18 @@ def is_admin(request):
 
 @login_required
 def create(request):
+    
     if is_admin(request):
         if request.method == 'POST':
             form = EventForm(request.POST)
             if form.is_valid():
-                form.save()
-                return HttpResponseRedirect(reverse('event:list'))
+                start_date = form.cleaned_data['start_date']
+                if start_date < (datetime.date.today() - datetime.timedelta(days=1)):
+                    messages.add_message(request, messages.INFO, 'Start date should be today\'s date or later.')
+                    return render(request, 'event/create.html', {'form': form, })
+                else:
+                    form.save()
+                    return HttpResponseRedirect(reverse('event:list'))
             else:
                 return render(request, 'event/create.html', {'form': form, })
         else:

vms/volunteer/models.py

@@ -111,7 +111,8 @@ class Volunteer(models.Model):
         )
     reminder_days = models.IntegerField(
         default=1,
-        validators=[MaxValueValidator(50), MinValueValidator(1)]
+        validators=[MaxValueValidator(50), MinValueValidator(1)],
+        blank=True
         )
 
     user = models.OneToOneField(User)