[Mpuls-commits] r2364 - wasko/branches/2.0/mpulsweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-15 10:33:58 +0200 (Thu, 15 Apr 2010)
New Revision: 2364

Modified:
   wasko/branches/2.0/mpulsweb/model/appointment.py
Log:
* mpulsweb/model/appointment.py: Renamed "__" private functions.


Modified: wasko/branches/2.0/mpulsweb/model/appointment.py
===================================================================
--- wasko/branches/2.0/mpulsweb/model/appointment.py	2010-04-15 08:29:32 UTC (rev 2363)
+++ wasko/branches/2.0/mpulsweb/model/appointment.py	2010-04-15 08:33:58 UTC (rev 2364)
@@ -457,8 +457,8 @@
         # longer than maxage.
         # orphaned means that all last appointmentment, aids or the
         # modification date is older than maxage
-        oldAndActive = self.__getOldAndActiveCases(maxage, user)
-        oldAndFinished = self.__getOldAndFinishedCases(maxage, user)
+        oldAndActive = self.getOldAndActiveCases(maxage, user)
+        oldAndFinished = self.getOldAndFinishedCases(maxage, user)
 
         # 1. Load cases of the user so we can so checks regarding the maximum
         # savetime on them
@@ -473,7 +473,7 @@
         for case in old_cases:
             info = oldAndActive[case.id]
             last = info['last_date']
-            appointment = self.__makeAppointment(case, last, maxage,
+            appointment = self.makeAppointment(case, last, maxage,
                                                  finished=False)
             self.appointment_list.append(appointment)
 
@@ -485,11 +485,11 @@
         for case in old_cases:
             info = oldAndFinished[case.id]
             access = info['access']
-            appointment = self.__makeAppointment(case, access, maxage,
+            appointment = self.makeAppointment(case, access, maxage,
                                                  finished=True)
             self.appointment_list.append(appointment)
 
-    def __getOldAndFinishedCases(self, days, user):
+    def getOldAndFinishedCases(self, days, user):
         conn, cur = None, None
         list = {}
         try:
@@ -512,7 +512,7 @@
             db.recycleConnection(conn, cur)
         return False
 
-    def __getOldAndActiveCases(self, days, user):
+    def getOldAndActiveCases(self, days, user):
         conn, cur = None, None
         list = {}
         try:
@@ -534,7 +534,7 @@
             db.recycleConnection(conn, cur)
         return False
 
-    def __makeAppointment(self, case, last_date, maxage, finished):
+    def makeAppointment(self, case, last_date, maxage, finished):
         factory = CaseAppointmentFactory()
         type = 1
         title = u"%s, %s" % (case.last_name, case.first_name)