Changeset 9b342a in indico

Timestamp:

06/09/11 11:11:38 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

880a3e, 2810d8

Parents:

699502

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (06/09/11 10:48:56)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (06/09/11 11:11:38)

Message:

[FIX] Make evaluation alarms work

Location:

indico

Files:

• MaKaC/evaluation.py (modified) (10 diffs)
• modules/scheduler/module.py (modified) (1 diff)
• modules/scheduler/tasks.py (modified) (1 diff)

indico/MaKaC/evaluation.py

@@ -28 +28 @@
 from MaKaC.common.info import HelperMaKaCInfo
 from MaKaC.common.Counter       import Counter
-from MaKaC.common.timerExec     import Alarm
 from MaKaC.i18n import _
 from pytz import timezone
 from MaKaC.common.timezoneUtils import nowutc
+
+from indico.modules.scheduler import Client
+from indico.modules.scheduler.tasks import AlarmTask
 
 
@@ -86 +88 @@
     def removeReferences(self):
         """remove all pointers to other objects."""
-        self._conf = None
         self.removeAllAlarms()
         self.removeAllNotifications()
         self.removeAllQuestions()
         self.removeAllSubmissions()
+        self._conf = None
 
     def clone(self, conference):
@@ -224 +226 @@
     def setStartDate( self, sd ):
         self.startDate = datetime(sd.year,sd.month,sd.day,0,0,0)
+        for nid, notif in self.getNotifications().iteritems():
+            if isinstance(notif, EvaluationAlarm):
+                if notif.getStartOn() != sd:
+                    notif.move(sd)
+
     def getStartDate( self ):
         if not hasattr(self, "startDate") or self.startDate==datetime(1,1,1,0,0,0):
@@ -412 +419 @@
         elif notificationKey == self._EVALUATION_START :
             notification = self.getNotification(notificationKey)
-            if notification != None :
+            if notification != None:
                 from MaKaC.webinterface import urlHandlers
                 alarm = self.getAlarm(notificationKey)
@@ -419 +426 @@
                     self.getConference().addAlarm(alarm)
                     self.getAlarms()[notificationKey] = alarm
+
                     self.notifyModification()
-                    alarm.initialiseToAddr()
+                else:
+                    if self.getStartDate() != alarm.getStartOn():
+                        alarm.move(self.getStartDate())
+
                 alarm.setFromAddr( HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail() )
-                alarm.setStartDate(self.getStartDate())
                 alarm.setToAddrList(notification.getToList())
                 alarm.setCcAddrList(notification.getCCList())
@@ -432 +442 @@
         """Remove given Alarm."""
         if alarm != None :
-            if self.getConference().getAlarmById(alarm.getId())!=None :
+            if self.getConference().getAlarmById(alarm.getConfRelativeId()) != None :
                 self.getConference().removeAlarm(alarm)
             else :
@@ -441 +451 @@
         """remove all alarms."""
         alarms = self.getAlarms()
+
         for alarm in alarms.values() :
             self.getConference().removeAlarm(alarm)
@@ -462 +473 @@
 
 
-class EvaluationAlarm(Alarm):
+class EvaluationAlarm(AlarmTask):
     """Suited alarm for an evaluation."""
 
     def __init__(self, evaluation, notificationKey):
         self._evaluation = evaluation
-        self.notificationKey = notificationKey #cf Evaluation._ALL_NOTIFICATIONS
-        Alarm.__init__(self, evaluation.getConference())
+        self.notificationKey = notificationKey  #cf Evaluation._ALL_NOTIFICATIONS
+        super(EvaluationAlarm, self).__init__(evaluation.getConference(),
+                                              'Eval_%s' % notificationKey,
+                                              evaluation.getStartDate())
 
     def setEvaluation(self, evaluation):
@@ -478 +491 @@
         return self._evaluation
 
-    def setNotificationKey(self, notificationKey): #cf Evaluation._ALL_NOTIFICATIONS
+    def setNotificationKey(self, notificationKey):
         self.notificationKey = notificationKey
 
-    def getNotificationKey(self): #cf Evaluation._ALL_NOTIFICATIONS
+    def getNotificationKey(self):
         if not hasattr(self, "notificationKey"):
             self.notificationKey = None
         return self.notificationKey
 
+    def move(self, newDate):
+        c = Client()
+        c.moveTask(self, newDate)
+
     def delete(self):
         evaluation = self.getEvaluation()
-        if evaluation != None :
+        if evaluation != None:
             evaluation.removeAlarm(self)
         self.setEvaluation(None)
         Alarm.delete(self)
 
-    def prerun(self):
-        """returns True if aborted, False otherwise."""
-        #date checking...
+    def _prepare(self, check=True):
+
+        # date checking...
         from MaKaC.conference import ConferenceHolder
         evaluation = self.getEvaluation()
@@ -502 +519 @@
         today = nowutc().date()
         if not ConferenceHolder().hasKey(self.conf.getId()) or \
-                evaluation.getNbOfQuestions()<1 or \
+                evaluation.getNbOfQuestions() < 1 or \
                 not evaluation.isVisible() or \
-                notificationKey==Evaluation._EVALUATION_START and evalEndDate<today :
+                (notificationKey == Evaluation._EVALUATION_START and \
+                evalEndDate < today and check):
             self.conf.removeAlarm(self)
-            return True #email aborted
-        return False #email ok
+            self.suicide()
+            return False  # email aborted
+        return True  # email ok
 
 

indico/modules/scheduler/module.py

@@ -147 +147 @@
             self._p_changed = True
         except ValueError:
-            logging.getLogger('scheduler').exception()
+            logging.getLogger('scheduler').exception("Problem removing running task: %s" % self._runningList)
 
     def moveTask(self, task, moveFrom, status, occurrence=None, nocheck=False):

indico/modules/scheduler/tasks.py

@@ -77 +77 @@
 
     def __cmp__(self, obj):
-        if self.id == obj.id and self.id == None:
+        if obj == None:
+            return 1
+        elif (not isinstance(obj, BaseTask) or \
+              self.id == obj.id and self.id == None):
             return cmp(hash(self), hash(obj))
         else: