From fdddd2eec271ee813754e71fcb3ccde11e8e9717 Mon Sep 17 00:00:00 2001
From: Aarni <aarni.halinen@aalto.fi>
Date: Mon, 1 Aug 2016 18:44:05 +0300
Subject: [PATCH 1/6] JS paths fixed.

---
 members/templates/index.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/members/templates/index.html b/members/templates/index.html
index f27671c..574042e 100644
--- a/members/templates/index.html
+++ b/members/templates/index.html
@@ -53,10 +53,10 @@
 		<div class="col-lg-12">
 			<h1>Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri</h1>
 			<div ng-view></div>
-				<script src="../js/remove_member.js"></script>
-				<script src="../js/post_member.js"></script>
+				<script src="../static/js/remove_member.js"></script>
+				<script src="../static/js/post_member.js"></script>
 
-				<script type="text/ng-template" id="addStudent.htm">
+				<script type="text/ng-template" id="viewStudents.htm">
 
 					<div ng-app="getMemberApp" ng-controller="getController">
 						
@@ -90,7 +90,7 @@
 						
 					</div>
 				</script>
-				<script type="text/ng-template" id="viewStudents.htm">
+				<script type="text/ng-template" id="addStudent.htm">
 					<div ng-app="postApp" ng-controller="postController">
 
 					<div id="input_form">
@@ -135,13 +135,13 @@
             $routeProvider.
             
             when('/list', {
-               templateUrl: 'addStudent.htm',
-               controller: 'AddStudentController'
+               templateUrl: 'viewStudents.htm',
+               controller: 'ViewStudentsController'
             }).
             
             when('/add', {
-               templateUrl: 'viewStudents.htm',
-               controller: 'ViewStudentsController'
+               templateUrl: 'addStudent.htm',
+               controller: 'AddStudentController'
             }).
             
             otherwise({

From a705d4ba675fdb15806ede9505d865d35d717d68 Mon Sep 17 00:00:00 2001
From: HooVee <henri.varjotie@gmail.com>
Date: Mon, 1 Aug 2016 18:45:35 +0300
Subject: [PATCH 2/6] Changed controllers as index

---
 members/static/js/app.js           | 18 ++++++++++++++++++
 members/static/js/getmembers.js    |  2 +-
 members/static/js/post_member.js   |  2 +-
 members/static/js/remove_member.js |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 members/static/js/app.js

diff --git a/members/static/js/app.js b/members/static/js/app.js
new file mode 100644
index 0000000..5de01c5
--- /dev/null
+++ b/members/static/js/app.js
@@ -0,0 +1,18 @@
+'use strict';
+var template = angular.module('memberlistApp',['memberlistApp.getmembers', 'memberlistApp.sendmember']);
+
+template.config(['$routeProvider',
+	function($routeProvider) {
+		$routeProvider.
+		
+		when('/members/#/list', {
+			templateUrl: '../html/jasenlista.html',
+			controller: 'getController'
+		}).
+		
+		when('/members/#/add', {
+			templateUrl: '../html/lisaa_jasen.html',
+			controller: 'postController'
+		});
+	}]
+);
\ No newline at end of file
diff --git a/members/static/js/getmembers.js b/members/static/js/getmembers.js
index 094f757..f67c27f 100644
--- a/members/static/js/getmembers.js
+++ b/members/static/js/getmembers.js
@@ -17,7 +17,7 @@ interaktiivinen, reaaliaikainen setti
 
 var app = angular.module("getMemberApp", []);
 
-app.controller("getController", function($scope, $http){
+app.controller("ViewStudentsController", function($scope, $http){
 	$http.get("/members/api/members").then(function(response){
 		$scope.members = response.data.records;	
 	});
diff --git a/members/static/js/post_member.js b/members/static/js/post_member.js
index 0d2bc7f..dc0fec0 100644
--- a/members/static/js/post_member.js
+++ b/members/static/js/post_member.js
@@ -14,7 +14,7 @@ function postMember(data){
 
 var app = angular.module("sendMember", []);
 
-app.controller("postController", function($scope) {
+app.controller("AddStudentController", function($scope) {
 	$scope.firstName = "";
 	$scope.lastName = "";
 	$scope.email = "";
diff --git a/members/static/js/remove_member.js b/members/static/js/remove_member.js
index 5889168..e34c386 100644
--- a/members/static/js/remove_member.js
+++ b/members/static/js/remove_member.js
@@ -13,6 +13,6 @@ app.controller("getController", function($scope) {
 		if( index === -1 ) {
 			alert( "Something gone wrong" );
 		}
-		$scope.members.splice( index, 1 );		
+		$scope.members.splice( index, 1 );	
 	};
 )};
\ No newline at end of file

From 6bd64d7a6630746277c9e3e185abd59562dc044d Mon Sep 17 00:00:00 2001
From: HooVee <henri.varjotie@gmail.com>
Date: Mon, 1 Aug 2016 18:54:37 +0300
Subject: [PATCH 3/6] Changed ng-app name on index, added getmembers.js script
 to index

---
 members/static/js/getmembers.js  | 2 +-
 members/static/js/post_member.js | 2 +-
 members/templates/index.html     | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/members/static/js/getmembers.js b/members/static/js/getmembers.js
index f67c27f..c0b8785 100644
--- a/members/static/js/getmembers.js
+++ b/members/static/js/getmembers.js
@@ -15,7 +15,7 @@ Typeeminen hakukenttään -> datapaketin filteröintiä
 interaktiivinen, reaaliaikainen setti
 */
 
-var app = angular.module("getMemberApp", []);
+var app = angular.module("getMembersApp", []);
 
 app.controller("ViewStudentsController", function($scope, $http){
 	$http.get("/members/api/members").then(function(response){
diff --git a/members/static/js/post_member.js b/members/static/js/post_member.js
index dc0fec0..5c41f41 100644
--- a/members/static/js/post_member.js
+++ b/members/static/js/post_member.js
@@ -12,7 +12,7 @@ function postMember(data){
 	$http.post("/members/api/member", JSON.stringify(data));
 }
 
-var app = angular.module("sendMember", []);
+var app = angular.module("postApp", []);
 
 app.controller("AddStudentController", function($scope) {
 	$scope.firstName = "";
diff --git a/members/templates/index.html b/members/templates/index.html
index 574042e..5e174e5 100644
--- a/members/templates/index.html
+++ b/members/templates/index.html
@@ -53,12 +53,13 @@
 		<div class="col-lg-12">
 			<h1>Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri</h1>
 			<div ng-view></div>
-				<script src="../static/js/remove_member.js"></script>
+				<!--<script src="../static/js/remove_member.js"></script>-->
 				<script src="../static/js/post_member.js"></script>
+				<script src="../static/js/getmembers.js"></script>
 
 				<script type="text/ng-template" id="viewStudents.htm">
 
-					<div ng-app="getMemberApp" ng-controller="getController">
+					<div ng-app="getMembersApp" ng-controller="ViewStudentsController">
 						
 						<table id="choose-address-table" class="ui-widget ui-widget-content">
 						<thead>
@@ -91,7 +92,7 @@
 					</div>
 				</script>
 				<script type="text/ng-template" id="addStudent.htm">
-					<div ng-app="postApp" ng-controller="postController">
+					<div ng-app="postApp" ng-controller="AddStudentController">
 
 					<div id="input_form">
 					<form name="memberForm" ng-submit="submitForm()">

From d0b4d04a9084ea54e48e18f3bbc92e4271dfe973 Mon Sep 17 00:00:00 2001
From: Aarni <aarni.halinen@aalto.fi>
Date: Mon, 1 Aug 2016 19:05:50 +0300
Subject: [PATCH 4/6] Tag and space cleanup

---
 members/templates/index.html | 104 +++++++++++++++++------------------
 1 file changed, 50 insertions(+), 54 deletions(-)

diff --git a/members/templates/index.html b/members/templates/index.html
index 5e174e5..39c6663 100644
--- a/members/templates/index.html
+++ b/members/templates/index.html
@@ -9,13 +9,13 @@
 	<title>Jäsenrekisteri</title>
 	
 	<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-	<script src = "https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
 	
 	<!-- Bootstrap -->
-	<link href = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel = "stylesheet">
+	<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
 
 	<!-- Include all compiled plugins (below), or include individual files as needed -->
-	<script src = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 	
 	<!-- Custom CSS -->
 	<link href="../static/css/simple-sidebar.css" rel="stylesheet">
@@ -24,13 +24,13 @@
 	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
 
 	<!--[if lt IE 9]>
-	<script src = "https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-	<script src = "https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+	<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 	<![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="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-route.min.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 %}
@@ -53,15 +53,15 @@
 		<div class="col-lg-12">
 			<h1>Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri</h1>
 			<div ng-view></div>
-				<!--<script src="../static/js/remove_member.js"></script>-->
-				<script src="../static/js/post_member.js"></script>
-				<script src="../static/js/getmembers.js"></script>
+			<!--<script src="../static/js/remove_member.js"></script>-->
+			<script src="../static/js/post_member.js"></script>
+			<script src="../static/js/getmembers.js"></script>
 
-				<script type="text/ng-template" id="viewStudents.htm">
+			<script type="text/ng-template" id="viewStudents.htm">
 
-					<div ng-app="getMembersApp" ng-controller="ViewStudentsController">
+				<div ng-app="getMembersApp" ng-controller="ViewStudentsController">
 						
-						<table id="choose-address-table" class="ui-widget ui-widget-content">
+					<table id="choose-address-table" class="ui-widget ui-widget-content">
 						<thead>
 							<tr ng-repeat="ui-widget-header">
 								<th>ID</th>
@@ -83,55 +83,51 @@
 								<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)"></input>
 								</td>
 							</tr>
 						</tbody>
-						</table>
-						
-					</div>
-				</script>
-				<script type="text/ng-template" id="addStudent.htm">
-					<div ng-app="postApp" ng-controller="AddStudentController">
-
+					</table>
+				</div>
+			</script>
+			<script type="text/ng-template" id="addStudent.htm">
+				<div ng-app="postApp" ng-controller="AddStudentController">
 					<div id="input_form">
-					<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>
-						</div>
-						<div class="form-group">
-						<label>Sukunimi: </label> 
-						<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="lastName"></input>
-						</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>
-						</div>
-						<div class="form-group">
-						<label>AYY jäsen: </label> 
-						<input type="checkbox" id="AYY" value="0" ng-model="AYY"></input>
-						</div>
-						<div class="form-group">
-						<label>JAS-listaan: </label> 
-						<input type="checkbox" id="JAS" value="0" ng-model="JAS"></input>
-						</div>
-						<div class="form-group">
-						<label>Asuinkunta: </label> 
-						<input id="PORField" required type="text" placeholder="Otaniemi" class="form-control" ng-model="POR"></input>
-						</div>
-						<button ng-click="send()" type="submit" id="sendmember">Tallenna</button>
-					</form>
-
+						<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>
+							</div>
+							<div class="form-group">
+								<label>Sukunimi: </label> 
+								<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="lastName"></input>
+							</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>
+							</div>
+							<div class="form-group">
+								<label>AYY jäsen: </label> 
+								<input type="checkbox" id="AYY" value="0" ng-model="AYY"></input>
+							</div>
+							<div class="form-group">
+								<label>JAS-listaan: </label> 
+								<input type="checkbox" id="JAS" value="0" ng-model="JAS"></input>
+							</div>
+							<div class="form-group">
+								<label>Asuinkunta: </label> 
+								<input id="PORField" required type="text" placeholder="Otaniemi" class="form-control" ng-model="POR"></input>
+							</div>
+							<button ng-click="send()" type="submit" id="sendmember">Tallenna</button>
+						</form>
 					</div>
-					</div>
-
-				</script>
+				</div>
+			</script>
 		</div>
 		<!-- /#page-content -->
 
       <script>
-         var memberlistApp = angular.module("memberlistApp", ['ngRoute']);
+         var memberlistApp=angular.module("memberlistApp", ['ngRoute']);
          memberlistApp.config(['$routeProvider', function($routeProvider) {
             $routeProvider.
             
@@ -151,11 +147,11 @@
          }]);
          
          memberlistApp.controller('AddStudentController', function($scope) {
-            $scope.content = "This page will be used to display add student form";
+            $scope.content="This page will be used to display add student form";
          });
          
          memberlistApp.controller('ViewStudentsController', function($scope) {
-            $scope.content = "This page will be used to display all the students";
+            $scope.content="This page will be used to display all the students";
          });
 			
       </script>

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 5/6] 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>
 
 

From fc0a453162c1dcb6b236d11214c43c1bf66317f1 Mon Sep 17 00:00:00 2001
From: Aarni <aarni.halinen@aalto.fi>
Date: Mon, 1 Aug 2016 20:16:19 +0300
Subject: [PATCH 6/6] Controllers moved to js-file

---
 members/static/js/controllers.js | 27 ++++++++++++++++++++++++++
 members/templates/index.html     | 33 ++------------------------------
 2 files changed, 29 insertions(+), 31 deletions(-)
 create mode 100644 members/static/js/controllers.js

diff --git a/members/static/js/controllers.js b/members/static/js/controllers.js
new file mode 100644
index 0000000..2e79194
--- /dev/null
+++ b/members/static/js/controllers.js
@@ -0,0 +1,27 @@
+var memberlistApp=angular.module("memberlistApp", ['ngRoute']);
+memberlistApp.config(['$routeProvider', function($routeProvider)
+{
+	$routeProvider
+	.when('/list', 
+	{
+		templateUrl: 'viewStudents.htm',
+		controller: 'ViewStudentsController'
+	})
+	.when('/add', 
+	{
+		templateUrl: 'addStudent.htm',
+		controller: 'AddStudentController'
+	})
+	.otherwise(
+	{
+		redirectTo: '/list'
+	});
+}]);
+memberlistApp.controller('AddStudentController', function($scope) 
+{
+	$scope.content="This page will be used to display add student form";
+});
+memberlistApp.controller('ViewStudentsController', function($scope) 
+{
+	$scope.content="This page will be used to display all the students";
+});
\ No newline at end of file
diff --git a/members/templates/index.html b/members/templates/index.html
index b88f88f..1c04c50 100644
--- a/members/templates/index.html
+++ b/members/templates/index.html
@@ -125,35 +125,7 @@
 			</script>
 		</div>
 		<!-- /#page-content -->
-
-      <script>
-         var memberlistApp=angular.module("memberlistApp", ['ngRoute']);
-         memberlistApp.config(['$routeProvider', function($routeProvider) {
-            $routeProvider.
-            
-            when('/list', {
-               templateUrl: 'viewStudents.htm',
-               controller: 'ViewStudentsController'
-            }).
-            
-            when('/add', {
-               templateUrl: 'addStudent.htm',
-               controller: 'AddStudentController'
-            }).
-            
-            otherwise({
-               redirectTo: '/list'
-            });
-         }]);
-         
-         memberlistApp.controller('AddStudentController', function($scope) {
-            $scope.content="This page will be used to display add student form";
-         });
-         
-         memberlistApp.controller('ViewStudentsController', function($scope) {
-            $scope.content="This page will be used to display all the students";
-         });
-      </script>
+		<script src="../static/js/controllers.js"></script>
 
 
 		<!--<script src="../static/appData.js"></script>
@@ -161,8 +133,7 @@
 		<script src="lib/angular/angular.js"></script>
 
 		<script src="../static/js/app.js"></script>
-		<script src="../static/js/services.js"></script>
-		<script src="../static/js/controllers.js"></script>-->
+		<script src="../static/js/services.js"></script>-->
 	</div>
 </body>
 </html>