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

[Robert Sajdok]

[Chris Johnston (cjohnston)]

This is good work, however I don't think that it quite fits the bug... I'm thinking more along the lines of be able to display June 2011 or January 2012... Or All of 2011.

review: Needs Fixing

[Robert Sajdok (ris)]

Is that the solution will be appropriate?
http://jsfiddle.net/timbuethe/PxGHV/

[Chris Johnston (cjohnston)]

That is better, yes.. Would it be possible to also display an entire year with that?

[Robert Sajdok (ris)]

Please review the new solution.

[Adnane Belmadiaf (daker)]

1- Move {{form.media}} to the top :

{% block extrahead %}{{ block.super }}
  {{form.media}}
{% endblock %}

2- The values 'all', 'month and year', 'only year' __must__ be translatable.
3- A form is not allowed to be a child element of a table, tbody or tr, so it should be like this :
<form action="." method="post">{% csrf_token %}
    <table>
        ...
    </table>
</form>

4- Everything else looks good to me.

review: Needs Fixing

[lp:~ris/loco-team-portal/part-fix-720824c]

528. By Robert Sajdok on 2012-06-10

1- Move {{form.media}} to the top
2- The values 'all', 'month and year', 'only year' __must__ be translatable.
3- A form is not allowed to be a child element of a table, tbody or tr.

[Robert Sajdok (ris)]

> 1- Move {{form.media}} to the top :
>
> {% block extrahead %}{{ block.super }}
> {{form.media}}
> {% endblock %}
>
> 2- The values 'all', 'month and year', 'only year' __must__ be translatable.
> 3- A form is not allowed to be a child element of a table, tbody or tr, so it
> should be like this :
> <form action="." method="post">{% csrf_token %}
> <table>
> ...
> </table>
> </form>
>
> 4- Everything else looks good to me.

Done

[Adnane Belmadiaf (daker)]

Thanks for your work, i approve it.

review: Approve

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2011-07-30 18:27:12 +0000
+++ loco_directory/events/forms.py	2012-06-10 19:15:23 +0000
@@ -196,4 +196,31 @@
               '/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/models.py'
--- loco_directory/events/models.py	2012-02-09 02:06:11 +0000
+++ loco_directory/events/models.py	2012-06-10 19:15:23 +0000
@@ -242,4 +242,3 @@
     def __unicode__(self):
         return self.attendee_profile.user.username
 
-

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2012-02-15 15:56:28 +0000
+++ loco_directory/events/views.py	2012-06-10 19:15:23 +0000
@@ -17,6 +17,8 @@
 from forms import TeamEventCommentForm
 from forms import GlobalEventForm
 from forms import AttendeeRegistrationForm
+from forms import FilterHistoryList
+
 from django.db.models import Q
 
 from common.utils import redirect, simple_iterator
@@ -90,15 +92,41 @@
     a list with all historical events (teamevents and globalevents)
     """
     team_event_list = TeamEvent.objects.history_events().select_related('global_event', 'venue')
+
+    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_event_list = TeamEvent.objects.history_events().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_event_list = TeamEvent.objects.history_events().filter(date_begin__year=filtering_date.year)
+            
+        else:
+            team_event_list = TeamEvent.objects.history_events().select_related('global_event', 'venue')
+
+    else:
+        form = FilterHistoryList()
+        team_event_list = TeamEvent.objects.history_events().select_related('global_event', 'venue')
+
     global_event_list = GlobalEvent.objects.history_events().annotate(num_teamevents=Count('teamevent'))
+
     context = {
+        'form': form,
         'team_event_list': team_event_list,
         'global_event_list': global_event_list,
     }
     return render_to_response('events/event_history_list.html', context,
                   RequestContext(request))
 
-
 #################################################################
 # Team Events
 #################################################################

=== modified file 'loco_directory/media/css/colortip-1.0-jquery.css'
--- loco_directory/media/css/colortip-1.0-jquery.css	2010-10-02 18:21:43 +0000
+++ loco_directory/media/css/colortip-1.0-jquery.css	2012-06-10 19:15:23 +0000
@@ -105,3 +105,7 @@
 	color:#fff;
 	text-shadow:none;
 }
+
+.ui-datepicker-calendar {
+  display: none;
+}

=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css	2012-02-09 02:06:11 +0000
+++ loco_directory/media/css/newstyle.css	2012-06-10 19:15:23 +0000
@@ -688,3 +688,9 @@
 table.side-table {
     width: 280px;
 }
+
+table.left {
+  position:relative;
+  top: 10px;
+  left:-180px;
+}

=== modified file 'loco_directory/media/js/events-ui.js'
--- loco_directory/media/js/events-ui.js	2011-07-30 18:27:12 +0000
+++ loco_directory/media/js/events-ui.js	2012-06-10 19:15:23 +0000
@@ -13,4 +13,17 @@
 
     $('span[rel*=help]').colorTip({color:'orange'});
 
+    $('#id_filtering').datepicker( {
+      changeYear: true,
+      changeMonth: true,
+      showButtonPanel: true,
+      dateFormat: 'yy-m',
+      onClose: function(dateText, inst) {
+        
+        var month = $("#ui-datepicker-div .ui-datepicker-month :selected").val();
+        var year = $("#ui-datepicker-div .ui-datepicker-year :selected").val();
+        $(this).datepicker('setDate', new Date(year, month, 1));
+      }
+    });
+
 });

=== modified file 'loco_directory/templates/events/event_history_list.html'
--- loco_directory/templates/events/event_history_list.html	2011-10-05 00:50:53 +0000
+++ loco_directory/templates/events/event_history_list.html	2012-06-10 19:15:23 +0000
@@ -1,4 +1,9 @@
 {% extends "base.html" %}
+
+{% block extrahead %}{{ block.super }}
+  {{form.media}}
+{% endblock %}
+
 {% load i18n %}
 
 {% block page_name %}{% trans "Ubuntu LoCo Events History" %}{% endblock %}
@@ -25,6 +30,23 @@
 
 <article class="main-content">
 <h2>{% trans "Ubuntu LoCo Team Events 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_event_list %}
 <p>{% trans "Select a past team event below to see more information about it:" %}</p>