Merge branch 'master' into staging

Rafael Diego
2 parents 0cdf1fb5 919ba03f
Showing 6 changed files with 27 additions and 102 deletions Show diff stats
src/app/components/article-service/article.service.js
src/app/components/proposal-box/proposal-box.html
src/app/pages/propostas/propostas.controller.js
src/app/pages/propostas/propostas.html
src/app/pages/respostas/respostas.controller.js
src/app/pages/respostas/respostas.html
@@ -267,7 +267,7 @@
     function searchTopics (params, cbSuccess, cbError) {
       // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Topic&query=cisternas
-      var url = service.apiSearch + '/article';
+      var url = service.apiSearch + 'article';
       var paramsExtended = angular.extend({
         // 'fields[]': ['id', 'title', 'slug', 'abstract', 'categories', 'setting', 'children_count', 'hits'],
         'type': 'ProposalsDiscussionPlugin::Topic'
@@ -283,7 +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);
+      console.log('url',url);
       var paramsExtended = angular.extend({
         page: 1,
         per_page: 10,
@@ -299,17 +299,18 @@
         'parent',
         'categories',
         'slug',
-            'url', // parent.image.url
-            'image',
-            'title',
-            'archived',
-            ]
-          }, params);
+        'url', // parent.image.url
+        'image',
+        'title',
+        'archived',
+        'has_children',
+        ]
+      }, params);
+      console.log("params",paramsExtended);
       UtilService.get(url, {params: paramsExtended}).then(function(data){
         _pipeInjectSlugIntoParentProgram(data);
         cbSuccess(data);
-        console.log("Resposta",data);
       }).catch(function(error){
         cbError(error);
       });
@@ -139,6 +139,9 @@
   <div class="proposal-box--top">
     <div class="proposal-box--theme color-theme-bg-complementar-2">{{vm.category.name}}</div>
     <div class="proposal-box--program color-theme-bg">{{vm.topic.title}}</div>
+    
+    <!-- Apagar o bloco abaixo -->
+    <span style="background: green;">{{::vm.proposal.body}}
   </div>
   <div class="proposal-box--middle">
     <div class="proposal-box--content">
@@ -32,7 +32,6 @@
     vm.themes = null;
     vm.selectedTheme = null;
     vm.filtredProposals = null;
-    vm.filtredProposalsArchived = null;
     vm.query = null;
     vm.search = vm.$location.search();
@@ -111,30 +110,6 @@
     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;
@@ -191,61 +166,12 @@
       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'));
-
-      // 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);
-      vm.loadingProposals = false;
-    });
-  };
-
-  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.total_proposals = parseInt(data._obj.headers('total'));
+      vm.filtredProposals = data.articles;
       vm.loadingProposals = false;
     }, function (error) {
       vm.error = error;
@@ -254,11 +180,9 @@
     });
   };
-
-
   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.filtredProposalsArchived || pagePropostas.themes">
+    <section class="section--header" ng-if="pagePropostas.filtredProposals || 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.filtredProposalsArchived || pagePropostas.themes">
+    <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.filtredProposals || 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.filtredProposalsArchived">
+                    <div class="row hidden-xs" ng-if="pagePropostas.filtredProposals">
                         <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.filtredProposalsArchived">
+                    <div id="search-result" class="row" ng-if="pagePropostas.filtredProposals">
                         <div class="col-sm-12">
                             <header class="header">
                                 <h2>Total de Propostas: "<b>{{pagePropostas.total_proposals}} propostas</b>"</h2>
@@ -91,10 +91,8 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-sm-12" ng-if="!pagePropostas.loadingProposals && pagePropostas.filtredProposalsArchived && pagePropostas.total_proposals">
-
-                            <proposal-grid proposals="pagePropostas.filtredProposalsArchived"></proposal-grid>
-
+                        <div class="col-sm-12" ng-if="!pagePropostas.loadingProposals && pagePropostas.filtredProposals && pagePropostas.total_proposals">
+                            <proposal-grid proposals="pagePropostas.filtredProposals"></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">
@@ -169,7 +169,7 @@
     var params = {
       page: page,
       per_page: per_page,
-      archived: true
+      has_children: true
     };
     if (vm.selectedTheme) {
@@ -180,8 +180,10 @@
     vm.loadingProposals = true;
     vm.DialogaService.searchProposals(params, function(data){
+      console.log("aaaaaaaaaaaaaaaaaaa",data);
       vm.total_proposals = parseInt(data._obj.headers('total'));
       vm.filtredProposals = data.articles;
+      console.log("----------------------------",vm.filtredProposals);
       vm.loadingProposals = false;
     }, function (error) {
       vm.error = error;
@@ -26,11 +26,8 @@
         <div class="container">
             <div class="row">
                 <div class="col-sm-12">
-                    <h1>O Dialoga Brasil já respondeu às solicitações!</h1>
-                    <p>
-                        Vários programas contaram com centenas de participações e elas foram respondidas pelo governo.
-                        Confira abaixo as propostas que foram respondidas:
-                    </p>
+                    <h1>O Governo Federal segue dialogando com a sociedade</h1>
+                    <p>Você fez sua parte participando com propostas para melhorar o país e o Governo respondeu. Confira as propostas respondidas.</p>
                 </div>
             </div>
         </div>
	@@ -32,7 +32,6 @@		@@ -32,7 +32,6 @@
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;
36	vm.query = null;	35	vm.query = null;
37	vm.search = vm.$location.search();	36	vm.search = vm.$location.search();
38		37
	@@ -111,30 +110,6 @@		@@ -111,30 +110,6 @@
111	vm.selectedTheme = null;	110	vm.selectedTheme = null;
112	};	111	};
113		112
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	-
138	PropostasPageController.prototype.changePage = function(pageIndex) {	113	PropostasPageController.prototype.changePage = function(pageIndex) {
139	var vm = this;	114	var vm = this;
140		115
	@@ -191,61 +166,12 @@		@@ -191,61 +166,12 @@
191	params.category_ids = vm.selectedTheme.id;	166	params.category_ids = vm.selectedTheme.id;
192	}	167	}
193		168
194	-
195	- if (query) {params.query = query; }
196	-
197	- vm.loadingProposals = true;
198	- vm.DialogaService.searchProposals(params, function(data){
199	-
200	- vm.total_proposals = parseInt(data._obj.headers('total'));
201	-
202	- // Antigo
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	-
211	- vm.loadingProposals = false;
212	-
213	- }, function (error) {
214	- vm.error = error;
215	- vm.$log.error(error);
216	- vm.loadingProposals = false;
217	- });
218	- };
219	-
220	- PropostasPageController.prototype.filterProposalsArchived = function(_page, _per_page) {
221	- var vm = this;
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; }	169	if (query) {params.query = query; }
242		170
243	vm.loadingProposals = true;	171	vm.loadingProposals = true;
244	vm.DialogaService.searchProposals(params, function(data){	172	vm.DialogaService.searchProposals(params, function(data){
245	-
246	- vm.total_proposals = parseInt(data._obj.headers('total'));
247	- vm.filtredProposals = vm.filtersArchived(data.articles);
248	-	173	+ vm.total_proposals = parseInt(data._obj.headers('total'));
		174	+ vm.filtredProposals = data.articles;
249	vm.loadingProposals = false;	175	vm.loadingProposals = false;
250	}, function (error) {	176	}, function (error) {
251	vm.error = error;	177	vm.error = error;
	@@ -254,11 +180,9 @@		@@ -254,11 +180,9 @@
254	});	180	});
255	};	181	};
256		182
257	-
258	-
259	PropostasPageController.prototype.submitSearch = function() {	183	PropostasPageController.prototype.submitSearch = function() {
260	var vm = this;	184	var vm = this;
261	-	185	+
262	// scroll to result grid	186	// scroll to result grid
263	var $searchResult = angular.element('#search-result');	187	var $searchResult = angular.element('#search-result');
264	if ($searchResult && $searchResult.length > 0) {	188	if ($searchResult && $searchResult.length > 0) {