added pagination to the queue and failed views

Author: Matt George

resweb/media/style.css

@@ -72,4 +72,12 @@ body { padding:0; margin:0; }
 #main p.pagination a.less { float:left;}
 #main p.pagination a.more { float:right;}
 
-#main form.clear-failed {float:right; margin-top:-10px;}
+#main form.clear-failed {float:right; margin-top:-10px;}
+
+ul.pagination{
+    list-style-type: none;
+}
+ul.pagination li{
+    text-decoration: none;
+    display:inline;
+}

resweb/templates/failed.mustache

@@ -9,7 +9,13 @@ $(document).ready(function(){
 </script>
 <h1>Failed Jobs</h1>
 <p class='sub'>Showing {{start}} to {{end}} of <b>{{size}}</b> jobs</p>
-
+<ul class='pagination'>
+{{#pagination}}
+      <li>
+          {{#current}}<a href='{{link}}'>{{/current}}{{link_name}}{{#current}}</a>{{/current}}
+      </li>
+  {{/pagination}}
+ </ul>
 <ul class='failed'>
     {{#failed_jobs}}
     <li>

resweb/templates/queue.mustache

@@ -1,6 +1,14 @@
 {{>header}}
+
 <h1>Pending jobs on <span class='hl'>{{queue}}</span></h1>
   <p class='sub'>Showing {{start}} to {{end}} of <b>{{size}}</b> jobs</p>
+  <ul class='pagination'>
+  {{#pagination}}
+      <li>
+          {{#current}}<a href='{{link}}'>{{/current}}{{link_name}}{{#current}}</a>{{/current}}
+      </li>
+  {{/pagination}}
+  </ul>
   <table class='jobs'>
     <tr>
       <th>Class</th>

resweb/views.py

@@ -19,7 +19,24 @@ def address(self):
         return '%s:%s' % (self.resq.redis.host,self.resq.redis.port)
     def version(self):
         return str(__version__)
-    
+    def pages(self, start, size, link_function, width=20):
+        pages = []
+
+        num_pages = size / width
+        if size % width > 0:
+            num_pages += 1
+
+        if size < width:
+            return pages
+
+        for i in range(num_pages):
+            current = True
+            if start == i*width:
+                current = False
+            link = link_function(i*width)
+            link_name = str(i+1)
+            pages.append(dict(link=link,link_name=link_name,current=current))
+        return pages
 
 class Overview(ResWeb):
     def __init__(self, host, queue=None, start=0):
@@ -138,20 +155,28 @@ def workers(self):
             item['nodata'] = not item['data']
             workers.append(item)
         return workers
+
 class Queue(ResWeb):
     def __init__(self, host, key, start=0):
         self.key = key
         self._start = start
         super(Queue, self).__init__(host)
+    
     def start(self):
         return str(self._start)
 
     def end(self):
-        return str(self._start + 20)
+        end = self._start + 20
+        if end > int(self.size()):
+            end = self.size()
+        return str(end)
+    
     def queue(self):
         return self.key
+    
     def size(self):
         return str(self.resq.size(self.key) or 0)
+    
     def jobs(self):
         jobs = []
         for job in self.resq.peek(self.key, self._start, self._start+20):
@@ -160,6 +185,14 @@ def jobs(self):
                 'args': str(job['args'])
             })
         return jobs
+    
+    def pagination(self):
+        return self.pages(self._start, int(self.size()), self.link_func)
+    
+    def link_func(self, start):
+        return '/queues/%s/?start=%s' % (self.key, start)
+    
+
 class Failed(ResWeb):
     def __init__(self, host, start=0):
         self._start = start
@@ -184,7 +217,12 @@ def failed_jobs(self):
             item['traceback'] = '\n'.join(job['backtrace'])
             jobs.append(item)
         return jobs
-
+    
+    def pagination(self):
+        return self.pages(self._start, int(self.size()), self.link_func)
+    
+    def link_func(self, start):
+        return '/failed/?start=%s' % start
 class Stats(ResWeb):
     def __init__(self, host, key_id):
         self.key_id = key_id

roadmap.md

@@ -5,6 +5,10 @@ Version 0.6
 * better webtests
 * resweb pagination
 
+Version 0.7
+===========
+* resweb controls for failed queues
+
 Version 0.8
 ===========
 * horde package integration
@@ -13,4 +17,4 @@ Version 0.8
 Version 1.0
 ===========
 * stabilize the api
-* semantic versioniong
+* semantic versioning