From f757c7767d573c426624a41a2dbfbb1975d483ea Mon Sep 17 00:00:00 2001
From: HooVee <henri.varjotie@gmail.com>
Date: Wed, 20 Jul 2016 20:22:30 +0300
Subject: [PATCH] Stuff

---
 members/static/html/lisaa_jasen.html |  8 ++++----
 members/static/js/getmembers.js      |  7 +++++--
 members/static/js/post_member.js     | 29 ++++++++++++++++++++++++----
 members/static/js/tutorial.js        |  2 +-
 members/templates/index.html         | 17 +++++++---------
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/members/static/html/lisaa_jasen.html b/members/static/html/lisaa_jasen.html
index c22b98b..96150d6 100644
--- a/members/static/html/lisaa_jasen.html
+++ b/members/static/html/lisaa_jasen.html
@@ -8,15 +8,15 @@
 <form name="memberForm" ng-submit="submitForm()">
 	<div class="form-group">
 	<label>Etunimi: </label> 
-	<input type="text" placeholder="Sähkö" class="form-control" ng-model="member.first_name"><br>
+	<input id="firstNameField" required type="text" placeholder="Sähkö" class="form-control" ng-model="member.first_name"><br>
 	</div>
 	<div class="form-group">
 	<label>Sukunimi: </label> 
-	<input type="text" placeholder="Insinööri" class="form-control" ng-model="member.last_name"><br>
+	<input id="lastNameField" required type="text" placeholder="Insinööri" class="form-control" ng-model="member.last_name"><br>
 	</div>
 	<div class="form-group">
 	<label>Sähköposti: </label>
-	<input type="text" placeholder="sahko.insinoori@aalto.fi" class="form-control" ng-model="member.email"><br>
+	<input id="emailField" required type="text" placeholder="sahko.insinoori@aalto.fi" class="form-control" ng-model="member.email"><br>
 	</div>
 	<div class="form-group">
 	<label>AYY jäsen: </label> 
@@ -28,7 +28,7 @@
 	</div>
 	<div class="form-group">
 	<label>Asuinkunta: </label> 
-	<input type="text" value="Otaniemi" class="form-control" ng-model="member.POR"><br>
+	<input id="PORField" required type="text" placeholder="Otaniemi" class="form-control" ng-model="member.POR"><br>
 	</div>
 	<input type="submit" id="sendmember" onclick="post_member" value="Lähetä">
 </form>
diff --git a/members/static/js/getmembers.js b/members/static/js/getmembers.js
index ad5d2cb..00c0b6c 100644
--- a/members/static/js/getmembers.js
+++ b/members/static/js/getmembers.js
@@ -17,6 +17,11 @@ interaktiivinen, reaaliaikainen setti
 
 //var app = angular.module("memberApp", []);
 
+$.get("/members/api/members", function(data){
+	alert(data);
+});
+
+/*
 function getAll() {
 	return $http.get('/members/api/members');
 }
@@ -33,8 +38,6 @@ 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'},
diff --git a/members/static/js/post_member.js b/members/static/js/post_member.js
index 2c62e76..9def114 100644
--- a/members/static/js/post_member.js
+++ b/members/static/js/post_member.js
@@ -1,4 +1,25 @@
-function post_member() {
-	//this function sends data from input form to server
-	
-}
\ No newline at end of file
+/*var firstNameField = document.getElementById('firstNameField').value;
+var lastNameField = document.getElementById('lastNameField').value;
+var emailField = document.getElementById('emailField').value;
+var ayy = document.getElementById('AYY').value;
+var jas = document.getElementById('JAS').value;
+var porField = document.getElementById('PORField').value;
+*/	
+var subButton = document.getElementById('sendmember');
+
+$(subButton).click(function(){
+	console.log("Jee");
+	$.post("/members/api/member",
+	{
+		first_name: document.getElementById('firstNameField').value,
+		last_name: document.getElementById('lastNameField').value,
+		email: document.getElementById('emailField').value,
+		AYY: document.getElementById('AYY').value,
+		jas: document.getElementById('JAS').value,
+		POR: document.getElementById('PORField').value
+	},
+	function(data, status){
+		alert("Data: " + data + "\nStatus: " + status);
+	});
+});
+
diff --git a/members/static/js/tutorial.js b/members/static/js/tutorial.js
index b072ae8..e648834 100644
--- a/members/static/js/tutorial.js
+++ b/members/static/js/tutorial.js
@@ -1,4 +1,4 @@
-ReactDOM.render(<h1>Hello World</h1>, document.getElementById("react-test"));
+//ReactDOM.render(<h1>Hello World</h1>, document.getElementById("react-test"));
 /*
 var CommentBox = React.createClass
 ({
diff --git a/members/templates/index.html b/members/templates/index.html
index 5e3f146..131a0f5 100644
--- a/members/templates/index.html
+++ b/members/templates/index.html
@@ -8,10 +8,16 @@
 	<meta name="author" content="">
 
 	<title>Jäsenrekisteri</title>
-
+	
+	<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+	<script src = "https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+	
 	<!-- Bootstrap -->
 	<link href = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel = "stylesheet">
 
+	<!-- Include all compiled plugins (below), or include individual files as needed -->
+	<script src = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+	
 	<!-- Custom CSS -->
 	<link href="../static/css/simple-sidebar.css" rel="stylesheet">
 
@@ -25,9 +31,7 @@
 
 	<!--ReactJS-->
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.min.js.map"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.map"></script>
 
 	{%load staticfiles %}
 
@@ -98,16 +102,9 @@
 		});
 	</script>
 
-	<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-	<script src = "https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-
-	<!-- Include all compiled plugins (below), or include individual files as needed -->
-	<script src = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
-
 	<!--
 	This is where you link to your Angular code. Only .js extension!
 	-->
-	<script src="../static/js/tutorial.js" type="text/babel"></script>
 	<script src="../static/js/getmembers.js"></script>
 
 </body>