From 98f6af1083fbbee8380a84812df240f7bd2e9530 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Sun, 7 May 2017 20:13:54 +0100
Subject: [PATCH] Added the facility to accept an alarm from the web interface
 ("/acceptalarm" url), and added button to web interface page.

---
 app/src/main/assets/www/index.html                     |  5 +++--
 app/src/main/assets/www/js/osd_main.js                 |  7 ++++++-
 .../main/java/uk/org/openseizuredetector/SdServer.java |  2 +-
 .../java/uk/org/openseizuredetector/SdWebServer.java   | 10 +++++++++-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/assets/www/index.html b/app/src/main/assets/www/index.html
index 0ce2ad3..e6f2b13 100644
--- a/app/src/main/assets/www/index.html
+++ b/app/src/main/assets/www/index.html
@@ -59,8 +59,9 @@
 	  </div>
 	</div>
 	<div id="settingsDiv">
-	  <h2>Seizure Detector Settings</h2>
-	  <button id="muteButton">Mute Alarm</button>
+		<h2>Seizure Detector Settings</h2>
+		<button id="acceptButton">Accept Alarm</button>
+		<button id="muteButton">Mute Alarm</button>
 	  <div id="sdSettings">
 	    SD Settings
 	  </div>
diff --git a/app/src/main/assets/www/js/osd_main.js b/app/src/main/assets/www/js/osd_main.js
index 0117ebe..815b209 100644
--- a/app/src/main/assets/www/js/osd_main.js
+++ b/app/src/main/assets/www/js/osd_main.js
@@ -162,7 +162,11 @@ toggleMute = function() {
        sd_muted = 1;
        $("#muteButton").text("Un-mute Audible Alarm");
    }
-}
+};
+
+acceptAlarm = function() {
+   $.ajax({url:"/acceptalarm"});
+};
 
 $(document).ready(function() {  
    sd_muted = 0;
@@ -173,4 +177,5 @@ $(document).ready(function() {
    setInterval("get_settings();",10000);
    setInterval("get_spectrum();",5000);
    $("#muteButton").click(toggleMute);
+   $("#acceptButton").click(acceptAlarm);
 });
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 24ed0f5..8cca4a5 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -755,7 +755,7 @@ public class SdServer extends Service implements SdDataReceiver, SdLocationRecei
         Log.v(TAG, "startWebServer()");
         mUtil.writeToSysLogFile("SdServer.Start Web Server.");
         if (webServer == null) {
-            webServer = new SdWebServer(getApplicationContext(), mUtil.getDataStorageDir(), mSdData);
+            webServer = new SdWebServer(getApplicationContext(), mUtil.getDataStorageDir(), mSdData, this);
             try {
                 webServer.start();
             } catch (IOException ioe) {
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java
index 9206594..cdc2572 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdWebServer.java
@@ -25,14 +25,16 @@ import fi.iki.elonen.NanoHTTPD;
 public class SdWebServer extends NanoHTTPD {
     private String TAG = "WebServer";
     private SdData mSdData;
+    private SdServer mSdServer;
     private Context mContext;
     private File mDataStorageDir = null;
 
-    public SdWebServer(Context context, File storageDir, SdData sdData) {
+    public SdWebServer(Context context, File storageDir, SdData sdData, SdServer sdServer) {
         // Set the port to listen on (8080)
         super(8080);
         mSdData = sdData;
         mContext = context;
+        mSdServer = sdServer;
         mDataStorageDir = storageDir;
     }
 
@@ -110,6 +112,12 @@ public class SdWebServer extends NanoHTTPD {
                 }
                 break;
 
+            case "/acceptalarm":
+                Log.v(TAG, "WebServer.serve() - Accepting alarm");
+                mSdServer.acceptAlarm();
+                answer = "Alarm Accepted";
+                break;
+
             default:
                 if (uri.startsWith("/index.html") ||
                         uri.startsWith("/logfiles.html") ||