[Mpuls-commits] r167 - in waska/trunk: . waskaweb/lib waskaweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-09-16 16:02:39 +0200 (Tue, 16 Sep 2008)
New Revision: 167

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/lib/evaluation.py
   waska/trunk/waskaweb/model/phase_transition.py
   waska/trunk/waskaweb/model/phases_factory.py
Log:
Changed description of phase "Clearing" to "Eingangsanamnese"


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-16 08:44:33 UTC (rev 166)
+++ waska/trunk/ChangeLog.txt	2008-09-16 14:02:39 UTC (rev 167)
@@ -13,6 +13,12 @@
 	  waskaweb/templates/casemanagement/phase.mako: Small layout changes
 	  on phase page.
 
+	Changed description of phase "Clearing" to "Eingangsanamnese"
+
+	* waskaweb/model/phase_transition.py,
+	  waskaweb/model/phases_factory.py,
+	  waskaweb/lib/evaluation.py: Changed naming
+
 2008-09-15	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Added support for displaying only relevant phases (commented out yet).

Modified: waska/trunk/waskaweb/lib/evaluation.py
===================================================================
--- waska/trunk/waskaweb/lib/evaluation.py	2008-09-16 08:44:33 UTC (rev 166)
+++ waska/trunk/waskaweb/lib/evaluation.py	2008-09-16 14:02:39 UTC (rev 167)
@@ -62,7 +62,7 @@
                 self.total_valid = c1.fetchone()[0]
 
                 # All "beratungsfälle" (valid)
-                c1.execute("""SELECT count(id) from master_tbl_eval_total_view m WHERE phase IN (5,6) AND %s""" % self.where_clause(self.compressed_ids))
+                c1.execute("""SELECT count(id) from master_tbl_eval_total_view m WHERE phase IN (0,1,5,6) AND %s""" % self.where_clause(self.compressed_ids))
                 self.total_valid_beratung = c1.fetchone()[0]
 
                 # All "cm-fälle" (valid)

Modified: waska/trunk/waskaweb/model/phase_transition.py
===================================================================
--- waska/trunk/waskaweb/model/phase_transition.py	2008-09-16 08:44:33 UTC (rev 166)
+++ waska/trunk/waskaweb/model/phase_transition.py	2008-09-16 14:02:39 UTC (rev 167)
@@ -43,8 +43,8 @@
 # dictionary for GUI
 PHASE_DESCRIPTIONS = {
     UNKNOWN        : u"Unbekannt",
-    CLEAR_START    : u"Clearing läuft",
-    CLEAR_ENDE     : u"Clearing beendet",
+    CLEAR_START    : u"Eingangsanamnese läuft",
+    CLEAR_ENDE     : u"Eingangsanamnese beendet",
     CM_START       : u"Case-Management läuft",
     CM_ENDE        : u"Case-Management beendet",
     NB_START       : u"Nachbetreuung läuft",

Modified: waska/trunk/waskaweb/model/phases_factory.py
===================================================================
--- waska/trunk/waskaweb/model/phases_factory.py	2008-09-16 08:44:33 UTC (rev 166)
+++ waska/trunk/waskaweb/model/phases_factory.py	2008-09-16 14:02:39 UTC (rev 167)
@@ -259,7 +259,7 @@
         return ',\n'.join(out)
 
 PAIRS = (
-    (CLEAR_START,    CLEAR_ENDE,    u"Clearing"),
+    (CLEAR_START,    CLEAR_ENDE,    u"Eingangs-&#8203;Anamnese"),
     (CM_START,       CM_ENDE,       u"Case-&#8203;Management"),
     (BERATUNG_START, BERATUNG_ENDE, u"Beratung"),
     (NB_START,       NB_ENDE,       u"Nach&shy;betreuung"))