Download as
Browse Code »

Commit 2fd7f009f62d76211f47b878f440101ea4fbc088

Authored by Rafael Diego
2 parents 0cdf1fb5 919ba03f
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

Merge branch 'master' into staging

Showing 6 changed files with 27 additions and 102 deletions   Show diff stats
src/app/components/article-service/article.service.js
  Diff comments   View file @2fd7f00
... ... @@ -267,7 +267,7 @@
267 267  
268 268 function searchTopics (params, cbSuccess, cbError) {
269 269 // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Topic&query=cisternas
270   - var url = service.apiSearch + '/article';
  270 + var url = service.apiSearch + 'article';
271 271 var paramsExtended = angular.extend({
272 272 // 'fields[]': ['id', 'title', 'slug', 'abstract', 'categories', 'setting', 'children_count', 'hits'],
273 273 'type': 'ProposalsDiscussionPlugin::Topic'
... ... @@ -283,7 +283,7 @@
283 283 function searchProposals (params, cbSuccess, cbError) {
284 284 // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Proposal&query=cisternas
285 285 var url = service.apiSearch + 'article';
286   - console.log("URL",url);
  286 + console.log('url',url);
287 287 var paramsExtended = angular.extend({
288 288 page: 1,
289 289 per_page: 10,
... ... @@ -299,17 +299,18 @@
299 299 'parent',
300 300 'categories',
301 301 'slug',
302   - 'url', // parent.image.url
303   - 'image',
304   - 'title',
305   - 'archived',
306   - ]
307   - }, params);
  302 + 'url', // parent.image.url
  303 + 'image',
  304 + 'title',
  305 + 'archived',
  306 + 'has_children',
  307 + ]
  308 + }, params);
  309 + console.log("params",paramsExtended);
308 310  
309 311 UtilService.get(url, {params: paramsExtended}).then(function(data){
310 312 _pipeInjectSlugIntoParentProgram(data);
311 313 cbSuccess(data);
312   - console.log("Resposta",data);
313 314 }).catch(function(error){
314 315 cbError(error);
315 316 });
... ...
src/app/components/proposal-box/proposal-box.html
  Diff comments   View file @2fd7f00
... ... @@ -139,6 +139,9 @@
139 139 <div class="proposal-box--top">
140 140 <div class="proposal-box--theme color-theme-bg-complementar-2">{{vm.category.name}}</div>
141 141 <div class="proposal-box--program color-theme-bg">{{vm.topic.title}}</div>
  142 +
  143 + <!-- Apagar o bloco abaixo -->
  144 + <span style="background: green;">{{::vm.proposal.body}}
142 145 </div>
143 146 <div class="proposal-box--middle">
144 147 <div class="proposal-box--content">
... ...
src/app/pages/propostas/propostas.controller.js
  Diff comments   View file @2fd7f00
... ... @@ -32,7 +32,6 @@
32 32 vm.themes = null;
33 33 vm.selectedTheme = null;
34 34 vm.filtredProposals = null;
35   - vm.filtredProposalsArchived = null;
36 35 vm.query = null;
37 36 vm.search = vm.$location.search();
38 37  
... ... @@ -111,30 +110,6 @@
111 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 113 PropostasPageController.prototype.changePage = function(pageIndex) {
139 114 var vm = this;
140 115  
... ... @@ -191,61 +166,12 @@
191 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 169 if (query) {params.query = query; }
242 170  
243 171 vm.loadingProposals = true;
244 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 175 vm.loadingProposals = false;
250 176 }, function (error) {
251 177 vm.error = error;
... ... @@ -254,11 +180,9 @@
254 180 });
255 181 };
256 182  
257   -
258   -
259 183 PropostasPageController.prototype.submitSearch = function() {
260 184 var vm = this;
261   -
  185 +
262 186 // scroll to result grid
263 187 var $searchResult = angular.element('#search-result');
264 188 if ($searchResult && $searchResult.length > 0) {
... ...
src/app/pages/propostas/propostas.html
  Diff comments   View file @2fd7f00
... ... @@ -22,7 +22,7 @@
22 22 </div>
23 23 </div>
24 24 </section>
25   - <section class="section--header" ng-if="pagePropostas.filtredProposalsArchived || pagePropostas.themes">
  25 + <section class="section--header" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
26 26 <div class="container">
27 27 <div class="row">
28 28 <div class="col-sm-12">
... ... @@ -31,7 +31,7 @@
31 31 </div>
32 32 </div>
33 33 </section>
34   - <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.filtredProposalsArchived || pagePropostas.themes">
  34 + <section class="section--articles section-gray section-space-up" ng-if="pagePropostas.filtredProposals || pagePropostas.themes">
35 35 <div class="container">
36 36 <div id="lista-de-propostas" class="row">
37 37 <div class="col-sm-4 col-md-3">
... ... @@ -67,7 +67,7 @@
67 67 </div>
68 68 </div>
69 69 <div class="col-sm-8 col-md-9">
70   - <div class="row hidden-xs" ng-if="pagePropostas.filtredProposalsArchived">
  70 + <div class="row hidden-xs" ng-if="pagePropostas.filtredProposals">
71 71 <div class="col-xs-12">
72 72 <div class="input-group input-group-lg input-group-search">
73 73 <label for="articleQueryFilter" class="control-label sr-only">Buscar propostas:</label>
... ... @@ -83,7 +83,7 @@
83 83 </div>
84 84 </div>
85 85 </div>
86   - <div id="search-result" class="row" ng-if="pagePropostas.filtredProposalsArchived">
  86 + <div id="search-result" class="row" ng-if="pagePropostas.filtredProposals">
87 87 <div class="col-sm-12">
88 88 <header class="header">
89 89 <h2>Total de Propostas: "<b>{{pagePropostas.total_proposals}} propostas</b>"</h2>
... ... @@ -91,10 +91,8 @@
91 91 </div>
92 92 </div>
93 93 <div class="row">
94   - <div class="col-sm-12" ng-if="!pagePropostas.loadingProposals && pagePropostas.filtredProposalsArchived && pagePropostas.total_proposals">
95   -
96   - <proposal-grid proposals="pagePropostas.filtredProposalsArchived"></proposal-grid>
97   -
  94 + <div class="col-sm-12" ng-if="!pagePropostas.loadingProposals && pagePropostas.filtredProposals && pagePropostas.total_proposals">
  95 + <proposal-grid proposals="pagePropostas.filtredProposals"></proposal-grid>
98 96 <app-paginator page="pagePropostas.page" per-page="pagePropostas.per_page" total="pagePropostas.total_proposals" change-page="pagePropostas.changePage(pageIndex)"></app-paginator>
99 97 </div>
100 98 <div ng-if="pagePropostas.loadingProposals">
... ...
src/app/pages/respostas/respostas.controller.js
  Diff comments   View file @2fd7f00
... ... @@ -169,7 +169,7 @@
169 169 var params = {
170 170 page: page,
171 171 per_page: per_page,
172   - archived: true
  172 + has_children: true
173 173 };
174 174  
175 175 if (vm.selectedTheme) {
... ... @@ -180,8 +180,10 @@
180 180  
181 181 vm.loadingProposals = true;
182 182 vm.DialogaService.searchProposals(params, function(data){
  183 + console.log("aaaaaaaaaaaaaaaaaaa",data);
183 184 vm.total_proposals = parseInt(data._obj.headers('total'));
184 185 vm.filtredProposals = data.articles;
  186 + console.log("----------------------------",vm.filtredProposals);
185 187 vm.loadingProposals = false;
186 188 }, function (error) {
187 189 vm.error = error;
... ...
src/app/pages/respostas/respostas.html
  Diff comments   View file @2fd7f00
... ... @@ -26,11 +26,8 @@
26 26 <div class="container">
27 27 <div class="row">
28 28 <div class="col-sm-12">
29   - <h1>O Dialoga Brasil já respondeu às solicitações!</h1>
30   - <p>
31   - Vários programas contaram com centenas de participações e elas foram respondidas pelo governo.
32   - Confira abaixo as propostas que foram respondidas:
33   - </p>
  29 + <h1>O Governo Federal segue dialogando com a sociedade</h1>
  30 + <p>Você fez sua parte participando com propostas para melhorar o país e o Governo respondeu. Confira as propostas respondidas.</p>
34 31 </div>
35 32 </div>
36 33 </div>
... ...