Changeset 929 for pykota/trunk/bin

Timestamp:

04/17/03 11:26:21 (22 years ago)

Author:

jalet

Message:

repykota now reports account balances too.

Files:

• pykota/trunk/bin/repykota (modified) (5 diffs)

pykota/trunk/bin/repykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.27  2003/04/17 09:26:21  jalet
+# repykota now reports account balances too.
+#
 # Revision 1.26  2003/04/16 12:35:49  jalet
 # Groups quota work now !
@@ -177 +180 @@
             print _("Pages grace time: %idays") % self.config.getGraceDelay(printer)
             total = 0
+            totalmoney = 0.0
             if options["groups"] :
-                print _("Group            used     soft     hard   grace        total")
-                print "------------------------------------------------------------"
+                print _("Group           used    soft    hard    balance grace         total       paid") 
+                print "------------------------------------------------------------------------------"
                 for (ident, name) in self.storage.getPrinterGroups(printerid) :
                     quota = self.storage.getGroupPQuota(ident, printerid) 
-                    total += self.printQuota(name, quota)
+                    balance = self.storage.getGroupBalance(ident)
+                    limitby = self.storage.getGroupLimitBy(ident)
+                    (pages, money) = self.printQuota(name, quota, balance, limitby)
+                    total += pages
+                    totalmoney += money
             else :
                 # default is user quota report
-                print _("User             used     soft     hard   grace        total")
-                print "------------------------------------------------------------"
+                print _("User            used    soft    hard    balance grace         total       paid") 
+                print "------------------------------------------------------------------------------"
                 for (ident, name) in self.storage.getPrinterUsers(printerid) :
                     quota = self.storage.getUserPQuota(ident, printerid)
-                    total += self.printQuota(name, quota)
-            if total :        
-                print (" " * 43) + (_("Total : %9i") % total)
+                    balance = self.storage.getUserBalance(ident)
+                    limitby = self.storage.getUserLimitBy(ident)
+                    (pages, money) = self.printQuota(name, quota, balance, limitby)
+                    total += pages
+                    totalmoney += money
+            if total or totalmoney :        
+                print (" " * 50) + (_("Total : %9i") % total) + (" %-12.12s" % ("%7.2f" % totalmoney)[:12])
             printerpagecounter = self.storage.getPrinterPageCounter(printerid)
             try :
@@ -197 +209 @@
             except TypeError :     
                 msg = _("unknown")
-            print (" " * 44) + (_("Real : %s") % msg)
+            print (" " * 51) + (_("Real : %s") % msg)
             print        
+        if options["groups"] :    
+            print _("Totals may be inaccurate if some users are members of several groups.")
                         
-    def printQuota(self, name, quota) :
+    def printQuota(self, name, quota, balance, limitby) :
         """Prints the quota information."""
         if quota is not None :
@@ -208 +222 @@
             hardlimit = quota["hardlimit"]
             datelimit = quota["datelimit"]
+            if balance is not None :
+                (balance, lifetimepaid) = balance
+            else :    
+                (balance, lifetimepaid) = 0.0
             if datelimit is not None :
                 now = DateTime.now()
@@ -215 +233 @@
             else :    
                 datelimit = ""
-            reached = ((softlimit is not None) and (pagecounter >= softlimit) and "+") or "-"
-            print "%-10.10s %c %8i %8s %8s %10s %9i" % (name, reached, pagecounter, str(softlimit), str(hardlimit), str(datelimit)[:10], lifepagecounter)
-            return lifepagecounter
+            if limitby == "balance" :    
+                reached = (((balance <= 0) and "+") or "-") + "B"
+            else :
+                reached = (((softlimit is not None) and (pagecounter >= softlimit) and "+") or "-") + "Q"
+            strbalance = ("%5.2f" % balance)[:10]
+            strlifetimepaid = ("%6.2f" % lifetimepaid)[:11]
+            print "%-9.9s %s %7i %7s %7s %10s %-10.10s %8i %-11.11s" % (name, reached, pagecounter, str(softlimit), str(hardlimit), strbalance, str(datelimit)[:10], lifepagecounter, strlifetimepaid)
+            return (lifepagecounter, lifetimepaid)