log in to homepage - fixed
This commit is contained in:
parent
c4b077a32f
commit
c01372eb58
2 changed files with 50 additions and 38 deletions
|
@ -1,46 +1,32 @@
|
||||||
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.user = $rootScope.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')
|
||||||
|
|
||||||
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.dropdownClicked = function()
|
|
||||||
{
|
|
||||||
console.log($scope.fullMail);
|
|
||||||
if($scope.campus){
|
|
||||||
$scope.campusChecked = true;
|
|
||||||
$scope.campusObj = null;
|
|
||||||
for (var i = $scope.campuses.length - 1; i >= 0; i--) {
|
|
||||||
if($scope.campuses[i].title == $scope.campus){
|
|
||||||
$scope.campusObj = $scope.campuses[i];
|
|
||||||
console.log($scope.campusObj);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
$scope.submitClicked = function()
|
|
||||||
{
|
|
||||||
if($scope.academicEmail === "")
|
|
||||||
isEmpty = true;
|
|
||||||
else{
|
|
||||||
$scope.isEmpty = false;
|
|
||||||
$scope.academicEmail = "matanbr";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
apiService.getAllCampuses($scope.user.seToken).success(function(data)
|
apiService.getAllCampuses($scope.user.seToken).success(function(data)
|
||||||
{
|
{
|
||||||
$scope.campuses = data;
|
$scope.campuses = data;
|
||||||
|
@ -49,6 +35,32 @@ angular.module('SeHub')
|
||||||
// TODO
|
// TODO
|
||||||
});
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$scope.dropdownClicked = function()
|
||||||
|
{
|
||||||
|
if($scope.campus){
|
||||||
|
$scope.campusChecked = true;
|
||||||
|
$scope.campusObj = null;
|
||||||
|
for (var i = $scope.campuses.length - 1; i >= 0; i--) {
|
||||||
|
if($scope.campuses[i].title == $scope.campus){
|
||||||
|
$scope.campusObj = $scope.campuses[i];
|
||||||
|
console.log($scope.campusObj); // TODO REMOVE!!
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.submitClicked = function()
|
||||||
|
{
|
||||||
|
$scope.mail = 'pin';
|
||||||
|
console.log($scope.mail);
|
||||||
|
};
|
||||||
|
|
||||||
// apiService.sendValidationMail($scope.user.seToken, $scope.fullMail).success(function(data) // TODO: Add 2nd parameter email type Email
|
// apiService.sendValidationMail($scope.user.seToken, $scope.fullMail).success(function(data) // TODO: Add 2nd parameter email type Email
|
||||||
// {
|
// {
|
||||||
// console.log($scope.fullMail);
|
// console.log($scope.fullMail);
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div class = "disabledSubmitButton">
|
<div class = "disabledSubmitButton">
|
||||||
<md-button ng-disabled="!campusChecked" class="md-raised md-primary">Submit</md-button>
|
<md-button ng-click = "submitClicked()" ng-disabled="!campusChecked" class="md-raised md-primary">Submit</md-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -45,8 +45,8 @@
|
||||||
<div ng-if="campusChecked">
|
<div ng-if="campusChecked">
|
||||||
<div>
|
<div>
|
||||||
<md-input-container>
|
<md-input-container>
|
||||||
<label>Academic Email</label>
|
<label>Academic email</label>
|
||||||
<input ng-model="academicEmail" required>
|
<input type = "text" ng-model="mail" required>
|
||||||
</md-input-container>
|
</md-input-container>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue