Skip to content
This repository has been archived by the owner on Nov 2, 2019. It is now read-only.

Add validations #30

Closed
wants to merge 2 commits into from
Closed

Add validations #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8561c4f
Added validation for n number and name
brentdur Apr 3, 2016
255259c
Update not a student switch
brentdur Apr 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 43 additions & 2 deletions app/js/controllers/entry-ctrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,71 @@ angular
$scope.dirty.nNumber = ""
$scope.dirty.name = ""
$scope.person = {attributes:{}};

$scope.nyuStudent = true;


//booleans for opening up new parts of the form
$scope.rsvpd = false;
$scope.needId = true;
$scope.needName = false;
$scope.needEmail = false;
$scope.allEntered = false;

$scope.nFailValidation = false;
$scope.nameFailValidation = false;

$scope.validateNNumber = function(number) {
var re = /N[0-9]{8}$/;
return re.test(number);
}

$scope.validateFullName = function(name) {
var re = /[A-Z][a-z]*\s[A-Z][a-z]*/;
return re.test(name);
}

$scope.findPersonNumber = function(number) {
$scope.nFailValidation = false;
if (number.indexOf('=') > -1) {
number = 'N' + number.substring(2, number.indexOf('='));
}
else if (number.indexOf('N') < 0) {
number = 'N' + number;
}

$scope.dirty.nNumber = number

if (!$scope.validateNNumber(number)) {
$scope.nFailValidation = true;
return;
}

personExists('people?filter[simple][nNumber]=' + number, function() {
$scope.needName = true;
});
}

$scope.notAStudent = function() {
$scope.needName = true;
$scope.notAStudent = function() {
$scope.dirty.nNumber = ""
$scope.nyuStudent = !$scope.nyuStudent;
if ($scope.nyuStudent) {
$scope.needId = true;
$scope.needName = false;
}
else {
$scope.needId = false;
$scope.needName = true;
}
}

$scope.findPersonName = function(name) {
$scope.nameFailValidation = false;
$scope.dirty.name = name;
if (!$scope.validateFullName(name)) {
$scope.nameFailValidation = true;
return;
}
personExists('people?filter[simple][name]=' + name, function() {
$scope.needEmail = true;
});
Expand Down
55 changes: 32 additions & 23 deletions app/partials/entry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,38 @@
<div ng-if="events">
<h2>{{events.attributes.title}}</h2>
<p>{{events.attributes.description}}</p>
<form name="idNumber" ng-submit="findPersonNumber(dirty.nNumber)">
<input class="button flatButton" type="text" placeholder="Swipe your id" ng-model="dirty.nNumber" ng-disabled="person.attributes.name || needName" autofocus />
</form>
<br>
<p ng-click="notAStudent()" role="button" class="button flatButton">Not a student</a>
</div>
<div ng-if="needName">
<h2>Welcome! Can I have your name?</h2>
<div mass-autocomplete>
<form name="name" ng-submit="findPersonName(dirty.value)">
<input class="button flatButton" placeholder="Enter your name" ng-model="dirty.value" mass-autocomplete-item="autocomplete_options" ng-disabled="person.attributes.name || needEmail" />
<div ng-if="needId">
<form name="idNumber" ng-submit="findPersonNumber(dirty.nNumber)">
<input class="button flatButton" type="text" placeholder="Swipe your id" ng-model="dirty.nNumber" ng-disabled="person.attributes.name || needName" autofocus />
<p ng-if="nFailValidation"> Something is wrong with the id number entered</p>
</form>
<br>
</div>
<p ng-click="notAStudent()" role="button" class="button flatButton">
<span ng-show="nyuStudent">Not an NYU Student?</span>
<span ng-hide="nyuStudent">NYU Student?</span>
</p>

<div ng-if="needName">
<h2>Welcome! Can I have your name?</h2>
<div mass-autocomplete>
<form name="name" ng-submit="findPersonName(dirty.value)">
<input class="button flatButton" placeholder="Enter your name" ng-model="dirty.value" mass-autocomplete-item="autocomplete_options" ng-disabled="person.attributes.name || needEmail" />
<p ng-if="nameFailValidation"> Something is wrong with the name entered</p>
</form>
</div>
</div>
<div ng-if="needEmail">
<h2>...and your email?</h2>
<form name="email" ng-submit="findPersonEmail(dirty.email)">
<input class="button flatButton" type="email" ng-model="dirty.email" ng-disabled="person.attributes.name || allEntered" />
</form>

</div>
<div ng-if="person.attributes.name">
<h2>Hello {{person.attributes.name}}!</h2>
<p ng-show="rsvpd">You have been successfully signed in!</p>
<p ng-hide="rsvpd">Checking you in now...</p>
</div>
</div>
<div ng-if="needEmail">
<h2>...and your email?</h2>
<form name="email" ng-submit="findPersonEmail(dirty.email)">
<input class="button flatButton" type="text" ng-model="dirty.email" ng-disabled="person.attributes.name || allEntered" />
</form>
</div>
<div ng-if="person.attributes.name">
<h2>Hello {{person.attributes.name}}!</h2>
<p ng-show="rsvpd">You have been successfully signed in!</p>
<p ng-hide="rsvpd">Checking you in now...</p>
</div>
</div>
</div>