[Mpuls-commits] r4976 - in wasko/trunk: . waskoweb/controllers

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-05-19 11:53:27 +0200 (Thu, 19 May 2011)
New Revision: 4976

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/controllers/mpuls.py
Log:
Case reminders are shown in the reminder part on the black board.(882)

Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-05-19 09:10:15 UTC (rev 4975)
+++ wasko/trunk/ChangeLog	2011-05-19 09:53:27 UTC (rev 4976)
@@ -1,3 +1,9 @@
+2011-05-19  Ludwig Reiter <ludwig.reiter at intevation.de>
+
+	* waskoweb/controllers/mpuls.py:
+	Case reminders are shown in the reminder part on the black board.
+	This should fix bug 882.
+
 2011-05-19  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* waskoweb/public/xml/eval_analyse.xml: Issue1385: Adapet descriptions
@@ -40,7 +46,6 @@
 	* waskoweb/public/formed/formedtree.xml: Port db_xml2 revision
 	588:a94ddc47172f. This removes the obsolete modes attributes.
 
->>>>>>> .r4974
 2011-04-27 Katharina Schütze <katharina at intevation.de>
 	* waskoweb/public/formed/annotations.xhtml:
 	issue 2013 annotations for "migrationshintergrund" adapted
@@ -264,7 +269,6 @@
 	* waskoweb/templates/casemanagement/new.mako: Remove unused hidden
 	input element "page".
 
->>>>>>> .r4855
 2011-02-01  Torsten Irlaender <torsten at intevation.de>
 
 	* wasko.json: Issue1744: Adapted dates to a new evaluation period

Modified: wasko/trunk/waskoweb/controllers/mpuls.py
===================================================================
--- wasko/trunk/waskoweb/controllers/mpuls.py	2011-05-19 09:10:15 UTC (rev 4975)
+++ wasko/trunk/waskoweb/controllers/mpuls.py	2011-05-19 09:53:27 UTC (rev 4976)
@@ -33,7 +33,7 @@
 from pylons import tmpl_context as c, app_globals as g
 
 from mpulsweb.model.appointment import MaxSaveTimeReminderOverview, \
-                CaseReminderOverview
+                CaseReminderOverview, CaseAppointmentOverview
 from mpulsweb.lib.base import BaseController, render, session
 from mpulsweb.controllers.mpuls import MpulsController
 import mpulsweb.lib.helpers as h
@@ -51,7 +51,17 @@
         
         remindlist = MaxSaveTimeReminderOverview()
         remindlist.join(CaseReminderMaxLength())
+
+        if h.hasRole(['cm']):
+            remindlist.join(CaseReminderOverview())
+
         remindlist.sort()
+        
         return remindlist
 
+    def get_case_appointments(self):
+        """ Return the user's appointments and reminders """
+        
+        appointment_list = CaseAppointmentOverview()
+        return appointment_list