arnaucube/commonroutesApp
1
0
Fork 0
mirror of https://github.com/arnaucube/commonroutesApp.git synced 2026-02-07 03:26:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

join inside the travel model

Browse Source
This commit is contained in:
idoctnef
2016-10-06 15:20:38 +02:00
parent c6fdff06c2
commit 1810e315a9
2 changed files with 11 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
www/js/controllers.js
View File

@@ -384,37 +384,10 @@ angular.module('starter.controllers', ['pascalprecht.translate'])
$http.defaults.headers.common['X-Access-Token'] = localStorage.getItem('c_token');
}
$scope.storageusername=localStorage.getItem("c_username");
$scope.travel="";
console.log($stateParams.travelId);
/*$http.get(urlapi + 'travels/'+$stateParams.travelId)
.success(function(data, status, headers,config){
console.log('data success');
console.log(data); // for browser console
$scope.travel = data; // for UI
console.log("b");
console.log($scope.travel);
})
.error(function(data, status, headers,config){
console.log('data error');
})
.then(function(result){
travel = result.data;
});*/
$scope.travels= JSON.parse(localStorage.getItem('c_travels'));
$scope.travel = $filter('filter')($scope.travels, $stateParams.travelId, true)[0];
$scope.joins="";
$http.get(urlapi + 'travels/join/'+$stateParams.travelId)
.success(function(data, status, headers,config){
console.log('data success');
console.log(data); // for browser console
$scope.joins = data; // for UI
})
.error(function(data, status, headers,config){
console.log('data error');
})
.then(function(result){
joins = result.data;
});
$http.get(urlapi + 'travels/comment/'+$stateParams.travelId)
.success(function(data, status, headers,config){
console.log(data); // for browser console
@@ -456,13 +429,13 @@ angular.module('starter.controllers', ['pascalprecht.translate'])
};
$scope.joinTravel = function(){
$scope.newjoin={
travelId: $stateParams.travelId,
//travelId: $stateParams.travelId,
joinedUserId: localStorage.getItem("c_userid"),
joinedUsername: localStorage.getItem("c_username"),
joinedAvatar: localStorage.getItem("c_avatar")
};
$http({
url: urlapi + 'travels/join/' + $stateParams.travelId,
url: urlapi + 'travels/'+ $stateParams.travelId+'/join',
method: "POST",
data: $scope.newjoin
})
@@ -485,7 +458,7 @@ angular.module('starter.controllers', ['pascalprecht.translate'])
joinedAvatar: localStorage.getItem("c_avatar")
};
$http({
url: urlapi + 'travels/unjoin/' + $stateParams.travelId,
url: urlapi + 'travels/'+ $stateParams.travelId+'/unjoin',
method: "POST",
data: $scope.unjoin
})
@@ -540,7 +513,7 @@ console.log($scope.newComment);
$scope.arrayObjectIndexOf = function(myArray, searchTerm, property) {
console.log(myArray+", "+searchTerm+", "+property);
//console.log(myArray+", "+searchTerm+", "+property);
if(myArray)
{
for(var i = 0, len = myArray.length; i < len; i++) {