diff --git a/ConfJuvApp/builds/confjuv-dev.apk b/ConfJuvApp/builds/confjuv-dev.apk index 97d2b61..cf32cd3 100644 Binary files a/ConfJuvApp/builds/confjuv-dev.apk and b/ConfJuvApp/builds/confjuv-dev.apk differ diff --git a/ConfJuvApp/builds/confjuvapp-live.apk b/ConfJuvApp/builds/confjuvapp-live.apk index 99fdca1..f8b6c43 100644 Binary files a/ConfJuvApp/builds/confjuvapp-live.apk and b/ConfJuvApp/builds/confjuvapp-live.apk differ diff --git a/ConfJuvApp/builds/confjuvapp-web.zip b/ConfJuvApp/builds/confjuvapp-web.zip index 45de636..1934d48 100644 Binary files a/ConfJuvApp/builds/confjuvapp-web.zip and b/ConfJuvApp/builds/confjuvapp-web.zip differ diff --git a/ConfJuvApp/www/html/_proposal_list.html b/ConfJuvApp/www/html/_proposal_list.html index baae7e7..1dff921 100644 --- a/ConfJuvApp/www/html/_proposal_list.html +++ b/ConfJuvApp/www/html/_proposal_list.html @@ -12,7 +12,7 @@ on-swipe-left="" on-swipe-right="" on-partial-swipe="cardPartialSwipe(amt)">

- {{proposal.title | limitTo:20}} + {{proposal.title | limitTo:100}}
Autor: {{proposal.author.name}}

diff --git a/ConfJuvApp/www/js/controllers.js b/ConfJuvApp/www/js/controllers.js index 5a8edd8..7da8df1 100644 --- a/ConfJuvApp/www/js/controllers.js +++ b/ConfJuvApp/www/js/controllers.js @@ -3,7 +3,7 @@ angular.module('confjuvapp.controllers', []) .controller('ProposalCtrl', function($scope, $ionicModal, $http, $ionicPopup, filterFilter) { - $scope.largeScreen = (window.innerWidth >= 768); + $scope.largeScreen = (window.innerWidth >= 600); $scope.loading = false; @@ -138,6 +138,10 @@ angular.module('confjuvapp.controllers', []) $ionicPopup.alert({ title: 'Registrar', template: 'Você deve concordar com os termos de uso e regimento da Conferência' }); return; } + else if (/[A-Z]/.test(data.login)) { + $ionicPopup.alert({ title: 'Registrar', template: 'O seu login não deve ter letras maiúsculas' }); + return; + } $scope.loading = true; @@ -293,9 +297,18 @@ angular.module('confjuvapp.controllers', []) $scope.loading = false; var topics = resp.data.articles; for (var i = 0; i < topics.length; i++) { - var topic = topics[i]; - topic.selected = true; - $scope.topics.push(topic); + var topic_id = topics[i].id; + var topic = null; + for (var j = 0; j < $scope.topics.length; j++) { + if (topic_id == $scope.topics[j].id) { + topic = $scope.topics[j]; + } + } + if (topic == null) { + topic = topics[i]; + topic.selected = true; + $scope.topics.push(topic); + } $scope.proposalsByTopic[topic.id] = []; $scope.loadProposals(token, topic); } @@ -349,7 +362,6 @@ angular.module('confjuvapp.controllers', []) } if ($scope.proposalList.length == 0){ $scope.forceReload = true; - $scope.topics = []; } for (var i = 0; i < $scope.proposalList.length; i++) { var card = $scope.proposalList[i]; -- libgit2 0.21.2