Merge branch 'master' of softwarepublico.gov.br:noosfero-apps/discussion-app

Rafael Diego
2 parents bb330252 2bfeaf43
Showing 6 changed files with 111 additions and 13 deletions Show diff stats
src/app/components/article-service/article.service.js
src/app/pages/inicio/inicio.html
src/app/pages/inicio/inicio.scss
src/app/pages/propostas/propostas.controller.js
src/app/pages/propostas/propostas.html
src/assets/images/banner_home_2.png
@@ -283,6 +283,7 @@
     function searchProposals (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Proposal&query=cisternas
       var url = service.apiSearch + 'article';
+      console.log("URL",url);
       var paramsExtended = angular.extend({
         page: 1,
         per_page: 10,
@@ -308,6 +309,7 @@
       UtilService.get(url, {params: paramsExtended}).then(function(data){
         _pipeInjectSlugIntoParentProgram(data);
         cbSuccess(data);
+        console.log("Resposta",data);
       }).catch(function(error){
         cbError(error);
       });
@@ -61,7 +61,10 @@
                     </div>
                 </div>
                 <div class="col-md-4" ng-show="pageInicio.bannerRespostas">
-                    <div class="banner-respostas banner-respostas--background-pink">
+                    <div class="banner-respostas">
+                        <img class="banner-respostas--logo banner-respostas--logo-small img-responsive banner-responsive" src="/assets/images/banner_home_2.png" alt="O governo federal segue  dialogando com a sociedade. Você fez sua parte mandando participando com propostas para melhorar o país e o governo respondeu. Confira aqui o resultado!">
+                    </div>
+                    <!-- <div class="banner-respostas banner-respostas--background-pink">
                         <a ui-sref="respostas" class="banner-respostas--link-top">
                             <span class="img-banner">
                                 <img class="banner-respostas--logo banner-respostas--logo-small" src="/assets/images/marca_banner2.png" alt="Logo Dialoga Brasil"/>
@@ -74,7 +77,7 @@
                         <div class="teste vertical-align">
                             <a ui-sref="respostas" class="banner-respostas--banner2--link-bottom">CONFIRA AQUI O RESULTADO!</a>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
             </div>
         </div>
@@ -132,7 +132,7 @@
     width: 100%;
     $bannerHeight: 338px;
     $bannerBottomHeight: 40px;
-   
+
     .img-banner {
         display: block;
         text-align: center;
@@ -145,7 +145,22 @@
     .text-bold {
         font-weight: bold;
     }
-    
+
+    .banner-responsive {
+
+        width: inherit;
+        height: inherit;
+
+        @media(max-width:991px) {
+            width: 50%;
+            margin: 0 auto;
+        }
+
+        @media(max-width:768px) {
+            width: inherit;
+        }
+    }
+
     .teste {
         display: block;
         height: 35px;
@@ -32,6 +32,7 @@
     vm.themes = null;
     vm.selectedTheme = null;
     vm.filtredProposals = null;
+    vm.filtredProposalsArchived = null;
     vm.query = null;
     vm.search = vm.$location.search();
@@ -110,6 +111,30 @@
     vm.selectedTheme = null;
   };
+  PropostasPageController.prototype.filtersArchived = function(dataArticles) {
+    
+    var vm = this;
+    var out = [];
+    var input = dataArticles || [];
+
+    for (var i = 0; i < input.length; i++) {
+      
+      var Proposals = input[i];
+      console.log('****************************',Proposals.parent.title + ' - ' +Proposals.parent.archived + ' - ' + Proposals.title);
+      
+      if (Proposals.parent.archived) {
+
+        out.push(Proposals);                      
+        
+      }
+
+    }
+    
+    return out
+
+  };
+
+
   PropostasPageController.prototype.changePage = function(pageIndex) {
     var vm = this;
@@ -166,13 +191,25 @@
       params.category_ids = vm.selectedTheme.id;
     }
+
     if (query) {params.query = query; }
-    vm.loadingProposals = true;
-    vm.DialogaService.searchProposals(params, function(data){
+      vm.loadingProposals = true;
+      vm.DialogaService.searchProposals(params, function(data){
+
       vm.total_proposals = parseInt(data._obj.headers('total'));
+
+      // Antigo
       vm.filtredProposals = data.articles;
+
+      // Novo
+      vm.filtredProposalsArchived = vm.filtersArchived(vm.filtredProposals);
+
+      // Misto
+      //vm.filtredProposals = vm.filtersArchived(data.articles);      
+      
       vm.loadingProposals = false;
+
     }, function (error) {
       vm.error = error;
       vm.$log.error(error);
@@ -180,9 +217,48 @@
     });
   };
-  PropostasPageController.prototype.submitSearch = function() {
+  PropostasPageController.prototype.filterProposalsArchived = function(_page, _per_page) {
     var vm = this;
+    if (vm.loadingProposals){
+      vm.$log.debug('Content is not loaded yet.');
+      return;
+    }
+
+    var page = _page || vm.page;
+    var per_page = _per_page || vm.per_page;
+    var query = vm.query;
+    var params = {
+      page: page,
+      per_page: per_page,
+    };
+
+    if (vm.selectedTheme) {
+      params.category_ids = vm.selectedTheme.id;
+    }
+
+
+    if (query) {params.query = query; }
+
+    vm.loadingProposals = true;
+    vm.DialogaService.searchProposals(params, function(data){
+
+      vm.total_proposals = parseInt(data._obj.headers('total'));   
+      vm.filtredProposals = vm.filtersArchived(data.articles);
+      
+      vm.loadingProposals = false;
+    }, function (error) {
+      vm.error = error;
+      vm.$log.error(error);
+      vm.loadingProposals = false;
+    });
+  };
+
+
+
+  PropostasPageController.prototype.submitSearch = function() {
+    var vm = this;
+    
     // scroll to result grid
     var $searchResult = angular.element('#search-result');
     if ($searchResult && $searchResult.length > 0) {
@@ -22,7 +22,7 @@
             </div>
         </div>
     </section>
-    <section class="section--header" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
+    <section class="section--header" ng-if="pagePropostas.filtredProposalsArchived || pagePropostas.themes">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12">
@@ -31,7 +31,7 @@
             </div>
         </div>
     </section>
-    <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
+    <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.filtredProposalsArchived || pagePropostas.themes">
         <div class="container">
             <div id="lista-de-propostas" class="row">
                 <div class="col-sm-4 col-md-3">
@@ -67,7 +67,7 @@
                     </div>
                 </div>
                 <div class="col-sm-8 col-md-9">
-                    <div class="row hidden-xs" ng-if="pagePropostas.filtredProposals">
+                    <div class="row hidden-xs" ng-if="pagePropostas.filtredProposalsArchived">
                         <div class="col-xs-12">
                             <div class="input-group input-group-lg input-group-search">
                                 <label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>
@@ -83,7 +83,7 @@
                             </div>
                         </div>
                     </div>
-                    <div id="search-result" class="row" ng-if="pagePropostas.filtredProposals">
+                    <div id="search-result" class="row" ng-if="pagePropostas.filtredProposalsArchived">
                         <div class="col-sm-12">
                             <header class="header">
                                 <h2>Total de Propostas: "<b>{{pagePropostas.total_proposals}} propostas</b>"</h2>
@@ -91,8 +91,10 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-sm-12" ng-if="!pagePropostas.loadingProposals && pagePropostas.filtredProposals && pagePropostas.total_proposals">
-                            <proposal-grid proposals="pagePropostas.filtredProposals"></proposal-grid>
+                        <div class="col-sm-12" ng-if="!pagePropostas.loadingProposals && pagePropostas.filtredProposalsArchived && pagePropostas.total_proposals">
+
+                            <proposal-grid proposals="pagePropostas.filtredProposalsArchived"></proposal-grid>
+
                             <app-paginator page="pagePropostas.page" per-page="pagePropostas.per_page" total="pagePropostas.total_proposals" change-page="pagePropostas.changePage(pageIndex)"></app-paginator>
                         </div>
                         <div ng-if="pagePropostas.loadingProposals">
	@@ -132,7 +132,7 @@		@@ -132,7 +132,7 @@
132	width: 100%;	132	width: 100%;
133	$bannerHeight: 338px;	133	$bannerHeight: 338px;
134	$bannerBottomHeight: 40px;	134	$bannerBottomHeight: 40px;
135	-	135	+
136	.img-banner {	136	.img-banner {
137	display: block;	137	display: block;
138	text-align: center;	138	text-align: center;
	@@ -145,7 +145,22 @@		@@ -145,7 +145,22 @@
145	.text-bold {	145	.text-bold {
146	font-weight: bold;	146	font-weight: bold;
147	}	147	}
148	-	148	+
		149	+ .banner-responsive {
		150	+
		151	+ width: inherit;
		152	+ height: inherit;
		153	+
		154	+ @media(max-width:991px) {
		155	+ width: 50%;
		156	+ margin: 0 auto;
		157	+ }
		158	+
		159	+ @media(max-width:768px) {
		160	+ width: inherit;
		161	+ }
		162	+ }
		163	+
149	.teste {	164	.teste {
150	display: block;	165	display: block;
151	height: 35px;	166	height: 35px;
	@@ -32,6 +32,7 @@		@@ -32,6 +32,7 @@
32	vm.themes = null;	32	vm.themes = null;
33	vm.selectedTheme = null;	33	vm.selectedTheme = null;
34	vm.filtredProposals = null;	34	vm.filtredProposals = null;
		35	+ vm.filtredProposalsArchived = null;
35	vm.query = null;	36	vm.query = null;
36	vm.search = vm.$location.search();	37	vm.search = vm.$location.search();
37		38
	@@ -110,6 +111,30 @@		@@ -110,6 +111,30 @@
110	vm.selectedTheme = null;	111	vm.selectedTheme = null;
111	};	112	};
112		113
		114	+ PropostasPageController.prototype.filtersArchived = function(dataArticles) {
		115	+
		116	+ var vm = this;
		117	+ var out = [];
		118	+ var input = dataArticles \|\| [];
		119	+
		120	+ for (var i = 0; i < input.length; i++) {
		121	+
		122	+ var Proposals = input[i];
		123	+ console.log('****************************',Proposals.parent.title + ' - ' +Proposals.parent.archived + ' - ' + Proposals.title);
		124	+
		125	+ if (Proposals.parent.archived) {
		126	+
		127	+ out.push(Proposals);
		128	+
		129	+ }
		130	+
		131	+ }
		132	+
		133	+ return out
		134	+
		135	+ };
		136	+
		137	+
113	PropostasPageController.prototype.changePage = function(pageIndex) {	138	PropostasPageController.prototype.changePage = function(pageIndex) {
114	var vm = this;	139	var vm = this;
115		140
	@@ -166,13 +191,25 @@		@@ -166,13 +191,25 @@
166	params.category_ids = vm.selectedTheme.id;	191	params.category_ids = vm.selectedTheme.id;
167	}	192	}
168		193
		194	+
169	if (query) {params.query = query; }	195	if (query) {params.query = query; }
170		196
171	- vm.loadingProposals = true;
172	- vm.DialogaService.searchProposals(params, function(data){	197	+ vm.loadingProposals = true;
		198	+ vm.DialogaService.searchProposals(params, function(data){
		199	+
173	vm.total_proposals = parseInt(data._obj.headers('total'));	200	vm.total_proposals = parseInt(data._obj.headers('total'));
		201	+
		202	+ // Antigo
174	vm.filtredProposals = data.articles;	203	vm.filtredProposals = data.articles;
		204	+
		205	+ // Novo
		206	+ vm.filtredProposalsArchived = vm.filtersArchived(vm.filtredProposals);
		207	+
		208	+ // Misto
		209	+ //vm.filtredProposals = vm.filtersArchived(data.articles);
		210	+
175	vm.loadingProposals = false;	211	vm.loadingProposals = false;
		212	+
176	}, function (error) {	213	}, function (error) {
177	vm.error = error;	214	vm.error = error;
178	vm.$log.error(error);	215	vm.$log.error(error);
	@@ -180,9 +217,48 @@		@@ -180,9 +217,48 @@
180	});	217	});
181	};	218	};
182		219
183	- PropostasPageController.prototype.submitSearch = function() {	220	+ PropostasPageController.prototype.filterProposalsArchived = function(_page, _per_page) {
184	var vm = this;	221	var vm = this;
185		222
		223	+ if (vm.loadingProposals){
		224	+ vm.$log.debug('Content is not loaded yet.');
		225	+ return;
		226	+ }
		227	+
		228	+ var page = _page \|\| vm.page;
		229	+ var per_page = _per_page \|\| vm.per_page;
		230	+ var query = vm.query;
		231	+ var params = {
		232	+ page: page,
		233	+ per_page: per_page,
		234	+ };
		235	+
		236	+ if (vm.selectedTheme) {
		237	+ params.category_ids = vm.selectedTheme.id;
		238	+ }
		239	+
		240	+
		241	+ if (query) {params.query = query; }
		242	+
		243	+ vm.loadingProposals = true;
		244	+ vm.DialogaService.searchProposals(params, function(data){
		245	+
		246	+ vm.total_proposals = parseInt(data._obj.headers('total'));
		247	+ vm.filtredProposals = vm.filtersArchived(data.articles);
		248	+
		249	+ vm.loadingProposals = false;
		250	+ }, function (error) {
		251	+ vm.error = error;
		252	+ vm.$log.error(error);
		253	+ vm.loadingProposals = false;
		254	+ });
		255	+ };
		256	+
		257	+
		258	+
		259	+ PropostasPageController.prototype.submitSearch = function() {
		260	+ var vm = this;
		261	+
186	// scroll to result grid	262	// scroll to result grid
187	var $searchResult = angular.element('#search-result');	263	var $searchResult = angular.element('#search-result');
188	if ($searchResult && $searchResult.length > 0) {	264	if ($searchResult && $searchResult.length > 0) {