Skip to content

Commit

Permalink
suppress graph headers when specified graphonly=1
Browse files Browse the repository at this point in the history
  • Loading branch information
@studio3104
studio3104 committed Apr 30, 2014
1 parent 92390f4 commit 8621c50
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 64 deletions.
6 changes: 6 additions & 0 deletions lib/HRForecast/Web.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,12 @@ my $metrics_validator = [
[['CHOICE',qw/1 0/],'invalid stack flag'],
],
},
'graphonly' => {
default => 0,
rule => [
[['CHOICE',qw/1 0/],'invalid graphonly flag'],
],
},
];

sub _build_metrics_params {
Expand Down
66 changes: 34 additions & 32 deletions views/ifr.tx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,45 +15,47 @@ body {
</head>
<body>

<h3 style="margin: 0px;padding: 8px 20px 7px;border-bottom: solid 1px #999;"><a href="<: $c.req.uri_for('/view/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t => $valid.valid('t')] ) :>" target="_blank"><: $metrics.graph_name :></a> <small><: $metrics.description :></small></h3>
: if $valid.valid('graphonly') != 1 {
<h3 style="margin: 0px;padding: 8px 20px 7px;border-bottom: solid 1px #999;"><a href="<: $c.req.uri_for('/view/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t => $valid.valid('t')] ) :>" target="_blank"><: $metrics.graph_name :></a> <small><: $metrics.description :></small></h3>


<div class="btn-toolbar" style="position:absolute;top:-2px;right:100px;padding-top:6px" role="toolbar">
<div class="btn-toolbar" style="position:absolute;top:-2px;right:100px;padding-top:6px" role="toolbar">

<div class="btn-group">
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'w') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'w']) :>">1週間</a>
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'm') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'m']) :>">1ヶ月</a>
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'y') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'y']) :>">1年</a>
</div>
<div class="btn-group">
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'w') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'w']) :>">1週間</a>
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'm') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'m']) :>">1ヶ月</a>
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'y') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'y']) :>">1年</a>
</div>

<div class="btn-group">
<a class="btn btn-default btn-sm" href="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[
t=>$valid.valid('t'),
from=>$valid.valid('from'),
to=>$valid.valid('to'),
period=>$valid.valid('period'),
offset=>$valid.valid('offset'),
d=>1,
]) :>">EXPORT</a>
<a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="dropdown-header">CSV</li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'w',d=>1]) :>">1週間</a></li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'m',d=>1]) :>">1ヶ月</a></li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'y',d=>1]) :>">1年</a></li>
<li class="divider"></li>
<li class="dropdown-header">HTML</li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'w',d=>1]) :>">1週間</a></li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'m',d=>1]) :>">1ヶ月</a></li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'y',d=>1]) :>">1年</a></li>
</ul>
</div><!-- /btn-group -->
<div class="btn-group">
<a class="btn btn-default btn-sm" href="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[
t=>$valid.valid('t'),
from=>$valid.valid('from'),
to=>$valid.valid('to'),
period=>$valid.valid('period'),
offset=>$valid.valid('offset'),
d=>1,
]) :>">EXPORT</a>
<a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="dropdown-header">CSV</li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'w',d=>1]) :>">1週間</a></li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'m',d=>1]) :>">1ヶ月</a></li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'y',d=>1]) :>">1年</a></li>
<li class="divider"></li>
<li class="dropdown-header">HTML</li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'w',d=>1]) :>">1週間</a></li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'m',d=>1]) :>">1ヶ月</a></li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,[t=>'y',d=>1]) :>">1年</a></li>
</ul>
</div><!-- /btn-group -->

</div>
</div>
: }

<div id="graphdiv-0" data-index="0" class="metrics-graph" data-csv="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,$metrics_params) :>" data-datewindow="<: $date_window :>" data-colors="<: $metrics.colors :>" style="position:absolute;top:45px;bottom:5px;left:5px;right:200px;"></div>
<div id="graphdiv-0" data-index="0" class="metrics-graph" data-csv="<: $c.req.uri_for('/csv/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,$metrics_params) :>" data-datewindow="<: $date_window :>" data-colors="<: $metrics.colors :>" style="position:absolute;top:<: ($valid.valid('graphonly') == 1) ? '0px' : '45px' :>;bottom:5px;left:5px;right:200px;"></div>

<div style="position:absolute;width:198px;right:0px;top:45px;word-wrap:break-word;">
<div style="position:absolute;width:198px;right:0px;top:<: ($valid.valid('graphonly') == 1) ? '0px' : '45px' :>;word-wrap:break-word;">
<span id="label-0">
<a href="<: $c.req.uri_for('/view/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name,$metrics_params) :>" style="color:<: $metrics.color :>">
<span style="font-weight:bold"><: '/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name :></span>
Expand Down
66 changes: 34 additions & 32 deletions views/ifr_complex.tx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,45 +15,47 @@ body {
</head>
<body>

<h3 style="margin: 0px;padding: 8px 20px 7px;border-bottom: solid 1px #999;"><a href="<: $c.req.uri_for('/view_complex/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t => $valid.valid('t')] ) :>" target="_blank"><: $metrics.graph_name :></a> <small><: $metrics.description :></small></h3>
: if $valid.valid('graphonly') != 1 {
<h3 style="margin: 0px;padding: 8px 20px 7px;border-bottom: solid 1px #999;"><a href="<: $c.req.uri_for('/view_complex/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t => $valid.valid('t')] ) :>" target="_blank"><: $metrics.graph_name :></a> <small><: $metrics.description :></small></h3>


<div class="btn-toolbar" style="position:absolute;top:-1px;right:100px;padding-top:6px" role="toolbar">
<div class="btn-toolbar" style="position:absolute;top:-1px;right:100px;padding-top:6px" role="toolbar">

<div class="btn-group">
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'w') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr_complex/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'w']) :>">1週間</a>
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'm') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr_complex/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'m']) :>">1ヶ月</a>
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'y') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr_complex/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'y']) :>">1年</a>
</div>
<div class="btn-group">
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'w') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr_complex/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'w']) :>">1週間</a>
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'm') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr_complex/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'m']) :>">1ヶ月</a>
<a class="btn btn-default btn-sm <: ($valid.valid('t') == 'y') ? 'active' : '' :>" href="<: $c.req.uri_for('/ifr_complex/'~$metrics.service_name~'/'~$metrics.section_name~'/'~$metrics.graph_name, [t=>'y']) :>">1年</a>
</div>

<div class="btn-group">
<a class="btn btn-default btn-sm" href="<: $c.req.uri_for('/csv/'~$metrics.uri,[
t=>$valid.valid('t'),
from=>$valid.valid('from'),
to=>$valid.valid('to'),
period=>$valid.valid('period'),
offset=>$valid.valid('offset'),
d=>1,
]) :>">EXPORT</a>
<a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="dropdown-header">CSV</li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.uri,[t=>'w',d=>1]) :>">1週間</a></li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.uri,[t=>'m',d=>1]) :>">1ヶ月</a></li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.uri,[t=>'y',d=>1]) :>">1年</a></li>
<li class="divider"></li>
<li class="dropdown-header">HTML</li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.uri,[t=>'w',d=>1]) :>" target="_blank">1週間</a></li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.uri,[t=>'m',d=>1]) :>" target="_blank">1ヶ月</a></li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.uri,[t=>'y',d=>1]) :>" target="_blank">1年</a></li>
</ul>
</div><!-- /btn-group -->
<div class="btn-group">
<a class="btn btn-default btn-sm" href="<: $c.req.uri_for('/csv/'~$metrics.uri,[
t=>$valid.valid('t'),
from=>$valid.valid('from'),
to=>$valid.valid('to'),
period=>$valid.valid('period'),
offset=>$valid.valid('offset'),
d=>1,
]) :>">EXPORT</a>
<a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="dropdown-header">CSV</li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.uri,[t=>'w',d=>1]) :>">1週間</a></li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.uri,[t=>'m',d=>1]) :>">1ヶ月</a></li>
<li><a href="<: $c.req.uri_for('/csv/'~$metrics.uri,[t=>'y',d=>1]) :>">1年</a></li>
<li class="divider"></li>
<li class="dropdown-header">HTML</li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.uri,[t=>'w',d=>1]) :>" target="_blank">1週間</a></li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.uri,[t=>'m',d=>1]) :>" target="_blank">1ヶ月</a></li>
<li><a href="<: $c.req.uri_for('/table/'~$metrics.uri,[t=>'y',d=>1]) :>" target="_blank">1年</a></li>
</ul>
</div><!-- /btn-group -->

</div>
</div>
: }

<div id="graphdiv-0" data-index="0" class="metrics-graph" data-csv="<: $c.req.uri_for('/csv/'~$metrics.uri,$metrics_params) :>" data-datewindow="<: $date_window :>" data-colors="<: $metrics.colors :>" data-stack="<: $metrics.stack :>" style="position:absolute;top:45px;bottom:5px;left:5px;right:200px;"></div>
<div id="graphdiv-0" data-index="0" class="metrics-graph" data-csv="<: $c.req.uri_for('/csv/'~$metrics.uri,$metrics_params) :>" data-datewindow="<: $date_window :>" data-colors="<: $metrics.colors :>" data-stack="<: $metrics.stack :>" style="position:absolute;top:<: ($valid.valid('graphonly') == 1) ? '0px' : '45px' :>;bottom:5px;left:5px;right:200px;"></div>

<div style="position:absolute;width:198px;right:0px;top:45px;word-wrap:break-word;">
<div style="position:absolute;width:198px;right:0px;top:<: ($valid.valid('graphonly') == 1) ? '0px' : '45px' :>;word-wrap:break-word;">
<span id="label-0">
: for $metrics.metricses -> $i_metrics {
<a href="<: $c.req.uri_for('/view/'~$i_metrics.service_name~'/'~$i_metrics.section_name~'/'~$i_metrics.graph_name,$metrics_params) :>" style="color:<: $i_metrics.color :>">
Expand Down

0 comments on commit 8621c50

Please sign in to comment.