From 86ce32b1d7bf65c1b05e327967ec78c4379d37fe Mon Sep 17 00:00:00 2001
From: Aarni <aarni.halinen@aalto.fi>
Date: Mon, 1 Aug 2016 20:06:40 +0300
Subject: [PATCH] minor tweaks and fixes.

---
 members/static/js/getmembers.js |  2 +-
 members/templates/index.html    | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/members/static/js/getmembers.js b/members/static/js/getmembers.js
index c0b8785..b785d49 100644
--- a/members/static/js/getmembers.js
+++ b/members/static/js/getmembers.js
@@ -19,7 +19,7 @@ var app = angular.module("getMembersApp", []);
 
 app.controller("ViewStudentsController", function($scope, $http){
 	$http.get("/members/api/members").then(function(response){
-		$scope.members = response.data.records;	
+		$scope.members = response.data;	
 	});
 	$scope.removeMember = function(id){				
 		var index = -1;		
diff --git a/members/templates/index.html b/members/templates/index.html
index 39c6663..b88f88f 100644
--- a/members/templates/index.html
+++ b/members/templates/index.html
@@ -29,8 +29,8 @@
 	<![endif]-->
 
 	<!--AngularJS-->
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.min.js"></script>
-	<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-route.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.js"></script>
+	<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-route.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
 	<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js'></script>
 	{%load staticfiles %}
@@ -63,7 +63,7 @@
 						
 					<table id="choose-address-table" class="ui-widget ui-widget-content">
 						<thead>
-							<tr ng-repeat="ui-widget-header">
+							<tr>
 								<th>ID</th>
 								<th>Etunimi</th>
 								<th>Sukunimi</th>
@@ -83,7 +83,7 @@
 								<td>{{ x.jas }}</td>
 								<td>{{ x.POR }}</td>
 								<td>
-									<input type="button" value="Remove" class="btn btn-primary" ng-click="removeMember(x.id)"></input>
+									<input type="button" value="Remove" class="btn btn-primary" ng-click="removeMember(x.id)"/>
 								</td>
 							</tr>
 						</tbody>
@@ -96,27 +96,27 @@
 						<form name="memberForm" ng-submit="submitForm()">
 							<div class="form-group">
 								<label>Etunimi: </label> 
-								<input id="firstNameField" required type="text" placeholder="Sähkö" class="form-control" ng-model="firstName"></input>
+								<input id="firstNameField" required type="text" placeholder="Sähkö" class="form-control" ng-model="firstName"/>
 							</div>
 							<div class="form-group">
 								<label>Sukunimi: </label> 
-								<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="lastName"></input>
+								<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="lastName"/>
 							</div>
 							<div class="form-group">
 								<label>Sähköposti: </label>
-								<input id="emailField" required type="text" placeholder="sahko.insinoori@aalto.fi" class="form-control" ng-model="email"></input>
+								<input id="emailField" required type="text" placeholder="sahko.insinoori@aalto.fi" class="form-control" ng-model="email"/>
 							</div>
 							<div class="form-group">
 								<label>AYY jäsen: </label> 
-								<input type="checkbox" id="AYY" value="0" ng-model="AYY"></input>
+								<input type="checkbox" id="AYY" value="0" ng-model="AYY"/>
 							</div>
 							<div class="form-group">
 								<label>JAS-listaan: </label> 
-								<input type="checkbox" id="JAS" value="0" ng-model="JAS"></input>
+								<input type="checkbox" id="JAS" value="0" ng-model="JAS"/>
 							</div>
 							<div class="form-group">
 								<label>Asuinkunta: </label> 
-								<input id="PORField" required type="text" placeholder="Otaniemi" class="form-control" ng-model="POR"></input>
+								<input id="PORField" required type="text" placeholder="Otaniemi" class="form-control" ng-model="POR"/>
 							</div>
 							<button ng-click="send()" type="submit" id="sendmember">Tallenna</button>
 						</form>
@@ -153,7 +153,6 @@
          memberlistApp.controller('ViewStudentsController', function($scope) {
             $scope.content="This page will be used to display all the students";
          });
-			
       </script>