From ceef406be9fa8b94c92d3eb74dac14c1ebdaf51a Mon Sep 17 00:00:00 2001 From: idoctnef Date: Mon, 10 Oct 2016 13:14:41 +0200 Subject: [PATCH] favsList implemented, show user by username filter bug fixed --- config.xml | 2 +- www/js/controllers.js | 23 +++++++++++++++++++---- www/js/translations.js | 1 + www/templates/favsList.html | 24 ++++++++++++++++++++++++ www/templates/help.html | 3 ++- www/templates/settings.html | 1 - www/templates/travel.html | 12 +++++++----- www/templates/travels.html | 2 +- www/templates/user.html | 12 ++++++++---- www/templates/users.html | 2 +- 10 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 www/templates/favsList.html diff --git a/config.xml b/config.xml index f4c7c70..eb1d1dc 100644 --- a/config.xml +++ b/config.xml @@ -1,6 +1,6 @@ - collectiveCar + CarsInCommon CarSharing app, for collective use. diff --git a/www/js/controllers.js b/www/js/controllers.js index 1cdc19a..f233ca6 100644 --- a/www/js/controllers.js +++ b/www/js/controllers.js @@ -648,13 +648,13 @@ console.log($scope.newComment); }; }) -.controller('UserCtrl', function($scope, $stateParams, $http, $filter) { +.controller('UserCtrl', function($scope, $stateParams, $http, $filter, $ionicModal) { if(localStorage.getItem('c_token')){// adding token to the headers $http.defaults.headers.common['X-Access-Token'] = localStorage.getItem('c_token'); } $scope.storageusername=localStorage.getItem("c_username"); $scope.users= JSON.parse(localStorage.getItem('c_users')); - $scope.user = $filter('filter')($scope.users, $stateParams.username, true)[0]; + $scope.user = $filter('filter')($scope.users, {username: $stateParams.username}, true)[0]; //$scope.user=""; console.log($stateParams.username); /*$http.get(urlapi + 'users/byusername/'+$stateParams.username) @@ -706,7 +706,7 @@ console.log($scope.newComment); $scope.users=response.data; localStorage.setItem('c_users', JSON.stringify($scope.users)); - $scope.user = $filter('filter')($scope.users, $stateParams.username, true)[0]; + $scope.user = $filter('filter')($scope.users, {username: $stateParams.username}, true)[0]; }, function(response) { // optional @@ -733,7 +733,7 @@ console.log($scope.newComment); $scope.users=response.data; localStorage.setItem('c_users', JSON.stringify($scope.users)); - $scope.user = $filter('filter')($scope.users, $stateParams.username, true)[0]; + $scope.user = $filter('filter')($scope.users, {username: $stateParams.username}, true)[0]; }, function(response) { // optional @@ -741,6 +741,21 @@ console.log($scope.newComment); }); }; + $ionicModal.fromTemplateUrl('templates/favsList.html', { + scope: $scope + }).then(function(modal) { + $scope.modalFavsList = modal; + }); + $scope.closeModalFavsList = function() { + $scope.modalFavsList.hide(); + }; + $scope.showFavsList = function(){ + $scope.modalFavsList.show(); + }; + $scope.closeModalAndGoUser = function(){ + $scope.modalFavsList.hide(); + }; + $scope.arrayObjectIndexOf = function(myArray, searchTerm, property) { if(myArray){ for(var i = 0, len = myArray.length; i < len; i++) { diff --git a/www/js/translations.js b/www/js/translations.js index 6e41fe5..e8c9529 100644 --- a/www/js/translations.js +++ b/www/js/translations.js @@ -53,6 +53,7 @@ var translations = { "Pull_from_top_to_refresh": "Pull from top to refresh", "User": "User", "history_of": "history of", + "current_publications_of": "current publications of", "publications": "publications", }, diff --git a/www/templates/favsList.html b/www/templates/favsList.html new file mode 100644 index 0000000..daf8a85 --- /dev/null +++ b/www/templates/favsList.html @@ -0,0 +1,24 @@ + + + +

+ + {{'Likes' | translate}} {{newtravel.title}} +
+ +
+ +

+ +
+ + +

{{fav.username}}

+ +
+
+ +
+ + + diff --git a/www/templates/help.html b/www/templates/help.html index 8f720b6..5a9756d 100644 --- a/www/templates/help.html +++ b/www/templates/help.html @@ -1,6 +1,5 @@ -

{{'Help' | translate}}

help instructions here

@@ -14,5 +13,7 @@

+

+

not yet

 diff --git a/www/templates/settings.html b/www/templates/settings.html index f1c6a8a..5aacb7e 100644 --- a/www/templates/settings.html +++ b/www/templates/settings.html @@ -1,6 +1,5 @@ -

{{'Settings' | translate}}