diff --git a/app-main/scripts/app.js b/app-main/scripts/app.js index ab86e63..d5ae29e 100644 --- a/app-main/scripts/app.js +++ b/app-main/scripts/app.js @@ -93,9 +93,6 @@ angular name:'sbAdminApp', files:[ 'scripts/controllers/main.js', - 'scripts/directives/timeline/timeline.js', - 'scripts/directives/notifications/notifications.js', - 'scripts/directives/chat/chat.js', 'scripts/directives/dashboard/stats/stats.js', 'scripts/services/transaction-service.js', 'scripts/services/prediction-service.js' @@ -121,9 +118,6 @@ angular name:'sbAdminApp', files:[ 'scripts/controllers/main.js', - 'scripts/directives/timeline/timeline.js', - 'scripts/directives/notifications/notifications.js', - 'scripts/directives/chat/chat.js', 'scripts/directives/dashboard/stats/stats.js', 'scripts/services/transaction-service.js', 'scripts/controllers/chartContoller.js', @@ -208,6 +202,7 @@ angular url:'/Completed', templateUrl:'views/MyTransactions/Completed.html', controller: 'CompletedCtrl', + params: {txSent: false, txDetails: null }, resolve: { loadMyFile:function($ocLazyLoad) { return $ocLazyLoad.load({ @@ -252,10 +247,6 @@ angular url:'/Profile', templateUrl:'views/user_profile/Profile.html' }) - .state('dashboard.form',{ - templateUrl:'views/form.html', - url:'/form' - }) .state('dashboard.chart',{ templateUrl:'views/chart.html', url:'/chart', @@ -276,32 +267,4 @@ angular } } }) - .state('dashboard.table',{ - templateUrl:'views/table.html', - url:'/table' - }) - .state('dashboard.panels-wells',{ - templateUrl:'views/ui-elements/panels-wells.html', - url:'/panels-wells' - }) - .state('dashboard.buttons',{ - templateUrl:'views/ui-elements/buttons.html', - url:'/buttons' - }) - .state('dashboard.notifications',{ - templateUrl:'views/ui-elements/notifications.html', - url:'/notifications' - }) - .state('dashboard.typography',{ - templateUrl:'views/ui-elements/typography.html', - url:'/typography' - }) - .state('dashboard.icons',{ - templateUrl:'views/ui-elements/icons.html', - url:'/icons' - }) - .state('dashboard.grid',{ - templateUrl:'views/ui-elements/grid.html', - url:'/grid' - }) }]); diff --git a/app-main/scripts/controllers/Completed.js b/app-main/scripts/controllers/Completed.js index 390cae6..d1383a8 100644 --- a/app-main/scripts/controllers/Completed.js +++ b/app-main/scripts/controllers/Completed.js @@ -7,7 +7,7 @@ * Controller of the sbAdminApp */ angular.module('sbAdminApp') - .controller('CompletedCtrl', ['$scope', '$interval', 'txService' ,function($scope, $interval, txService) { + .controller('CompletedCtrl', ['$scope', '$interval', 'txService', '$stateParams' ,function($scope, $interval, txService, $stateParams) { console.log("loaded"); $scope.balance = 0; @@ -31,11 +31,11 @@ angular.module('sbAdminApp') }); txService.getBought(function(txs) { $scope.tempBought = $scope.tempBought.concat(txs); - $scope.bought = $scope.tempBought; + $scope.bought = $scope.tempBought.filter($scope.filterOutDonations); }); txService.getSold(function(txs) { $scope.tempSold = $scope.tempSold.concat(txs); - $scope.sold = $scope.tempSold; + $scope.sold = $scope.tempSold.filter($scope.filterOutDonations); }); } @@ -52,4 +52,11 @@ angular.module('sbAdminApp') }, 3000) reloadData(); + $scope.txAlert = $stateParams.txSent; + $scope.txDetails = $stateParams.txDetails; + + $scope.closeTxAlert = function(index) { + $scope.txAlert = false; + }; + }]); diff --git a/app-main/scripts/controllers/Donations.js b/app-main/scripts/controllers/Donations.js index 9fe634e..2df3cb7 100644 --- a/app-main/scripts/controllers/Donations.js +++ b/app-main/scripts/controllers/Donations.js @@ -27,12 +27,7 @@ angular.module('sbAdminApp') } $scope.accepts = txs.pendingAccepts.concat(txs.successfulAccepts); $scope.agrees = txs.offersAccepted; -/* - for (var i = 0; i -
- - Chat -
- - -
-
- -
- -
- -
-
- - - - -
-
- - \ No newline at end of file diff --git a/app-main/scripts/directives/chat/chat.js b/app-main/scripts/directives/chat/chat.js deleted file mode 100644 index 5055069..0000000 --- a/app-main/scripts/directives/chat/chat.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; - -/** - * @ngdoc directive - * @name izzyposWebApp.directive:adminPosHeader - * @description - * # adminPosHeader - */ -angular.module('sbAdminApp') - .directive('chat',function(){ - return { - templateUrl:'scripts/directives/chat/chat.html', - restrict: 'E', - replace: true, - } - }); - - diff --git a/app-main/scripts/directives/header/header-notification/header-notification.html b/app-main/scripts/directives/header/header-notification/header-notification.html index d651da6..c09e991 100644 --- a/app-main/scripts/directives/header/header-notification/header-notification.html +++ b/app-main/scripts/directives/header/header-notification/header-notification.html @@ -1,202 +1,4 @@