Stuff

members/static/html/jasenlista.html

@@ -1,6 +1,7 @@
 <h1> Jäsenlista </h1>
 
 <script src="../js/post_member.js"></script>
+<script src="../js/remove_member.js"></script>
 
 <div ng-app="getMemberApp" ng-controller="getController">
 	
@@ -17,14 +18,17 @@
 		</tr>
 	</thead>
 	<tbody>
-		<tr ng-repeat="x in members"><span>50</span>
+		<tr ng-repeat="x in members">
-			<td>{{ x.id}}</td>
+			<td>{{ x.id }}</td>
-			<td>{{ x.first_name}}</td>
+			<td>{{ x.first_name }}</td>
-			<td>{{ x.last_name}}</td>
+			<td>{{ x.last_name }}</td>
-			<td>{{ x.email}}</td>
+			<td>{{ x.email }}</td>
-			<td>{{ x.AYY}}</td>
+			<td>{{ x.AYY }}</td>
-			<td>{{ x.jas}}</td>
+			<td>{{ x.jas }}</td>
-			<td>{{ x.POR}}</td>
+			<td>{{ x.POR }}</td>
+			<td>
+			<input type="button" value="Remove" class="btn btn-primary" ng-click="removeMember(x.id)"/>
+			</td>
 		</tr>
 	</tbody>
 	</table>

members/static/js/appData.js

@@ -0,0 +1,5 @@
+var appData = {
+	"views": {
+		
+	}
+}

members/static/js/getmembers.js

@@ -21,6 +21,20 @@ app.controller("getController", function($scope, $http){
 	$http.get("/members/api/members").then(function(response){
 		$scope.members = response.data.records;	
 	});
+	$scope.removeMember = function(id){				
+		var index = -1;		
+		var comArr = eval( $scope.members );
+		for( var i = 0; i < comArr.length; i++ ) {
+			if( comArr[i].id === id ) {
+				index = i;
+				break;
+			}
+		}
+		if( index === -1 ) {
+			alert( "Something gone wrong" );
+		}
+		$scope.members.splice( index, 1 );		
+	};
 });
 
 /*$.get("/members/api/members", function(data){

members/static/js/remove_member.js

@@ -0,0 +1,18 @@
+var app = angular.module("removeMember", []);
+
+app.controller("getController", function($scope) {
+	$scope.removeMember = function(id){				
+		var index = -1;		
+		var comArr = eval( $scope.members );
+		for( var i = 0; i < comArr.length; i++ ) {
+			if( comArr[i].id === id ) {
+				index = i;
+				break;
+			}
+		}
+		if( index === -1 ) {
+			alert( "Something gone wrong" );
+		}
+		$scope.members.splice( index, 1 );		
+	};
+)};

members/templates/index.html

@@ -36,7 +36,8 @@
 	<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js'></script>
 	<!--<script type='text/javascript' src='js/modernizr.js'></script>-->
 	<script type='text/javascript' src='../static/js/dynamicpage.js'></script>
-
+	<script src="../static/html/jasenlista.html"></script>
+	<script src="../static/html/lisaa_jasen.html"></script>
 	{%load staticfiles %}
 
 </head>
@@ -49,9 +50,9 @@
 			<nav>
 				<ul class="sidebar-nav">
 					<li class="sidebar-brand"><a href="">Home</a></li>
-					<li><a href="add.html">Lisää</a></li>
+					<li><a href="#/add">Lisää</a></li>
-					<li><a href="remove.html">Poista</a></li>
+					<li><a href="#/remove">Poista</a></li>
-					<li><a href="list.html">Listaa</a></li>
+					<li><a href="#/list">Listaa</a></li>
 				</ul>
 			</nav>
 		</div>
@@ -59,6 +60,7 @@
 
 		<!-- Page Content -->
 		<div id="page-content-wrapper">
+			<div ng-view></div>
 			<div class="row">
 				<div class="col-lg-12">
 					<h1>Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri</h1>