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

Merge UI - Conflict Fixed

Browse source
This commit is contained in:
Sagi Dayan 2015-06-16 20:38:26 +03:00
commit b3dc506d49
4 changed files with 72 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/css/theme.css
View file

@ -147,9 +147,9 @@ body.noscroll
.createCampus
{
position:relative;
/*float:right;*/
}
/*div.img campusAvatar
{
border: 1px solid #0000ff;

1
templates/js/controllers/homeController.js
View file

@ -6,5 +6,4 @@ angular.module('SeHub')
{
}]);

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

@ -76,37 +76,69 @@ angular.module('SeHub')
};
$scope.lecturer = function(ev)
$scope.createCampus = function(ev)
{
console.log("inside");
$scope.createCampusClicked = true;
if(!$scope.isLecturer) // if i am a lecturer (when pressing -> getting last data value before pressing) = "!isLecturer" it means => I Am Lecturer
if(!$scope.isLecturer) // "!isLecturer" Means => I Am Lecturer; if i am a lecturer (when pressing -> getting last data value before pressing)
{
// var jsonCreateCampus =
// {
// "title": "Create Campus",
// "email": "email_ending",
// "avatar": "self.avatar.url"
// }
console.log("YES lecturer " + $scope.jsonCreateCampus.title);
if($scope.user.campusSuffixMail != null)
{
validateEmail($scope.user.campusSuffixMail);
}
}
}
if($scope.user.lecAcMail != null)
validateEmail = function(email) // TODO ADD IT
{
apiService.sendValidationMail($scope.user.seToken, $scope.user.lecAcMail).success(function(data)
var result = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
console.log("Email: " + email);
if (!result.test(email))
{
console.log(email + ", Error in email, should alert");
alert('Please provide a valid e-mail address');
}
if(result.test(email))
{
console.log("Im good");
apiService.sendValidationMail($scope.user.seToken, email).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)); // Pop-up alert for e-mail verification
.ariaLabel('Email verification alert dialog').ok('Got it!').targetEvent(email)); // Pop-up alert for e-mail verification
// TODO ADD delete cookies and redirect only after pressed 'Got it'
$cookieStore.remove("com.sehub.www"); // Removing the cookies
$window.location.href = 'http://se-hub.appspot.com'; // Reference to 'welcome' page
}).error(function()
{
$mdDialog.show($mdDialog.alert().title('Error - E-mail Verification').content('An error has occured in your e-mail address or in the campus name.')
.ariaLabel('Email verification error alert dialog').ok('Got it!').targetEvent(ev));
.ariaLabel('Email verification error alert dialog').ok('Got it!').targetEvent(email));
});
}
}
}
// TODO FOR LATER - toast
// TODO FOR LATER
// $scope.getPopWindowPosition = function()
// {
// return Object.keys($scope.toastPosition).filter(function(pos)
// {
// return $scope.toastPosition[pos];
// }).join(' ');
// };
// $scope.toastPosition =
// {
// bottom: false,
// top: true,
// left: false,
// right: true
// };
// TODO FOR LATER
// TODO FOR LATER
}]);

18
templates/views/register.html
View file

@ -25,19 +25,19 @@
<div>
<div ng-if="user.isLecturer">
<div>
<md-button ng-click = "lecturer($event)" ng-model="jsonCreateCampus" class="md-raised">Create Campus</md-button>
<md-button ng-click = "createCampus($event)" ng-model="jsonCreateCampus" class="md-raised">Create Campus</md-button>
<div class = "createCampus" ng-if="createCampusClicked">
<md-input-container>
<label>Academic Lecturer Email</label>
<input type="text" ng-disabled="!createCampusClicked" ng-model="user.lecAcMail" required/>
<label>Academic Suffix Email</label>
<input type="text" ng-model="user.campusSuffixMail" ng-minlength="1" required/>
</md-input-container>
<md-input-container>
<label>Campus Name</label>
<input type="text" ng-disabled="!createCampusClicked" ng-model="user.campusName" required/>
<input type="text" ng-if="createCampusClicked" ng-model="user.campusName" ng-minlength="1" required !important/>
</md-input-container>
<md-input-container>
<label>Campus Avatar Url (optional)</label>
<input type="text" ng-disabled="!createCampusClicked" ng-model="user.newCampusAvatar" required/>
<input type="text" ng-if="createCampusClicked" ng-model="user.newCampusAvatar"/>
</md-input-container>
</div>
</div>
@ -48,7 +48,6 @@
</md-select>
</div>
</div>
<div layout="col" layout-align="center center">
<div>
<div class="campusAvatar" ng-if="campusChecked">
@ -76,13 +75,6 @@
</div>
</div>
</div>
<!-- <div> // TODO return
<p>
<b>Note:</b> This setting can be changed in the future. <br>
But Choose Now for easy Registration...
</p>
</div> -->
</md-card>
</md-content>
</div>