Merge branch 'refact-proposal-image'

Leonardo Merlin
2 parents 1236933e 89eb86c0
Showing 7 changed files with 79 additions and 3 deletions Show diff stats
src/app/components/article-service/article.service.js
src/app/components/category-list/category-list.html
src/app/components/category-list/category-list.scss
src/app/components/dialoga-service/dialoga.service.js
src/app/pages/programas/programa.controller.js
src/app/pages/programas/programa.html
src/app/pages/respostas/respostas.controller.js
@@ -329,6 +329,5 @@
  
       data.articles = results;
     }
-
   }
 })();
@@ -18,6 +18,9 @@
         <span class="category-list--label">{{::category.name}}</span>
         <span class="category-list--icon--right glyphicon glyphicon-chevron-right hidden-xs" ng-hide="vm.selectedCategory.slug === category.slug"></span>
         <span class="category-list--icon--right glyphicon glyphicon-remove hidden-xs" ng-show="vm.selectedCategory.slug === category.slug"></span>
+        <div ng-if="category.archived" class="category-list--icon-archived">
+          <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
+        </div>
       </button>
     </div>
   </nav>
@@ -77,6 +77,24 @@
         }
     }
  
+    &--icon-archived {
+        position: absolute;
+        width: 15px;
+        height: 15px;
+        font-size: 12px;
+        bottom: 8px;
+        left: 41px;
+
+        .glyphicon {
+            position: relative;
+            top: -2px;
+            color: #fff;
+            background-color: #3FC869;
+            padding: 3px;
+            border-radius: 100%;
+        }
+    }
+
     .category-list--icon {
         position: absolute;
         top: 6px;
@@ -321,6 +321,40 @@
       }
  
       _pipeCalcColors(data);
+      _pipeCheckArchived(data);
+    }
+
+
+    function _pipeCheckArchived(data){
+
+      var programs = data.article.children; // Programas
+      var themes = data.article.categories; // Temas
+
+      // para cada Tema
+      for (var i = themes.length - 1; i >= 0; i--) {
+        var theme = themes[i];
+
+        // para cada programa
+        for (var j = programs.length - 1; j >= 0; j--) {
+          var program = programs[j];
+
+          // Verifica se o programa 'j' perntece ao tema 'i'
+          if(program.categories && program.categories.length > 0){
+            if(angular.equals(program.categories[0].slug, theme.slug)){
+              
+              // Verifica se o programa está 'congelado' (archived)
+              if(program.archived){
+                theme.archived = true;
+                break;
+              }
+            }
+          }
+        }
+
+        if(!theme.archived){
+          theme.archived = false;
+        }
+      }
     }
  
     function _pipeSetPrograms (data) {
@@ -120,6 +120,18 @@
             // TODO: load and show proposal response
           }
         }
+
+        // HACK: get image from body 'proposal'
+        // remove tags html
+        for (var j = vm.proposalsTopRated.length - 1; j >= 0; j--) {
+          var proposalTopRated = vm.proposalsTopRated[j];
+          if (proposalTopRated && proposalTopRated.body && proposalTopRated.body.length > 0) {
+            proposalTopRated.body = String(proposalTopRated.body).replace(/<[^>]+>/gm, '');
+          }else{
+            proposalTopRated.body = vm.banner.src;
+          }
+        }
+
       }, function(error) {
         vm.$log.error(error);
         vm.loadingTopProposals = false;
@@ -234,7 +234,7 @@
                         <div class="container">
                             <div class="row">
                                 <div class="col-sm-4 col-md-3">
-                                    <div class="img-mask--container" ng-style="{'background-image':'url( {{::pagePrograma.banner.src}} )'}">
+                                    <div class="img-mask--container" ng-style="{'background-image':'url( {{::proposal.body}} )'}">
                                         <div class="img-mask--background">
                                             <div class="icon icon-programa-respondido">
                                                 <div class="icon-circle">
@@ -64,7 +64,17 @@
     // 1. Load themes
     vm.loadingThemes = true;
     vm.DialogaService.getThemes(function(themes) {
-      vm.themes = themes;
+      var archivedThemes = [];
+
+      for (var i = themes.length - 1; i >= 0; i--) {
+        var theme = themes[i];
+
+        if(theme.archived){
+          archivedThemes.push(theme);
+        }
+      }
+
+      vm.themes = archivedThemes;
       vm.loadingThemes = false;
       vm.loading = false;
...	...	@@ -329,6 +329,5 @@
329	329
330	330	data.articles = results;
331	331	}
332		-
333	332	}
334	333	})();
...	...
...	...	@@ -18,6 +18,9 @@
18	18	<span class="category-list--label">{{::category.name}}</span>
19	19	<span class="category-list--icon--right glyphicon glyphicon-chevron-right hidden-xs" ng-hide="vm.selectedCategory.slug === category.slug"></span>
20	20	<span class="category-list--icon--right glyphicon glyphicon-remove hidden-xs" ng-show="vm.selectedCategory.slug === category.slug"></span>
	21	+ <div ng-if="category.archived" class="category-list--icon-archived">
	22	+ <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
	23	+ </div>
21	24	</button>
22	25	</div>
23	26	</nav>
...	...
...	...	@@ -77,6 +77,24 @@
77	77	}
78	78	}
79	79
	80	+ &--icon-archived {
	81	+ position: absolute;
	82	+ width: 15px;
	83	+ height: 15px;
	84	+ font-size: 12px;
	85	+ bottom: 8px;
	86	+ left: 41px;
	87	+
	88	+ .glyphicon {
	89	+ position: relative;
	90	+ top: -2px;
	91	+ color: #fff;
	92	+ background-color: #3FC869;
	93	+ padding: 3px;
	94	+ border-radius: 100%;
	95	+ }
	96	+ }
	97	+
80	98	.category-list--icon {
81	99	position: absolute;
82	100	top: 6px;
...	...
...	...	@@ -321,6 +321,40 @@
321	321	}
322	322
323	323	_pipeCalcColors(data);
	324	+ _pipeCheckArchived(data);
	325	+ }
	326	+
	327	+
	328	+ function _pipeCheckArchived(data){
	329	+
	330	+ var programs = data.article.children; // Programas
	331	+ var themes = data.article.categories; // Temas
	332	+
	333	+ // para cada Tema
	334	+ for (var i = themes.length - 1; i >= 0; i--) {
	335	+ var theme = themes[i];
	336	+
	337	+ // para cada programa
	338	+ for (var j = programs.length - 1; j >= 0; j--) {
	339	+ var program = programs[j];
	340	+
	341	+ // Verifica se o programa 'j' perntece ao tema 'i'
	342	+ if(program.categories && program.categories.length > 0){
	343	+ if(angular.equals(program.categories[0].slug, theme.slug)){
	344	+
	345	+ // Verifica se o programa está 'congelado' (archived)
	346	+ if(program.archived){
	347	+ theme.archived = true;
	348	+ break;
	349	+ }
	350	+ }
	351	+ }
	352	+ }
	353	+
	354	+ if(!theme.archived){
	355	+ theme.archived = false;
	356	+ }
	357	+ }
324	358	}
325	359
326	360	function _pipeSetPrograms (data) {
...	...
...	...	@@ -120,6 +120,18 @@
120	120	// TODO: load and show proposal response
121	121	}
122	122	}
	123	+
	124	+ // HACK: get image from body 'proposal'
	125	+ // remove tags html
	126	+ for (var j = vm.proposalsTopRated.length - 1; j >= 0; j--) {
	127	+ var proposalTopRated = vm.proposalsTopRated[j];
	128	+ if (proposalTopRated && proposalTopRated.body && proposalTopRated.body.length > 0) {
	129	+ proposalTopRated.body = String(proposalTopRated.body).replace(/<[^>]+>/gm, '');
	130	+ }else{
	131	+ proposalTopRated.body = vm.banner.src;
	132	+ }
	133	+ }
	134	+
123	135	}, function(error) {
124	136	vm.$log.error(error);
125	137	vm.loadingTopProposals = false;
...	...
...	...	@@ -234,7 +234,7 @@
234	234	<div class="container">
235	235	<div class="row">
236	236	<div class="col-sm-4 col-md-3">
237		- <div class="img-mask--container" ng-style="{'background-image':'url( {{::pagePrograma.banner.src}} )'}">
	237	+ <div class="img-mask--container" ng-style="{'background-image':'url( {{::proposal.body}} )'}">
238	238	<div class="img-mask--background">
239	239	<div class="icon icon-programa-respondido">
240	240	<div class="icon-circle">
...	...
...	...	@@ -64,7 +64,17 @@
64	64	// 1. Load themes
65	65	vm.loadingThemes = true;
66	66	vm.DialogaService.getThemes(function(themes) {
67		- vm.themes = themes;
	67	+ var archivedThemes = [];
	68	+
	69	+ for (var i = themes.length - 1; i >= 0; i--) {
	70	+ var theme = themes[i];
	71	+
	72	+ if(theme.archived){
	73	+ archivedThemes.push(theme);
	74	+ }
	75	+ }
	76	+
	77	+ vm.themes = archivedThemes;
68	78	vm.loadingThemes = false;
69	79	vm.loading = false;
70	80
...	...