Merge branch 'remove-Button-ranking'

98287028191
2 parents 72255466 3b4724ae
Showing 6 changed files with 23 additions and 10 deletions Show diff stats
src/app/components/category-list/category-list.directive.js
src/app/components/category-list/category-list.html
src/app/pages/auth/new-password.html
src/app/pages/auth/newPassword.controller.js
src/app/pages/ranking/ranking.controller.js
src/app/pages/ranking/ranking.html
@@ -9,23 +9,33 @@
   function categoryList() {
  
     /** @ngInject */
-    function CategoryListController($rootScope, $element, $log) {
+    function CategoryListController($rootScope, $location, $element, $log) {
       $log.debug('CategoryListController');
  
       // alias
       var vm = this;
-
+      
       // dependencies
       vm.$rootScope = $rootScope;
+      vm.$location = $location;
       vm.$element = $element;
       vm.$log = $log;
  
+
       // initialization
       vm.init();
     }
  
     CategoryListController.prototype.init = function() {
       var vm = this;
+      vm.pathUrl = vm.$location.$$path;
+      //var pathUrl = String(window.location.pathname)
+      vm.escodeRemover = true;
+
+      // Disable button remove of page ranking
+      if(vm.pathUrl=="/ranking"){
+        vm.escodeRemover = false;
+      }
  
       // Default values
       if(!vm.isCollapsed){
@@ -47,12 +57,13 @@
  
     CategoryListController.prototype.selectCategory = function(category, $event) {
       var vm = this;
-
+      
       // prevent glitch
       $event.stopPropagation();
  
       if (category !== vm.selectedCategory) {
         vm.selectedCategory = category;
+
       }else{
  
         if(vm._disableUnselect()){
@@ -5,7 +5,6 @@
       <!-- <span class="visible-xs"><b>Filtrar</b> por Tema <span class="glyphicon glyphicon-filter pull-right"></span></span> -->
       <b>Filtrar</b> por Tema <span class="glyphicon glyphicon-filter pull-right"></span>
     </h3>
-
     <!-- <div class="list-group ng-hide" ng-show="!vm.isCollapsed" ng-class="vm.selectedCategory.slug"> -->
     <div class="list-group" ng-class="vm.selectedCategory.slug">
       <button type="button" class="list-group-item category-list--item"
@@ -17,7 +16,7 @@
         <span class="category-list--icon icon" aria-hidden="true" ng-class="'icon-tema-' + category.slug + '-small'"></span>
         <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>
+        <span ng-if="vm.escodeRemover" 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>
@@ -31,7 +31,8 @@
                         novalidate
                         name="newPasswordForm"
                         ng-submit="newPasswordForm.$valid && pageNewPassword.submitNewPassword($event, newPasswordForm)">
-                            <input type="hidden" id="code" name="code" value="{{::pageNewPassword.token}}" />
+
+
                             <div class="row">
                                 <div class="col-md-6">
                                     <div class="form-group">
@@ -43,7 +43,7 @@
  
     // get form data
     var data = {
-      code: newPasswordForm.code,
+      code: vm.token,
       newPassword: newPasswordForm.newPassword.$modelValue,
       newPasswordConfirmation: newPasswordForm.newPasswordConfirmation.$modelValue
     };
@@ -37,8 +37,8 @@
     vm.query = null;
     vm.search = vm.$location.search();
     //Remove "X" from the theme at the ranking page
-    // vm.slug = vm.$location.$$path;
-    // console.log(vm.$location.$$path);
+    vm.slug = vm.$location.$$path;
+    console.log("aqui",vm.$location.$$path);
  
     if (vm.search.tema) {
       vm._filtredByThemeSlug = vm.search.tema;
@@ -40,9 +40,11 @@
 		<div class="container">
 			<div id="lista-de-propostas" class="row">
 				<div class="col-sm-4 col-md-3">
+				<!-- Banner lateral de temas -->
 					<div ng-if="pageRanking.themes">
-						<category-list categories="pageRanking.themes" selected-category="pageRanking.selectedTheme" disable-unselect="true"></category-list>
+						<category-list categories="pageRanking.themes" selected-category="" disable-unselect="true"></category-list>
 					</div>
+
 					<div ng-if="pageRanking.filtredPrograms && pageRanking.selectedProgram" class="topics-select--wrapper">
 						<topics-select topics="pageRanking.filtredPrograms" selected-topic="pageRanking.selectedProgram"></topics-select>
 					</div>
...	...	@@ -9,23 +9,33 @@
9	9	function categoryList() {
10	10
11	11	/** @ngInject */
12		- function CategoryListController($rootScope, $element, $log) {
	12	+ function CategoryListController($rootScope, $location, $element, $log) {
13	13	$log.debug('CategoryListController');
14	14
15	15	// alias
16	16	var vm = this;
17		-
	17	+
18	18	// dependencies
19	19	vm.$rootScope = $rootScope;
	20	+ vm.$location = $location;
20	21	vm.$element = $element;
21	22	vm.$log = $log;
22	23
	24	+
23	25	// initialization
24	26	vm.init();
25	27	}
26	28
27	29	CategoryListController.prototype.init = function() {
28	30	var vm = this;
	31	+ vm.pathUrl = vm.$location.$$path;
	32	+ //var pathUrl = String(window.location.pathname)
	33	+ vm.escodeRemover = true;
	34	+
	35	+ // Disable button remove of page ranking
	36	+ if(vm.pathUrl=="/ranking"){
	37	+ vm.escodeRemover = false;
	38	+ }
29	39
30	40	// Default values
31	41	if(!vm.isCollapsed){
...	...	@@ -47,12 +57,13 @@
47	57
48	58	CategoryListController.prototype.selectCategory = function(category, $event) {
49	59	var vm = this;
50		-
	60	+
51	61	// prevent glitch
52	62	$event.stopPropagation();
53	63
54	64	if (category !== vm.selectedCategory) {
55	65	vm.selectedCategory = category;
	66	+
56	67	}else{
57	68
58	69	if(vm._disableUnselect()){
...	...
...	...	@@ -5,7 +5,6 @@
5	5	<!-- <span class="visible-xs"><b>Filtrar</b> por Tema <span class="glyphicon glyphicon-filter pull-right"></span></span> -->
6	6	<b>Filtrar</b> por Tema <span class="glyphicon glyphicon-filter pull-right"></span>
7	7	</h3>
8		-
9	8	<!-- <div class="list-group ng-hide" ng-show="!vm.isCollapsed" ng-class="vm.selectedCategory.slug"> -->
10	9	<div class="list-group" ng-class="vm.selectedCategory.slug">
11	10	<button type="button" class="list-group-item category-list--item"
...	...	@@ -17,7 +16,7 @@
17	16	<span class="category-list--icon icon" aria-hidden="true" ng-class="'icon-tema-' + category.slug + '-small'"></span>
18	17	<span class="category-list--label">{{::category.name}}</span>
19	18	<span class="category-list--icon--right glyphicon glyphicon-chevron-right hidden-xs" ng-hide="vm.selectedCategory.slug === category.slug"></span>
20		- <span class="category-list--icon--right glyphicon glyphicon-remove hidden-xs" ng-show="vm.selectedCategory.slug === category.slug"></span>
	19	+ <span ng-if="vm.escodeRemover" class="category-list--icon--right glyphicon glyphicon-remove hidden-xs" ng-show="vm.selectedCategory.slug === category.slug"></span>
21	20	<div ng-if="category.archived" class="category-list--icon-archived">
22	21	<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
23	22	</div>
...	...
...	...	@@ -31,7 +31,8 @@
31	31	novalidate
32	32	name="newPasswordForm"
33	33	ng-submit="newPasswordForm.$valid && pageNewPassword.submitNewPassword($event, newPasswordForm)">
34		- <input type="hidden" id="code" name="code" value="{{::pageNewPassword.token}}" />
	34	+
	35	+
35	36	<div class="row">
36	37	<div class="col-md-6">
37	38	<div class="form-group">
...	...
...	...	@@ -43,7 +43,7 @@
43	43
44	44	// get form data
45	45	var data = {
46		- code: newPasswordForm.code,
	46	+ code: vm.token,
47	47	newPassword: newPasswordForm.newPassword.$modelValue,
48	48	newPasswordConfirmation: newPasswordForm.newPasswordConfirmation.$modelValue
49	49	};
...	...
...	...	@@ -37,8 +37,8 @@
37	37	vm.query = null;
38	38	vm.search = vm.$location.search();
39	39	//Remove "X" from the theme at the ranking page
40		- // vm.slug = vm.$location.$$path;
41		- // console.log(vm.$location.$$path);
	40	+ vm.slug = vm.$location.$$path;
	41	+ console.log("aqui",vm.$location.$$path);
42	42
43	43	if (vm.search.tema) {
44	44	vm._filtredByThemeSlug = vm.search.tema;
...	...
...	...	@@ -40,9 +40,11 @@
40	40	<div class="container">
41	41	<div id="lista-de-propostas" class="row">
42	42	<div class="col-sm-4 col-md-3">
	43	+ <!-- Banner lateral de temas -->
43	44	<div ng-if="pageRanking.themes">
44		- <category-list categories="pageRanking.themes" selected-category="pageRanking.selectedTheme" disable-unselect="true"></category-list>
	45	+ <category-list categories="pageRanking.themes" selected-category="" disable-unselect="true"></category-list>
45	46	</div>
	47	+
46	48	<div ng-if="pageRanking.filtredPrograms && pageRanking.selectedProgram" class="topics-select--wrapper">
47	49	<topics-select topics="pageRanking.filtredPrograms" selected-topic="pageRanking.selectedProgram"></topics-select>
48	50	</div>
...	...