Changeset 1806 for pykota/trunk/bin

Timestamp:

10/12/04 10:58:53 (20 years ago)

Author:

jalet

Message:

Now warnpykota only warns users who have already printed, to not confuse
users who have just opened their account.

Files:

• pykota/trunk/bin/warnpykota (modified) (2 diffs)

pykota/trunk/bin/warnpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.33  2004/10/12 08:58:53  jalet
+# Now warnpykota only warns users who have already printed, to not confuse
+# users who have just opened their account.
+#
 # Revision 1.32  2004/10/11 22:53:05  jalet
 # Postponed string interpolation to help message's output method
@@ -234 +238 @@
             else :
                 for (user, userpquota) in self.storage.getPrinterUsersAndQuotas(printer, ugnames) :
-                    self.warnUserPQuota(userpquota)
+                    # we only want to warn users who have ever printed something
+                    # and don't want to warn users who have never printed
+                    if (user.AccountBalance and (user.AccountBalance != user.LifeTimePaid)) or \
+                       userpquota.PageCounter or userpquota.LifePageCounter or \
+                       self.storage.getUserNbJobsFromHistory(user) :
+                        self.warnUserPQuota(userpquota)
                      
 if __name__ == "__main__" :