From cede815e9314290227f18156b93f8020041381d6 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Thu, 5 Oct 2017 09:08:40 +0200
Subject: Support des catégories iCalendar

---
 feeds.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'feeds.py')

diff --git a/feeds.py b/feeds.py
index 564b285..c2c5b14 100644
--- a/feeds.py
+++ b/feeds.py
@@ -29,7 +29,7 @@ from .templatetags.rooms import format_rooms
 from .utils import get_current_or_next_week, get_week, group_courses
 
 ICAL_NAMES = ["uid", "summary", "description", "location",
-              "start", "dtstart", "dtend", "dtstamp"]
+              "start", "dtstart", "dtend", "dtstamp", "categories"]
 
 
 class IcalFeedGenerator(SyndicationFeed):
@@ -66,6 +66,9 @@ class IcalFeed(Feed):
         else:
             return group
 
+    def item_categories(self, item):
+        return (item.type,)
+
     def item_description(self, item):
         return item.notes
 
-- 
cgit v1.2.1


From 12184b16e97d9f5c6c99d6bfe79b1e5c53464fb3 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 20 Oct 2017 17:46:37 +0200
Subject: Ajout d’un calendrier ICS spécifique pour un groupe qui ne prend pas
 en compte les parents

---
 feeds.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'feeds.py')

diff --git a/feeds.py b/feeds.py
index c2c5b14..66be12e 100644
--- a/feeds.py
+++ b/feeds.py
@@ -87,6 +87,11 @@ class IcalFeed(Feed):
                 "location": format_rooms(item.rooms.all())}
 
 
+class IcalOnlyOneFeed(IcalFeed):
+    def items(self, obj):
+        return Course.objects.filter(groups=obj).order_by("begin")
+
+
 class RSSFeed(Feed):
     def get_object(self, request, year_slug, timetable_slug, group_slug):
         year, week = get_current_or_next_week()
-- 
cgit v1.2.1


From 2d68777e50e261cb793186321947b677ed9de692 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 1 Nov 2017 15:20:55 +0100
Subject: Correction des crashes provoqués lors de la génération des ICS
 lorsque le type d’un cours est nul.

---
 feeds.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'feeds.py')

diff --git a/feeds.py b/feeds.py
index 66be12e..aced5e6 100644
--- a/feeds.py
+++ b/feeds.py
@@ -75,6 +75,11 @@ class IcalFeed(Feed):
     def item_link(self, item):
         return ""
 
+    def item_summary(self, item):
+        if item.type is not None:
+            return item.name + " (" + item.type + ")"
+        return item.name
+
     def items(self, obj):
         return Course.objects.get_courses_for_group(obj)
 
@@ -83,7 +88,7 @@ class IcalFeed(Feed):
                 "dtstart": item.begin,
                 "dtend": item.end,
                 "dtstamp": item.last_update,
-                "summary": item.name + " (" + item.type + ")",
+                "summary": self.item_summary(item),
                 "location": format_rooms(item.rooms.all())}
 
 
-- 
cgit v1.2.1