From d62969875c5f60af4a0251f2715e743157a92218 Mon Sep 17 00:00:00 2001
From: HooVee <henri.varjotie@gmail.com>
Date: Mon, 8 Aug 2016 19:02:47 +0300
Subject: [PATCH] Changed delete function to give success status alert

---
 members/static/html/jasenlista.html      |  3 +--
 members/static/html/lisaa_jasen.html     |  2 +-
 members/static/js/members_controllers.js | 11 +++++++++--
 members/templates/members_index.html     |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/members/static/html/jasenlista.html b/members/static/html/jasenlista.html
index ec41ca8..bc85091 100644
--- a/members/static/html/jasenlista.html
+++ b/members/static/html/jasenlista.html
@@ -2,7 +2,6 @@
 
 
 <div >
-
 	<table id="choose-address-table" class="ui-widget ui-widget-content">
 	<thead>
 		<tr ng-repeat="ui-widget-header">
@@ -23,7 +22,7 @@
 			<td>{{ x.jas }}</td>
 			<td>{{ x.POR }}</td>
 			<td>
-			<input type="button" value="Remove" class="btn btn-warning" ng-click="delete_member(x.id)"/>
+			<input type="button" value="Remove" class="btn btn-danger" ng-click="delete_member(x.id)"/>
 			</td>
 		</tr>
 	</tbody>
diff --git a/members/static/html/lisaa_jasen.html b/members/static/html/lisaa_jasen.html
index 2e9b90a..61272fa 100644
--- a/members/static/html/lisaa_jasen.html
+++ b/members/static/html/lisaa_jasen.html
@@ -15,7 +15,7 @@
 	<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>
+	<label>AYY jäsen: </label>
 	<input type="checkbox" id="AYY" value="0" ng-model="AYY"></input>
 	</div>
 	<div class="form-group">
diff --git a/members/static/js/members_controllers.js b/members/static/js/members_controllers.js
index c8bcfa8..adae015 100644
--- a/members/static/js/members_controllers.js
+++ b/members/static/js/members_controllers.js
@@ -1,11 +1,18 @@
 
 app.controller("getController", function($scope, $http){
 	$scope.members = [];
-	$http.get("/members/api/members").then(function(response){
+	$scope.getMembers = $http.get("/members/api/members").then(function(response){
 		$scope.members = response.data;
 	});
 	$scope.delete_member = function(id, $http) {
-		$http.delete("/members/api/member/" + id);
+		$http.delete("/members/api/member/" + id).then(
+			function(response) {
+				$window.alert("Onnistui! Hyvä Harry!");
+			};
+			function(response) {
+				$window.alert("Epäonnistui. Yritä uudelleen.");
+			};
+		);
 	};
 });
 
diff --git a/members/templates/members_index.html b/members/templates/members_index.html
index e966eda..890e92b 100644
--- a/members/templates/members_index.html
+++ b/members/templates/members_index.html
@@ -31,7 +31,7 @@
 			<ul class="sidebar-nav">
 				<li><a href="#/list">Listaa jäsenet</a></li>
 				<li><a href="#/add">Lisää jäsen</a></li>
-				<li><a href="#/add">Jäsenhakemukset</a></li>
+				<li><a href="#/applications">Jäsenhakemukset</a></li>
 			</ul>
 		</div>
 		<!-- /#sidebar-wrapper -->