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

Merge remote-tracking branch 'origin/matanBranch'

Browse source 
# Conflicts:
#	templates/js/controllers/registerController.js
#	templates/views/register.html
This commit is contained in:
Sagi Dayan 2015-06-14 19:39:30 +03:00
commit 9ab8628f90
1 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,29 +1,54 @@
angular.module('SeHub') angular.module('SeHub')
.controller('registerController', ['$scope', 'apiService', '$rootScope', function ($scope, apiService ,$rootScope) { .controller('registerController', ['$scope', '$location', '$cookies', 'apiService', '$rootScope', function ($scope, $location, $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 // $scope.fullMail = $scope.academicEmail + $scope.campusObj.email_ending; // Will hold the full academic email of the user
$rootScope.seToken = $cookies['com.sehub.www'];
var token = $rootScope.seToken;
apiService.getUserByToken(token).success(function(data){
$scope.user = data;
console.log(data);
if(data.message == 'No User Found')
console.error("No User Found!");
$scope.user = data;
$rootScope.user = data;
if($scope.user.isFirstLogin)
$location.path('/register')
$scope.user = $rootScope.user;
if($scope.user.name === ";"){ if($scope.user.name === ";"){
$scope.user.name = ""; $scope.user.name = "";
$scope.user.name = $scope.user.username $scope.user.name = $scope.user.username
$scope.userHasNoName = true; $scope.userHasNoName = true;
}; }
apiService.getAllCampuses($scope.user.seToken).success(function(data)
{
$scope.campuses = data;
}).error(function()
{
// TODO
});
});
$scope.dropdownClicked = function() $scope.dropdownClicked = function()
{ {
// console.log($scope.fullMail);
if($scope.campus){ if($scope.campus){
$scope.campusChecked = true; $scope.campusChecked = true;
$scope.campusObj = null; $scope.campusObj = null;
for (var i = $scope.campuses.length - 1; i >= 0; i--) { for (var i = $scope.campuses.length - 1; i >= 0; i--) {
if($scope.campuses[i].title == $scope.campus){ if($scope.campuses[i].title == $scope.campus){
$scope.campusObj = $scope.campuses[i]; $scope.campusObj = $scope.campuses[i];
console.log($scope.campusObj); console.log($scope.campusObj); // TODO REMOVE!!
} }
}; };
} }
@ -33,9 +58,12 @@ angular.module('SeHub')
$scope.submitClicked = function() $scope.submitClicked = function()
{ {
console.log($scope.user.AcMail); console.log($scope.user.AcMail);
$scope.mail = 'pin';
console.log($scope.mail);
}; };
apiService.getAllCampuses($scope.user.seToken).success(function(data) apiService.getAllCampuses($scope.user.seToken).success(function(data)
{ {
$scope.campuses = data; $scope.campuses = data;