Changeset 1418

Timestamp:

03/24/04 16:15:24 (20 years ago)

Author:

jalet

Message:

Began integration of Henrik Janhagen's work on quota-then-balance
and balance-then-quota

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (3 diffs)
• pykota/reporter.py (modified) (3 diffs)
• pykota/storage.py (modified) (2 diffs)

pykota/trunk/bin/edpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.71  2004/03/24 15:15:24  jalet
+# Began integration of Henrik Janhagen's work on quota-then-balance
+# and balance-then-quota
+#
 # Revision 1.70  2004/02/27 09:23:21  jalet
 # Minor code reorganisation
@@ -320 +324 @@
                        by its account balance or by its page quota.
                        The default value is 'quota'. Allowed values
-                       are 'quota' and 'balance'.
+                       are 'quota' 'balance' 'quota-then-balance' and
+                       'balance-then-quota'.
                        
   -b | --balance b     Sets the user's account balance to b.                     
@@ -467 +472 @@
         if limitby :
             limitby = limitby.strip().lower()
-        if limitby and (limitby not in ('quota', 'balance')) :    
+        if limitby and (limitby not in ('quota', 'balance', 'quota-then-balance', 'balance-then-quota')) :    
             raise PyKotaToolError, _("Invalid limitby value %s") % options["limitby"]
             

pykota/trunk/pykota/reporter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.8  2004/03/24 15:15:24  jalet
+# Began integration of Henrik Janhagen's work on quota-then-balance
+# and balance-then-quota
+#
 # Revision 1.7  2004/01/08 14:10:32  jalet
 # Copyright year changed.
@@ -96 +100 @@
         balance = float(entry.AccountBalance or 0.0)
         lifetimepaid = float(entry.LifeTimePaid or 0.0)
-        
+        
+        #balance
         if entry.LimitBy and (entry.LimitBy.lower() == "balance") :    
             if balance <= 0 :
@@ -107 +112 @@
                 datelimit = ""
                 reached = "-B"
+
+        #balance-then-quota
+        elif entry.LimitBy and (entry.LimitBy.lower() == "balance-then-quota") :
+            if balance <= 0 :
+                if (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"
+                elif quota.DateLimit is not None :
+                    now = DateTime.now()
+                    datelimit = DateTime.ISO.ParseDateTime(quota.DateLimit)
+                    if now >= datelimit :
+                        datelimit = "QUOTA_DENY"
+                else :
+                    datelimit = ""
+                reached = ( ((datelimit == "DENY" ) and "+B") or "-Q")
+                datelimit = ( ((datelimit == "QUOTA_DENY") and "DENY") or datelimit)
+            elif balance <= self.tool.config.getPoorMan() :
+                if (quota.HardLimit is not None) and (pagecounter >= quota.HardLimit) :
+                    datelimit = "WARNING"
+                elif (quota.HardLimit is None) and (quota.SoftLimit is not None) and (pagecounter >= quota.SoftLimit) :
+                    datelimit = "WARNING"
+                elif quota.DateLimit is not None :
+                    now = DateTime.now()
+                    datelimit = DateTime.ISO.ParseDateTime(quota.DateLimit)
+                    if now >= datelimit :
+                        datelimit = "QUOTA_DENY"
+                else :
+                    datelimit = ""
+                reached = ( ((datelimit == "WARNING" ) and "?B") or "+Q")
+                datelimit = ( ((datelimit == "QUOTA_DENY") and "WARNING") or datelimit)
+            else :
+                datelimit = ""
+                reached = "-B"
+
+        #Quota-then-balance
+        elif entry.LimitBy and (entry.LimitBy.lower() == "quota-then-balance") :
+            if (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"
+            elif quota.DateLimit is not None :
+                now = DateTime.now()
+                datelimit = DateTime.ISO.ParseDateTime(quota.DateLimit)
+                if now >= datelimit :
+                    datelimit = "DENY"
+            else :
+                datelimit = ""
+                
+            reached = (((quota.SoftLimit is not None) and (pagecounter >= quota.SoftLimit) and "+") or "-") + "Q"
+
+            if (datelimit == "DENY") and (reached == "-Q") and (balance > self.tool.config.getPoorMan()) :
+                datelimit = ""
+                reached = "-B"
+            else :
+                reached = (((datelimit == "DENY") and (self.tool.config.getPoorMan() < balance ) and "-B") or reached)
+                if (datelimit == "DENY") and (self.tool.config.getPoorMan() < balance) :
+                    datelimit = ""
+                reached = (((datelimit == "DENY") and (0.0 < balance <= self.tool.config.getPoorMan()) and "?B") or reached)
+                datelimit = (((datelimit == "DENY") and (0.0 < balance <= self.tool.config.getPoorMan()) and "WARNING") or datelimit)
+
+        #Quota
         else :
             if (quota.HardLimit is not None) and (pagecounter >= quota.HardLimit) :    

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.51  2004/03/24 15:15:24  jalet
+# Began integration of Henrik Janhagen's work on quota-then-balance
+# and balance-then-quota
+#
 # Revision 1.50  2004/03/09 08:05:27  jalet
 # Small fix : only keeps existing quota entries when searching parents
@@ -235 +239 @@
         except AttributeError :    
             limitby = "quota"
-        if limitby in ["quota", "balance"] :
+        if limitby in ["quota", "balance", "quota-then-balance", "balance-then-quota"] :
             self.parent.writeUserLimitBy(self, limitby)
             self.LimitBy = limitby