[Pykafe-commits] SF.net SVN: pykafe: [84] trunk/pykafe

[<jn...@us...>]

Revision: 84
          http://pykafe.svn.sourceforge.net/pykafe/?rev=84&view=rev
Author:   jnmbk
Date:     2007-06-03 09:25:29 -0700 (Sun, 03 Jun 2007)

Log Message:
-----------
price should be calculated by session

Modified Paths:
--------------
    trunk/pykafe/client/session.py
    trunk/pykafe/server/session.py

Modified: trunk/pykafe/client/session.py
===================================================================
--- trunk/pykafe/client/session.py	2007-06-03 16:24:43 UTC (rev 83)
+++ trunk/pykafe/client/session.py	2007-06-03 16:25:29 UTC (rev 84)
@@ -10,9 +10,11 @@
 # Please read the COPYING file.
 #
 
+from PyQt4 import QtCore
+
 import locale, gettext
 locale.setlocale(locale.LC_ALL, "C")
-_ = gettext.translation("pyKafe_client", fallback=True).ugettext
+_ = gettext.translation("pyKafe_server", fallback=True).ugettext
 
 class ClientSession:
     """class for managing client sessions"""
@@ -25,21 +27,15 @@
         self.endTime = None
         self.orders = []
 
-    def isReachable(self):
-        if self.state == 0:
-            return False
+    def calculatePrice(self, config):
+        time = self.startTime.secsTo(QtCore.QDateTime.currentDateTime())
+        if time/60 < int(config.price_fixedpriceminutes):
+            price = float(config.price_fixedprice)
         else:
-            return True
-    def isWorking(self):
-        if self.state == 1:
-            return True
-        else:
-            return False
-    def isLoggedIn(self):
-        if self.state == 2:
-            return True
-        else:
-            return False
+            #TODO: round the price using price_rounding
+            price = float(config.price_onehourprice)/3600 * time
+        return price
+
     def toString(self):
         """returns current state as a string"""
         if self.state == self.notConnected:

Modified: trunk/pykafe/server/session.py
===================================================================
--- trunk/pykafe/server/session.py	2007-06-03 16:24:43 UTC (rev 83)
+++ trunk/pykafe/server/session.py	2007-06-03 16:25:29 UTC (rev 84)
@@ -10,6 +10,8 @@
 # Please read the COPYING file.
 #
 
+from PyQt4 import QtCore
+
 import locale, gettext
 locale.setlocale(locale.LC_ALL, "C")
 _ = gettext.translation("pyKafe_server", fallback=True).ugettext
@@ -25,21 +27,15 @@
         self.endTime = None
         self.orders = []
 
-    def isReachable(self):
-        if self.state == 0:
-            return False
+    def calculatePrice(self, config):
+        time = self.startTime.secsTo(QtCore.QDateTime.currentDateTime())
+        if time/60 < int(config.price_fixedpriceminutes):
+            price = float(config.price_fixedprice)
         else:
-            return True
-    def isWorking(self):
-        if self.state == 1:
-            return True
-        else:
-            return False
-    def isLoggedIn(self):
-        if self.state == 2:
-            return True
-        else:
-            return False
+            #TODO: round the price using price_rounding
+            price = float(config.price_onehourprice)/3600 * time
+        return price
+
     def toString(self):
         """returns current state as a string"""
         if self.state == self.notConnected:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.