From efcdba92bcf161641c4cc2b7033418a27dc55297 Mon Sep 17 00:00:00 2001
From: HooVee <henri.varjotie@gmail.com>
Date: Mon, 15 Aug 2016 21:28:10 +0300
Subject: [PATCH] UTF8 changes and removed # from URLs

---
 members/static/html/jasenhakemukset.html   |  2 +-
 members/static/html/muokkaa_hakemusta.html | 10 ++++-----
 members/static/js/members_controllers.js   | 26 +++++++++++-----------
 members/static/js/members_routers.js       |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/members/static/html/jasenhakemukset.html b/members/static/html/jasenhakemukset.html
index 3c42515..e6eda34 100644
--- a/members/static/html/jasenhakemukset.html
+++ b/members/static/html/jasenhakemukset.html
@@ -21,7 +21,7 @@
 			</div>
 			<div class="row">
 				<div class="col-sm-4">
-					<a href="#applications/edit/{{x.id}}"<input type="button" value="Edit" class="btn btn-warning">Muokkaa</input></a>
+					<a href="#/applications/edit/{{x.id}}"<input type="button" value="Edit" class="btn btn-warning">Muokkaa</input></a>
 					<input type="button" value="Hyväksy" class="btn btn-success" confirmed-click="send_appl(x.id)" ng-confirm-click="Oletko varma, että haluat hyväksyä?"/>
 					<input type="button" value="Hylkää" class="btn btn-danger" confirmed-click="delete_appl(x.id)" ng-confirm-click="Oletko varma, että haluat hylätä hakemuksen?"/>
 				</div>
diff --git a/members/static/html/muokkaa_hakemusta.html b/members/static/html/muokkaa_hakemusta.html
index 5eb0bec..0d71c95 100644
--- a/members/static/html/muokkaa_hakemusta.html
+++ b/members/static/html/muokkaa_hakemusta.html
@@ -1,21 +1,21 @@
-<h1> Muokkaa hakemuksen jäsentietoja </h1>
+<h1> Muokkaa hakemuksen jäsentietoja </h1>
 
 <div id="input_form">
 <form name="applicationForm">
 	<div class="form-group">
 	<label>Etunimi: </label>
-	<input id="firstNameField" required type="text" placeholder="Sähkö" class="form-control" ng-model="application.member.first_name"></input>
+	<input id="firstNameField" required type="text" placeholder="Sähkö" class="form-control" ng-model="application.first_name"></input>
 	</div>
 	<div class="form-group">
 	<label>Sukunimi: </label>
-	<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="application.member.last_name"></input>
+	<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="application.member.last_name"></input>
 	</div>
 	<div class="form-group">
-	<label>Sähköposti: </label>
+	<label>Sähköposti: </label>
 	<input id="emailField" required type="text" placeholder="sahko.insinoori@aalto.fi" class="form-control" ng-model="application.member.email"></input>
 	</div>
 	<div class="form-group">
-	<label>AYY jäsen: </label>
+	<label>AYY jäsen: </label>
 	<input type="checkbox" id="AYY" ng-model="application.member.AYY"></input>
 	</div>
 	<div class="form-group">
diff --git a/members/static/js/members_controllers.js b/members/static/js/members_controllers.js
index 410dc1f..3f4001d 100644
--- a/members/static/js/members_controllers.js
+++ b/members/static/js/members_controllers.js
@@ -27,7 +27,7 @@ app.controller("getController", function($scope, $http, $window, $location){
 					// http://ned.im/noty/#/about
 				});
 
-				$location.path("#/list");
+				$location.path("/list");
 			},
 			function(response) {
 				noty({ 
@@ -36,7 +36,7 @@ app.controller("getController", function($scope, $http, $window, $location){
 					type: "error",
 					timeout: 10000
 				});
-				$location.path("#/list");
+				$location.path("/list");
 			}
 		);
 	};
@@ -98,7 +98,7 @@ app.controller("postController", function($scope, $http, $location) {
 				type: "success",
 				timeout: 10000
 			});
-			$location.path("#/list");
+			$location.path("/list");
 		});
 	}
 });
@@ -116,11 +116,11 @@ app.controller("editController", function($scope, $http, $route, $routeParams, $
 				type: "success",
 				timeout: 10000
 			});
-            $location.path("#/list");
+            $location.path("/list");
         });
 	}
 	$scope.cancel = function() { //user canceled. return to list
-        $location.path("#/list");
+        $location.path("/list");
 	}
 });
 
@@ -137,7 +137,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $
 					type: "success",
 					timeout: 10000
 				});
-				$location.path("#/applications");
+				$location.path("/applications");
 			},
 			function(response) {
 				noty({ 
@@ -146,7 +146,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $
 					type: "success",
 					timeout: 10000
 				});
-				$location.path("#/applications");
+				$location.path("/applications");
 			}
 		);
 	};
@@ -159,7 +159,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $
 					type: "success",
 					timeout: 10000
 				});
-				$location.path("#/applications");
+				$location.path("/applications");
 			},
 			function(response) {
 				noty({ 
@@ -168,7 +168,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $
 					type: "success",
 					timeout: 10000
 				});
-				$location.path("#/applications");
+				$location.path("/applications");
 			}
 		);
 	};
@@ -177,21 +177,21 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $
 app.controller("appleditController", function($scope, $http, $route, $routeParams, $window, $location){
 	$scope.application = {"id": $routeParams.id};
     $http.get("/members/api/request/"+$scope.application.id).then(function(response){
-        $scope.application_data = response.data;
+        $scope.application = response.data;
     });
 
 	$scope.sendappl = function() {
-		$http.put("/members/api/request/"+$scope.application_data.id, $scope.application_data).then(function(data){
+		$http.put("/members/api/request/"+$scope.application.id, $scope.application).then(function(data){
             noty({ 
 					text: "Jäsentiedot tallennettu",
 					layout: "bottomRight",
 					type: "success",
 					timeout: 10000
 				});
-            $location.path("#/applications");
+            $location.path("/applications");
         });
 	};
 	$scope.cancelappl = function() { //user canceled. return to applications
-        $location.path("#/applications");
+        $location.path("/applications");
 	};
 });
diff --git a/members/static/js/members_routers.js b/members/static/js/members_routers.js
index 663bfed..7c274a7 100644
--- a/members/static/js/members_routers.js
+++ b/members/static/js/members_routers.js
@@ -20,7 +20,7 @@ app.config(['$routeProvider', function($routeProvider){
 			templateUrl:"/static/html/jasenhakemukset.html",
 			controller:'applController',
 		})
-		.when('applications/edit/:id',{
+		.when('/applications/edit/:id',{
             templateUrl:"/static/html/muokkaa_hakemusta.html",
             controller:'appleditController',
 		})