Skip to content

Commit

Permalink
Merge pull request #678 from Airistotal/dev
Browse files Browse the repository at this point in the history 
Reports Refactoring
  • Loading branch information
@martenson
martenson committed Sep 2, 2015
2 parents 291d16f + c057bfa commit f48dd99
Show file tree
Hide file tree
Showing 25 changed files with 1,070 additions and 149 deletions.
17 changes: 17 additions & 0 deletions client/galaxy/style/less/reports.less
View file
Expand Up @@ -218,3 +218,20 @@
text-align: center;
text-align: -moz-center;
}

#systemForm {
width: 90%;
margin-left: auto;
margin-right: auto;
padding: 5px;
border-spacing: 5px;
border-collapse: separate;
}

.lastAccessForm, .diskUsageForm {
width: 70%;
margin-left: auto;
margin-right: auto;
padding: 5px;
border-spacing: 5px;
}
2 changes: 1 addition & 1 deletion static/style/blue/base.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/style/blue/reports.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

105 changes: 94 additions & 11 deletions templates/webapps/reports/jobs_errors_per_tool.mako
View file
Expand Up @@ -25,37 +25,106 @@ ${get_css()}
<table id="formHeader">
<tr>
<td>
${get_pages( sort_id, order, page_specs, 'jobs', 'errors_per_tool',spark_time=time_period )}
${
get_pages( sort_id, order,
page_specs,
'jobs',
'errors_per_tool',
spark_time=time_period )
}
</td>
<td>
<h4 align="center">Jobs In Error Per Tool</h4>
<h5 align="center">
<p>Click Tool ID to view details. Click error number to view job details.</p>
Graph goes from present to past for ${make_spark_settings( "jobs", "errors_per_tool", spark_limit, sort_id, order, time_period, page=page, offset=offset, entries=entries )}
<p>
Click Tool ID to view details.
Click error number to view job details.
</p>

Graph goes from present to past for
${
make_spark_settings(
"jobs",
"errors_per_tool",
spark_limit,
sort_id,
order,
time_period,
page=page,
offset=offset,
entries=entries)
}
</h5>
</td>
<td align="right">
${get_entry_selector("jobs", "errors_per_tool", page_specs.entries, sort_id, order)}
${
get_entry_selector(
"jobs",
"errors_per_tool",
page_specs.entries,
sort_id,
order)
}
</td>
</tr>
</table>
<table align="center" width="60%" class="colored">
%if len( jobs ) == 0:
<tr><td colspan="2">There are no jobs in the error state.</td></tr>
<tr>
<td colspan="2">
There are no jobs in the error state.
</td>
</tr>
%else:
<tr class="header">
<td class="half_width">
${get_sort_url(sort_id, order, 'tool_id', 'jobs', 'errors_per_tool', 'Tool ID', spark_time=time_period, page=page, offset=offset, entries=entries)}
${
get_sort_url(
sort_id,
order,
'tool_id',
'jobs',
'errors_per_tool',
'Tool ID',
spark_time=time_period,
page=page,
offset=offset,
entries=entries)
}
<span class='dir_arrow tool_id'>${arrow}</span>
</td>
%if is_user_jobs_only:
<td class="third_width">
${get_sort_url(sort_id, order, 'total_jobs', 'jobs', 'errors_per_tool', 'User Jobs in Error', spark_time=time_period, page=page, offset=offset, entries=entries)}
${
get_sort_url(
sort_id,
order,
'total_jobs',
'jobs',
'errors_per_tool',
'User Jobs in Error',
spark_time=time_period,
page=page,
offset=offset,
entries=entries)
}
<span class='dir_arrow total_jobs'>${arrow}</span>
</td>
%else:
<td class="third_width">
${get_sort_url(sort_id, order, 'total_jobs', 'jobs', 'errors_per_tool', 'User and Monitor Jobs in Error', spark_time=time_period, page=page, offset=offset, entries=entries)}
${
get_sort_url(
sort_id,
order,
'total_jobs',
'jobs',
'errors_per_tool',
'User and Monitor Jobs in Error',
spark_time=time_period,
page=page,
offset=offset,
entries=entries)
}
<span class='dir_arrow total_jobs'>${arrow}</span>
</td>
%endif
Expand All @@ -78,10 +147,24 @@ ${get_css()}
<tr class="tr">
%endif
<td><a href="${h.url_for( controller='jobs', action='tool_per_month', tool_id=job[1], sort_id='default', order='default' )}">${job[1]}</a></td>
<td><a href="${h.url_for( controller='jobs', action='specified_date_handler', operation='specified_tool_in_error', tool_id= job[1] )}">${job[0]}</a></td>
<td>
<a href="${h.url_for( controller='jobs', action='tool_per_month', tool_id=job[1], sort_id='default', order='default')}">
${job[1]}
</a>
</td>
<td>
<a href="${h.url_for( controller='jobs', action='specified_date_handler', operation='specified_tool_in_error', tool_id=job[1])}">
${job[0]}
</a>
</td>
%try:
${make_sparkline(key, trends[key], "bar", "/ " + time_period[:-1])}
${
make_sparkline(
key,
trends[key],
"bar",
"/ " + time_period[:-1])
}
%except KeyError:
%endtry
<td id="${key}"></td>
Expand Down
76 changes: 68 additions & 8 deletions templates/webapps/reports/jobs_per_month_all.mako
View file
Expand Up @@ -22,14 +22,31 @@ ${get_css()}
<table id="formHeader">
<tr>
<td>
${get_pages( sort_id, order, page_specs, 'jobs', 'per_month_all' )}
${
get_pages(
sort_id,
order,
page_specs,
'jobs',
'per_month_all')
}
</td>
<td>
<h4 align="center">Jobs Per Month</h4>
<h5 align="center">Click Month to view details. Graph goes from the 1st to the last of the month.</h5>
<h5 align="center">
Click Month to view details.
Graph goes from the 1st to the last of the month.
</h5>
</td>
<td align="right">
${get_entry_selector("jobs", "per_month_all", page_specs.entries, sort_id, order)}
${
get_entry_selector(
"jobs",
"per_month_all",
page_specs.entries,
sort_id,
order)
}
</td>
</tr>
</table>
Expand All @@ -40,17 +57,50 @@ ${get_css()}
%else:
<tr class="header">
<td class="third_width">
${get_sort_url(sort_id, order, 'date', 'jobs', 'per_month_all', 'Month', page=page, offset=offset, entries=entries)}
${
get_sort_url(
sort_id,
order,
'date',
'jobs',
'per_month_all',
'Month',
page=page,
offset=offset,
entries=entries)
}
<span class='dir_arrow date'>${arrow}</span>
</td>
%if is_user_jobs_only:
<td class="third_width">
${get_sort_url(sort_id, order, 'total_jobs', 'jobs', 'per_month_all', 'User Jobs', page=page, offset=offset, entries=entries)}
${
get_sort_url(
sort_id,
order,
'total_jobs',
'jobs',
'per_month_all',
'User Jobs',
page=page,
offset=offset,
entries=entries)
}
<span class='dir_arrow total_jobs'>${arrow}</span>
</td>
%else:
<td class="third_width">
${get_sort_url(sort_id, order, 'total_jobs', 'jobs', 'per_month_all', 'User and Monitor Jobs', page=page, offset=offset, entries=entries)}
${
get_sort_url(
sort_id,
order,
'total_jobs',
'jobs',
'per_month_all',
'User and Monitor Jobs',
page=page,
offset=offset,
entries=entries)
}
<span class='dir_arrow total_jobs'>${arrow}</span>
</td>
%endif
Expand All @@ -73,9 +123,19 @@ ${get_css()}
<tr class="tr">
%endif
<td><a href="${h.url_for( controller='jobs', action='specified_month_all', specified_date=job[0]+'-01', sort_id='default', order='default' )}">${job[2]} ${job[3]}</a></td>
<td>
<a href="${h.url_for( controller='jobs', action='specified_month_all', specified_date=job[0]+'-01', sort_id='default', order='default' )}">
${job[2]} ${job[3]}
</a>
</td>
<td>${job[1]}</td>
${make_sparkline(key, trends[key], "bar", "/ day")}
${
make_sparkline(
key,
trends[key],
"bar",
"/ day")
}
<td id="${key}"></td>
</tr>
<%
Expand Down

0 comments on commit f48dd99

Please sign in to comment.