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

Merge pull request #21 from sagidayan/matanBranch

Browse source 
Matan branch
This commit is contained in:
Sagi Dayan 2015-06-14 22:06:50 +03:00
commit c32e0ad971
2 changed files with 57 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,45 +1,39 @@
angular.module('SeHub') angular.module('SeHub')
.controller('registerController', ['$scope', '$location', '$cookies', 'apiService', '$rootScope', function ($scope, $location, $cookies, apiService ,$rootScope) { .controller('registerController', ['$scope', '$cookies', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $cookies, $location, $mdToast, $mdDialog, 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) // Get user token
{
$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; if($scope.user.name === ";")
$rootScope.user = data; {
if($scope.user.isFirstLogin)
$location.path('/register')
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) apiService.getAllCampuses($scope.user.seToken).success(function(data) // Get all the campuses
{ {
$scope.campuses = data; $scope.campuses = data;
}).error(function() }).error(function()
{ {
// TODO // TODO
}); });
}); });
$scope.dropdownClicked = function() $scope.dropdownClicked = function()
{ {
if($scope.campus){ if($scope.campus){
@ -51,40 +45,54 @@ angular.module('SeHub')
console.log($scope.campusObj); // TODO REMOVE!! console.log($scope.campusObj); // TODO REMOVE!!
} }
}; };
} };
}; };
$scope.submitClicked = function() $scope.submitClicked = function(ev)
{ {
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)
{
console.log("DONE - 200");
$mdDialog.show($mdDialog.alert().title('E-mail Verification').content('A verification e-mail has been sent to your email address.')
.ariaLabel('Email verification alert dialog').ok('Got it!').targetEvent(ev));
// TODO - ADD DELETE COOKIES
$cookies.remove("com.sehub.www");
// $location.path("templates/views/home.html"); // Redirecting to home page // TODO REMOVE REMOVE!!
}).error(function()
{
$mdDialog.show($mdDialog.alert().title('Error - E-mail Verification').content('An error has occured in your e-mail address.')
.ariaLabel('Email verification error alert dialog').ok('Got it!').targetEvent(ev));
});
};
}; };
apiService.getAllCampuses($scope.user.seToken).success(function(data) // TODO FOR LATER
{ // TODO FOR LATER
$scope.campuses = data;
}).error(function()
{
// TODO
});
// apiService.sendValidationMail($scope.user.seToken, $scope.fullMail).success(function(data) // TODO: Add 2nd parameter email type Email $scope.getPopWindowPosition = function()
// { {
// console.log($scope.fullMail); return Object.keys($scope.toastPosition).filter(function(pos)
// console.log("200"); {
return $scope.toastPosition[pos];
// // TODO }).join(' ');
// }).error(function() };
// {
$scope.toastPosition =
// }); {
bottom: false,
top: true,
left: false,
right: true
};
// TODO FOR LATER
// TODO FOR LATER
}]);
}]);

6
templates/views/register.html
View file

@ -18,8 +18,8 @@
</div> </div>
<div layout="row" layout-align="center center"> <div layout="row" layout-align="center center">
Are You A Lecturer? Are You A Lecturer?
<md-switch ng-model="user.isLecturer" aria-label="Switch 1"> <md-switch class="md-primary" md-no-ink aria-label="Switch No Ink" ng-model="data.cb5">
</md-switch> </md-switch>
</div> </div>
</div> </div>
<div> <div>
@ -37,7 +37,7 @@
</div> </div>
<div> <div>
<div class = "disabledSubmitButton"> <div class = "disabledSubmitButton">
<md-button ng-click="submitClicked()" ng-disabled="!campusChecked" class="md-raised md-primary">Submit</md-button> <md-button ng-click="submitClicked($event)" ng-disabled="!campusChecked" class="md-raised md-primary">Submit</md-button>
</div> </div>
</div> </div>
</div> </div>