|
|
|
@ -34,7 +34,8 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
|
|
|
|
|
|
|
|
|
|
$scope.today = new Date();
|
|
|
|
|
$scope.chooseToday = function () {
|
|
|
|
|
$scope.params.datefrom = $scope.params.dateto = new Date();
|
|
|
|
|
$scope.params.datefrom = new Date();
|
|
|
|
|
$scope.params.dateto = new Date();
|
|
|
|
|
$scope.loadTradeLogs(1);
|
|
|
|
|
};
|
|
|
|
|
$scope.chooseYesterday = function () {
|
|
|
|
@ -269,14 +270,16 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
|
|
|
|
|
// var day = new Date();
|
|
|
|
|
// day.setDate(day.getDate() - 7);
|
|
|
|
|
// $scope.params.datefrom = day;
|
|
|
|
|
$scope.params.datefrom = $scope.params.dateto = new Date();
|
|
|
|
|
$scope.params.datefrom = new Date();
|
|
|
|
|
$scope.params.dateto = new Date();
|
|
|
|
|
$scope.chooseClient('all');
|
|
|
|
|
}else {
|
|
|
|
|
// $scope.params.dateto = new Date();
|
|
|
|
|
// var day = new Date();
|
|
|
|
|
// day.setDate(day.getDate() - 7);
|
|
|
|
|
// $scope.params.datefrom = day;
|
|
|
|
|
$scope.params.datefrom = $scope.params.dateto = new Date();
|
|
|
|
|
$scope.params.datefrom = new Date();
|
|
|
|
|
$scope.params.dateto = new Date();
|
|
|
|
|
$scope.chooseClient('all');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|