Merge lp:~daker/loco-team-portal/fix.1164296 into lp:loco-team-portal

[Adnane Belmadiaf]

Fix the time widget to select the correct time

[lp:~daker/loco-team-portal/fix.1164296]

633. By Adnane Belmadiaf on 2013-04-08

More fixes

634. By Adnane Belmadiaf on 2013-04-08

removed comma

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2013-02-17 01:44:52 +0000
+++ loco_directory/events/forms.py	2013-04-08 20:27:19 +0000
@@ -44,12 +44,12 @@
 
     class Media:
         css = {'all': (
-                settings.MEDIA_URL + 'jquery-ui/css/smoothness/jquery-ui.css',
-                )}
+            settings.MEDIA_URL + 'jquery-ui/css/smoothness/jquery-ui.css',
+        )}
         js = (
-              settings.MEDIA_URL + 'jquery-ui/jquery-ui.js',
-              settings.MEDIA_URL + 'js/events-ui.js',
-              )
+            settings.MEDIA_URL + 'jquery-ui/jquery-ui.js',
+            settings.MEDIA_URL + 'js/events-ui.js',
+        )
 
     def __init__(self, *args, **kargs):
         super(BaseEventForm, self).__init__(*args, **kargs)
@@ -60,7 +60,7 @@
         begin = self.cleaned_data.get('date_begin')
         end = self.cleaned_data.get('date_end')
         if begin and end and begin > end:
-            raise forms.ValidationError("Events can not end before they start.")
+            raise forms.ValidationError(_("Events can not end before they start."))
         return self.cleaned_data
 
 
@@ -86,15 +86,13 @@
 
     def clean(self):
         venue = self.cleaned_data.get('venue')
+        begin = self.cleaned_data.get('date_begin', None)
+        end = self.cleaned_data.get('date_end', None)
         if venue is not None:
-            begin = self.cleaned_data.get('date_begin', None)
-            end = self.cleaned_data.get('date_end', None)
             if begin is not None and end is not None:
                 self.cleaned_data['date_begin'] = venue.fromlocaltime(begin)
                 self.cleaned_data['date_end'] = venue.fromlocaltime(end)
         elif self.teams:
-            begin = self.cleaned_data.get('date_begin', None)
-            end = self.cleaned_data.get('date_end', None)
             if begin is not None and end is not None:
                 self.cleaned_data['date_begin'] = self.teams[0].fromlocaltime(begin)
                 self.cleaned_data['date_end'] = self.teams[0].fromlocaltime(end)
 
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2013-02-18 22:16:11 +0000
+++ loco_directory/events/views.py	2013-04-08 20:27:19 +0000
@@ -8,12 +8,11 @@
 from django.db.models import Count
 
 from .models import (TeamEvent, GlobalEvent, Attendee, TeamEventComment)
-from teams.models import Team, Country, Continent
+from teams.models import Team
 
 from .forms import (TeamEventForm, TeamEventCommentForm,
                     GlobalEventForm, AttendeeRegistrationForm)
 
-from common.utils import simple_iterator
 from common.forms import FilterHistoryList
 from common import launchpad
 
@@ -294,10 +293,11 @@
     """
     update team event
     """
-    team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
+    team_event = get_object_or_404(TeamEvent, pk=team_event_id)
+    teams = team_event.teams.all()
     #check if user is admin or owner of a team
     is_member = False
-    for team in team_event_object.teams.all():
+    for team in teams:
         if launchpad.is_team_member(request.user, team):
             is_member = True
             break
@@ -306,22 +306,24 @@
 
     if is_on_lc or is_member:
         if request.method == 'POST':
-            form = TeamEventForm(data=request.POST, instance=team_event_object, teams=team_event_object.teams.all())
+            form = TeamEventForm(data=request.POST, instance=team_event, teams=teams)
             if form.is_valid():
                 form.save()
                 request.user.message_set.create(message=_('Team Event updated.'))
-                return redirect(team_event_object)
+                return redirect(team_event)
         else:
-            form = TeamEventForm(instance=team_event_object, teams=team_event_object.teams.all())
+            form = TeamEventForm(instance=team_event, teams=teams)
 
         context = {
             'form': form,
         }
-        return render_to_response('events/team_event_update.html',
-                                         context, RequestContext(request))
+        return render_to_response(
+            'events/team_event_update.html',
+            context, RequestContext(request)
+        )
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not update this team event.'), _('You are not a member of the team or on the LoCo Council.')))
-        return redirect(team_event_object)
+        return redirect(team_event)
 
 
 @login_required
@@ -349,8 +351,8 @@
         is_past_event = True
 
     context = {
-           'form': form,
-           'is_past_event': is_past_event,
+        'form': form,
+        'is_past_event': is_past_event,
     }
 
     return render_to_response('events/team_event_register.html',
 
=== modified file 'loco_directory/events/widgets.py'
--- loco_directory/events/widgets.py	2013-02-17 01:44:52 +0000
+++ loco_directory/events/widgets.py	2013-04-08 20:27:19 +0000
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
+from django import forms
+from django.utils.translation import ugettext as _
+
 from datetime import time
 from time import strptime, strftime
 
-from django import forms
-from django.utils.translation import ugettext as _
-
 
 class DateWidget(forms.DateInput):
     """A more-friendly date widget with a pop-up calendar.
@@ -45,7 +45,17 @@
         super(TimeWidget, self).__init__(widgets, attrs)
 
     def decompress(self, value):
-        if isinstance(value, time):
+        if isinstance(value, str):
+            value = strptime(value, '%I:%M %p')
+            hour = int(value.tm_hour)
+            minute = int(value.tm_min)
+            if hour < 12:
+                meridian = 'AM'
+            else:
+                meridian = 'PM'
+                hour -= 12
+            return (hour, minute, meridian)
+        elif isinstance(value, time):
             hour = int(value.strftime("%I"))
             minute = int(value.strftime("%M"))
             meridian = value.strftime("%p")
@@ -65,11 +75,8 @@
 
 
 class DateTimeWidget(forms.SplitDateTimeWidget):
-    """A more-friendly date/time widget.
-
-    Inspired by:
-
-    http://copiesofcopies.org/webl/2010/04/26/a-better-datetime-widget-for-django/
+    """
+    A more-friendly date/time widget.
     """
     def __init__(self, attrs=None, date_format=None, time_format=None):
         super(DateTimeWidget, self).__init__(attrs, date_format, time_format)
@@ -87,4 +94,4 @@
             return (None, None)
 
     def format_output(self, rendered_widgets):
-        return '%s%s' % (rendered_widgets[0], rendered_widgets[1])
+        return '%s %s' % (rendered_widgets[0], rendered_widgets[1])