Changeset 1619:9ce784bcab86

Timestamp:

11/11/08 09:52:20 (2 months ago)

Author:

Greg Von Kuster <greg@bx.psu.edu>

branch:

default

Message:

Fixes for jobs reports.

Files:

• lib/galaxy/webapps/reports/controllers/jobs.py (modified) (6 diffs)
• lib/galaxy/webapps/reports/static/january_2008_style/blue/base.css (modified) (7 diffs)
• lib/galaxy/webapps/reports/templates/jobs_all_unfinished.mako (modified) (1 diff)
• lib/galaxy/webapps/reports/templates/jobs_per_month_in_error.mako (modified) (1 diff)
• lib/galaxy/webapps/reports/templates/jobs_specified_date_all.mako (modified) (1 diff)
• lib/galaxy/webapps/reports/templates/jobs_specified_date_in_error.mako (modified) (1 diff)
• lib/galaxy/webapps/reports/templates/jobs_tool_for_month.mako (modified) (1 diff)
• lib/galaxy/webapps/reports/templates/jobs_user_for_month.mako (modified) (1 diff)

lib/galaxy/webapps/reports/controllers/jobs.py

@@ -140 +140 @@
-                                              galaxy.model.Job.table.c.create_time < end_date ),
-                       from_obj = [ sa.outerjoin( galaxy.model.Job.table, 
-
-
+
+
+
+
-                       order_by = [ sa.desc( galaxy.model.Job.table.c.id ) ] )
-        jobs = []
@@ -198 +200 @@
-                                              galaxy.model.Job.table.c.create_time < end_date ),
-                       from_obj = [ sa.outerjoin( galaxy.model.Job.table, 
-
-
+
+
+
+
-                       order_by = [ sa.desc( galaxy.model.Job.table.c.id ) ] )
-        jobs = []
@@ -246 +250 @@
-                         ( galaxy.model.User.table.c.email ).label( 'user_email' ),
-                         galaxy.model.GalaxySession.table.c.remote_addr ),
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                       order_by = [ sa.desc( galaxy.model.Job.table.c.id ) ] )
-        for row in q.execute():
@@ -380 +385 @@
-                                              galaxy.model.Job.table.c.create_time < end_date ),
-                       from_obj = [ sa.outerjoin( galaxy.model.Job.table, 
-
-
+
+
+
+
-                       order_by = [ sa.desc( galaxy.model.Job.table.c.id ) ] )
-        for row in q.execute():
@@ -468 +475 @@
-                                              galaxy.model.Job.table.c.create_time < end_date ),
-                       from_obj = [ sa.outerjoin( galaxy.model.Job.table, 
-
-
+
+
+
+
-                       order_by = [ sa.desc( galaxy.model.Job.table.c.id ) ] )
-        for row in q.execute():
@@ -499 +508 @@
-    @web.expose
-    def per_domain( self, trans, **kwd ):
+        # TODO: rewrite using alchemy
-        params = util.Params( kwd )
-        msg = ''

lib/galaxy/webapps/reports/static/january_2008_style/blue/base.css

@@ -253 +253 @@
-table.colored tr.header
-{ 
-ebd9b
+EBD9B
-  background-image: url(report_title_bg.png);
-  background-repeat: repeat-x;
@@ -262 +262 @@
-table.colored tr.headernew
-{ 
-add8e
+ADD8E
-  background-repeat: repeat-x;
-  background-position: top;
@@ -270 +270 @@
-table.colored tr.headerwaiting
-{ 
-ebd9b2
+FF6600
-  background-repeat: repeat-x;
-  background-position: top;
@@ -278 +278 @@
-table.colored tr.headerqueued
-{ 
-ee82ee
+EE82EE
-  background-repeat: repeat-x;
-  background-position: top;
@@ -286 +286 @@
-table.colored tr.headerrunning
-{ 
-ffff
+FFFF
-  background-repeat: repeat-x;
-  background-position: top;
@@ -294 +294 @@
-table.colored tr.headererror
-{ 
-
+
+
+
+
+
+
+
+
+
-  background-repeat: repeat-x;
-  background-position: top;
@@ -303 +311 @@
-{ 
-  background: #008000;
+  background-repeat: repeat-x;
+  background-position: top;
+  border-bottom: solid #d8b365 1px;
+  font-weight: bold;
+}
+table.colored tr.headerupload
+{ 
+  background: #336699;
+  background-repeat: repeat-x;
+  background-position: top;
+  border-bottom: solid #d8b365 1px;
+  font-weight: bold;
+}
+table.colored tr.headerunknown
+{ 
+  background: #FF6666;
-  background-repeat: repeat-x;
-  background-position: top;

lib/galaxy/webapps/reports/templates/jobs_all_unfinished.mako

@@ -24 +24 @@
-            elif state == 'running':
-              rowdef = '<tr class="headerrunning">'
+            elif state == 'upload':
+              rowdef = '<tr class="headerupload">'
+            else:
+              rowdef = '<tr class="headerunknown">'
-          %>
-          ${rowdef}

lib/galaxy/webapps/reports/templates/jobs_per_month_in_error.mako

@@ -12 +12 @@
-    <table align="center" width="60%" class="colored">
-      %if len( jobs ) == 0:
-error
+the deleted or error state
-      %else:
-        <tr class="header">

lib/galaxy/webapps/reports/templates/jobs_specified_date_all.mako

@@ -27 +27 @@
-              rowdef = '<tr class="headererror">'
-            elif state == 'deleted':
-
+
+
+
-            elif state == 'ok':
-              rowdef = '<tr class="headerok">'
+            else:
+              rowdef = '<tr class="headerunknown">'
-          %>
-          ${rowdef}

lib/galaxy/webapps/reports/templates/jobs_specified_date_in_error.mako

@@ -11 +11 @@
-    <table align="center" width="60%" class="colored">
-      %if len( jobs ) == 0:
-error
+the deleted or error state
-      %else:
-        %for job in jobs:
-
+
+
+
+
+
+
+
+
+
+
-            <td>State</td>
-            <td>Job Id</td>

lib/galaxy/webapps/reports/templates/jobs_tool_for_month.mako

@@ -27 +27 @@
-              rowdef = '<tr class="headererror">'
-            elif state == 'deleted':
-
+
+
+
-            elif state == 'ok':
-              rowdef = '<tr class="headerok">'
+            else:
+              rowdef = '<tr class="headerunknown">'
-          %>
-          ${rowdef}

lib/galaxy/webapps/reports/templates/jobs_user_for_month.mako

@@ -27 +27 @@
-              rowdef = '<tr class="headererror">'
-            elif state == 'deleted':
-
+
+
+
-            elif state == 'ok':
-              rowdef = '<tr class="headerok">'
+            else:
+              rowdef = '<tr class="headerunknown">'
-          %>
-          ${rowdef}