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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
James Brooks
2016-07-29 11:45:45 -04:00
parent 0f029702d4 380048dd53
commit 915ea0d0bd
9 changed files with 72312 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@
</div>
<div class="row">
<div class="col-xs-12">
<canvas id="metric-{{ $metric->id }}" data-metric-name="{{ $metric->name }}" data-metric-suffix="{{ $metric->suffix }}" data-metric-id="{{ $metric->id }}" data-metric-group="{{ $metric->view_name }}" 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="{{ $metric->view_name }}" data-metric-precision="{{ $metric->places }}" height="160" width="600"></canvas>
</div>
</div>
</li>
@@ -97,6 +97,7 @@
ticks: {
beginAtZero: true,
suggestedMax: 0.1,
fixedStepSize: result.data.metric.places,
callback: function(tickValue, index, ticks) {
var delta = ticks[1] - ticks[0];