From 647c462426a9dd90acf4c383a0092de856f105b1 Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <patrickjmcd@gmail.com>
Date: Fri, 9 Jun 2017 09:46:01 -0500
Subject: [PATCH] Fixes maps and adds schedule page

---
 POCloud/HTML/Schedule.html | 66 ++++++++++++++++++++++++++++++++++++++
 POCloud/Maps.py            |  3 +-
 POCloud/advvfdipp.py       |  4 +--
 3 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 POCloud/HTML/Schedule.html

diff --git a/POCloud/HTML/Schedule.html b/POCloud/HTML/Schedule.html
new file mode 100644
index 0000000..f617d00
--- /dev/null
+++ b/POCloud/HTML/Schedule.html
@@ -0,0 +1,66 @@
+<div class="row">
+    <div class="col-md-12">
+        <h1>Production Scheduler: <%=channels["advvfdipp.sch_enabled"].value %></h1>
+        <h2>Upcoming Schedule</h2>
+        <div class="table table-responsive">
+            <form>
+                <table>
+                    <thead>
+                        <tr>
+                            <th>ID</th>
+                            <th>Control Mode</th>
+                            <th>Completion Parameter</th>
+                            <th></th>
+                            <th>Target Value</th>
+                            <th>Actual Value</th>
+                        </tr>
+                    </thead>
+                    <tbody id="upcoming_schedule">
+                        <tr>
+                            <td><input id="ps_id_1" type="number"></td>
+                            <td><input id="ps_controlmode_1" type="number"></td>
+                            <td><input id="ps_complparam_1" type="number"></td>
+                            <td><input id="ps_complcomp_1" type="number"></td>
+                            <td><input id="ps_target_1" type="number"></td>
+                            <td><input id="ps_actual_1" type="number"></td>
+                            <td><input id="ps_totalbbl_1" type="number"></td>
+                        </tr>
+
+
+                    </tbody>
+                </table>
+            </form>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <h2>Previously Scheduled Runs</h2>
+        <div class="table table-responsive">
+            <table>
+                <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>Control Mode</th>
+                        <th>Completion Parameter</th>
+                        <th></th>
+                        <th>Target Value</th>
+                        <th>Actual Value</th>
+                        <th>Total BBL</th>
+                    </tr>
+                </thead>
+                <tbody id="past_schedule"></tbody>
+            </table>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+//Get values of run_schedule_x
+var run_schedule = [];
+
+for
+
+
+</script>
diff --git a/POCloud/Maps.py b/POCloud/Maps.py
index c029a7b..3286759 100644
--- a/POCloud/Maps.py
+++ b/POCloud/Maps.py
@@ -45,5 +45,6 @@ adv_vfd_ipp_map = {
       4: "Tubing Pressure",
       5: "Time",
   },
-  'completion_comparison': {0: ">", 1: "<"}
+  'completion_comparison': {0: ">", 1: "<"},
+  'enable_disable': {0: "Disabled", 1: "Enabled"}
 }
diff --git a/POCloud/advvfdipp.py b/POCloud/advvfdipp.py
index e3b82f4..0d5e2e5 100644
--- a/POCloud/advvfdipp.py
+++ b/POCloud/advvfdipp.py
@@ -68,7 +68,7 @@ channels = [
     Channel(plc_ip_address, "temperatureshutdownlimit", "AIn_IntakeTemperature.Val_HiLim", "REAL", 0.5, 14400),
     Channel(plc_ip_address, "temperaturestartuplimit", "AIn_IntakeTemperature.Val_LoLim", "REAL", 0.5, 14400),
     Channel(plc_ip_address, "sensorheight", "cfg_DHSensorDistToIntake", "REAL", 0.5, 14400),
-    Channel(plc_ip_address, "sch_enabled", "sch_enabled", "BOOL", _, 3600)
+    Channel(plc_ip_address, "sch_enabled", "sch_enabled", "STRING", _, 3600, map_=maps['enable_disable'])
 ]
 
 scheduler_history = [
@@ -134,7 +134,7 @@ class start(threading.Thread, deviceBase):
 
             for sch_s in scheduler_schedule:
                 if sch_s.read(self.forceSend):
-                    self.sendtodbJSON("run_schedule", json.dumps(sch_s.jsonify()), 0)
+                    self.sendtodbJSON("run_schedule_{}".format(sch_s.index_), json.dumps(sch_s.jsonify()), 0)
 
             print("advvfdipp driver still alive...")
             if self.forceSend: