diff --git a/members/static/html/jasenlista.html b/members/static/html/jasenlista.html
index 9795e62..7385a18 100644
--- a/members/static/html/jasenlista.html
+++ b/members/static/html/jasenlista.html
@@ -1,43 +1,32 @@
-
+
-
-
-
-
-
- | 50
- |
- Some Street 1 |
- Leeds |
- L0 0XX |
- United Kingdom |
-
-
- |
-
-
- | 49 |
- Some Street 2 |
- Lancaster |
- L0 0XX |
- United Kingdom |
-
-
- |
-
-
+
+
+ | ID |
+ Etunimi |
+ Sukunimi |
+ Sähköposti |
+ AYY-jäsen |
+ JAS-listalla |
+ Asuinpaikka |
+
+
+
+ 50
+ | {{ x.id}} |
+ {{ x.first_name}} |
+ {{ x.last_name}} |
+ {{ x.email}} |
+ {{ x.AYY}} |
+ {{ x.jas}} |
+ {{ x.POR}} |
+
+
\ No newline at end of file
diff --git a/members/static/js/getmembers.js b/members/static/js/getmembers.js
index 00c0b6c..06db287 100644
--- a/members/static/js/getmembers.js
+++ b/members/static/js/getmembers.js
@@ -15,13 +15,18 @@ Typeeminen hakukenttään -> datapaketin filteröintiä
interaktiivinen, reaaliaikainen setti
*/
-//var app = angular.module("memberApp", []);
+var app = angular.module("getMemberApp", []);
-$.get("/members/api/members", function(data){
+app.controller("getController", function($scope, $http){
+ $http.get("/members/api/members").then(function(response){
+ $scope.members = response.data.records;
+ });
+});
+
+/*$.get("/members/api/members", function(data){
alert(data);
});
-/*
function getAll() {
return $http.get('/members/api/members');
}
@@ -37,19 +42,4 @@ function updateUser(user) {
function deleteUser(user) {
return $http.delete('/members/api/members', user);
}
-
-angular.module('ngRepeat', ['ngAnimate']).controller('repeatController', function($scope) {
- $scope.friends = [
- {name:'John', age:25, gender:'boy'},
- {name:'Jessie', age:30, gender:'girl'},
- {name:'Johanna', age:28, gender:'girl'},
- {name:'Joy', age:15, gender:'girl'},
- {name:'Mary', age:28, gender:'girl'},
- {name:'Peter', age:95, gender:'boy'},
- {name:'Sebastian', age:50, gender:'boy'},
- {name:'Erika', age:27, gender:'girl'},
- {name:'Patrick', age:40, gender:'boy'},
- {name:'Samantha', age:60, gender:'girl'}
- ];
-});
*/
diff --git a/members/static/js/post_member.js b/members/static/js/post_member.js
index 8736068..0d2bc7f 100644
--- a/members/static/js/post_member.js
+++ b/members/static/js/post_member.js
@@ -9,6 +9,7 @@ var porField = document.getElementById('PORField').value;
function postMember(data){
//post json dada to server
//url /members/api/member
+ $http.post("/members/api/member", JSON.stringify(data));
}
var app = angular.module("sendMember", []);
@@ -21,9 +22,9 @@ app.controller("postController", function($scope) {
$scope.JAS = "";
$scope.POR = "";
$scope.send = function() {
- postMember({"first_name":$scope.firstName, "last_name":$scope.lastName, "email":$scope.email, "AYY":$scope.AYY, "jas":$scope.JAS, "POR":$scope.POR});
- });
-}
+ postMember({"first_name":$scope.firstName, "last_name":$scope.lastName, "email":$scope.email, "AYY":$scope.AYY, "jas":$scope.JAS, "POR":$scope.POR});
+ }
+});