From ec6ac3179796d002cdb7aef62bd954fb4b27a7e3 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 24 Jan 2018 20:08:18 +0100
Subject: Annulation de la conversion des heures au bon fuseau dans l’ICS. Pour
 cela, on avait besoin d’insérer un objet vTimezone dans l’en-tête du fichier,
 ce qui est assez fastidieux.  À la place, on met une valeur x-wr-timezone
 dans les en-têtes.

Ajout de valeurs calscale, method, x-wr-calname et x-wr-caldesc aux ICS.

Revert "Bon fuseau horaire dans les ICS."

This reverts commit e2bc777f7f988cba945c027aaa27d98aa3913a71.
---
 feeds.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/feeds.py b/feeds.py
index da077f0..c92445f 100644
--- a/feeds.py
+++ b/feeds.py
@@ -21,7 +21,7 @@ from django.db.models.functions import ExtractWeek, ExtractYear
 from django.template import loader
 from django.urls import reverse
 from django.utils.feedgenerator import Atom1Feed, SyndicationFeed
-from django.utils.timezone import localtime
+from django.utils.timezone import get_current_timezone_name
 
 from icalendar import Calendar, Event
 
@@ -40,6 +40,11 @@ class IcalFeedGenerator(SyndicationFeed):
         calendar = Calendar()
         calendar.add("prodid", "-//celcatsanitizer//NONSGML v1.0//EN")
         calendar.add("version", "2.0")
+        calendar.add("calscale", "GREGORIAN")
+        calendar.add("method", "PUBLISH")
+        calendar.add("x-wr-timezone", get_current_timezone_name())
+        calendar.add("x-wr-calname", self.feed["title"])
+        calendar.add("x-wr-caldesc", self.feed["title"])
 
         self.write_events(calendar)
         outfile.write(calendar.to_ical())
@@ -86,12 +91,15 @@ class IcalFeed(Feed):
 
     def item_extra_kwargs(self, item):
         return {"uid": "{0}@celcatsanitizer".format(item.id),
-                "dtstart": localtime(item.begin),
-                "dtend": localtime(item.end),
-                "dtstamp": localtime(item.last_update),
+                "dtstart": item.begin,
+                "dtend": item.end,
+                "dtstamp": item.last_update,
                 "summary": self.item_summary(item),
                 "location": format_rooms(item.rooms.all())}
 
+    def title(self, obj):
+        return "Emploi du temps du groupe {0}".format(obj)
+
 
 class IcalOnlyOneFeed(IcalFeed):
     def items(self, obj):
-- 
cgit v1.2.1


From 605eaafddc2e626dfbce13b6d1c99757562ee971 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 24 Jan 2018 21:15:44 +0100
Subject: Version 0.12.3

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 6d78c7a..3dcdeff 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,7 +13,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION = "0.12.2"
+VERSION = "0.12.3"
 __version__ = VERSION
 
 default_app_config = "edt.apps.EdtConfig"
-- 
cgit v1.2.1