lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes metrics displaying incorrect name and suffix

Browse Source
This commit is contained in:
James Brooks
2015-08-15 20:18:02 +01:00
parent 46cd61e3fe
commit 5e69f23783
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/partials/metrics.blade.php
View File

@@ -25,7 +25,7 @@
<div class="row">
<div class="col-xs-12">
<div>
<canvas id="metric-{{ $metric->id }}" data-metric-id="{{ $metric->id }}" data-metric-group="today" height="160" width="600"></canvas>
<canvas id="metric-{{ $metric->id }}" data-metric-name="{{ $metric->name }}" data-metric-suffix="{{ $metric->suffix }}" data-metric-id="{{ $metric->id }}" data-metric-group="today" height="160" width="600"></canvas>
</div>
</div>
</div>
@@ -92,7 +92,7 @@
chartConfig.datasets[0].data = _.values(charter);
charts[metricId].chart = new Chart(charts[metricId].context).Line(chartConfig, {
tooltipTemplate: "{!! $metric->name !!}: <%= value %> {!! $metric->suffix !!}",
tooltipTemplate: $el.data('metric-name') + ": <%= value %> " + $el.data('metric-suffix'),
scaleShowVerticalLines: true,
scaleShowLabels: false,
responsive: true,