Changeset 1319:ce8243c677c8

Show
Ignore:
Timestamp:
05/23/08 10:13:01 (8 months ago)
Author:
Greg Von Kuster <greg@bx.psu.edu>
branch:
default
convert_revision:
svn:9bcadc22-80f8-0310-8a53-c8f022958886/galaxy/trunk@2680
Message:

Fix for current month's job report.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1318 r1319  
    9393        job_rows = engine.text( s ).execute().fetchall() 
    9494        for job in job_rows: 
    95             jobs.append( ( job.day_label, job.year_month_day, job.num_jobs, job.num_monitor_jobs ) ) 
     95            try: 
     96                num_user_jobs = job.num_jobs - job.num_monitor_jobs 
     97            except: 
     98                num_user_jobs = job.num_jobs 
     99            jobs.append( ( job.day_label, job.year_month_day, num_user_jobs, job.num_monitor_jobs, job.num_jobs ) ) 
    96100        return jobs 
    97101 

  • lib/galaxy/webapps/reports/templates/jobs_current_month.mako

    r1318 r1319  
    1414    %endif 
    1515    <table align="center" width="60%" class="colored"> 
    16       <tr><td colspan="4"><div class="reportTitle">Jobs for Current Month</div></td></tr> 
     16      <tr><td colspan="5"><div class="reportTitle">Jobs for Current Month</div></td></tr> 
    1717      %if len( jobs ) == 0: 
    18         <tr class="header"><td colspan="4">There are no jobs for the current month</td></tr> 
     18        <tr class="header"><td colspan="5">There are no jobs for the current month</td></tr> 
    1919      %else: 
    2020        <tr class="header"> 
    …… 
    2323          <td>User Jobs</td> 
    2424          <td>Monitor Jobs</td> 
     25          <td>Total</td> 
    2526        </tr> 
    2627        <% 
    …… 
    3738            <td>${job[2]}</td> 
    3839            <td>${job[3]}</td> 
     40            <td>${job[4]}</td> 
    3941          </tr> 
    4042          <% 

  • run_reports.sh

    r1318 r1319  
    33cd `dirname $0` 
    44 
    5 #python -ES ./scripts/paster.py serve reports_wsgi.ini --pid-file=reports_webapp.pid --log-file=reports_webapp.log $@ 
    6 python -ES ./scripts/paster.py serve reports_wsgi.ini --pid-file=reports_webapp.pid $@ 
     5python -ES ./scripts/paster.py serve reports_wsgi.ini --pid-file=reports_webapp.pid --log-file=reports_webapp.log $@