[Mpuls-commits] r319 - in wasko/trunk: . waskaweb/controllers waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-03-03 14:42:05 +0100 (Tue, 03 Mar 2009)
New Revision: 319

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/controllers/case_overview.py
   wasko/trunk/waskaweb/templates/casemanagement/search.mako
Log:
Fixed search (phases)


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-03-03 11:46:20 UTC (rev 318)
+++ wasko/trunk/ChangeLog.txt	2009-03-03 13:42:05 UTC (rev 319)
@@ -4,6 +4,12 @@
 
 	* waskaweb/model/case.py: Added missing import of RequiredFields
 
+	Fixed search (phases)
+
+	* waskaweb/templates/casemanagement/search.mako,
+	* waskaweb/controllers/case_overview.py: Changed labeling of phases in
+	  search
+
 2009-03-03	Sascha L. Teichmann	<teichmann at intevation.de>
 
 	Initial code to import XML documents. Parses the documents

Modified: wasko/trunk/waskaweb/controllers/case_overview.py
===================================================================
--- wasko/trunk/waskaweb/controllers/case_overview.py	2009-03-03 11:46:20 UTC (rev 318)
+++ wasko/trunk/waskaweb/controllers/case_overview.py	2009-03-03 13:42:05 UTC (rev 319)
@@ -156,14 +156,12 @@
             phases = []
         if cm_state == 'clearing':
             phases = [0,1]
-        if cm_state == 'before':
-            phases = [6,7]
         if cm_state == 'active':
             phases = [2]
         if cm_state == 'finished':
             phases = [3,4,5]
         if cm_state == 'all':
-            phases = [-1,0,1,2,3,4,5,6,7]
+            phases = [-1,0,1,2,3,4,5]
         phases = '%s' % ";".join("phase:%s" % p for p in phases)
         if phases: search_options.append(phases)
 

Modified: wasko/trunk/waskaweb/templates/casemanagement/search.mako
===================================================================
--- wasko/trunk/waskaweb/templates/casemanagement/search.mako	2009-03-03 11:46:20 UTC (rev 318)
+++ wasko/trunk/waskaweb/templates/casemanagement/search.mako	2009-03-03 13:42:05 UTC (rev 319)
@@ -77,8 +77,7 @@
         <td valign="top">
           <select name="cm_state" id="cm_state">
             <option value="all">Alle</option>
-            <option value="clearing">Eingangsanamnese</option>
-            <option value="before">Beratungskunde</option>
+            <option value="clearing">Eingangsdokumentation</option>
             <option value="active">CM-Laufend</option>
             <option value="finished">CM-Abgeschlossen</option>
             <option value="none">Keine Auswahl</option>