sagi/se-hub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Email verification added-

Browse source 
empty user name test added
This commit is contained in:
Matan Bar Yosef 2015-06-14 20:06:00 +03:00
parent 9ab8628f90
commit ce8efbcaa9
1 changed files with 16 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
templates/js/controllers/registerController.js
View file

@ -1,25 +1,19 @@
angular.module('SeHub') angular.module('SeHub')
.controller('registerController', ['$scope', '$location', '$cookies', 'apiService', '$rootScope', function ($scope, $location, $cookies, apiService ,$rootScope) { .controller('registerController', ['$scope', '$cookies', 'apiService', '$rootScope', function ($scope, $cookies, apiService ,$rootScope) {
$scope.userHasNoName = false; $scope.userHasNoName = false;
$scope.campusChecked = false; $scope.campusChecked = false;
$scope.isEmpty = true; // if the academic email line is empty $scope.isEmpty = true; // if the academic email line is empty
// $scope.fullMail = $scope.academicEmail + $scope.campusObj.email_ending; // Will hold the full academic email of the user
$rootScope.seToken = $cookies['com.sehub.www']; $rootScope.seToken = $cookies['com.sehub.www'];
var token = $rootScope.seToken; var token = $rootScope.seToken;
apiService.getUserByToken(token).success(function(data){ apiService.getUserByToken(token).success(function(data){
$scope.user = data; $scope.user = data;
console.log(data);
if(data.message == 'No User Found') if(data.message == 'No User Found')
console.error("No User Found!"); console.error("No User Found!");
console.log(data);
$scope.user = data;
$rootScope.user = data;
if($scope.user.isFirstLogin)
$location.path('/register')
if($scope.user.name === ";"){ if($scope.user.name === ";"){
$scope.user.name = ""; $scope.user.name = "";
@ -38,8 +32,6 @@ angular.module('SeHub')
}); });
$scope.dropdownClicked = function() $scope.dropdownClicked = function()
{ {
if($scope.campus){ if($scope.campus){
@ -51,37 +43,26 @@ angular.module('SeHub')
console.log($scope.campusObj); // TODO REMOVE!! console.log($scope.campusObj); // TODO REMOVE!!
} }
}; };
} };
}; };
$scope.submitClicked = function() $scope.submitClicked = function()
{ {
console.log($scope.user.AcMail); if($scope.user.AcMail != null)
$scope.mail = 'pin'; {
console.log($scope.mail); var fullMail = $scope.user.AcMail + $scope.campusObj.email_ending; // Holds the full academic email of the user
apiService.sendValidationMail($scope.user.seToken, fullMail).success(function(data) // TODO: Add 2nd parameter email type Email
{
console.log("DONE - 200");
// TODO - add a window that display that an email has been sent for verification
}).error(function()
{
// TODO
});
};
}; };
apiService.getAllCampuses($scope.user.seToken).success(function(data)
{
$scope.campuses = data;
}).error(function()
{
// TODO
});
// apiService.sendValidationMail($scope.user.seToken, $scope.fullMail).success(function(data) // TODO: Add 2nd parameter email type Email
// {
// console.log($scope.fullMail);
// console.log("200");
// // TODO
// }).error(function()
// {
// });