From 53b9f840fc5cdd8b1068a19a30c6c6572aa9b52d Mon Sep 17 00:00:00 2001
From: nau
Date: Mon, 5 Sep 2016 17:45:07 +0200
Subject: [PATCH] delete travel and join travel implemented
---
www/js/controllers.js | 34 +++++++++++++++++++++++++++++++++-
www/templates/travel.html | 6 ++++++
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/www/js/controllers.js b/www/js/controllers.js
index 7ec5fbd..bd1f4bd 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -68,6 +68,7 @@ angular.module('starter.controllers', [])
console.log("login successful");
localStorage.setItem("c_username", $scope.loginData.username);
localStorage.setItem("c_token", response.data.token);
+ localStorage.setItem("c_userid", response.data.userid);
}else{
console.log("login failed");
}
@@ -330,8 +331,21 @@ angular.module('starter.controllers', [])
console.log('data error');
})
.then(function(result){
- travels = result.data;
+ travel = result.data;
+ });
+ $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;
});
+
$scope.deleteTravel = function(){
console.log("delete travel: " + $stateParams.travelId);
$http({
@@ -346,7 +360,25 @@ angular.module('starter.controllers', [])
});
};
$scope.joinTravel = function(){
+ $scope.newjoin={
+ travelId: $stateParams.travelId,
+ joinedUserId: localStorage.getItem("c_userid"),
+ joinedUsername: localStorage.getItem("c_username")
+ };
+ $http({
+ url: urlapi + 'travels/join/' + $stateParams.travelId,
+ method: "POST",
+ data: $scope.newjoin
+ })
+ .then(function(response) {
+ // success
+ console.log("response: ");
+ console.log(response);
+ },
+ function(response) { // optional
+ // failed
+ });
};
})
diff --git a/www/templates/travel.html b/www/templates/travel.html
index a7b0353..56c371d 100644
--- a/www/templates/travel.html
+++ b/www/templates/travel.html
@@ -43,5 +43,11 @@
+