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

[Adnane Belmadiaf]

Optimized the global event page

A gloval event with 225 events now generate 731 queries rather than 1379 queries

http://i.imgur.com/fkyMFat.jpg

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

611. By Adnane Belmadiaf on 2013-02-14

Remove print statement

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2012-12-22 23:22:32 +0000
+++ loco_directory/events/views.py	2013-02-14 00:27:22 +0000
@@ -385,37 +385,26 @@
     detailed view for a global event
     """
     global_event = get_object_or_404(GlobalEvent, pk=global_event_id)
-    team_events = global_event.teamevent_set.all()
-
+    team_events = global_event.teamevent_set.all().order_by('venue__continent__name')
+    for event in team_events:
+        event.v = "z-v"
+        event.ctr = "z-ctr"
+        event.ctn = "z-ctn"
+        if event.venue and event.venue is not None:
+            event.v = event.venue
+            if event.v.country:
+                event.ctr = str(event.v.country)
+            if event.v.continent:
+                event.ctn = str(event.v.continent)
     add_team_event = (request.user and request.user.is_authenticated() and \
                       request.user.groups.exclude(name__exact='ubuntu-lococouncil'))
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
 
-    events_without_venue = team_events.filter(venue__isnull=True)
-    country_ids = [a.venue.country.id for a in team_events.filter(venue__isnull=False,
-                                                                                venue__country__continents__isnull=False)]
-    country_without_continents_ids = [a.venue.country.id \
-            for a in team_events.filter(venue__isnull=False,
-                                                              venue__country__isnull=False,
-                                                              venue__country__continents__isnull=True)]
-
-    countries = Country.objects.filter(id__in=country_ids).order_by('name')
-    countries_without_continents = Country.objects.filter(id__in=country_without_continents_ids).order_by('name')
-    continent_ids = []
-    for continent_list in map(lambda a: a.continents.all(), countries):
-        continent_ids += [continent.id for continent in continent_list]
-    continents = Continent.objects.filter(id__in=continent_ids).order_by('name')
-
     context = {
         'global_event': global_event,
         'team_events': team_events,
         'add_team_event': add_team_event,
-        'events_without_venue': events_without_venue,
         'user_is_on_lc': is_on_lc,
-        'continents': continents,
-        'countries': countries,
-        'countries_without_continents': countries_without_continents,
-        'colcycle': simple_iterator('col_left', 'col_right'),
     }
     return render_to_response('events/global_event_detail.html',
                                          context, RequestContext(request))

=== modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html'
--- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html	2012-12-22 23:22:32 +0000
+++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html	2013-02-14 00:27:22 +0000
@@ -1,65 +1,26 @@
 {% load i18n %}
 {% if team_events %}
-    <table class="basic wide">
-    {% for continent in continents %}
-        <thead><tr><th colspan="3">{{ continent.name }}</th></tr></thead>
-        {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %}
-            {% for team_event in team_events %}{% ifequal country team_event.venue.country %}
-            <tr>
-                <td>
-                <a title="{% trans 'More Information about Team Event' %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
-                </td>
-                <td>
-                    {{ country.name }}
-                    {% for team in team_event.teams.all %}
-                        {% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %}
-                    {% endfor %}
-                </td>
-                <td>
-                    {{ team_event.local_date_begin|date:"D, d N" }}
-                </td>
-            </tr>
-            {% endifequal %}{% endfor %}
-        {% endifequal %}{% endfor %}{% endfor %}
+
+<div class="events-meetings-wrapper">
+    {% regroup team_events|dictsort:"ctn" by ctn as events_list_by_continent %}
+    {% for continent in events_list_by_continent %}
+        <div style="overflow: auto; margin-bottom: 10px;border-bottom: 1px solid #E6E6E6;">
+        <h1 style="padding-left: 15px;">{% if continent.grouper == 'z-ctn'%}{% trans "Events in countries without continents" %}{% else %}{{ continent.grouper }}{% endif %}</h2>
+        {% regroup continent.list|dictsort:"ctr" by ctr as events_list_by_countries %}
+        {% for events in events_list_by_countries %}
+            <h3 style="border-top: 1px solid #E6E6E6;padding-top: 10px;padding-left: 15px;">{% if events.grouper == 'z-ctr'%}{% trans "Events without countries" %}{% else %}{{ events.grouper }} ({{ events.list|length }}){% endif %}</h3>
+            {% for team_event in events.list %}
+            <a href="{{ team_event.get_absolute_url }}" title="{{ team_event.name }}" class="event-meetings">
+                <span class="title">{{ team_event.name }}</span>
+                <small>{{ team_event.local_date_begin|date:"D, d N" }}</small>
+                {% if team_event.v != 'z-v' %}
+                    <p>{% if team_event.v.city %}{{ team_event.v.city }}{% endif %}</p>
+                {% endif %}
+            </a>
+            {% endfor %}
+        {% endfor %}
+        </div>
     {% endfor %}
-
-    {% if countries_without_continents %}
-        <thead><tr><th colspan="3">{% trans "Events in countries without continents" %}</th></tr></thead>
-        {% for country in countries_without_continents %}
-        <tr>
-            <td>
-                <a title="{{ team_event.name }}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
-            </td>
-            <td>
-                {{ country.name }}
-                {% for team in team_event.teams.all %}
-                    {% if team_event.venue.city %}, {{ team_event.venue.city }}{% endif %}
-                {% endfor %}
-            </td>
-            <td>
-                {{ team_event.local_date_begin|date:"D, d N" }}
-            </td>
-        </tr>
-        {% endfor %}
-    {% endif %}
-
-    {% if events_without_venue %}
-        <thead><tr><th colspan="3">{% trans "Events without venue" %}</th></tr></thead>
-            {% for team_event in events_without_venue %}
-            <tr>
-                <td>
-                <a title="{% trans 'More Information about Team Event' %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
-                </td>
-                <td>
-                    {% for team in team_event.teams.all %}
-                        {{team.country}}
-                    {% endfor %}
-                </td>
-                <td>
-                    {{ team_event.local_date_begin|date:"D, d N" }}
-                </td>
-            </tr>
-            {% endfor %}
-    {% endif %}
-    </table>
-{% endif %}
+</div>
+
+{% endif %}
\ No newline at end of file