From a2faa5033ba88677e66e53288935cc5d212c8496 Mon Sep 17 00:00:00 2001
From: Isaac <r.sato7690@me.com>
Date: Sun, 15 Jan 2017 13:40:22 +0900
Subject: [PATCH 1/9] Fix js

---
 web/docker_django/apps/smap/static/smap/modal.js | 16 ++++++----------
 .../apps/smap/static/smap/script.js              |  1 +
 .../apps/smap/templates/smap/home.html           |  1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/web/docker_django/apps/smap/static/smap/modal.js b/web/docker_django/apps/smap/static/smap/modal.js
index 120b3bd..3b98d76 100644
--- a/web/docker_django/apps/smap/static/smap/modal.js
+++ b/web/docker_django/apps/smap/static/smap/modal.js
@@ -47,7 +47,6 @@ $(".modal__open").click( function(){
 		return false ;
 	}
 	if(target == "seasma") {
-		console.log("タグ検索");
 		getTags();
 	}
 	nowModalSyncer = document.getElementById( target ) ;
@@ -67,9 +66,9 @@ $(".modal__open").click( function(){
 	$( nowModalSyncer ).fadeIn( "slow" ) ;
 
 	$("#inbtn").click(function() {
-		var message = document.getElementById("message").value;
-		var tags = document.getElementById("tags").value;
-		if(!message || !tags) {
+		var message = document.getElementById("message");
+		var tags = document.getElementById("tags");
+		if(!message.value || !tags.value) {
 			alert("messageとtagを入力してください");
 			return;
 		}
@@ -84,15 +83,14 @@ $(".modal__open").click( function(){
  						"lat": lat,
  						"lng": lng
  					},
- 					"message": message,
- 					"tags": tags
+ 					"message": message.value,
+ 					"tags": tags.value
  				}
  			),
  			contentType: 'application/JSON',
  			dataType : 'JSON'
 		}).done(function(res) {
-			console.log("success!");
-			message = "", tags = "";
+			message.value = "", tags.value = "";
 			closeModal();
 		}).fail(function(err) {
 			alert(err);
@@ -101,13 +99,11 @@ $(".modal__open").click( function(){
 	});
 
 	$("#seabtn").click(function() {
-		console.log("タグ検索");
 		var checks = document.getElementsByName("tags");
 		var checkTags = "";
 		for(var i = 0; i < checks.length; i++) {
 			if(checks[i].checked) checkTags += checks[i].value + ",";
 		}
-		console.log(checkTags);
 		window.checkTags = checkTags;
 		if(checkTags = "") {
 			alert("tagを入力してください");
diff --git a/web/docker_django/apps/smap/static/smap/script.js b/web/docker_django/apps/smap/static/smap/script.js
index e2f0585..c72641b 100644
--- a/web/docker_django/apps/smap/static/smap/script.js
+++ b/web/docker_django/apps/smap/static/smap/script.js
@@ -93,6 +93,7 @@ function makeMarker(title, position, message) {
 function getMarker() {
   getData("/sumari/").then(function(data) {
     for(var i = 0; i < data.length; i++) {
+      console.log(data[i]);
       var name = data[i]["name"];
       var lat = data[i]["position"]["lat"];
       var lng = data[i]["position"]["lng"];
diff --git a/web/docker_django/apps/smap/templates/smap/home.html b/web/docker_django/apps/smap/templates/smap/home.html
index 9a81fc9..9b59b53 100644
--- a/web/docker_django/apps/smap/templates/smap/home.html
+++ b/web/docker_django/apps/smap/templates/smap/home.html
@@ -39,7 +39,6 @@
     <div id="seasma" class="sma">
       <p class="sma__lead">タグ検索</p>
       <div class="sma__message">
-        <!--<textarea id="seatag" cols="30" rows="15" placeholder="input one tag"></textarea>-->
         <div id="findtags"></div>
       </div>
       <div class="sma__twoBtn">

From 5e8de6da264c058c67f91c61d399cac8b7b5fd72 Mon Sep 17 00:00:00 2001
From: Isaac <isaac@nicofun.club>
Date: Sun, 15 Jan 2017 13:43:43 +0900
Subject: [PATCH 2/9] Add good button

---
 web/docker_django/apps/smap/static/smap/script.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/docker_django/apps/smap/static/smap/script.js b/web/docker_django/apps/smap/static/smap/script.js
index c72641b..b7d8a4f 100644
--- a/web/docker_django/apps/smap/static/smap/script.js
+++ b/web/docker_django/apps/smap/static/smap/script.js
@@ -77,12 +77,13 @@ function grepTags(url, tags) {
 /**
 * マーカー作成
 */
-function makeMarker(title, position, message) {
+function makeMarker(title, position, message, good) {
   return new google.maps.Marker({
     map: map,
     title: title,
     position: position,
     message: message,
+    good: good,
     animation: google.maps.Animation.DROP
   });
 }
@@ -98,10 +99,11 @@ function getMarker() {
       var lat = data[i]["position"]["lat"];
       var lng = data[i]["position"]["lng"];
       var message = data[i]["message"];
-      markers[i] = makeMarker(name, {lat: lat,lng: lng}, message);
+      var good = data[i]["good"];
+      markers[i] = makeMarker(name, {lat: lat,lng: lng}, message, good);
       markers[i].addListener('click', function() {
         infoWindow = new google.maps.InfoWindow({
-          content: "<b>" + this.title + "</b><br><p>" + this.message + "</br>"
+          content: "<b>" + this.title + "</b><br><p>" + this.message + "</br><button>" + this.good + "</button>"
         });
         infoWindow.open(map, this);
       });

From 2a927a59c8f6fd1f59ffc2af2bf852e2607ced82 Mon Sep 17 00:00:00 2001
From: Isaac <r.sato7690@me.com>
Date: Sun, 15 Jan 2017 13:52:46 +0900
Subject: [PATCH 3/9] =?UTF-8?q?Add=20=F0=9F=91=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/docker_django/apps/smap/static/smap/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/docker_django/apps/smap/static/smap/script.js b/web/docker_django/apps/smap/static/smap/script.js
index b7d8a4f..d6035c4 100644
--- a/web/docker_django/apps/smap/static/smap/script.js
+++ b/web/docker_django/apps/smap/static/smap/script.js
@@ -103,7 +103,7 @@ function getMarker() {
       markers[i] = makeMarker(name, {lat: lat,lng: lng}, message, good);
       markers[i].addListener('click', function() {
         infoWindow = new google.maps.InfoWindow({
-          content: "<b>" + this.title + "</b><br><p>" + this.message + "</br><button>" + this.good + "</button>"
+          content: "<b>" + this.title + "</b><br><p>" + this.message + "</br><button>👍" + this.good + "</button>"
         });
         infoWindow.open(map, this);
       });

From 40c79176d66792e7bd7862fa65caa8902fdbeca8 Mon Sep 17 00:00:00 2001
From: Isaac <r.sato7690@me.com>
Date: Sun, 15 Jan 2017 13:57:33 +0900
Subject: [PATCH 4/9] Add good function

---
 web/docker_django/apps/smap/static/smap/script.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/web/docker_django/apps/smap/static/smap/script.js b/web/docker_django/apps/smap/static/smap/script.js
index d6035c4..5097590 100644
--- a/web/docker_django/apps/smap/static/smap/script.js
+++ b/web/docker_django/apps/smap/static/smap/script.js
@@ -77,13 +77,14 @@ function grepTags(url, tags) {
 /**
 * マーカー作成
 */
-function makeMarker(title, position, message, good) {
+function makeMarker(title, position, message, good, id) {
   return new google.maps.Marker({
     map: map,
     title: title,
     position: position,
     message: message,
     good: good,
+    id: id,
     animation: google.maps.Animation.DROP
   });
 }
@@ -100,10 +101,11 @@ function getMarker() {
       var lng = data[i]["position"]["lng"];
       var message = data[i]["message"];
       var good = data[i]["good"];
-      markers[i] = makeMarker(name, {lat: lat,lng: lng}, message, good);
+      var id = data[i]["id"];
+      markers[i] = makeMarker(name, {lat: lat,lng: lng}, message, good, id);
       markers[i].addListener('click', function() {
         infoWindow = new google.maps.InfoWindow({
-          content: "<b>" + this.title + "</b><br><p>" + this.message + "</br><button>👍" + this.good + "</button>"
+          content: "<b>" + this.title + "</b><br><p>" + this.message + "</br><button onclick='good(" + this.id + ")'>👍" + this.good + "</button>"
         });
         infoWindow.open(map, this);
       });
@@ -111,6 +113,13 @@ function getMarker() {
   });
 };
 
+/**
+* good
+*/
+function good(id) {
+  console.log(id);
+}
+
 /**
 * マーカーを全て削除する
 */

From c89b61745569e3cc5fb483732971f9e4036855cd Mon Sep 17 00:00:00 2001
From: Isaac <r.sato7690@me.com>
Date: Sun, 15 Jan 2017 14:02:54 +0900
Subject: [PATCH 5/9] Modify good function

---
 web/docker_django/apps/smap/static/smap/script.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/docker_django/apps/smap/static/smap/script.js b/web/docker_django/apps/smap/static/smap/script.js
index 5097590..deaa184 100644
--- a/web/docker_django/apps/smap/static/smap/script.js
+++ b/web/docker_django/apps/smap/static/smap/script.js
@@ -105,7 +105,7 @@ function getMarker() {
       markers[i] = makeMarker(name, {lat: lat,lng: lng}, message, good, id);
       markers[i].addListener('click', function() {
         infoWindow = new google.maps.InfoWindow({
-          content: "<b>" + this.title + "</b><br><p>" + this.message + "</br><button onclick='good(" + this.id + ")'>👍" + this.good + "</button>"
+          content: "<b>" + this.title + "</b><br><p>" + this.message + "</br><button id='" + this.id + "' onclick='good(" + this.id + ")'>👍" + this.good + "</button>"
         });
         infoWindow.open(map, this);
       });
@@ -118,6 +118,12 @@ function getMarker() {
 */
 function good(id) {
   console.log(id);
+  $.ajax({
+    url: "/sumari/" + id + "/good",
+    type: "POST"
+  });
+  id++;
+  $("#" + id).value("👍" + id);
 }
 
 /**

From 0efa58e4f84d3a2f3619667ed0f663dfba70fa59 Mon Sep 17 00:00:00 2001
From: Isaac <r.sato7690@me.com>
Date: Sun, 15 Jan 2017 14:05:29 +0900
Subject: [PATCH 6/9] Modify good

---
 web/docker_django/apps/smap/static/smap/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/docker_django/apps/smap/static/smap/script.js b/web/docker_django/apps/smap/static/smap/script.js
index deaa184..68d8c45 100644
--- a/web/docker_django/apps/smap/static/smap/script.js
+++ b/web/docker_django/apps/smap/static/smap/script.js
@@ -123,7 +123,7 @@ function good(id) {
     type: "POST"
   });
   id++;
-  $("#" + id).value("👍" + id);
+  $("#" + id).text("👍" + id);
 }
 
 /**

From 969ad8ae0db03cedd0b3dc454cf7c7c93ebfcdec Mon Sep 17 00:00:00 2001
From: Isaac <r.sato7690@me.com>
Date: Sun, 15 Jan 2017 14:07:12 +0900
Subject: [PATCH 7/9] Fix good

---
 web/docker_django/apps/smap/static/smap/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/docker_django/apps/smap/static/smap/script.js b/web/docker_django/apps/smap/static/smap/script.js
index 68d8c45..91a5b6d 100644
--- a/web/docker_django/apps/smap/static/smap/script.js
+++ b/web/docker_django/apps/smap/static/smap/script.js
@@ -122,8 +122,8 @@ function good(id) {
     url: "/sumari/" + id + "/good",
     type: "POST"
   });
-  id++;
-  $("#" + id).text("👍" + id);
+  var new = id++;
+  $("#" + id).text("👍" + new);
 }
 
 /**

From 61555bc26418a0b4b7460e922b0847f979c3ce8a Mon Sep 17 00:00:00 2001
From: Isaac <isaac@nicofun.club>
Date: Sun, 15 Jan 2017 14:11:27 +0900
Subject: [PATCH 8/9] =?UTF-8?q?Fixfixfix=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/docker_django/apps/smap/static/smap/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/docker_django/apps/smap/static/smap/script.js b/web/docker_django/apps/smap/static/smap/script.js
index 91a5b6d..f2d0b78 100644
--- a/web/docker_django/apps/smap/static/smap/script.js
+++ b/web/docker_django/apps/smap/static/smap/script.js
@@ -122,8 +122,8 @@ function good(id) {
     url: "/sumari/" + id + "/good",
     type: "POST"
   });
-  var new = id++;
-  $("#" + id).text("👍" + new);
+  var newid = id++;
+  $("#" + id).text("👍" + newid);
 }
 
 /**

From 89ad55dd0221b778fda7c39b6612607bade1e1de Mon Sep 17 00:00:00 2001
From: Isaac <isaac@nicofun.club>
Date: Sun, 15 Jan 2017 14:14:10 +0900
Subject: [PATCH 9/9] Fix

---
 web/docker_django/apps/smap/static/smap/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/docker_django/apps/smap/static/smap/script.js b/web/docker_django/apps/smap/static/smap/script.js
index f2d0b78..7e59fce 100644
--- a/web/docker_django/apps/smap/static/smap/script.js
+++ b/web/docker_django/apps/smap/static/smap/script.js
@@ -121,9 +121,9 @@ function good(id) {
   $.ajax({
     url: "/sumari/" + id + "/good",
     type: "POST"
+  }).done(function(res) {
+    $("#" + id).text("👍" + res.good);
   });
-  var newid = id++;
-  $("#" + id).text("👍" + newid);
 }
 
 /**