671 filtering activities by label

amelie/activities/templates/activity_list.html

@@ -41,7 +41,6 @@ <h2>{% trans "Activities you don't want to miss" %}</h2>
                                 {% if not only_open_enrollments or activity.enrollment_open %}
                                 <tr{% if activity.dutch_activity %} class="dutch-only"{% endif %}>
                                     <td class="activity-list-date">
-
                                         <a href="{{ activity.get_calendar_url }}">
                                             <span class="icon icon-calendar"
                                                   title="{% trans 'iCal document with activity' %}"></span>
@@ -50,15 +49,21 @@ <h2>{% trans "Activities you don't want to miss" %}</h2>
                                         {{ activity.begin|date:"d-b (D)" }}
                                     </td>
                                     <td>
-                                        <div class="activity-list-label"
-                                            style="background: #{{ activity.activity_label.color }};">
-                                            <span class="activity-list-label-name">
-                                                {{ activity.activity_label.name }}
-                                            </span>
-                                        </div>
-                                        <div class="activity-list-label-icon">
-                                            <img src="{{STATIC_URL}}img/icons/{{ activity.activity_label.icon }}.png" alt="{{ activity.activity_label.name }}">
-                                        </div>
+                                        <a
+                                            {% if activity.activity_label.name %}
+                                                href="{% url 'activities:activities_type' act_type=activity.activity_label.name %}"
+                                            {% endif %}
+                                            style="padding: 0px; margin: 0px;"
+                                        >
+                                            <div class="activity-list-label" style="background: #{{ activity.activity_label.color }};">
+                                                <span class="activity-list-label-name">
+                                                    {{ activity.activity_label.name }}
+                                                </span>
+                                            </div>
+                                            <div class="activity-list-label-icon">
+                                                <img src="{{STATIC_URL}}img/icons/{{ activity.activity_label.icon }}.png" alt="{{ activity.activity_label.name }}">
+                                            </div>
+                                        </a>
                                     </td>
                                     <td>
                                         <img class="dutch-indicator" src="{{ STATIC_URL }}img/layout/flag_nl.png"
@@ -79,7 +84,11 @@ <h2>{% trans "Activities you don't want to miss" %}</h2>
                         </table>
                     </div>
                 {% else %}
-                    <p class="icon warning">{% trans 'There are no planned events. Maybe because it is holiday?' %}</p>
+                    {% if act_type %}
+                        <p class="icon warning">{% blocktrans with type=act_type %}It looks like there are no events with label {{ type }}{% endblocktrans %}</p>
+                    {% else %}
+                        <p class="icon warning">{% trans 'There are no planned events. Maybe because it is holiday?' %}</p>
+                    {% endif %}
                 {% endif %}
 
                 {% if request.person.current_committees|length > 0 or request.person.is_board %}

amelie/activities/urls.py

@@ -27,6 +27,7 @@
 urlpatterns = [
     # URLs that are not about a specific activity
     path('', views.activities, name='activities'),
+    path('<str:act_type>', views.activities, name='activities_type'),
     path('old/', views.activities_old, name='activities_old'),
     # URLs about the photo gallery
     path('photos/', views.photos, name='photos'),

amelie/activities/views.py

@@ -114,11 +114,15 @@ def activity_ics(request, pk):
     return resp
 
 
-def activities(request):
+def activities(request, act_type=None):
     """
     Gives an overview of all upcoming activities and recent past activities.
     """
     activities = Event.objects.filter_public(request)
+
+    if act_type:
+        activities = activities.filter(Q(activity__activity_label__name_en=act_type) | Q(activity__activity_label__name_nl=act_type))
+
     old_activities = list(activities.filter(end__lt=timezone.now()))[-10:]
     new_activities = list(activities.filter(end__gte=timezone.now()))
 

amelie/calendar/models.py

@@ -195,7 +195,9 @@ def save(self, *args, **kwargs):
 
     def description_short(self):
         char_limit = 150
-        total_string = f"{self.begin.strftime('%d/%m/%Y, %H:%M')} @{self.location} {self.promo_en}"
+        location_prefix = " @" if self.location is not "" else ""
+        activity_prefix = (self.as_leaf_class().activity_label.name_en + " - ") if self.as_leaf_class().activity_label else ""
+        total_string = f"{activity_prefix}{self.begin.strftime('%d/%m/%Y, %H:%M')}{location_prefix}{self.location} {self.promo_en}"
 
         if len(total_string) > char_limit:
             total_string = total_string[:char_limit] + '...'

amelie/weekmail/templates/weekmail/weekmail_mail_html.mail

@@ -169,4 +169,4 @@
 
 
     </div>
-</body>
+</body>