diff --git a/src/app/components/proposal-box/proposal-box.directive.js b/src/app/components/proposal-box/proposal-box.directive.js index 797e642..22f6416 100644 --- a/src/app/components/proposal-box/proposal-box.directive.js +++ b/src/app/components/proposal-box/proposal-box.directive.js @@ -9,14 +9,15 @@ function proposalBox() { /** @ngInject */ - function ProposalBoxController($scope, $state, STATUS_VOTE, $log) { + function ProposalBoxController($scope, $state, VOTE_STATUS, VOTE_OPTIONS, $log) { $log.debug('ProposalBoxController'); var vm = this; vm.$scope = $scope; vm.$state = $state; + vm.VOTE_STATUS = VOTE_STATUS; + vm.VOTE_OPTIONS = VOTE_OPTIONS; vm.$log = $log; - vm.STATUS_VOTE = STATUS_VOTE; vm.init(); vm.addListeners(); @@ -34,13 +35,15 @@ ProposalBoxController.prototype.addListeners = function () { var vm = this; - vm.$scope.$on('proposal-vote:success', function(e, data){ - vm.STATE = vm.STATUS_VOTE.SUCCESS; - vm.message = data.message; - }); - - vm.$scope.$on('proposal-vote:error', function(e, data){ - vm.STATE = vm.STATUS_VOTE.ERROR; + vm.$scope.$on('proposal-box:vote-response', function(e, data){ + if(data.success) { + vm.STATE = vm.VOTE_STATUS.SUCCESS; + } + + if(data.error) { + vm.STATE = vm.VOTE_STATUS.ERROR; + + } vm.message = data.message; }); }; @@ -59,24 +62,33 @@ ProposalBoxController.prototype.voteUp = function () { var vm = this; - vm.STATE = vm.STATUS_VOTE.LOADING; - vm.$scope.$emit('proposal-vote:voteUp', vm.proposal.id); + vm.STATE = vm.VOTE_STATUS.LOADING; + vm.$scope.$emit('proposal-box:vote', { + OPTION: vm.VOTE_OPTIONS.UP, + proposal_id: vm.proposal.id + }); vm.$log.debug('Sending vote'); }; ProposalBoxController.prototype.voteDown = function () { var vm = this; - vm.STATE = vm.STATUS_VOTE.LOADING; - vm.$scope.$emit('proposal-vote:voteDown', vm.proposal.id); + vm.STATE = vm.VOTE_STATUS.LOADING; + vm.$scope.$emit('proposal-box:vote', { + OPTION: vm.VOTE_OPTIONS.DOWN, + proposal_id: vm.proposal.id + }); vm.$log.debug('Sending vote'); }; - ProposalBoxController.prototype.next = function () { + ProposalBoxController.prototype.skip = function () { var vm = this; - vm.STATE = vm.STATUS_VOTE.LOADING; - vm.$scope.$emit('proposal-vote:next', vm.proposal.id); + vm.STATE = vm.VOTE_STATUS.LOADING; + vm.$scope.$emit('proposal-box:vote', { + OPTION: vm.VOTE_OPTIONS.SKIP, + proposal_id: vm.proposal.id + }); vm.$log.debug('Sending vote'); }; diff --git a/src/app/components/proposal-box/proposal-box.html b/src/app/components/proposal-box/proposal-box.html index 6edb85d..8ab1d6c 100644 --- a/src/app/components/proposal-box/proposal-box.html +++ b/src/app/components/proposal-box/proposal-box.html @@ -1,9 +1,9 @@ -
Verifique seu email para confirmar o cadastro.
'; vm.redirectBack(); - }, function(response){ + }, function(response) { vm.$log.debug('register error.response', response); // TODO: mensagens de erro @@ -127,29 +127,29 @@ }); }; - AuthPageController.prototype.redirectBack = function(){ + AuthPageController.prototype.redirectBack = function() { var vm = this; - if(!vm.hasRedirect){ + if (!vm.hasRedirect) { vm.$log.warn('No redirect params defined.'); return; } // start countdown vm.countdown = vm.delay; - (function countdown(){ - vm.$timeout(function(){ + (function countdown() { + vm.$timeout(function() { vm.countdown--; vm.$log.debug('vm.countdown', vm.countdown); - if(vm.countdown > 0){ + if (vm.countdown > 0) { countdown(); } }, 1000); })(); - vm.$timeout(function(){ + vm.$timeout(function() { var state = vm.params.state; - switch(state){ + switch (state){ case 'inicio': vm.$state.go(state, { event_id: vm.params.event_id, @@ -169,15 +169,15 @@ }, vm.delay * 1000); }; - AuthPageController.prototype.authWithFacebook = function(){ + AuthPageController.prototype.authWithFacebook = function() { var vm = this; var url = 'http://login.dialoga.gov.br/plugin/oauth_client/facebook?oauth_client_popup=true&id=1'; vm.$window.oauthClientAction(url); }; - AuthPageController.prototype.authWithGooglePlus = function(){ + AuthPageController.prototype.authWithGooglePlus = function() { var vm = this; - + var url = 'http://login.dialoga.gov.br/plugin/oauth_client/google_oauth2?oauth_client_popup=true&id=4'; vm.$window.oauthClientAction(url); }; diff --git a/src/app/pages/programas/programa.controller.js b/src/app/pages/programas/programa.controller.js index d925e85..517922c 100644 --- a/src/app/pages/programas/programa.controller.js +++ b/src/app/pages/programas/programa.controller.js @@ -135,6 +135,10 @@ vm.creatingProposal = false; }); }); + + vm.$scope.$on('proposal-box:vote', function(event, params) { + + }); }; ProgramaPageController.prototype.showProposalsList = function() { -- libgit2 0.21.2