Changeset 1203 for pykota/trunk/pykota/accounters

Timestamp:

11/23/03 20:01:37 (20 years ago)

Author:

jalet

Message:

Job price added to history

Location:

pykota/trunk/pykota/accounters

Files:

• external.py (modified) (2 diffs)
• stupid.py (modified) (2 diffs)

pykota/trunk/pykota/accounters/external.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.10  2003/11/23 19:01:36  jalet
+# Job price added to history
+#
 # Revision 1.9  2003/11/21 14:28:45  jalet
 # More complete job history.
@@ -107 +110 @@
         
         # adds the current job to history    
-        printer.addJobToHistory(self.filter.jobid, user, self.getLastPageCounter(), action, jobsize, self.filter.preserveinputfile, self.filter.title, self.filter.copies, self.filter.options)
+        jobprice = (float(printer.PricePerPage or 0.0) * jobsize) + float(printer.PricePerJob or 0.0)
+        printer.addJobToHistory(self.filter.jobid, user, self.getLastPageCounter(), action, jobsize, jobprice, self.filter.preserveinputfile, self.filter.title, self.filter.copies, self.filter.options)
         
         self.endJob(printer, user)

pykota/trunk/pykota/accounters/stupid.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.8  2003/11/23 19:01:37  jalet
+# Job price added to history
+#
 # Revision 1.7  2003/11/21 14:28:46  jalet
 # More complete job history.
@@ -109 +112 @@
         
         # adds the current job to history    
-        printer.addJobToHistory(self.filter.jobid, user, counterbeforejob, action, jobsize, self.filter.preserveinputfile, self.filter.title, self.filter.copies, self.filter.options)
+        jobprice = (float(printer.PricePerPage or 0.0) * jobsize) + float(printer.PricePerJob or 0.0)
+        printer.addJobToHistory(self.filter.jobid, user, counterbeforejob, action, jobsize, jobprice, self.filter.preserveinputfile, self.filter.title, self.filter.copies, self.filter.options)
             
         return action