Handle archived program (DiscussionTopic) - issue #59

Leonardo Merlin
1 parent 505d9b3a
Showing 12 changed files with 115 additions and 49 deletions Show diff stats
src/app/components/app-paginator/app-paginator.directive.js
src/app/components/article-service/article.service.js
src/app/components/dialoga-service/dialoga.service.js
src/app/components/proposal-box/proposal-box.directive.js
src/app/components/proposal-box/proposal-box.html
src/app/components/proposal-carousel/proposal-carousel.directive.js
src/app/components/proposal-carousel/proposal-carousel.html
src/app/components/proposal-grid/proposal-grid.html
src/app/components/proposal-list/proposal-list.html
src/app/pages/programas/programa.controller.js
src/app/pages/programas/programa.html
src/app/pages/ranking/ranking.controller.js
@@ -46,11 +46,11 @@
     AppPaginatorController.prototype.attachListeners = function() {
       var vm = this;
  
-      vm.$scope.$watch('vm.perPage', function(newValue/*, oldValue*/) {
+      vm.$scope.$watch('vm.perPage', function() {
         vm.calcArrayPages();
       });
  
-      vm.$scope.$watch('vm.total', function(newValue/*, oldValue*/) {
+      vm.$scope.$watch('vm.total', function() {
         vm.calcArrayPages();
       });
     };
@@ -269,6 +269,7 @@
             'url', // parent.image.url
             'image',
             'title',
+            'archived',
           ]
       }, params);
  
@@ -39,7 +39,7 @@
       }else{
         // load main content
         ArticleService.getArticleById(API.articleId.home, {
-        'fields[]': ['id','abstract','body','categories','children','children_count','title','slug','image','url', 'amount_of_children', 'archived'],
+        'fields[]': ['id','abstract','body','categories','children','children_count','title','slug','image','url', 'archived'],
         'content_type':'ProposalsDiscussionPlugin::DiscussionTopic'
         }, function (data){
           CACHE.home = data;
@@ -33,6 +33,7 @@
       var vm = this;
  
       vm.showVote = vm.showVote || false;
+      vm.archived = vm.archived || false;
       vm.focus = vm.focus || false;
       vm.STATE = null;
       vm.errorOnSkip = false;
@@ -169,6 +170,11 @@
     ProposalBoxController.prototype.vote = function(value) {
       var vm = this;
  
+      if(vm.archived === true){
+        vm.$log.info('Article archived. Abort.');
+        return;
+      }
+
       vm._oldVoteValue = value;
       if (vm.canVote()) {
         if (vm.doVote) {
@@ -190,6 +196,11 @@
     ProposalBoxController.prototype.skip = function() {
       var vm = this;
  
+      if(vm.archived === true){
+        vm.$log.info('Article archived. Abort.');
+        return;
+      }
+
       vm.errorOnSkip = false;
       vm.STATE = vm.VOTE_STATUS.LOADING;
       vm.doVote({
@@ -226,15 +237,16 @@
       restrict: 'E',
       templateUrl: 'app/components/proposal-box/proposal-box.html',
       scope: {
-        proposal: '=',
-        topic: '=',
-        category: '=',
-        showVote: '=',
-        focus: '@',
-        doVote: '&'
         // @ -> Text binding / one-way binding
         // = -> Direct model binding / two-way binding
         // & -> Behaviour binding / Method binding
+        archived: '=',
+        category: '=',
+        doVote: '&',
+        focus: '@',
+        proposal: '=',
+        showVote: '=',
+        topic: '=',
       },
       controller: ProposalBoxController,
       controllerAs: 'vm',
@@ -145,9 +145,16 @@
       <div class="proposal-box--content-inner">{{vm.proposal.abstract}}</div>
     </div>
     <div ng-hide="vm.showVote" class="proposal-box--join">
-      <button class="btn btn-link color-theme-common-fg" ng-click="vm.showContent(vm.topic.slug)">
-        Participe
-      </button>
+      <button
+      class="btn btn-link color-theme-common-fg"
+      ng-if="vm.archived === false"
+      ng-click="vm.showContent(vm.topic.slug)"
+      >Participe</button>
+      <button
+      class="btn btn-link color-theme-common-fg"
+      ng-if="vm.archived === true"
+      ng-click="vm.showContent(vm.topic.slug)"
+      >Ir para o programa</button>
     </div>
     <div ng-show="vm.showVote" class="proposal-box--actions text-center">
       <div class="row">
@@ -31,6 +31,7 @@
       }
  
       vm.activeIndex = 0;
+      vm.archived = vm.archived || false;
       vm.loading = false;
       vm.proposalsLength = vm.proposals.length;
     };
@@ -80,6 +81,7 @@
       restrict: 'E',
       templateUrl: 'app/components/proposal-carousel/proposal-carousel.html',
       scope: {
+        archived: '=',
         proposals: '='
       },
       controller: ProposalCarouselController,
@@ -20,7 +20,7 @@
             <div class="inner">{{::proposal.abstract}}</div>
           </div>
         </div>
-        <div class="join" ng-show="vm.activeIndex === $index">
+        <div class="join" ng-if="vm.archived === false" ng-show="vm.activeIndex === $index">
           <button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)">
             Participe
             <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
 <div class="proposal-grid row">
   <div ng-repeat="proposal in vm.proposals as results">
-    <proposal-box proposal="proposal" topic="proposal.parent" category="proposal.parent.categories[0]" show-vote="false" class="col-xs-12 col-sm-6"></proposal-box>
+    <proposal-box
+    archived="proposal.parent.archived"
+    proposal="proposal"
+    topic="proposal.parent"
+    category="proposal.parent.categories[0]"
+    show-vote="false"
+    class="col-xs-12 col-sm-6"
+    ></proposal-box>
     <div ng-if="$odd" class="clearfix"></div>
   </div>
   <div class="animate-repeat" ng-if="results.length == 0">
@@ -23,9 +23,20 @@
 						</div>
 						<div class="row row-actions">
 							<div class="col-sm-8">
-								<button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)">
-									Participe
-								</button>
+								<div ng-if="proposal.parent.archived === false">
+									<button
+									type="button"
+									class="btn btn-link btn-rate color-theme-common-fg"
+									ng-click="vm.showContent(proposal)"
+									>Participe</button>
+								</div>
+								<div ng-if="proposal.parent.archived === true">
+									<button
+									type="button"
+									class="btn btn-link btn-rate color-theme-common-fg"
+									ng-click="vm.showContent(proposal)"
+									>Ir para o programa</button>
+								</div>
 							</div>
 							<div class="col-sm-4">
 								<proposal-stats class="text-right" views="{{::proposal.hits}}" up="{{::proposal.votes_for}}" down="{{::proposal.votes_against}}"></proposal-stats>
@@ -39,6 +39,7 @@
     vm.loadingTopProposals = null;
     vm.loadingProposalBox = null;
     vm.sendProposalRedirectURI = null;
+    vm.showDetailAboutArchived = false;
     // vm.voteProposalRedirectURI = null;
     vm.search = vm.$location.search();
  
@@ -86,7 +87,8 @@
       vm.DialogaService.getProposalsByTopicId(vm.article.id, {
         'limit': 5
       }, function(data) {
-        vm.total_proposals = parseInt(vm.article.amount_of_children);
+        vm.total_proposals = parseInt(vm.article.children_count);
+        // vm.total_proposals = parseInt(vm.article.amount_of_children); // DEPRECATED?!
         vm.proposals = data.articles;
         vm.proposalsTopFive = vm.proposals.slice(0, 5);
         vm.proposalsTopRated = vm.proposals.slice(0, 3);
@@ -202,6 +204,11 @@
   ProgramaPageController.prototype.vote = function(proposal_id, value) {
     var vm = this;
  
+    if(vm.article.archived === true){
+      vm.$log.info('Article archived. Abort.');
+      return;
+    }
+
     if (value === vm.VOTE_OPTIONS.SKIP) {
       vm.voteSkip();
       return;
@@ -237,6 +244,12 @@
  
   ProgramaPageController.prototype.showProposalForm = function() {
     var vm = this;
+
+    if(vm.article.archived === true){
+      vm.$log.info('Article archived. Abort.');
+      return;
+    }
+
     vm.findAndShow('#section-proposal-form');
   };
  
@@ -57,9 +57,19 @@
                   <div class="program-preview--make-proposal">
                     <div class="row">
                       <div class="col-sm-6">
-                        <div class="button--themed">
+                        <div class="button--themed" ng-if="!pagePrograma.article.archived">
                           <button type="button" class="btn btn-block" ng-click="pagePrograma.showProposalForm()">Faça uma proposta</button>
                         </div>
+                        <div ng-if="pagePrograma.article.archived">
+                          <button type="button"
+                            class="btn btn-block disabled"
+                            title="Este programa já foi analisado. Não está mais habilitado a receber novas propostas."
+                            ng-click="pagePrograma.showDetailAboutArchived = true"
+                            >Faça uma proposta</button>
+                        </div>
+                      </div>
+                      <div class="col-sm-6" ng-show="pagePrograma.showDetailAboutArchived === true">
+                        <p>(&#9679;) Este programa está arquivado.<br>Não pode receber novas propostas.</p>
                       </div>
                     </div>
                   </div>
@@ -82,12 +92,15 @@
                   <!-- Top Proposals > Carousel -->
                   <div class="col-xs-12" ng-if="!pagePrograma.loadingTopProposals && pagePrograma.proposalsTopRated && pagePrograma.proposalsTopRated.length > 0">
                     <h3 class="color-theme-fg">Propostas mais votadas</h3>
-                    <proposal-carousel proposals="pagePrograma.proposalsTopRated"></proposal-carousel>
+                    <proposal-carousel
+                    proposals="pagePrograma.proposalsTopRated"
+                    archived="pagePrograma.article.archived"
+                    ></proposal-carousel>
                   </div>
                 </div>
  
                 <!-- Proposal Box -->
-                <div>
+                <div ng-if="!pagePrograma.article.archived">
                   <div class="col-xs-12" ng-if="!pagePrograma.loadingProposalBox && pagePrograma.randomProposal" ng-class="{'focused-proposal': !!pagePrograma.search.proposal_id}">
                     <h3 class="color-theme-fg">Apoie outras propostas</h3>
                     <proposal-box
@@ -97,6 +110,7 @@
                     show-vote="true"
                     focus="{{pagePrograma.search.proposal_id}}"
                     do-vote="pagePrograma.vote(proposal_id, value)"
+                    archived="pagePrograma.article.archived"
                     ></proposal-box>
                   </div>
  
@@ -136,7 +150,7 @@
           </button>
         </div>
         <div class="proposal-extended-section-content">
-          <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list>
+          <proposal-list proposals="pagePrograma.proposalsTopFive" archived="pagePrograma.article.archived"></proposal-list>
           <div class="row text-center">
             <div class="col-xs-12">
               <a ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link">
@@ -37,6 +37,18 @@
     vm.query = null;
     vm.search = vm.$location.search();
  
+    if (vm.search.tema) {
+      vm._filtredByThemeSlug = vm.search.tema;
+    }
+
+    if (vm.search.programa) {
+      vm._filtredByProgramSlug = vm.search.programa;
+    }
+
+    if (vm.search.tema || vm.search.programa) {
+      vm.loadingFilter = true;
+    }
+
     vm.loading = null;
     vm.error = null;
   };
@@ -62,11 +74,11 @@
  
       // 2. Select a Random Theme (T)
       var selectedTheme = null;
-      if(vm.search.tema){
+      if(vm.search.tema || vm._filtredByThemeSlug){
  
         // vanilla filter
         var results = vm.themes.filter(function(t){
-          return t.slug === vm.search.tema;
+          return (t.slug === vm.search.tema || (t.slug === vm._filtredByThemeSlug));
         });
  
         if(results && results.length > 0){
@@ -85,6 +97,7 @@
       vm.loadPrograms(themeId, function(){
         // vm.loadProposals();
         vm.loading = false;
+        vm.loadingFilter = false;
       });
     }, function (error) {
       vm.error = error;
@@ -103,11 +116,11 @@
  
       // 4. Select a random program of T
       var selectedProgram = null;
-      if(vm.search.programa){
+      if(vm.search.programa || vm._filtredByProgramSlug){
  
         // vanilla filter
         var results = vm.filtredPrograms.filter(function(p){
-          return p.slug === vm.search.programa;
+          return (p.slug === vm.search.programa || (p.slug === vm._filtredByProgramSlug));
         });
  
         if(results && results.length > 0){
@@ -131,26 +144,6 @@
     });
   };
  
-  // RankingPageController.prototype.loadProposals = function () {
-  //   var vm = this;
-
-  //   // load Proposals
-  //   vm.loadingProposals = true;
-  //   vm.DialogaService.getProposals({
-  //     page: vm.page,
-  //     per_page: vm.per_page
-  //   }, function(data){
-  //     vm.filtredProposals = data.articles;
-  //     vm.loadingProposals = false;
-
-  //     vm.attachListeners();
-  //   }, function (error) {
-  //     vm.error = error;
-  //     vm.$log.error(error);
-  //     vm.loadingProposals = false;
-  //   });
-  // };
-
   RankingPageController.prototype.attachListeners = function() {
     var vm = this;
  
@@ -162,7 +155,7 @@
       vm.search.tema = newValue ? newValue.slug : null;
       vm.$location.search('tema', vm.search.tema);
  
-      if(vm.selectedTheme && vm.selectedTheme.id){
+      if(!vm.loadingFilter && vm.selectedTheme && vm.selectedTheme.id){
         vm.loadPrograms(vm.selectedTheme.id, function(){
           vm.filterProposals();
         });
@@ -176,13 +169,19 @@
     vm.$scope.$watch('pageRanking.selectedProgram', function(newValue/*, oldValue*/) {
       vm.search.programa = newValue ? newValue.slug : null;
       vm.$location.search('programa', vm.search.programa);
-      vm.filterProposals();
+      
+      if (!vm.loadingFilter) {
+        vm.filterProposals();
+      }
     });
  
     vm.$scope.$watch('pageRanking.query', function(newValue/*, oldValue*/) {
       vm.search.filtro = newValue ? newValue : null;
       vm.$location.search('filtro', vm.search.filtro);
-      vm.filterProposals();
+      
+      if (!vm.loadingFilter) {
+        vm.filterProposals();
+      }
     });
   };
...	...	@@ -46,11 +46,11 @@
46	46	AppPaginatorController.prototype.attachListeners = function() {
47	47	var vm = this;
48	48
49		- vm.$scope.$watch('vm.perPage', function(newValue/, oldValue/) {
	49	+ vm.$scope.$watch('vm.perPage', function() {
50	50	vm.calcArrayPages();
51	51	});
52	52
53		- vm.$scope.$watch('vm.total', function(newValue/, oldValue/) {
	53	+ vm.$scope.$watch('vm.total', function() {
54	54	vm.calcArrayPages();
55	55	});
56	56	};
...	...
...	...	@@ -269,6 +269,7 @@
269	269	'url', // parent.image.url
270	270	'image',
271	271	'title',
	272	+ 'archived',
272	273	]
273	274	}, params);
274	275
...	...
...	...	@@ -39,7 +39,7 @@
39	39	}else{
40	40	// load main content
41	41	ArticleService.getArticleById(API.articleId.home, {
42		- 'fields[]': ['id','abstract','body','categories','children','children_count','title','slug','image','url', 'amount_of_children', 'archived'],
	42	+ 'fields[]': ['id','abstract','body','categories','children','children_count','title','slug','image','url', 'archived'],
43	43	'content_type':'ProposalsDiscussionPlugin::DiscussionTopic'
44	44	}, function (data){
45	45	CACHE.home = data;
...	...
...	...	@@ -33,6 +33,7 @@
33	33	var vm = this;
34	34
35	35	vm.showVote = vm.showVote \|\| false;
	36	+ vm.archived = vm.archived \|\| false;
36	37	vm.focus = vm.focus \|\| false;
37	38	vm.STATE = null;
38	39	vm.errorOnSkip = false;
...	...	@@ -169,6 +170,11 @@
169	170	ProposalBoxController.prototype.vote = function(value) {
170	171	var vm = this;
171	172
	173	+ if(vm.archived === true){
	174	+ vm.$log.info('Article archived. Abort.');
	175	+ return;
	176	+ }
	177	+
172	178	vm._oldVoteValue = value;
173	179	if (vm.canVote()) {
174	180	if (vm.doVote) {
...	...	@@ -190,6 +196,11 @@
190	196	ProposalBoxController.prototype.skip = function() {
191	197	var vm = this;
192	198
	199	+ if(vm.archived === true){
	200	+ vm.$log.info('Article archived. Abort.');
	201	+ return;
	202	+ }
	203	+
193	204	vm.errorOnSkip = false;
194	205	vm.STATE = vm.VOTE_STATUS.LOADING;
195	206	vm.doVote({
...	...	@@ -226,15 +237,16 @@
226	237	restrict: 'E',
227	238	templateUrl: 'app/components/proposal-box/proposal-box.html',
228	239	scope: {
229		- proposal: '=',
230		- topic: '=',
231		- category: '=',
232		- showVote: '=',
233		- focus: '@',
234		- doVote: '&'
235	240	// @ -> Text binding / one-way binding
236	241	// = -> Direct model binding / two-way binding
237	242	// & -> Behaviour binding / Method binding
	243	+ archived: '=',
	244	+ category: '=',
	245	+ doVote: '&',
	246	+ focus: '@',
	247	+ proposal: '=',
	248	+ showVote: '=',
	249	+ topic: '=',
238	250	},
239	251	controller: ProposalBoxController,
240	252	controllerAs: 'vm',
...	...
...	...	@@ -145,9 +145,16 @@
145	145	<div class="proposal-box--content-inner">{{vm.proposal.abstract}}</div>
146	146	</div>
147	147	<div ng-hide="vm.showVote" class="proposal-box--join">
148		- <button class="btn btn-link color-theme-common-fg" ng-click="vm.showContent(vm.topic.slug)">
149		- Participe
150		- </button>
	148	+ <button
	149	+ class="btn btn-link color-theme-common-fg"
	150	+ ng-if="vm.archived === false"
	151	+ ng-click="vm.showContent(vm.topic.slug)"
	152	+ >Participe</button>
	153	+ <button
	154	+ class="btn btn-link color-theme-common-fg"
	155	+ ng-if="vm.archived === true"
	156	+ ng-click="vm.showContent(vm.topic.slug)"
	157	+ >Ir para o programa</button>
151	158	</div>
152	159	<div ng-show="vm.showVote" class="proposal-box--actions text-center">
153	160	<div class="row">
...	...
...	...	@@ -31,6 +31,7 @@
31	31	}
32	32
33	33	vm.activeIndex = 0;
	34	+ vm.archived = vm.archived \|\| false;
34	35	vm.loading = false;
35	36	vm.proposalsLength = vm.proposals.length;
36	37	};
...	...	@@ -80,6 +81,7 @@
80	81	restrict: 'E',
81	82	templateUrl: 'app/components/proposal-carousel/proposal-carousel.html',
82	83	scope: {
	84	+ archived: '=',
83	85	proposals: '='
84	86	},
85	87	controller: ProposalCarouselController,
...	...
...	...	@@ -20,7 +20,7 @@
20	20	<div class="inner">{{::proposal.abstract}}</div>
21	21	</div>
22	22	</div>
23		- <div class="join" ng-show="vm.activeIndex === $index">
	23	+ <div class="join" ng-if="vm.archived === false" ng-show="vm.activeIndex === $index">
24	24	<button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)">
25	25	Participe
26	26	<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
...	...
1	1	<div class="proposal-grid row">
2	2	<div ng-repeat="proposal in vm.proposals as results">
3		- <proposal-box proposal="proposal" topic="proposal.parent" category="proposal.parent.categories[0]" show-vote="false" class="col-xs-12 col-sm-6"></proposal-box>
	3	+ <proposal-box
	4	+ archived="proposal.parent.archived"
	5	+ proposal="proposal"
	6	+ topic="proposal.parent"
	7	+ category="proposal.parent.categories[0]"
	8	+ show-vote="false"
	9	+ class="col-xs-12 col-sm-6"
	10	+ ></proposal-box>
4	11	<div ng-if="$odd" class="clearfix"></div>
5	12	</div>
6	13	<div class="animate-repeat" ng-if="results.length == 0">
...	...
...	...	@@ -23,9 +23,20 @@
23	23	</div>
24	24	<div class="row row-actions">
25	25	<div class="col-sm-8">
26		- <button type="button" class="btn btn-link btn-rate color-theme-common-fg" ng-click="vm.showContent(proposal)">
27		- Participe
28		- </button>
	26	+ <div ng-if="proposal.parent.archived === false">
	27	+ <button
	28	+ type="button"
	29	+ class="btn btn-link btn-rate color-theme-common-fg"
	30	+ ng-click="vm.showContent(proposal)"
	31	+ >Participe</button>
	32	+ </div>
	33	+ <div ng-if="proposal.parent.archived === true">
	34	+ <button
	35	+ type="button"
	36	+ class="btn btn-link btn-rate color-theme-common-fg"
	37	+ ng-click="vm.showContent(proposal)"
	38	+ >Ir para o programa</button>
	39	+ </div>
29	40	</div>
30	41	<div class="col-sm-4">
31	42	<proposal-stats class="text-right" views="{{::proposal.hits}}" up="{{::proposal.votes_for}}" down="{{::proposal.votes_against}}"></proposal-stats>
...	...
...	...	@@ -39,6 +39,7 @@
39	39	vm.loadingTopProposals = null;
40	40	vm.loadingProposalBox = null;
41	41	vm.sendProposalRedirectURI = null;
	42	+ vm.showDetailAboutArchived = false;
42	43	// vm.voteProposalRedirectURI = null;
43	44	vm.search = vm.$location.search();
44	45
...	...	@@ -86,7 +87,8 @@
86	87	vm.DialogaService.getProposalsByTopicId(vm.article.id, {
87	88	'limit': 5
88	89	}, function(data) {
89		- vm.total_proposals = parseInt(vm.article.amount_of_children);
	90	+ vm.total_proposals = parseInt(vm.article.children_count);
	91	+ // vm.total_proposals = parseInt(vm.article.amount_of_children); // DEPRECATED?!
90	92	vm.proposals = data.articles;
91	93	vm.proposalsTopFive = vm.proposals.slice(0, 5);
92	94	vm.proposalsTopRated = vm.proposals.slice(0, 3);
...	...	@@ -202,6 +204,11 @@
202	204	ProgramaPageController.prototype.vote = function(proposal_id, value) {
203	205	var vm = this;
204	206
	207	+ if(vm.article.archived === true){
	208	+ vm.$log.info('Article archived. Abort.');
	209	+ return;
	210	+ }
	211	+
205	212	if (value === vm.VOTE_OPTIONS.SKIP) {
206	213	vm.voteSkip();
207	214	return;
...	...	@@ -237,6 +244,12 @@
237	244
238	245	ProgramaPageController.prototype.showProposalForm = function() {
239	246	var vm = this;
	247	+
	248	+ if(vm.article.archived === true){
	249	+ vm.$log.info('Article archived. Abort.');
	250	+ return;
	251	+ }
	252	+
240	253	vm.findAndShow('#section-proposal-form');
241	254	};
242	255
...	...