Changeset 4e85d600f1de1c5d436e7c313e857864685d87d4 in indico

Timestamp:

01/10/12 11:56:28 (4 months ago)

Author:

Alberto Resco Perez <alberto.resco.perez@…>

Children:

d000ed6e4ca1695ad7169e63ab4b8fbdb90d9ff7

Parents:

d250c39ec10423159d3ee0c682970922ad5c9d5b

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (01/10/12 11:56:28)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (01/16/12 10:31:34)

Message:

[IMP] Do not show TT in weekends if no entries

• If no entries are in the weekends do not add to the dictionary.

Location:

indico/MaKaC

Files:

• schedule.py (modified) (2 diffs)
• webinterface/pages/conferences.py (modified) (1 diff)

indico/MaKaC/schedule.py

@@ -1486 +1486 @@
 
     @staticmethod
-    def process(schedule, tz, aw, days = None, mgmtMode = False, useAttrCache = False):
+    def process(schedule, tz, aw, days = None, mgmtMode = False, useAttrCache = False, hideWeekends = False):
 
         scheduleDict={}
@@ -1508 +1508 @@
                 if day in dates:
                     scheduleDict[day][genId] = resultData
+        if hideWeekends:
+            for entry in scheduleDict.keys():
+                weekDay = datetime.strptime(entry, "%Y%m%d").weekday()
+                if scheduleDict[entry] == {} and (weekDay == 5 or weekDay == 6):
+                    del scheduleDict[entry]
 
         return scheduleDict

indico/MaKaC/webinterface/pages/conferences.py

@@ -1452 +1452 @@
         vars["ttdata"] = json.dumps(schedule.ScheduleToJson.process(self._conf.getSchedule(),
                                                                           tz, self._aw,
-                                                                          useAttrCache = True))
+                                                                          useAttrCache = True,
+                                                                          hideWeekends = True))
         eventInfo = fossilize(self._conf, IConferenceEventInfoFossil, tz = tz)
         eventInfo['isCFAEnabled'] = self._conf.getAbstractMgr().isActive()