Changeset 2340

Timestamp:

07/03/05 23:47:57 (19 years ago)

Author:

jerome

Message:

More work on billing codes.
Some typos fixed in Docstrings.

Location:

pykota/trunk

Files:

• bin/pkbcodes (modified) (1 diff)
• pykota/storage.py (modified) (6 diffs)

pykota/trunk/bin/pkbcodes

@@ -49 +49 @@
 
   -d | --delete        Deletes billing codes from PyKota's database.
+                       NB : the history entries with this billing code
+                       are not deleted, voluntarily.
 
   -D | --description d Adds a textual description to billing codes.

pykota/trunk/pykota/storage.py

@@ -99 +99 @@
         else :    
             self.parent.commitTransaction()
+            self.Exists = 0
         
 class StorageGroup(StorageObject) :        
@@ -129 +130 @@
         else :    
             self.parent.commitTransaction()
+            self.Exists = 0
         
 class StoragePrinter(StorageObject) :
@@ -176 +178 @@
         self.parent.writePrinterPrices(self)
         
-    def setDescription(self, description = None) :    
-        """Sets the printer's prices."""
+    def setDescription(self, description=None) :
+        """Sets the printer's description."""
         if description is None :
             description = self.Description
@@ -194 +196 @@
         else :    
             self.parent.commitTransaction()
+            self.Exists = 0    
         
 class StorageUserPQuota(StorageObject) :
@@ -301 +304 @@
                     upq.PageCounter = int(upq.PageCounter or 0) + jobsize
                     upq.LifePageCounter = int(upq.LifePageCounter or 0) + jobsize
+                # TODO : consume from the billing code as well
             except PyKotaStorageError, msg :    
                 self.parent.rollbackTransaction()
@@ -412 +416 @@
         self.PrinterName = printer.Name # not needed
         self.Printer = printer
+        
+class StorageBillingCode(StorageObject) :
+    """Billing code class."""
+    def __init__(self, parent, name) :
+        StorageObject.__init__(self, parent)
+        self.BillingCode = name
+        self.Description = None
+        self.PageCounter = None
+        self.Balance = None
+        
+    def delete(self) :    
+        """Deletes the billing code from the database."""
+        self.parent.deleteBillingCode(self)
+        self.Exists = 0
+        
+    def reset(self, pagecounter=0, balance=0.0) :    
+        """Resets the pagecounter and balance for this billing code."""
+        self.parent.setBillingCodeValues(self, pagecounter, balance)
+        self.PageCounter = pagecounter
+        self.Balance = balance
+        
+    def setDescription(self, description=None) :
+        """Modifies the description for this billing code."""
+        if description is None :
+            description = self.Description
+        else :    
+            self.Description = str(description)
+        self.parent.writeBillingCodeDescription(self)
+        
+    def consume(self, pages, price) :
+        """Consumes some pages and credits for this billing code."""
+        if pages :
+           self.parent.consumeBillingCode(self, pages, price)
+           self.PageCounter += pages
+           self.Balance -= price
         
 class BaseStorage :