From a9988a03ee3a5f943162037f13759338020da701 Mon Sep 17 00:00:00 2001
From: HooVee <henri.varjotie@gmail.com>
Date: Mon, 25 Jul 2016 19:04:24 +0300
Subject: [PATCH] Added table to jasenlista.html, created postMember function
 to post_member.js and finished getmember.js

---
 members/static/html/jasenlista.html | 59 ++++++++++++-----------------
 members/static/js/getmembers.js     | 26 ++++---------
 members/static/js/post_member.js    |  7 ++--
 3 files changed, 36 insertions(+), 56 deletions(-)

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 @@
-<h1> Lisää jäsen </h1>
+<h1> Jäsenlista </h1>
 
 <script src="../js/post_member.js"></script>
 
-<div ng-app="getApp" ng-controller="getController">
+<div ng-app="getMemberApp" ng-controller="getController">
 	
 	<table id="choose-address-table" class="ui-widget ui-widget-content">
-    <thead>
-        <tr class="ui-widget-header ">
-            <th>Etunimi</th>
-            <th>Sukunimi</th>
-            <th>Sähköposti</th>
-            <th>AYY-jäsen</th>
-            <th>JAS-listalla</th>
-            <th>Asuinpaikka</th>
-        </tr>
-    </thead>
-    <tbody>
-        <tr>
-            <td class="nr"><span>50</span>
-            </td>
-            <td>Some Street 1</td>
-            <td>Leeds</td>
-            <td>L0 0XX</td>
-            <td>United Kingdom</td>
-            <td>
-                <button type="button" class="use-address" />
-            </td>
-        </tr>
-        <tr>
-            <td class="nr">49</td>
-            <td>Some Street 2</td>
-            <td>Lancaster</td>
-            <td>L0 0XX</td>
-            <td>United Kingdom</td>
-            <td>
-                <button type="button" class="use-address" />
-            </td>
-        </tr>
-    </tbody>
+	<thead>
+		<tr ng-repeat="ui-widget-header">
+			<th>ID</th>
+			<th>Etunimi</th>
+			<th>Sukunimi</th>
+			<th>Sähköposti</th>
+			<th>AYY-jäsen</th>
+			<th>JAS-listalla</th>
+			<th>Asuinpaikka</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr ng-repeat="x in members"><span>50</span>
+			<td>{{ x.id}}</td>
+			<td>{{ x.first_name}}</td>
+			<td>{{ x.last_name}}</td>
+			<td>{{ x.email}}</td>
+			<td>{{ x.AYY}}</td>
+			<td>{{ x.jas}}</td>
+			<td>{{ x.POR}}</td>
+		</tr>
+	</tbody>
 	</table>
 	
 </div>
\ 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});
+	}
+});