Changeset 1285 for pykota/trunk/bin

Timestamp:

01/12/04 23:43:40 (20 years ago)

Author:

jalet

Message:

New formula to compute a job's price

Location:

pykota/trunk/bin

Files:

• cupspykota (modified) (2 diffs)
• pykotme (modified) (2 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.22  2004/01/12 22:43:40  jalet
+# New formula to compute a job's price
+#
 # Revision 1.21  2004/01/12 18:17:36  jalet
 # Denied jobs weren't stored into the history anymore, this is now fixed.
@@ -192 +195 @@
             
             # update the quota for the current user on this printer 
-            jobprice = (float(printer.PricePerPage or 0.0) * jobsize) + float(printer.PricePerJob or 0.0)
-            if jobsize :
-                self.logdebug("Updating user %s's quota on printer %s" % (user.Name, printer.Name))
-                userpquota.increasePagesUsage(jobsize)
+            self.logdebug("Updating user %s's quota on printer %s" % (user.Name, printer.Name))
+            jobprice = userpquota.increasePagesUsage(jobsize)
             
             # adds the current job to history    

pykota/trunk/bin/pykotme

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.7  2004/01/12 22:43:40  jalet
+# New formula to compute a job's price
+#
 # Revision 1.6  2004/01/08 14:10:32  jalet
 # Copyright year changed.
@@ -157 +160 @@
         print _("Job size : %i pages") % nbpages    
         for printer in printers :
-            cost = (nbpages * float(printer.PricePerPage or 0)) + float(printer.PricePerJob or 0)
+            userpquota = self.storage.getUserPQuota(user, printer)
+            cost = userpquota.computeJobPrice(nbpages)
             print _("Cost on printer %s : %.2f") % (printer.Name, cost)