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

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2008-09-02 11:41:35 +0200 (Tue, 02 Sep 2008)
New Revision: 112

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/model/case.py
Log:
Phases: phases are now stored in the master_tbl


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-02 09:07:36 UTC (rev 111)
+++ waska/trunk/ChangeLog.txt	2008-09-02 09:41:35 UTC (rev 112)
@@ -1,5 +1,9 @@
 2008-09-02  Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
+	* waskaweb/model/case.py:  phase is now stored in the master_tbl
+
+2008-09-02  Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
 	* waskaweb/lib/xmlimport.py: Updated checking dictionaries from FormEd.
 
 2008-09-02  Sascha L. Teichmann <sascha.teichmann at intevation.de>
@@ -12,7 +16,7 @@
 
 2008-09-01  Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
-	* formed/formedtree_web.xml: FormE tree from setup.
+	* formed/formedtree_web.xml: FormEd tree from setup.
 
 2008-09-01	Torsten Irlaender  <torsten.irlaender at intevation.de>
 

Modified: waska/trunk/waskaweb/model/case.py
===================================================================
--- waska/trunk/waskaweb/model/case.py	2008-09-02 09:07:36 UTC (rev 111)
+++ waska/trunk/waskaweb/model/case.py	2008-09-02 09:41:35 UTC (rev 112)
@@ -73,7 +73,7 @@
     m.zeitraum_nachbetreuung AS cm_beendet, 
     m.art_beendigung AS cm_abbruch, 
     getLastCaseAppointment(m.id) AS letzer_termin,
-    s.phase AS phase
+    m.phase AS phase
 FROM ka_status_tbl_view s JOIN master_tbl_view m ON m.id = s.master_id 
 WHERE s.master_id = %(id)s
 """