[Mpuls-commits] r123 - in waska/trunk: . waskaweb/model waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2008-09-03 12:56:10 +0200 (Wed, 03 Sep 2008)
New Revision: 123

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/model/case.py
   waska/trunk/waskaweb/templates/casemanagement/main.mako
Log:
Load current phase from database and displa it in case digest.


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-03 10:38:22 UTC (rev 122)
+++ waska/trunk/ChangeLog.txt	2008-09-03 10:56:10 UTC (rev 123)
@@ -1,5 +1,11 @@
 2008-09-03  Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
+	* waskaweb/templates/casemanagement/main.mako: Show current phase in case digest
+
+	* waskaweb/model/case.py: Removed '#' before loading of phase from database.
+
+2008-09-03  Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
 	* waskaweb/model/phase_transition.py: New. Transition table for phase model.
 	  Contains descption strings for phases, too.
 

Modified: waska/trunk/waskaweb/model/case.py
===================================================================
--- waska/trunk/waskaweb/model/case.py	2008-09-03 10:38:22 UTC (rev 122)
+++ waska/trunk/waskaweb/model/case.py	2008-09-03 10:56:10 UTC (rev 123)
@@ -54,6 +54,8 @@
 from waskaweb.model.statement import PrivacyStatement, AidPlanStatement, DiscretionStatement
 from waskaweb.model.document import listDocuments 
 
+from waskaweb.model.phase_transition import phase_description
+
 from waskaweb.lib.helpers import dd_mm_yyyy_HH_MM, dd_mm_YYYY
 
 from os import tmpnam, unlink
@@ -1081,7 +1083,7 @@
                 self._last_date  = result.get('letzer_termin')
                 self.cm_finished = result.get('cm_beendet')
                 self.cm_canceled = result.get('cm_abbruch')
-                #self.phase       = result.get('phase')
+                self.phase       = result.get('phase')
             finally:
                 db.recycleConnection(conn, cur)
         except:
@@ -1143,6 +1145,9 @@
     def getPhase(self):
         return self.phase
 
+    def getPhaseDescription(self):
+        return phase_description(self.phase)
+
     def getAccessTime(self, format=None):
         if format:
             try:

Modified: waska/trunk/waskaweb/templates/casemanagement/main.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/main.mako	2008-09-03 10:38:22 UTC (rev 122)
+++ waska/trunk/waskaweb/templates/casemanagement/main.mako	2008-09-03 10:56:10 UTC (rev 123)
@@ -14,14 +14,15 @@
 </%def>
 
 <%def name="buildInfofield()">
+  <% case = session.get('case') %>
   <div id="infofield">
     <strong>${_('cm_info_name')}:</strong>
-       ${h.getCaseShort(session.get('case').first_name, 15) | F.NA, h} 
-       ${h.getCaseShort(session.get('case').last_name, 15)  | F.NA, h}<br>
-    <strong>${_('cm_info_phase')}:</strong> Beratung (läuft)<br>
+       ${h.getCaseShort(case.first_name, 15) | F.NA, h} 
+       ${h.getCaseShort(case.last_name, 15)  | F.NA, h}<br>
+    <strong>${_('cm_info_phase')}:</strong> ${ case.getState().getPhaseDescription() | h }<br>
     <strong>${_('cm_info_status')}:</strong>
-       ${session.get('case').getState().getStateLabel()  | F.NA, h}<br>
-    <strong>${_('cm_info_nr')}:</strong> ${session.get('case').knr | F.NA, h}
+       ${case.getState().getStateLabel()  | F.NA, h}<br>
+    <strong>${_('cm_info_nr')}:</strong> ${case.knr | F.NA, h}
   </div>
 </%def>