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

Adds the ability to set the default view in which to display metrics

Browse Source
This commit is contained in:
James Brooks
2015-12-26 16:43:22 +00:00
parent 0d406b8360
commit 1c27cf7360
16 changed files with 152 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Api/MetricController.php
View File

@@ -73,7 +73,8 @@ class MetricController extends AbstractApiController
Binput::get('default_value'),
Binput::get('calc_type', 0),
Binput::get('display_chart'),
Binput::get('places', 2)
Binput::get('places', 2),
Binput::get('view', 1)
));
} catch (QueryException $e) {
throw new BadRequestHttpException();
@@ -100,7 +101,8 @@ class MetricController extends AbstractApiController
Binput::get('default_value'),
Binput::get('calc_type', 0),
Binput::get('display_chart'),
Binput::get('places', 2)
Binput::get('places', 2),
Binput::get('view', 1)
));
} catch (QueryException $e) {
throw new BadRequestHttpException();

18
app/Http/Controllers/Dashboard/MetricController.php
View File

@@ -78,7 +78,8 @@ class MetricController extends Controller
$metricData['default_value'],
$metricData['calc_type'],
$metricData['display_chart'],
$metricData['places']
$metricData['places'],
$metricData['view']
));
} catch (ValidationException $e) {
return Redirect::route('dashboard.metrics.add')
@@ -143,13 +144,14 @@ class MetricController extends Controller
try {
dispatch(new UpdateMetricCommand(
$metric,
Binput::get('metric.name', null, false),
Binput::get('metric.suffix', null, false),
Binput::get('metric.description', null, false),
Binput::get('metric.default_value', null, false),
Binput::get('metric.calc_type', null, false),
Binput::get('metric.display_chart', null, false),
Binput::get('metric.places', null, false)
Binput::get('name', null, false),
Binput::get('suffix', null, false),
Binput::get('description', null, false),
Binput::get('default_value', null, false),
Binput::get('calc_type', null, false),
Binput::get('display_chart', null, false),
Binput::get('places', null, false),
Binput::get('default_view', null, false)
));
} catch (ValidationException $e) {
return Redirect::route('dashboard.metrics.edit', ['id' => $metric->id])