|
|
@@ -8547,7 +8547,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.condition.dateFrom = ($scope.sdateFrom || 0);
|
|
|
$scope.thisdatato = ($scope.sdateTo || 0);
|
|
|
if($scope.thisdatato != 0) {
|
|
|
- $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf() + 3600 * 12 * 1000) || 0);
|
|
|
+ $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf()) || 0);
|
|
|
} else {
|
|
|
$scope.condition.dateTo = ($scope.sdateTo || 0);
|
|
|
}
|
|
|
@@ -9460,7 +9460,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.condition.dateFrom = ($scope.sdateFrom || 0);
|
|
|
$scope.thisdatato = ($scope.sdateTo || 0);
|
|
|
if ($scope.thisdatato != 0) {
|
|
|
- $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf() + 3600 * 12 * 1000 - 1) || 0);
|
|
|
+ $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf()) || 0);
|
|
|
} else {
|
|
|
$scope.condition.dateTo = ($scope.sdateTo || 0);
|
|
|
}
|