From 1fbf7a5af3f24d25c47a74fe4fd0435aae2c5d38 Mon Sep 17 00:00:00 2001
From: Sagi Dayan <sagidayan@gmail.com>
Date: Sun, 14 Jun 2015 19:31:16 +0300
Subject: [PATCH] Fixed the ng-model

---
 SE_API/API.py                                  |  8 ++++++++
 templates/js/controllers/registerController.js | 15 +++++----------
 templates/views/register.html                  |  6 +++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/SE_API/API.py b/SE_API/API.py
index 2fb2f16..8b887e3 100644
--- a/SE_API/API.py
+++ b/SE_API/API.py
@@ -346,6 +346,14 @@ def login():
 
 
 
+@app.route('/api/qa/init')
+def init_QA():
+    qa_user = User(username='qa_student', name='Student QA', avatar_url='http://ava.com', email='just@mail.com',
+                   isLecturer=False, accessToken='student_token_', seToken='_QA_TOKEN_TEST')
+
+
+
+
 
 def cookieMonster(uid):
     redirect_to_home = redirect('/home')
diff --git a/templates/js/controllers/registerController.js b/templates/js/controllers/registerController.js
index dc4d561..0e59981 100644
--- a/templates/js/controllers/registerController.js
+++ b/templates/js/controllers/registerController.js
@@ -12,11 +12,11 @@ angular.module('SeHub')
 		$scope.user.name = "";
 		$scope.user.name = $scope.user.username
 		$scope.userHasNoName = true;
-	}
+	};
 
 	$scope.dropdownClicked = function()
 	{
-			console.log($scope.fullMail);
+			// console.log($scope.fullMail);
 		if($scope.campus){
 			$scope.campusChecked = true;
 			$scope.campusObj = null;
@@ -28,18 +28,13 @@ angular.module('SeHub')
 			};
 		}
 		
-	}
+	};
 
 	$scope.submitClicked = function()
 	{
-		if($scope.academicEmail === "")
-			isEmpty = true;
-		else{
-			$scope.isEmpty = false;
-			$scope.academicEmail = "matanbr";
-		}
+		console.log($scope.user.AcMail);
 
-	}
+	};
 
 	apiService.getAllCampuses($scope.user.seToken).success(function(data)
 	{
diff --git a/templates/views/register.html b/templates/views/register.html
index c312d3d..bbe6b26 100644
--- a/templates/views/register.html
+++ b/templates/views/register.html
@@ -37,7 +37,7 @@
 		</div>
 			<div>
 				<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>
@@ -45,8 +45,8 @@
 			<div ng-if="campusChecked">
 				<div>
 					<md-input-container>
-					<label>Academic Email</label>
-					<input ng-model="academicEmail" required>
+						<label>Academic Email</label>
+						<input type="text" ng-model="user.AcMail" required/>
 					</md-input-container>
 				</div>
 			</div>