[Mpuls-commits] r950 - in wasko/branches/2.0: . waskaweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-27 16:03:48 +0100 (Wed, 27 Jan 2010)
New Revision: 950

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/model/case.py (State.setData): Remove cm_finished and
cm_canceled parameters and instance variables.
(CaseFactory.loadByName): Remove s_cm_finished and s_cm_canceled
parameters.
(CaseOverview.search): Don't pass row['art_beendigung'] and
row['zeitraum_nachbetreuung'] to loadByName


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-27 14:45:40 UTC (rev 949)
+++ wasko/branches/2.0/ChangeLog	2010-01-27 15:03:48 UTC (rev 950)
@@ -1,5 +1,14 @@
 2010-01-27  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/model/case.py (State.setData): Remove cm_finished and
+	cm_canceled parameters and instance variables.
+	(CaseFactory.loadByName): Remove s_cm_finished and s_cm_canceled
+	parameters.
+	(CaseOverview.search): Don't pass row['art_beendigung'] and
+	row['zeitraum_nachbetreuung'] to loadByName
+
+2010-01-27  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/lib/search.py (SEARCH_CASE_SQL),
 	waskaweb/model/case.py (CaseOverview.search): use the formed names
 	for name, vorname, fn in the search API

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-01-27 14:45:40 UTC (rev 949)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-01-27 15:03:48 UTC (rev 950)
@@ -380,9 +380,7 @@
                                       row['einverstaendniserklaerung'],
                                       row['s_id'],
                                       row['status'],
-                                      row['zugriff'],
-                                      row['zeitraum_nachbetreuung'],
-                                      row['art_beendigung'])
+                                      row['zugriff'])
             self.ds_list.append(case)
         return self.ds_list
 
@@ -426,8 +424,7 @@
         return case
 
     def loadByName(self, id, first_name, last_name, knr, bearbeiter_id,
-                   einverst, s_id, s_state, s_access, s_cm_finished,
-                   s_cm_canceled):
+                   einverst, s_id, s_state, s_access):
         """This method does not actually loads a case from the database. It
         just returns a case object initiated with the provided parameters"""
         case = Case()
@@ -437,8 +434,7 @@
         case.knr        = unicode(str(knr),        'utf-8')
         case.editor     = bearbeiter_id
         case.state      = State()
-        case.state.setData(s_id, id, s_state, s_access, s_cm_finished,
-                           s_cm_canceled)
+        case.state.setData(s_id, id, s_state, s_access)
         case.privacy_statement_signed = einverst in (1, -1) and True or False
         return case
 
@@ -1037,13 +1033,11 @@
 
     last_date = property(getLastDateFromDB)
 
-    def setData(self, id, master_id, state, access, cm_finished, cm_canceled):
+    def setData(self, id, master_id, state, access):
         self.master_id   = master_id
         self.id          = id
         self.state       = state
         self.access      = access
-        self.cm_finished = cm_finished
-        self.cm_canceled = cm_canceled
 
     def _load(self):
         conn, cur = None, None