diff --git a/src/app/components/article-service/article.service.js b/src/app/components/article-service/article.service.js index 9393b1d..59b4cde 100644 --- a/src/app/components/article-service/article.service.js +++ b/src/app/components/article-service/article.service.js @@ -6,12 +6,13 @@ .factory('ArticleService', ArticleService); /** @ngInject */ - function ArticleService($http, $q, $rootScope, API, UtilService, Slug, $log) { + function ArticleService($http, $q, $rootScope, API, UtilService, Slug, GUID, $log) { $log.debug('ArticleService'); var service = { apiArticles: $rootScope.basePath + '/api/v1/articles/', apiCommunities: $rootScope.basePath + '/api/v1/communities/', + apiProposals: $rootScope.basePath + '/api/v1/proposals_discussion_plugin/', getArticleById: getArticleById, getArticleBySlug: getArticleBySlug, getCategories: getCategories, @@ -21,6 +22,7 @@ getProposals: getProposals, getProposalById: getProposalById, getProposalsByTopicId: getProposalsByTopicId, + createProposal: createProposal, getEvents: getEvents, subscribeToEvent: subscribeToEvent, searchTopics: searchTopics, @@ -148,6 +150,28 @@ getProposalById(topicId + '/children', params, cbSuccess, cbError); } + function createProposal (proposal, targetId, cbSuccess, cbError){ + + if(!$rootScope.currentUser){ + cbError({message: 'Usuário não logado.'}); + }else{ + // /api/v1/proposals_discussion_plugin/' + targetId + '/propose + var url = service.apiProposals + targetId + '/propose'; + + var encodedParams = []; + encodedParams.push('private_token=' + $rootScope.currentUser.private_token); + encodedParams.push('fields=id'); + encodedParams.push('article[name]=article_' + GUID.generate()); + encodedParams = encodedParams.join('&'); + + UtilService.post(url, encodedParams).then(function(response){ + cbSuccess(response); + }).catch(function(error){ + cbError(error); + }); + } + } + function getEvents (community_id, params, cbSuccess, cbError) { // Ex.: /api/v1/communities/19195/articles?categories_ids[]=' + cat_id + '&content_type=Event'; // Ex.: /api/v1/communities/' + community_id + '/articles?categories_ids[]=' + cat_id + '&content_type=Event'; @@ -183,16 +207,17 @@ if(!$rootScope.currentUser){ cbError({message: 'Usuário não logado.'}); - } - var url = service.apiArticles + event_id + '/follow'; - var encodedParams = 'private_token=' + $rootScope.currentUser.private_token; + }else{ + var url = service.apiArticles + event_id + '/follow'; + var encodedParams = 'private_token=' + $rootScope.currentUser.private_token; - UtilService.post(url, encodedParams).then(function(response){ - cbSuccess(response); - }).catch(function(error){ - cbError(error); - }); + UtilService.post(url, encodedParams).then(function(response){ + cbSuccess(response); + }).catch(function(error){ + cbError(error); + }); + } } function searchTopics (params, cbSuccess, cbError) { diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.directive.js b/src/app/components/cadastro-proposta/cadastro-proposta.directive.js index c19fb80..29c28b0 100644 --- a/src/app/components/cadastro-proposta/cadastro-proposta.directive.js +++ b/src/app/components/cadastro-proposta/cadastro-proposta.directive.js @@ -28,13 +28,20 @@ // requeue to wait until DOM be created vm.$timeout(function(){ attachPopover.call(vm); - }, 100); + }, 200); + }; + + CadastroPropostaController.prototype.sendProposal = function (proposal) { + var vm = this; + + // notify parents - handled by parents + vm.$scope.$emit('cadastro-proposa:startSendProposal', proposal); }; function attachPopover(){ var vm = this; - vm.popover = angular.element(vm.$element.find('.link-popover')); + vm.popover = angular.element(vm.$element.find('.btn-question')); vm.popover.popover({ html: true, placement: 'bottom', @@ -47,7 +54,9 @@ var directive = { restrict: 'E', templateUrl: 'app/components/cadastro-proposta/cadastro-proposta.html', - scope: {}, + scope: { + program: '=' + }, controller: CadastroPropostaController, controllerAs: 'vm', bindToController: true diff --git a/src/app/components/cadastro-proposta/cadastro-proposta.html b/src/app/components/cadastro-proposta/cadastro-proposta.html index 1bd003b..b58f752 100644 --- a/src/app/components/cadastro-proposta/cadastro-proposta.html +++ b/src/app/components/cadastro-proposta/cadastro-proposta.html @@ -11,23 +11,29 @@

Você está fazendo uma proposta para o programa:

- Nome do progama + {{::vm.program.title}}
-
+
- Descrição da proposta* + ? - - - *Dados obrigatórios - Máx. 200 caracteres + +
+
+ *Dados obrigatórios +
+
+ Máx. 200 caracteres +
+
diff --git a/src/app/components/proposal-carousel/proposal-carousel.directive.js b/src/app/components/proposal-carousel/proposal-carousel.directive.js index c381541..866e432 100644 --- a/src/app/components/proposal-carousel/proposal-carousel.directive.js +++ b/src/app/components/proposal-carousel/proposal-carousel.directive.js @@ -56,11 +56,11 @@ } }; - ProposalCarouselController.prototype.showProposals = function () { + ProposalCarouselController.prototype.showProposalsList = function () { var vm = this; // notify parents - handled by parents - vm.$scope.$emit('proposal-carousel:showProposals'); + vm.$scope.$emit('proposal-carousel:showProposalsList'); }; var directive = { diff --git a/src/app/components/proposal-carousel/proposal-carousel.html b/src/app/components/proposal-carousel/proposal-carousel.html index bea3e81..ff7da6e 100644 --- a/src/app/components/proposal-carousel/proposal-carousel.html +++ b/src/app/components/proposal-carousel/proposal-carousel.html @@ -23,7 +23,7 @@ -
+
Veja as propostas mais vortadas
diff --git a/src/app/pages/programas/programa.controller.js b/src/app/pages/programas/programa.controller.js index 43c4d58..6bd041c 100644 --- a/src/app/pages/programas/programa.controller.js +++ b/src/app/pages/programas/programa.controller.js @@ -118,29 +118,58 @@ ProgramaPageController.prototype.attachListeners = function() { var vm = this; - vm.$scope.$on('proposal-carousel:showProposals', function() { - if(!vm._proposal_list){ - vm._proposal_list = vm.$element.find('.proposal-ranking-section'); - } + vm.$scope.$on('proposal-carousel:showProposalsList', function() { + vm.showProposalsList(); + }); - vm._proposal_list.slideDown(); - angular.element('body').animate({scrollTop: vm._proposal_list.offset().top}, 'fast'); + vm.$scope.$on('cadastro-proposa:startSendProposal', function(event, proposal) { + // vm.$log.debug('proposal', proposal); + vm.creatingProposal = true; + vm.DialogaService.createProposal(proposal, vm.article.id, function (response){ + vm.$log.debug('response', response); + vm.creatingProposal = false; + }, function (error) { + vm.$log.error(error); + vm.creatingProposal = false; + }); }); }; - ProgramaPageController.prototype.hideProposals = function() { + ProgramaPageController.prototype.showProposalsList = function() { var vm = this; + vm.findAndShow('#section-proposal-list'); + }; - if(!vm._proposal_list){ - vm._proposal_list = vm.$element.find('.proposal-ranking-section'); - } + ProgramaPageController.prototype.hideProposalsList = function() { + var vm = this; + vm.findAndHide('#section-proposal-list'); + }; - vm._proposal_list.slideUp(); + ProgramaPageController.prototype.showProposalForm = function() { + var vm = this; + vm.findAndShow('#section-proposal-form'); }; - ProgramaPageController.prototype.makeProposal = function() { + ProgramaPageController.prototype.hideProposalForm = function() { + var vm = this; + vm.findAndHide('#section-proposal-form'); + }; + + ProgramaPageController.prototype.findAndShow = function(rule) { + var vm = this; + var el = vm.$element.find(rule); + el.slideDown(); + angular.element('body').animate({scrollTop: el.offset().top}, 'fast'); + } + + ProgramaPageController.prototype.findAndHide = function(rule) { + var vm = this; + vm.$element.find(rule).slideUp(); + } + + ProgramaPageController.prototype.sendProposal = function() { var vm = this; - vm.$log.warn('Not implemented yet: "makeProposal"'); + vm.$log.warn('Not implemented yet: "sendProposal"'); }; })(); diff --git a/src/app/pages/programas/programa.html b/src/app/pages/programas/programa.html index 37c0a98..0cd0f3f 100644 --- a/src/app/pages/programas/programa.html +++ b/src/app/pages/programas/programa.html @@ -6,7 +6,7 @@
-
+
@@ -47,7 +47,7 @@
- +
@@ -70,7 +70,7 @@

Este programa ainda não possui nenhuma proposta.

- +

@@ -81,20 +81,33 @@
-