Changeset 7293:fbc43cf8113f for sage/dsage/web/web_server.py

Timestamp:

10/16/07 21:11:07 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Message:

Random javascript hackery.

File:

• sage/dsage/web/web_server.py (modified) (4 diffs)

sage/dsage/web/web_server.py

@@ -27 +27 @@
 DSAGE_LOCAL = SAGE_ROOT + '/local/dsage'
 CSS_FILE = os.path.join(DSAGE_LOCAL,'web/static/dsage_web.css')
+SORTTABLE = os.path.join(DSAGE_LOCAL,'web/static/sorttable.js')
 JS_FILE = os.path.join(DSAGE_LOCAL,'web/static/dsage_web.js')
 PROTOTYPE = os.path.join(DSAGE_LOCAL,'web/static/prototype.js')
@@ -103 +104 @@
 setattr(Toplevel, 'child_dsage_web.js', static.File(JS_FILE))
 setattr(Toplevel, 'child_prototype.js', static.File(PROTOTYPE))
+setattr(Toplevel, 'child_sorttable.js', static.File(SORTTABLE))
 # setattr(Toplevel, 'child_index.html', static.File(INDEX))
 
@@ -116 +118 @@
         
     def render(self, request):
-        jdicts = self.dsage_server.jobdb.get_all_jobs()
-        html = ""
-        if len(jdicts) != len(self.jdicts):
-            self.jdicts = jdicts
-            for i, jdict in enumerate(jdicts):
-                html+="""
-                <tr class='tr%s'
-                """ % (i % 2)
-                html+="""
-                    <td><a href='get_details?job_id=%s'>%s</a></td>
-                    <td>%s</td>
-                    <td>%s</td>
-                    <td>%s</td>
-                    <td>%s</td>
-                    <td>%s</td>
-                </tr>
-                """ % (jdict['job_id'],jdict['job_id'], jdict['status'], 
-                       jdict['username'], jdict['creation_time'],
-                       jdict['update_time'], jdict['priority'])
-
-            html += '</table>'
-        else:
-            pass
+        jdicts = self.dsage_server.jobdb.get_all_jobs()[:10]
+        html = """
+        <tr class='thead'>
+            <td>Job ID</td>
+            <td>Status</td>
+            <td>Username</td>
+            <td>Creation Time</td>
+            <td>Last Update</td>
+            <td>Priority</td>
+        </tr>"""
+        # if len(jdicts) != len(self.jdicts):
+        #     self.jdicts = jdicts
+        for i, jdict in enumerate(jdicts):
+            html+="""
+            <tr class='tr%s'>
+            """ % (i % 2)
+            html+="""
+                <td><a href='get_details?job_id=%s'>%s</a></td>
+                <td>%s</td>
+                <td>%s</td>
+                <td>%s</td>
+                <td>%s</td>
+                <td>%s</td>
+            </tr>
+            """ % (jdict['job_id'],jdict['job_id'], jdict['status'], 
+                   jdict['username'], jdict['creation_time'],
+                   jdict['update_time'], jdict['priority'])
+
+        html += '</table>'
+        # else:
+        #     pass
         # xml_stream = self.build_xml(jdicts)
         
@@ -211 +221 @@
             if not isinstance(jdict, dict):
                 raise TypeError
-            for k, v in jdict.iteritems():
+            for i, (k, v) in enumerate(jdict.iteritems()):
                 if k == 'code': # We will display the code below the table
                     continue
                 html += """
-                <tr class='tr0'>
+                <tr class='tr%s'>
+                """ % (i % 2)
+                html += """
                 <td>%s</td>
                 <td>%s</td>