Changeset 1056 for pykota/trunk

Timestamp:

07/02/03 11:29:12 (21 years ago)

Author:

jalet

Message:

Bug fixed when wanting a report and an user/group was limited by account balance

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/reporters/text.py (modified) (2 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.10 :
+    
+        - Bug fixed wrt quota reports when print limiting is by 
+          account balance.
+          
     - 1.09 :
     

pykota/trunk/pykota/reporters/text.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.2  2003/07/02 09:29:12  jalet
+# Bug fixed when wanting a report and an user/group was limited by account balance
+#
 # Revision 1.1  2003/06/30 12:46:15  jalet
 # Extracted reporting code.
@@ -81 +84 @@
         lifetimepaid = float(entry.LifeTimePaid or 0.0)
         
-        if quota.DateLimit is not None :
-            now = DateTime.now()
-            datelimit = DateTime.ISO.ParseDateTime(quota.DateLimit)
-            if now >= datelimit :
+        if entry.LimitBy.lower() == "balance" :    
+            if balance <= 0 :
                 datelimit = "DENY"
-        elif (quota.HardLimit is not None) and (pagecounter >= quota.HardLimit) :    
-            datelimit = "DENY"
-        elif (quota.HardLimit is None) and (quota.SoftLimit is not None) and (pagecounter >= quota.SoftLimit) :
-            datelimit = "DENY"
-        else :    
-            datelimit = ""
-            
-        if entry.LimitBy.lower() == "balance" :    
-            reached = (((balance <= 0) and "+") or "-") + "B"
+                reached = "+B"
+            else :    
+                datelimit = ""
+                reached = "-B"
         else :
+            if quota.DateLimit is not None :
+                now = DateTime.now()
+                datelimit = DateTime.ISO.ParseDateTime(quota.DateLimit)
+                if now >= datelimit :
+                    datelimit = "DENY"
+            elif (quota.HardLimit is not None) and (pagecounter >= quota.HardLimit) :    
+                datelimit = "DENY"
+            elif (quota.HardLimit is None) and (quota.SoftLimit is not None) and (pagecounter >= quota.SoftLimit) :
+                datelimit = "DENY"
+            else :    
+                datelimit = ""
             reached = (((quota.SoftLimit is not None) and (pagecounter >= quota.SoftLimit) and "+") or "-") + "Q"
             

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.09_unofficial"
+__version__ = "1.10_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""