- Profile -
- Inbox 8 +
- Inbox {{user.data.inbox.total_count}}
- Sent requests
- Connections
- Events @@ -76,6 +77,7 @@
+
diff --git a/app/scripts/controllers/application.js b/app/scripts/controllers/application.js
index cf7407d..d7c594e 100644
--- a/app/scripts/controllers/application.js
+++ b/app/scripts/controllers/application.js
@@ -8,9 +8,10 @@
* Controller of the connectApp
*/
angular.module('connectApp')
- .controller('ApplicationCtrl', function ($scope, $state, auth, WSAlert) {
+ .controller('ApplicationCtrl', function ($scope, $state, auth, WSAlert, User) {
$scope.auth = auth;
+ $scope.user = User;
$scope.logout = function (e) {
auth.logout();
diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
index f8f4cbf..91afeca 100644
--- a/app/scripts/controllers/main.js
+++ b/app/scripts/controllers/main.js
@@ -17,24 +17,52 @@ angular.module('connectApp')
$scope.statuses = Statuses;
$scope.loading = {};
- $q.when(User.init()).then(function(result){
- User.subscriptions($scope.user.data.id).then(function(res){
- //console.log('subscriptions loaded');
- },
- function(error){
- WSAlert("", error);
- });
+ $q.when(User.init()).then(function(){
+
+ //load other resource
+ var promises = [];
+ promises.push(User.inbox());
+ promises.push(User.subscriptions(User.data.id));
+ promises.push(User.getConnections());
+
+ $q.all(promises).then(function(result){
+ //console.log('loaded external resources');
+ User.data.subscriptions = result[1];
+ User.data.connections = result[2];
+ },
+ function(error){
+ WSAlert.danger("Error loading user resources: " + error.data.user_msg);
+ });
+ //event subscriptions
+ //User.subscriptions($scope.user.data.id).then(function(res){
+ // //console.log('subscriptions loaded');
+ //},
+ //function(error){
+ // WSAlert.danger("", error);
+ //});
+
+ //load inbox
+ //loaded in chain because it gets saved within the user var
+ //User.getInbox().then(function(result){
+ // $scope.user.inbox = result;
+ //},
+ //function(error){
+ // //fail silently
+ //});
},
function(error){
WSAlert.danger("", error);
});
//load events
+ $scope.loading.events_init = true;
Events.init().then(function(result){
- //console.log("events init");
+ //console.log("events init");
+ $scope.loading.events_init = false;
},
function(error){
WSAlert.danger("", error);
+ $scope.loading.events_init = false;
});
//load events
diff --git a/app/scripts/controllers/user.js b/app/scripts/controllers/user.js
index 49361a8..e988d63 100644
--- a/app/scripts/controllers/user.js
+++ b/app/scripts/controllers/user.js
@@ -8,10 +8,14 @@
* Controller of the connectApp
*/
angular.module('connectApp')
- .controller('UserCtrl', function ($q, $scope, $state, Language, APP_ROLES, User, auth) {
+ .controller('UserCtrl', function ($q, $scope, $state, Language, APP_ROLES, $timeout, User, auth, WSAlert) {
$scope.loading = {};
$scope.userId = $state.params.userId;
- $scope.editable = false;
+ $scope.myProfile = false;
+ $scope.editable = false;
+ $scope.profile = {};
+ $scope.connected = false;
+ $scope.connectedAndAccepted = false;
$scope.init = function(){
@@ -20,32 +24,87 @@ angular.module('connectApp')
//load user info
User.getById($scope.userId).then(function(result){
$scope.loading.user = false;
- $scope.user = result;
+ $scope.profile = result;
- //preload inbox - server should reject if it's not me
- //loaded in chain because it gets saved within the user var
- User.getInbox($scope.userId).then(function(result){
- $scope.user.inbox = result;
+ //check if a connection exists between the users
+ $scope.loading.request_contact = true;
+ User.connectionExists($scope.userId).then(function(){
+ $scope.loading.request_contact = false;
+ $scope.connected = true;
},
function(error){
- //fail silently
+ //not really an error, but no connection here, stop loading
+ $scope.loading.request_contact = false;
+ $scope.connected = false;
});
-
+ $q.when(User.connections.promise).then(function(){
+ $scope.connectedAndAccepted = User.isConnected($scope.userId);
+ });
+
},
function(error){
WSAlert.danger(error);
$scope.loading.user = false;
});
- // //check if user is editable
- // $q.when(User.getUser()).then(function(result){
- // console.log(result.data);
- // //console.log(result);
- // //console.log(User);
- // });
+ //get user subscriptions
+ User.subscriptions($scope.userId).then(function(result){
+ $scope.profile.subscriptions = result;
+ },
+ function(error){
+ WSAlert.danger("", error);
+ })
+
+ //check if user is editable
+ $q.when(User.data.promise).then(function(){
+ $scope.myProfile = (User.data.id == $scope.userId) ? true : false;
+ },
+ function(error){
+ WSAlert.danger("", "Could not fetch user edit status: " + error.data.user_msg);
+ });
+ };
+
+ //$scope.init();
+
+ $scope.requestContact = function(userId){
+ $scope.loading.request_contact = true;
+
+ User.requestContact(userId).then(function(){
+ WSAlert.success("Contact request sent");
+ $scope.loading.request_contact = false;
+ $scope.init();
+ },
+ function(error){
+ WSAlert.danger(error);
+ $scope.loading.request_contact = false;
+ });
+ };
+
+ $scope.cancelRequest = function(userId){
+ $scope.loading.request_contact = true;
+
+ User.cancelRequestByUserId(userId).then(function(result){
+ WSAlert.success("Contact request cancelled");
+ $scope.loading.request_contact = false;
+ $scope.init();
+ },
+ function(error){
+ WSAlert.danger(error);
+ $scope.loading.request_contact = false;
+ });
};
- $scope.init();
+ //after User has loaded
+ $q.when(User.data.promise).then(function(){
+ $scope.init();
+ });
- });
+ })
+.directive('requestbtn', function(){
+ return {
+ restrict: 'E',
+ replace: true,
+ templateUrl: 'views/directive.requestbtn.html'
+ }
+});
diff --git a/app/scripts/controllers/userconnections.js b/app/scripts/controllers/userconnections.js
index 54d0302..061cec4 100644
--- a/app/scripts/controllers/userconnections.js
+++ b/app/scripts/controllers/userconnections.js
@@ -8,38 +8,112 @@
* Controller of the connectApp
*/
angular.module('connectApp')
- .controller('UserConnectionsCtrl', function ($scope) {
+ .controller('UserConnectionsCtrl', function ($scope, User, $q, WSAlert) {
$scope.sortType = 'name'; // set the default sort type
$scope.sortReverse = false; // set the default sort order
$scope.searchContact = ''; // set the default search/filter term
+ $scope.contacts = [];
+ $scope.loading.connections = {};
- $scope.contacts = [
- { 'id': 1, name: 'Joni Aaltonen', company: 'WorldSkills', position: 'Position 1', country: 'Finland', requestSent: true},
- { 'id': 1, name: 'John Cox', company: 'WorldSkills', position: 'Position 2', country: 'Australia', requestSent: false},
- { 'id': 1, name: 'Adam Walsh', company: 'WorldSkills', position: 'Position 3', country: 'Australia', requestSent: true},
- { 'id': 1, name: 'Fabian Vogler', company: 'WorldSkills', position: 'Position 4', country: 'Switzerland' , requestSent: true},
- { 'id': 1, name: 'Joni Aaltonen', company: 'WorldSkills', position: 'Position 1', country: 'Finland', requestSent: false},
- { 'id': 1, name: 'John Cox', company: 'WorldSkills', position: 'Position 2', country: 'Australia', requestSent: false},
- { 'id': 1, name: 'Adam Walsh', company: 'WorldSkills', position: 'Position 3', country: 'Australia', requestSent: true},
- { 'id': 1, name: 'Fabian Vogler', company: 'WorldSkills', position: 'Position 4', country: 'Switzerland' , requestSent: false},
- { 'id': 1, name: 'Joni Aaltonen', company: 'WorldSkills', position: 'Position 1', country: 'Finland', requestSent: true},
- { 'id': 1, name: 'John Cox', company: 'WorldSkills', position: 'Position 2', country: 'Australia', requestSent: true},
- { 'id': 1, name: 'Adam Walsh', company: 'WorldSkills', position: 'Position 3', country: 'Australia', requestSent: false},
- { 'id': 1, name: 'Fabian Vogler', company: 'WorldSkills', position: 'Position 4', country: 'Switzerland' , requestSent: false},
- { 'id': 1, name: 'Joni Aaltonen', company: 'WorldSkills', position: 'Position 1', country: 'Finland', requestSent: true},
- { 'id': 1, name: 'John Cox', company: 'WorldSkills', position: 'Position 2', country: 'Australia', requestSent: false},
- { 'id': 1, name: 'Adam Walsh', company: 'WorldSkills', position: 'Position 3', country: 'Australia', requestSent: false},
- { 'id': 1, name: 'Fabian Vogler', company: 'WorldSkills', position: 'Position 4', country: 'Switzerland' , requestSent: false}
- ];
+ // $scope.contacts = [
+ // { 'id': 1, name: 'Joni Aaltonen', company: 'WorldSkills', position: 'Position 1', country: 'Finland', requestSent: true},
+ // { 'id': 1, name: 'John Cox', company: 'WorldSkills', position: 'Position 2', country: 'Australia', requestSent: false},
+ // { 'id': 1, name: 'Adam Walsh', company: 'WorldSkills', position: 'Position 3', country: 'Australia', requestSent: true},
+ // { 'id': 1, name: 'Fabian Vogler', company: 'WorldSkills', position: 'Position 4', country: 'Switzerland' , requestSent: true},
+ // { 'id': 1, name: 'Joni Aaltonen', company: 'WorldSkills', position: 'Position 1', country: 'Finland', requestSent: false},
+ // { 'id': 1, name: 'John Cox', company: 'WorldSkills', position: 'Position 2', country: 'Australia', requestSent: false},
+ // { 'id': 1, name: 'Adam Walsh', company: 'WorldSkills', position: 'Position 3', country: 'Australia', requestSent: true},
+ // { 'id': 1, name: 'Fabian Vogler', company: 'WorldSkills', position: 'Position 4', country: 'Switzerland' , requestSent: false},
+ // { 'id': 1, name: 'Joni Aaltonen', company: 'WorldSkills', position: 'Position 1', country: 'Finland', requestSent: true},
+ // { 'id': 1, name: 'John Cox', company: 'WorldSkills', position: 'Position 2', country: 'Australia', requestSent: true},
+ // { 'id': 1, name: 'Adam Walsh', company: 'WorldSkills', position: 'Position 3', country: 'Australia', requestSent: false},
+ // { 'id': 1, name: 'Fabian Vogler', company: 'WorldSkills', position: 'Position 4', country: 'Switzerland' , requestSent: false},
+ // { 'id': 1, name: 'Joni Aaltonen', company: 'WorldSkills', position: 'Position 1', country: 'Finland', requestSent: true},
+ // { 'id': 1, name: 'John Cox', company: 'WorldSkills', position: 'Position 2', country: 'Australia', requestSent: false},
+ // { 'id': 1, name: 'Adam Walsh', company: 'WorldSkills', position: 'Position 3', country: 'Australia', requestSent: false},
+ // { 'id': 1, name: 'Fabian Vogler', company: 'WorldSkills', position: 'Position 4', country: 'Switzerland' , requestSent: false}
+ // ];
+
+
+ $scope.removeConnection = function(connectionId, $index){
+ if(confirm("Are you sure?")){
+ $scope.loading.connections[connectionId] = true;
+ User.deleteConnection(connectionId).then(function(res){
+ User.connections.connections.splice($index, 1);
+ User.connections.total_count -= 1;
+ User.connections.totalConnections -= 1;
+ $scope.contacts.splice($index, 1);
+ WSAlert.success("Connection deleted");
+ $scope.loading.connections[connectionId] = false;
+
+ },
+ function(error){
+ WSAlert.danger("", error);
+ $scope.loading.connections[connectionId] = false;
+ });
+ }
+ };
+
+ $scope.refresh = function(){
+ $scope.loading.connections = true;
+
+ //if still loading
+ if(typeof User.connections.promise == 'object'){
+ //console.log("still loading initial");
+ $scope.init();
+ }//if
+ else{
+ //console.log("needs refreshing");
+ User.connections = $q.defer();
+ User.getConnections().then(function(){
+ $scope.init();
+ });
+ }
+ };
+
+ $scope.init = function(){
+ $q.when(User.connections.promise).then(function(result){
+ angular.forEach(User.connections.connections, function(val, key){
+ var temp_contact = false;
+
+ if(val.to.id != User.data.id)
+ temp_contact = val.to;
+ else if(val.from.id != User.data.id)
+ temp_contact = val.from;
+
+ //add in connection id for later use
+ if(typeof temp_contact == 'object'){
+ temp_contact.connection_id = val.id;
+ $scope.contacts.push(temp_contact);
+ }
+ });
+ $scope.loading.connections = false;
+ });
+ }
+
+ $scope.refresh();
$scope.searchConnections = function (contact) {
- return (angular.lowercase(contact.name).indexOf(angular.lowercase($scope.searchContact) || '') !== -1
+ return (
+ angular.lowercase(contact.first_name).indexOf(angular.lowercase($scope.searchContact) || '') !== -1
+ || angular.lowercase(contact.last_name).indexOf(angular.lowercase($scope.searchContact) || '') !== -1
|| angular.lowercase(contact.company).indexOf(angular.lowercase($scope.searchContact) || '') !== -1
- || angular.lowercase(contact.position).indexOf(angular.lowercase($scope.searchContact) || '') !== -1
- || angular.lowercase(contact.country).indexOf(angular.lowercase($scope.searchContact) || '') !== -1
+ || angular.lowercase(contact.job_title).indexOf(angular.lowercase($scope.searchContact) || '') !== -1
+ || angular.lowercase(contact.country.name.text).indexOf(angular.lowercase($scope.searchContact) || '') !== -1
);
};
+ $scope.downloadCSV = function(){
+ alert("Not yet implemented...");
+ };
+
+ $scope.downloadVCF = function(){
+ alert("Not yet implemented...");
+ };
+
+ $scope.download = function(userId){
+ alert("Not yet implemented...");
+ };
});
diff --git a/app/scripts/controllers/userevents.js b/app/scripts/controllers/userevents.js
index 73c43d2..c1e98a2 100644
--- a/app/scripts/controllers/userevents.js
+++ b/app/scripts/controllers/userevents.js
@@ -8,6 +8,39 @@
* Controller of the connectApp
*/
angular.module('connectApp')
- .controller('UserEventsCtrl', function ($scope) {
-
- });
+ .controller('UserEventsCtrl', function ($scope, Statuses, User, WSAlert) {
+ $scope.statuses = Statuses;
+ $scope.loading.userevents = {};
+ $scope.STATUS = Statuses.status();
+
+ $scope.setAttendance = function(eventId, status, e){
+ e.preventDefault();
+ //e.stopPropagation();
+
+ $scope.loading.userevents[eventId] = true;
+
+ User.setAttendance(eventId, status).then(function(res){
+ //set status to UI
+
+ if(typeof User.data.subscriptions[eventId] == 'undefined') //init
+ User.data.subscriptions[eventId] = {};
+
+ User.data.subscriptions[eventId].status = res.status;
+ $scope.profile.subscriptions[eventId].status = res.status;
+ $scope.loading.userevents[eventId] = false;
+ },
+ function(error){
+ WSAlert.danger(error);
+ $scope.loading.userevents[eventId] = false;
+ });
+ };
+
+
+ })
+ .directive('userevents', function(){
+ return {
+ restrict: 'E',
+ replace: true,
+ templateUrl: 'views/directive.user-events.html'
+ }
+});
diff --git a/app/scripts/controllers/userinbox.js b/app/scripts/controllers/userinbox.js
index 6780cda..b7df670 100644
--- a/app/scripts/controllers/userinbox.js
+++ b/app/scripts/controllers/userinbox.js
@@ -7,12 +7,43 @@
* # UserinboxCtrl
* Controller of the connectApp
*/
-angular.module('connectApp')
- .controller('UserInboxCtrl', function ($scope, User) {
+angular.module('connectApp')
+ .controller('UserInboxCtrl', function ($q, $scope, User, WSAlert) {
+ $scope.loading.inbox = false;
+ $scope.loading.inboxItem = {};
- $scope.actionConnection = function(connectionId, accepted){
- console.log(connectionId);
- console.log(accepted);
+ $scope.refresh = function(){
+ $scope.loading.inbox = true;
+ $q.when(User.data.promise).then(function(){
+ User.inbox().then(function(res){
+ //refreshed
+ $scope.loading.inbox = false;
+ },
+ function(error){
+ WSAlert.danger(error);
+ $scope.loading.inbox = false;
+ });
+ });
+ };
+ $scope.refresh();
+
+ $scope.actionConnection = function(connectionId, accepted, $index){
+ $scope.loading.inboxItem[connectionId] = true;
+
+ User.actionConnection(connectionId, accepted).then(function(res){
+ if(accepted)
+ WSAlert.success("Connection accepted");
+ else WSAlert.success("Connection denied");
+
+ User.data.inbox.connections.splice($index, 1);
+ User.data.inbox.total_count -= 1;
+
+ $scope.loading.inboxItem[connectionId] = false;
+ },
+ function(error){
+ WSAlert.danger(error);
+ $scope.loading.inboxItem[connectionId] = false;
+ });
};
});
diff --git a/app/scripts/controllers/usersent.js b/app/scripts/controllers/usersent.js
index 2325f48..54b9548 100644
--- a/app/scripts/controllers/usersent.js
+++ b/app/scripts/controllers/usersent.js
@@ -8,10 +8,38 @@
* Controller of the connectApp
*/
angular.module('connectApp')
- .controller('UserSentCtrl', function ($scope) {
- $scope.awesomeThings = [
- 'HTML5 Boilerplate',
- 'AngularJS',
- 'Karma'
- ];
+ .controller('UserSentCtrl', function ($scope, User, $q, WSAlert) {
+
+ $scope.loading.sentItem = {};
+
+ $scope.init = function(){
+ $scope.loading.sent = true;
+
+ User.getSent().then(function(){
+ $scope.loading.sent = false;
+ },
+ function(error){
+ WSAlert.danger(error);
+ $scope.loading.sent = false;
+ });
+ };
+
+ $scope.cancelRequest = function(connectionId, $index){
+ $scope.loading.sentItem[connectionId] = true;
+
+ User.cancelRequest(connectionId).then(function(result){
+ User.data.sent.connections.splice($index, 1);
+ User.data.sent.total_count -= 1;
+ $scope.loading.sentItem[connectionId] = false;
+ },
+ function(error){
+ WSAlert.danger(error);
+ $scope.loading.sentItem[connectionId] = false;
+ });
+ };
+
+ //after User has loaded
+ $q.when(User.data.promise).then(function(){
+ $scope.init();
+ });
});
diff --git a/app/scripts/services/events.js b/app/scripts/services/events.js
index 9182c78..1f9bca8 100644
--- a/app/scripts/services/events.js
+++ b/app/scripts/services/events.js
@@ -21,7 +21,7 @@ angular.module('connectApp')
deferred.resolve(Events.data);
},
function(error){
- deferred.reject("Could not fetch events: " + error);
+ deferred.reject("Could not fetch events: " + error.data.user_msg);
});
return deferred.promise;
};
diff --git a/app/scripts/services/user.js b/app/scripts/services/user.js
index a72fa5b..5d79ee2 100644
--- a/app/scripts/services/user.js
+++ b/app/scripts/services/user.js
@@ -8,54 +8,41 @@
* Service in the connectApp.
*/
angular.module('connectApp')
- .service('User', function ($q, $http, API_CONNECT, $timeout, auth) {
+ .factory('User', function ($q, $http, API_CONNECT, $timeout, auth, APP_ID, APP_ROLES) {
var User = {
+ data: $q.defer(),
+ connections: $q.defer()
};
User.init = function(){
- var deferred = $q.defer();
// var featuredOnly = (featured) ? "?featured=" + featured : "";
//wait for auth.user to resolve
$q.when(auth.user.$promise).then(function(){
- $http.get(API_CONNECT + "/user/person/" + auth.user.person_id).then(function(result){
- User.data = result.data;
- deferred.resolve(User.data);
+ $http.get(API_CONNECT + "/user/person/" + auth.user.person_id).then(function(result){
+ User.data.resolve();
+ User.data = result.data;
},
function(error){
- deferred.reject("Could not fetch user: " + error);
+ User.data.reject("Could not fetch user: " + error.data.user_msg);
})
});
- return deferred.promise;
+ return User.data.promise;
};
- User.subscriptions = function(uid){
- var Subscriptions = {};
- var deferred = $q.defer();
+ User.isAdmin = function(){
+ var isAdmin = false;
- $http.get(API_CONNECT + "/subscriptions/users/" + uid).then(function(result){
-
- Subscriptions = result.data;
- //User.data.subscriptions = Subscriptions;
- var temp_subscriptions = {};
+ angular.forEach(auth.user.roles, function(val, key){
+ if(val.role_application.application_code == APP_ID && val.name == APP_ROLES.ADMIN)
+ isAdmin = true;
+ });
- //cleanup, go through all subs
- angular.forEach(result.data.subscription, function(val, key){
- temp_subscriptions[val.event.id] = val;
- });
+ return isAdmin;
- User.data.subscriptions = temp_subscriptions;
- Subscriptions = temp_subscriptions;
+ };
- deferred.resolve(Subscriptions);
- },
- function(error){
- deferred.reject("Could not fetch subscriptions: " + error);
- });
-
- return deferred.promise;
- };
User.setAttendance = function(event, status){
var deferred = $q.defer();
@@ -70,37 +57,215 @@ angular.module('connectApp')
deferred.resolve(res.data);
},
function(error){
- deferred.reject("Could not save subscription to event: " + error);
+ deferred.reject("Could not save subscription to event: " + error.data.user_msg);
})
return deferred.promise;
};
- User.getById = function(uid){
+ User.actionConnection = function(connectionId, accepted){
var deferred = $q.defer();
+ var acceptStr = (accepted) ? "accept" : "deny";
+
+ $http.put(API_CONNECT + "/connections/" + connectionId + "/" + acceptStr).then(function(res){
+ deferred.resolve(res);
+ },
+ function(error){
+ deferred.reject("Could not save connection: " + error.data.user_msg);
+ });
- $http.get(API_CONNECT + "/user/" + uid).then(function(result){
+ return deferred.promise;
+ };
+
+ User.deleteConnection = function(connectionId){
+ var deferred = $q.defer();
+
+ $http.delete(API_CONNECT + "/connections/" + connectionId).then(function(res){
+ deferred.resolve(res);
+ }, function(error){
+ deferred.reject("Could not delete connection: " + error.data.user_msg);
+ });
+
+ return deferred.promise;
+ }
+
+
+
+ User.inbox = function(){
+ var deferred = $q.defer();
+
+ $http.get(API_CONNECT + "/connections/user/" + User.data.id + "/inbox").then(function(result){
+ User.data.inbox = result.data;
+ deferred.resolve(result.data);
+ },
+ function(error){
+ deferred.reject("Could not fetch inbox: " + error.data.user_msg);
+ });
+
+ return deferred.promise;
+ };
+
+ User.getConnections = function(){
+ //User.connections = $q.defer();
+
+ $http.get(API_CONNECT + "/connections/user/" + User.data.id).then(function(result){
+ User.connections.resolve(result.data);
+ User.connections = result.data;
+ },
+ function(error){
+ User.connections.reject("Could not fetch connections: " + error.data.user_msg);
+ });
+
+ return User.connections.promise;
+ };
+
+ User.requestContact = function(uid){
+ var deferred = $q.defer();
+
+ var postData = {
+ "from": {
+ "id": User.data.id
+ },
+ "to": {
+ "id": uid
+ },
+ "accepted": false,
+ "denied": false
+ };
+
+ $http.post(API_CONNECT + "/connections/", postData).then(function(result){
+ deferred.resolve(result);
+ },
+ function(error){
+ deferred.reject("Could not send contact request: " + error.data.user_msg);
+ });
+
+ return deferred.promise;
+ };
+
+ User.cancelRequest = function(connectionId){
+ var deferred = $q.defer();
+
+ $http.delete(API_CONNECT + "/connections/" + connectionId).then(function(result){
+ deferred.resolve(result);
+ },
+ function(error){
+ deferred.reject("Could not cancel request: " + error.data.user_msg);
+ });
+
+ return deferred.promise;
+ };
+
+ User.cancelRequestByUserId = function(userId){
+ var deferred = $q.defer();
+
+ //get connection id
+ User.connectionExists(userId).then(function(result){
+ //remove connection
+ $http.delete(API_CONNECT + "/connections/" + result.id).then(function(result2){
+ deferred.resolve(result2);
+ },
+ function(error){
+ deferred.reject("Could not cancel request: " + error.data.user_msg);
+ });
+ },
+ function(error){
+ deferred.reject(error.data.user_msg);
+ });
+
+ return deferred.promise;
+ };
+
+ User.getSent = function(){
+ var deferred = $q.defer();
+
+ $http.get(API_CONNECT + "/connections/user/" + User.data.id + "/sent").then(function(result){
+ User.data.sent = result.data;
deferred.resolve(result.data);
},
function(error){
- deferred.reject("Could not fetch user: " + error);
+ deferred.reject("Could not fetch sent contact requests: " + error.data.user_msg);
+ });
+
+ return deferred.promise;
+ };
+
+ User.isConnected = function(uid){
+ var connected = false;
+
+ angular.forEach(User.connections.connections, function(val, key){
+ if(val.from.id == uid || val.to.id == uid){
+ connected = true;
+ }
+ });
+
+ return connected;
+ };
+
+ User.connectionExists = function(uid){
+ var connected = false;
+
+ var deferred = $q.defer();
+
+ $http.get(API_CONNECT + "/connections/user/" + User.data.id + "?include_pending=1").then(function(result){
+ //go through results
+ angular.forEach(result.data.connections, function(val, key){
+ if(val.from.id == uid || val.to.id == uid) deferred.resolve(val);
+ });
+ deferred.reject();
+ },
+ function(error){
+ deferred.reject(error.data.user_msg);
});
return deferred.promise;
};
- User.getInbox = function(uid){
+
+
+ //external resources
+
+
+ User.subscriptions = function(uid){
+ var Subscriptions = {};
var deferred = $q.defer();
+ $http.get(API_CONNECT + "/subscriptions/users/" + uid).then(function(result){
+
+ Subscriptions = result.data;
+ //User.data.subscriptions = Subscriptions;
+ var temp_subscriptions = {};
+
+ //cleanup, go through all subs
+ angular.forEach(result.data.subscription, function(val, key){
+ temp_subscriptions[val.event.id] = val;
+ });
+
+ //User.data.subscriptions = temp_subscriptions;
+ Subscriptions = temp_subscriptions;
- $http.get(API_CONNECT + "/connections/user/" + uid + "/inbox").then(function(result){
+ deferred.resolve(Subscriptions);
+ },
+ function(error){
+ deferred.reject("Could not fetch subscriptions: " + error.data.user_msg);
+ });
+
+ return deferred.promise;
+ };
+
+
+ User.getById = function(uid){
+ var deferred = $q.defer();
+
+ $http.get(API_CONNECT + "/user/" + uid).then(function(result){
deferred.resolve(result.data);
},
function(error){
- deferred.reject("Could not fetch connections: " + error);
+ deferred.reject("Could not fetch user: " + error.data.user_msg);
});
return deferred.promise;
};
+
return User;
});
diff --git a/app/styles/application.scss b/app/styles/application.scss
index 83e7f05..f5514f5 100644
--- a/app/styles/application.scss
+++ b/app/styles/application.scss
@@ -88,6 +88,9 @@ li.active a {
.popular-connection-image img{ margin-bottom: 0; }
.events{ clear: both; }
+
+.cb{ clear: both; }
+
.event{
margin-bottom: 3em;
float: left;
diff --git a/app/views/directive.events.html b/app/views/directive.events.html
index 2d0c979..aaefde5 100644
--- a/app/views/directive.events.html
+++ b/app/views/directive.events.html
@@ -6,8 +6,8 @@
-
+
+
{{user.data.subscriptions[event.id].status.name.text}}
Not attending
diff --git a/app/views/directive.requestbtn.html b/app/views/directive.requestbtn.html
new file mode 100644
index 0000000..13f60eb
--- /dev/null
+++ b/app/views/directive.requestbtn.html
@@ -0,0 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/app/views/directive.user-events.html b/app/views/directive.user-events.html
new file mode 100644
index 0000000..421ed05
--- /dev/null
+++ b/app/views/directive.user-events.html
@@ -0,0 +1,29 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/views/events.html b/app/views/events.html
index 1b74f36..36288d0 100644
--- a/app/views/events.html
+++ b/app/views/events.html
@@ -1,4 +1,5 @@
-
+
+
+
+ {{profile.subscriptions[userevent.event.id].status.name.text}}
+ Not attending
+
+
+
+
+
+
WorldSkills Events
diff --git a/app/views/user.html b/app/views/user.html index 6b7770a..538443f 100644 --- a/app/views/user.html +++ b/app/views/user.html @@ -4,30 +4,37 @@ --> - - - + +{{user.first_name + " " + user.last_name}}
-+
{{profile.first_name + " " + profile.last_name}}
+
diff --git a/app/views/userconnections.html b/app/views/userconnections.html
index 2503dea..e12f77b 100644
--- a/app/views/userconnections.html
+++ b/app/views/userconnections.html
@@ -1,26 +1,28 @@