From 5fb9be745eb84907e1672da971eac05a45bc5888 Mon Sep 17 00:00:00 2001 From: Caio Almeida Date: Sat, 27 Jun 2015 12:57:20 -0300 Subject: [PATCH] adding state and cities selection --- ConfJuvApp/www/html/_login.html | 1 + ConfJuvApp/www/html/_select_city.html | 12 ++++++++++++ ConfJuvApp/www/html/_select_state.html | 15 +++++++++++++++ ConfJuvApp/www/js/controllers.js | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 ConfJuvApp/www/html/_select_city.html create mode 100644 ConfJuvApp/www/html/_select_state.html diff --git a/ConfJuvApp/www/html/_login.html b/ConfJuvApp/www/html/_login.html index 09f6f7d..16bf166 100644 --- a/ConfJuvApp/www/html/_login.html +++ b/ConfJuvApp/www/html/_login.html @@ -73,6 +73,7 @@ + diff --git a/ConfJuvApp/www/html/_select_city.html b/ConfJuvApp/www/html/_select_city.html new file mode 100644 index 0000000..e331bb0 --- /dev/null +++ b/ConfJuvApp/www/html/_select_city.html @@ -0,0 +1,12 @@ +
+ + + +
diff --git a/ConfJuvApp/www/html/_select_state.html b/ConfJuvApp/www/html/_select_state.html new file mode 100644 index 0000000..11a0e44 --- /dev/null +++ b/ConfJuvApp/www/html/_select_state.html @@ -0,0 +1,15 @@ +
+ + + +
+ + + diff --git a/ConfJuvApp/www/js/controllers.js b/ConfJuvApp/www/js/controllers.js index 32eb641..e883529 100644 --- a/ConfJuvApp/www/js/controllers.js +++ b/ConfJuvApp/www/js/controllers.js @@ -115,13 +115,17 @@ angular.module('confjuvapp.controllers', []) $scope.registerFormDisplayed = false; $scope.displayRegisterForm = function() { + $scope.loadStates(); $scope.registerFormDisplayed = true; $scope.loginFormDisplayed = false; + $scope.loading = false; }; // Function to register $scope.Register = function(data) { +alert('no registro') if (!data || !data.login || !data.email || !data.password || !data.password_confirmation) { +alert('teste'); $ionicPopup.alert({ title: 'Registrar', template: 'Por favor preencha todos os campos' }); return; } @@ -168,6 +172,53 @@ angular.module('confjuvapp.controllers', []) }; /****************************************************************************** + States > Cities + ******************************************************************************/ + + $scope.states = []; + $scope.stateChoosed = null; + $scope.cities = []; + $scope.cityChoosed = null; + $scope.shouldDisplayCities = false; + + // Load States + $scope.loadStates = function() { + $scope.loading = true; + $scope.shouldDisplayCities = false; + $scope.stateChoosed = null; + $scope.cityChoosed = null; + + var path = 'states'; + + $http.get(ConfJuvAppUtils.pathTo(path)) + .then(function(resp) { + $scope.states = resp.data; + $scope.loading = false; + }, function(err) { + $ionicPopup.alert({ title: 'Estados', template: 'Não foi possível carregar os estados' }); + $scope.loading = false; + }); + }; + + // Load Cities + $scope.loadCitiesByState = function(state) { + $scope.loading = true; + + var path = 'states/' + state + '/cities'; + + $http.get(ConfJuvAppUtils.pathTo(path)) + .then(function(resp) { + $scope.loading = false; + $scope.cities = resp.data; + $scope.shouldDisplayCities = true; + $scope.loading = false; + }, function(err) { + $ionicPopup.alert({ title: 'Estados', template: 'Não foi possível carregar as cidades' }); + $scope.loading = false; + }); + }; + + /****************************************************************************** D I S C U S S I O N S > T O P I C S > P R O P O S A L S ******************************************************************************/ -- libgit2 0.21.2