From bc391a14bd1378e47d93064a0a665637ad9424a3 Mon Sep 17 00:00:00 2001
From: kharisisriyant <kharisisriyant@gmail.com>
Date: Tue, 29 Nov 2016 21:35:35 +0700
Subject: [PATCH] ng-click dan show, sendmessage
---
.../src/java/org/ChatService/SendMessage.java | 38 +++++++++++++++++--
KAA-JSP/build/web/catalog.jsp | 8 ++--
KAA-JSP/build/web/scripts/app.js | 4 +-
KAA-JSP/web/catalog.jsp | 8 ++--
KAA-JSP/web/scripts/app.js | 4 +-
5 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/ChatService/src/java/org/ChatService/SendMessage.java b/ChatService/src/java/org/ChatService/SendMessage.java
index 95706b6..a069dc5 100644
--- a/ChatService/src/java/org/ChatService/SendMessage.java
+++ b/ChatService/src/java/org/ChatService/SendMessage.java
@@ -7,7 +7,10 @@ package org.ChatService;
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
import java.sql.Connection;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.logging.Level;
@@ -17,6 +20,7 @@ import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.json.simple.JSONObject;
/**
*
@@ -42,9 +46,37 @@ public class SendMessage extends HttpServlet {
Statement stmt = conn.createStatement();
String sql;
String username = request.getParameter("username");
- String chattoken = request.getParameter("usernamereceiver");
- sql = "insert into chattoken values (\""+ chattoken+ "\",\""+username+"\")";
- stmt.executeUpdate(sql);
+ String usernamereceiver = request.getParameter("usernamereceiver");
+ String message = request.getParameter("message");
+ sql = "SELECT * FROM chattoken WHERE usernamereceiver=\""+usernamereceiver+"\";";
+ ResultSet rs = stmt.executeQuery(sql);
+ if(rs.next()){
+ JSONObject json = new JSONObject();
+ String chattoken =rs.getString("chattoken");
+ json.put("to", chattoken);
+ json.put("username",username);
+ json.put("message",message);
+ String url = "https://fcm.googleapis.com/fcm/send";
+ URL obj = new URL(url);
+ HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+ con.setRequestMethod("POST");
+ con.setRequestProperty("Content-Type","application/json");
+ con.setRequestProperty("Authorization","key:");
+ }
+
+ /* format
+ https://fcm.googleapis.com/fcm/send
+ Content-Type:application/json
+ Authorization:key=AIzaSyZ-1u...0GBYzPu7Udno5aA
+
+ { "data": {
+ "score": "5x1",
+ "time": "15:10"
+ },
+ "to" : "bk3RNwTe3H0:CI2k_HHwgIpoDKCIZvvDMExUdFQ3P1..."
+ }
+
+ */
}
else{
try (PrintWriter out = response.getWriter()) {
diff --git a/KAA-JSP/build/web/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index 30b8876..7eff429 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -311,7 +311,7 @@
out.print("<p>No product to be sold.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\")\"><p><b>" + result.get(i).getUsername() + "</b><br/>");
+ out.print("<div ng-click=\"setReceiver('"+result.get(i).getUsername()+"')\"><p><b>" + result.get(i).getUsername() + "</b><br/>");
out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
out.print("<hr/>");
out.print("<table>");
@@ -363,8 +363,8 @@
out.print("<p>Nothing matches your search.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\")\"><p><b>" + result.get(i).getUsername() + "</b></div><br/>");
- out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
+ out.print("<div ng-click=\"setReceiver('"+result.get(i).getUsername()+"')\"><b>" + result.get(i).getUsername() + "</b></div><br/>");
+ out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
out.print("<hr/>");
out.print("<table>");
out.print("<tr class = \"container\">");
@@ -400,6 +400,8 @@
<br>
{{user}}
{{receiver}}
+
+ <div ng-show="isReceiverSet()">Aku ng-show lho</div>
<!-- <div ng-app="chatApp" ng-controller="chatController">
<p>Name: <input type="text" ng-model="newmessage.user"></p>
diff --git a/KAA-JSP/build/web/scripts/app.js b/KAA-JSP/build/web/scripts/app.js
index d7578f0..af54978 100644
--- a/KAA-JSP/build/web/scripts/app.js
+++ b/KAA-JSP/build/web/scripts/app.js
@@ -23,11 +23,11 @@ app.controller('chatController', ['$scope','Message', function($scope,Message){
};
$scope.setReceiver = function(username){
- receiver = username;
+ $scope.receiver = username;
};
$scope.isReceiverSet = function(){
- return !(receiver === "");
+ return !($scope.receiver === "");
};
var config = {
diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp
index 30b8876..7eff429 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -311,7 +311,7 @@
out.print("<p>No product to be sold.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\")\"><p><b>" + result.get(i).getUsername() + "</b><br/>");
+ out.print("<div ng-click=\"setReceiver('"+result.get(i).getUsername()+"')\"><p><b>" + result.get(i).getUsername() + "</b><br/>");
out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
out.print("<hr/>");
out.print("<table>");
@@ -363,8 +363,8 @@
out.print("<p>Nothing matches your search.</p>");
} else {
for (int i = 0; i < result.size(); i++) {
- out.print("<div ng-click=\"setReceiver(\""+result.get(i).getUsername()+"\")\"><p><b>" + result.get(i).getUsername() + "</b></div><br/>");
- out.print("added this on " + result.get(i).getDate().getDate() + "</p>");
+ out.print("<div ng-click=\"setReceiver('"+result.get(i).getUsername()+"')\"><b>" + result.get(i).getUsername() + "</b></div><br/>");
+ out.print("added this on " + result.get(i).getDate().getDate() + "</p></div>");
out.print("<hr/>");
out.print("<table>");
out.print("<tr class = \"container\">");
@@ -400,6 +400,8 @@
<br>
{{user}}
{{receiver}}
+
+ <div ng-show="isReceiverSet()">Aku ng-show lho</div>
<!-- <div ng-app="chatApp" ng-controller="chatController">
<p>Name: <input type="text" ng-model="newmessage.user"></p>
diff --git a/KAA-JSP/web/scripts/app.js b/KAA-JSP/web/scripts/app.js
index d7578f0..af54978 100644
--- a/KAA-JSP/web/scripts/app.js
+++ b/KAA-JSP/web/scripts/app.js
@@ -23,11 +23,11 @@ app.controller('chatController', ['$scope','Message', function($scope,Message){
};
$scope.setReceiver = function(username){
- receiver = username;
+ $scope.receiver = username;
};
$scope.isReceiverSet = function(){
- return !(receiver === "");
+ return !($scope.receiver === "");
};
var config = {
--
GitLab