nmelone/DataLogger-Generic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes POCONSOLE-56. Start/End times are now working and enough data points are being pulled.

Browse Source
This commit is contained in:
Patrick McDonagh
2016-07-27 17:30:17 -05:00
parent 5ea8697662
commit 67a5ef3ee5
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/assets/js/ng/controller_tagVals.js
View File

@@ -4,21 +4,23 @@ poconsole.controller('tagValsCtrl', function($scope, $route, $http, $routeParams
$log.info({routeParams:$routeParams});
var colors = ['#d7191c','#fdae61','#abdda4','#2b83ba'];
if ($routeParams.endDatetime){
$scope.endDatetime = Date.parse(dateConversion.sqliteDate($routeParams.endDatetime));
} else {
if (!$routeParams.endDatetime){
$scope.endDatetime = new Date();
} else {
$scope.endDatetime = Date.parse(dateConversion.sqliteDate($routeParams.endDatetime));
}
if ($routeParams.startDatetime){
$scope.startDatetime = Date.parse(dateConversion.sqliteDate($routeParams.startDatetime));
} else {
if (!$routeParams.startDatetime){
$scope.startDatetime = new Date();
$scope.startDatetime.setHours($scope.endDatetime.getHours() - 2);
} else {
$scope.startDatetime = Date.parse(dateConversion.sqliteDate($routeParams.startDatetime));
}
$log.info({start: $scope.startDatetime, end:$scope.endDatetime});
$scope.loadTagVals = function(sDTime, eDTime){
$scope.startDatetime = sDTime;
$scope.endDatetime = eDTime;
$log.info({start: sDTime, end:eDTime});
$scope.loading = true;
var tags_to_get = $routeParams.tagID.split(",");

2
www/config/blueprints.js
View File

@@ -157,6 +157,6 @@ module.exports.blueprints = {
* *
****************************************************************************/
// defaultLimit: 30
defaultLimit: 20000
};