# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Greg Von Kuster <greg@bx.psu.edu> # Date 1279734781 14400 # Node ID a37b8a979f7d0d040527413695c5828d22ca5e54 # Parent 8ffcaf3d9a0c16d080801f3f81104e829403da41 Add job.stdout to Job Info page in reports webapp ( patch from Assaf Gordon ), and change the previously displayed job.update_time to now be "Time To Finish", which is the total execution time of the job displayed in hh:mm:ss. --- a/templates/webapps/reports/job_info.mako +++ b/templates/webapps/reports/job_info.mako @@ -1,6 +1,8 @@ <%inherit file="/base.mako"/><%namespace file="/message.mako" import="render_msg" /> +<% import datetime %> + %if message: ${render_msg( message, 'done' )} %endif @@ -13,14 +15,17 @@ <td>State</td><td>Job Id</td><td>Create Time</td> - <td>Update Time</td> + <td>Time To Finish</td><td>Session Id</td></tr><tr><td><div class="count-box state-color-${job.state}">${job.state}</div></td><td>${job.id}</td><td>${job.create_time}</td> - <td>${job.update_time}</td> + <td> + <% execute_time = job.update_time - job.create_time %> + ${datetime.timedelta( seconds=execute_time.seconds )} + </td><td>${job.session_id}</td></tr><tr class="header"> @@ -56,6 +61,12 @@ <td colspan="5">${job.command_line}</td></tr><tr class="header"> + <td colspan="5">Stdout</td> + </tr> + <tr> + <td colspan="5"><pre>${job.stdout}</pre></td> + </tr> + <tr class="header"><td colspan="5">Stderr</td></tr><tr>