Changeset 1277

Timestamp:

01/12/04 16:12:50 (21 years ago)

Author:

jalet

Message:

Small fix for history

Location:

pykota/trunk/pykota

Files:

• reporters/html.py (modified) (2 diffs)
• storages/pgstorage.py (modified) (4 diffs)

pykota/trunk/pykota/reporters/html.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.7  2004/01/12 15:12:50  jalet
+# Small fix for history
+#
 # Revision 1.6  2004/01/12 14:35:01  jalet
 # Printing history added to CGI script.
@@ -79 +82 @@
                     else :    
                         oddevenclass = "warn"
-                if not self.tool.config.getDisableHistory() :
+                if (not self.tool.config.getDisableHistory()) and (not self.isgroup) :
                     name = '<a href="%s?username=%s&printername=%s&history=1">%s</a>' % (os.environ.get("SCRIPT_NAME", ""), name, printer.Name, name)
                 self.report.append('<tr class="%s">%s</tr>' % (oddevenclass, "".join(["<td>%s</td>" % h for h in (name, reached, pagecounter, soft, hard, balance, datelimit or "&nbsp;", lifepagecounter, lifetimepaid)])))

pykota/trunk/pykota/storages/pgstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.34  2004/01/12 15:12:50  jalet
+# Small fix for history
+#
 # Revision 1.33  2004/01/12 14:44:47  jalet
 # Missing space in SQL query
@@ -541 +544 @@
     def retrieveHistory(self, user=None, printer=None, datelimit=None, limit=100) :    
         """Retrieves all print jobs for user on printer (or all) before date, limited to first 100 results."""
-        query = "SELECT * FROM jobhistory"
+        query = "SELECT jobhistory.*,username,printername FROM jobhistory,users,printers WHERE users.id=userid AND printers.id=printerid"
         where = []
         if (user is not None) and user.Exists :
@@ -550 +553 @@
             where.append("jobdate<=%s" % self.doQuote(datelimit))
         if where :    
-            query += " WHERE %s" % " AND ".join(where)
+            query += " AND %s" % " AND ".join(where)
         query += " ORDER BY id DESC"
         if limit :
@@ -570 +573 @@
                 job.JobOptions = fields.get("options")
                 job.JobDate = fields.get("jobdate")
-                job.User = self.getUser(fields.get("userid"))
-                job.Printer = self.getPrinter(fields.get("printerid"))
+                job.User = self.getUser(fields.get("username"))
+                job.Printer = self.getPrinter(fields.get("printername"))
                 job.Exists = 1
                 jobs.append(job)