Validate start time and duration of event form

Author: chaosagent

filters.py

@@ -1,8 +1,10 @@
 import constants
 
 
-def formatted_duration(duration, input='hour'):
-    base_duration = float(duration * constants.TIME_UNITS[input])
+def formatted_duration(duration, input_units):
+    base_duration = float(duration * constants.TIME_UNITS[input_units])
+    if base_duration < 1:
+        return '<1 %s' % constants.TIME_ABBREVIATIONS['second']
     parts = []
     for unit, value in constants.TIME_UNITS.items()[::-1]:
         if base_duration >= value:

forms.py

@@ -4,7 +4,7 @@
 from sqlalchemy import func
 from wtforms import ValidationError
 from wtforms.fields import *
-from wtforms.validators import InputRequired, Length
+from wtforms.validators import *
 from wtforms.widgets import TextArea
 
 import util
@@ -50,8 +50,8 @@ def validate_username(self, field):
 
 class EventForm(Form):
     title = StringField('Title', validators=[InputRequired(), Length(max=256)])
-    start_time = IntegerField('Start Time', validators=[InputRequired()])
-    duration = FloatField('Duration (hours)', validators=[InputRequired()])
+    start_time = IntegerField('Start Time', validators=[InputRequired(), NumberRange(min=0, message='Start time must be >0!')])
+    duration = FloatField('Duration (hours)', validators=[InputRequired(), NumberRange(min=0, message='Start time must be >0!')])
     description = StringField('Description', widget=TextArea(), validators=[InputRequired(), Length(max=1024)])
     link = StringField('Link', validators=[InputRequired(), Length(max=256)])
 

templates/events/detail.html

@@ -9,7 +9,7 @@
     <br/>
     Start: {{ event.start_time }}
     <br/>
-    Duration: {{ event.duration }}
+    Duration: {{ event.duration|duration('hour') }}
     <br/>
     Link: <a href="{{ event.link }}">link</a>
     <br/>

templates/events/list.html

@@ -44,7 +44,7 @@
                         <td><a href="{{ url_for('events.events_detail', event_id=event.id) }}">{{ event.title }}</a></td>
                         <td>{{ event.description }}</td>
                         <td><time class="timeago" datetime="{{ event.start_time_format }}">{{ event.start_time_format }}</time></td>
-                        <td>{{ event.duration|duration }}</td>
+                        <td>{{ event.duration|duration('hour') }}</td>
                         <td><a href="{{ event.link }}" target="_blank">Website</a></td>
                         {% if enabled_actions %}
                             <td>