From b7e21a20541c9621e727e5bddd83c826af777c2d Mon Sep 17 00:00:00 2001
From: Caio Almeida <caiosba@gmail.com>
Date: Mon, 10 Aug 2015 01:19:41 -0300
Subject: [PATCH] Loading proposals by city

---
 ConfJuvApp/www/html/_right_sidebar.html | 12 +++++++++++-
 ConfJuvApp/www/js/controllers.js        | 17 +++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ConfJuvApp/www/html/_right_sidebar.html b/ConfJuvApp/www/html/_right_sidebar.html
index ad85c08..2854e62 100644
--- a/ConfJuvApp/www/html/_right_sidebar.html
+++ b/ConfJuvApp/www/html/_right_sidebar.html
@@ -4,7 +4,17 @@
       <span>Filtros</span>
       <button menu-toggle="right" class="button button-icon icon ion-close-circled" hide-when="large"></button>
     </h2>
-    <h3>Mostrar apenas propostas do eixo:</h2>
+    <h3 ng-show="user.region">
+      Propostas de {{user.region.full_name}}
+      <label class="checkbox my-city-cbox">
+        <input  type="checkbox" ng-click="loadProposalsOfMyCity()">
+      </label>
+    </h3>
+    <h3 ng-show="!user.region">
+      <a ng-click="loadStates()">Adicione sua cidade no seu cadastro se der.</a>
+      <ng-include ng-show="states.length != 0" src="'html/_select_state.html'"></ng-include>
+    </h3>
+    <h3>Mostrar apenas propostas do eixo:</h3>
     <ion-radio class="radio-balanced" ng-value="'all'" ng-model="topicFilter.value" ng-click="$parent.reloadProposals()">Todos</ion-radio>
     <label ng-repeat="topic in topics">
       <ion-radio class="radio-balanced" ng-value="topic.id" ng-model="topicFilter.value" ng-click="$parent.reloadProposals()">
diff --git a/ConfJuvApp/www/js/controllers.js b/ConfJuvApp/www/js/controllers.js
index eaa976f..ae4ccbd 100644
--- a/ConfJuvApp/www/js/controllers.js
+++ b/ConfJuvApp/www/js/controllers.js
@@ -332,6 +332,8 @@ angular.module('confjuvapp.controllers', [])
     $scope.topics = [];
     $scope.cards = [];
     $scope.emptyTopicsCount = 0;
+    //FIXME refatoring this variable to make the proposals filters more generic
+    $scope.proposalsFilter = '';
     $scope.topicFilter = { value: 'all' };
 
     $scope.reloadTopics = function() {
@@ -376,8 +378,19 @@ angular.module('confjuvapp.controllers', [])
       });
     };
 
-    // Load proposals
+    // Load Proposals of My City
+    $scope.loadProposalsOfMyCity = function() {
+      $scope.loading = true;
+      if($scope.proposalsFilter == ''){
+        $scope.proposalsFilter = '&categories_ids=' + $scope.user.region.id;
+      }else{
+        $scope.proposalsFilter = '';
+      }
+      $scope.reloadProposals();
+      $scope.loading = false;
+    }
 
+    // Load proposals
     $scope.loadProposals = function(token, topic) {
       if ($scope.topicFilter.value != 'all' && topic.id != $scope.topicFilter.value) {
         return;
@@ -390,7 +403,7 @@ angular.module('confjuvapp.controllers', [])
         perPage = 11;
       }
 
-      var params = '?private_token=' + token + '&fields=title,image,body,abstract,id,tag_list,categories,created_by&content_type=ProposalsDiscussionPlugin::Proposal&limit=' + perPage + '&oldest=younger_than&reference_id=' + topic.lastProposalId;
+      var params = '?private_token=' + token + '&fields=title,image,body,abstract,id,tag_list,categories,created_by&content_type=ProposalsDiscussionPlugin::Proposal&limit=' + perPage + '&oldest=younger_than&reference_id=' + topic.lastProposalId + $scope.proposalsFilter;
 
       var path = 'articles/' + topic.id + '/children' + params;
 
--
libgit2 0.21.2