Merge lp:~ris/loco-team-portal/part-fix-720824-meetings into lp:loco-team-portal

[Robert Sajdok]

[Adnane Belmadiaf (daker)]

Thanks Robert for the MP, i'll look into it in the next few days.

[Adnane Belmadiaf (daker)]

Thanks for the fix Robert, merged :)

review: Approve

=== modified file 'loco_directory/common/forms.py'
--- loco_directory/common/forms.py	2010-11-20 17:25:50 +0000
+++ loco_directory/common/forms.py	2012-07-14 20:22:20 +0000
@@ -2,6 +2,8 @@
 from django import forms
 from django.utils.translation import ugettext as _
 
+import datetime
+
 # Taken from http://djangosnippets.org/snippets/1732/
 class RenderableMixin(object):
     """
@@ -50,3 +52,30 @@
         "Returns this form rendered. Only the fields. Nothing else HTML."
         return self._html_output(u'%(label)s %(errors)s%(field)s%(help_text)s', u'%s', '', u'%s', False)
 
+class FilterHistoryList(forms.Form):
+    """
+    a form to filter event history list
+    """
+
+    choices = [('all', _(u'all')), ('my', _(u'month and year')), ('y', _(u'only year'))]
+
+    scope = forms.ChoiceField(choices)
+
+    now = datetime.datetime.now().strftime("%Y-%m")
+    filtering = forms.CharField(required=False, initial=now)
+
+    class Media:
+        css = {'all': (
+                       '/media/jquery-ui/css/css/smoothness/jquery-ui.css',
+                       '/media/jquery-ui-timepicker/css/ui-lightness/ui.timepickr.css',
+                       '/media/css/colortip-1.0-jquery.css',
+                       '/media/css/newstyle.css',
+                       )}
+        js = (
+              '/media/jquery/jquery.js',
+              '/media/jquery-ui/jquery-ui.js',
+              '/media/jquery-ui-timepicker/js/jquery.timepickr.min.js',
+              '/media/jquery-ui-timepicker/js/ui.timepickr.min.js',
+              '/media/js/colortip-1.0-jquery.js',
+              '/media/js/events-ui.js',
+              )

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2012-06-30 23:44:14 +0000
+++ loco_directory/events/forms.py	2012-07-14 20:22:20 +0000
@@ -10,8 +10,6 @@
 from userprofiles.models import UserProfile
 
 import itertools
-import datetime
-
 
 def grouped_user_list(teams):
     other_members, team_members = [], []
@@ -199,32 +197,3 @@
               '/media/jquery/jquery.js',
               '/media/js/colortip-1.0-jquery.js',
               )
-
-
-class FilterHistoryList(forms.Form):
-    """
-    a form to filter event history list
-    """
-
-    choices = [('all', _(u'all')), ('my', _(u'month and year')), ('y', _(u'only year'))]
-
-    scope = forms.ChoiceField(choices)
-
-    now = datetime.datetime.now().strftime("%Y-%m")
-    filtering = forms.CharField(required=False, initial=now)
-
-    class Media:
-        css = {'all': (
-                       '/media/jquery-ui/css/css/smoothness/jquery-ui.css',
-                       '/media/jquery-ui-timepicker/css/ui-lightness/ui.timepickr.css',
-                       '/media/css/colortip-1.0-jquery.css',
-                       '/media/css/newstyle.css',
-                       )}
-        js = (
-              '/media/jquery/jquery.js',
-              '/media/jquery-ui/jquery-ui.js',
-              '/media/jquery-ui-timepicker/js/jquery.timepickr.min.js',
-              '/media/jquery-ui-timepicker/js/ui.timepickr.min.js',
-              '/media/js/colortip-1.0-jquery.js',
-              '/media/js/events-ui.js',
-              )

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2012-06-30 23:44:14 +0000
+++ loco_directory/events/views.py	2012-07-14 20:22:20 +0000
@@ -16,9 +16,9 @@
 from forms import TeamEventCommentForm
 from forms import GlobalEventForm
 from forms import AttendeeRegistrationForm
-from forms import FilterHistoryList
 
 from common.utils import redirect, simple_iterator
+from common.forms import FilterHistoryList
 from common import launchpad
 
 import datetime

=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py	2011-03-18 13:37:13 +0000
+++ loco_directory/meetings/views.py	2012-07-14 20:22:20 +0000
@@ -10,10 +10,12 @@
 from teams.models import Team
 
 from forms import TeamMeetingForm, AgendaItemForm
+
 from django.db.models import Q
 
 from common.utils import redirect, simple_iterator
 from common import launchpad
+from common.forms import FilterHistoryList
 
 from userprofiles.models import UserProfile
 import datetime
@@ -78,7 +80,32 @@
     a list with all historical meetings (teammeetings)
     """
     team_meeting_list = TeamMeeting.objects.history_meetings()
+
+    if request.method == 'POST':
+        form = FilterHistoryList(request.POST)
+        if form.is_valid():
+
+            filtering = form.cleaned_data['filtering']
+
+            scope = form.cleaned_data['scope']
+
+            if u'my' in scope:
+                filtering_date = datetime.datetime.strptime(filtering, "%Y-%m")
+
+                team_meeting_list = TeamMeeting.objects.history_meetings().filter(date_begin__year=filtering_date.year, date_begin__month=filtering_date.month)
+            elif u'y' in scope:
+                filtering_date = datetime.datetime.strptime(filtering, "%Y-%m")
+
+                team_meeting_list = TeamMeeting.objects.history_meetings().filter(date_begin__year=filtering_date.year)
+        else:
+            team_meeting_list = TeamMeeting.objects.history_meetings()
+
+    else:
+        form = FilterHistoryList()
+        team_meeting_list = TeamMeeting.objects.history_meetings()
+
     context = {
+        'form': form,
         'team_meeting_list': team_meeting_list,
     }
     return render_to_response('meetings/meeting_history_list.html', context,

=== modified file 'loco_directory/templates/meetings/meeting_history_list.html'
--- loco_directory/templates/meetings/meeting_history_list.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/meetings/meeting_history_list.html	2012-07-14 20:22:20 +0000
@@ -1,4 +1,9 @@
 {% extends "base.html" %}
+
+{% block extrahead %}{{ block.super }}
+  {{form.media}}
+{% endblock %}
+
 {% load i18n %}
 
 {% block page_name %}{% trans "Ubuntu Teams Meeting History" %}{% endblock %}
@@ -11,6 +16,24 @@
 <div class="row">
 <section class="span-12">
 <h2>{% trans "Ubuntu Teams Meeting History" %}</h2>
+
+<form action="." method="post">{% csrf_token %}
+<table class="table left">
+<tr>
+{% for field in form %}
+    <td>
+    {{ field }} {{ field.errors }}
+    </td>
+{% endfor %}
+<td>
+<input type="submit" value="Submit" />
+</td>
+</tr>
+</table>
+
+</form>
+</br>
+
 {% if team_meeting_list %}
 <p>{% trans "Select a past team meeting below to see more information about it:" %}</p>