From 67c13ef2d79068a97f30fc9c97b553ec982218f0 Mon Sep 17 00:00:00 2001
From: Matt DiCicco <matt@aescape.co>
Date: Mon, 8 Jul 2019 19:16:27 -0400
Subject: [PATCH 1/4] fix

---
 client/app/utilities/ros_scripts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/app/utilities/ros_scripts.js b/client/app/utilities/ros_scripts.js
index c1e1c10..45083db 100644
--- a/client/app/utilities/ros_scripts.js
+++ b/client/app/utilities/ros_scripts.js
@@ -71,9 +71,9 @@ function disableUI() {
     });
 
     document.querySelectorAll('.force-bar .progress-bar').forEach(function(element){
-      element.style.width = totalForcePercent + "%";
-      element.innerHTML = totalForce + " N";
-      element.setAttribute('aria-valuenow', totalForce);
+      element.style.width = "";
+      element.innerHTML = "";
+      element.setAttribute('aria-valuenow', 0);
     });
 
   } catch(err) {

From d8645887a03bf8cd59522cfeba9aafa39dfe5940 Mon Sep 17 00:00:00 2001
From: Matt DiCicco <matt@aescape.co>
Date: Wed, 10 Jul 2019 14:16:40 -0400
Subject: [PATCH 2/4] temp remove labels from bars to make progress bars work

---
 client/app/components/coordinator/coordinator.html |  8 ++++----
 client/app/utilities/ros_scripts.js                | 10 +---------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/client/app/components/coordinator/coordinator.html b/client/app/components/coordinator/coordinator.html
index 5e44963..d48e6c8 100644
--- a/client/app/components/coordinator/coordinator.html
+++ b/client/app/components/coordinator/coordinator.html
@@ -127,7 +127,7 @@
                                         <div class="status-list">
                                             <div class="commanded">
                                                 <div class="progress">
-                                                    <div class="progress-bar-label">Commanded</div>
+                                                    <!-- <div class="progress-bar-label">Commanded</div> -->
                                                     <div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div>
                                                 </div>
                                                 <ul class="list-group list-group-horizontal text-center">
@@ -144,7 +144,7 @@
                                             </div>
                                             <div class="observed">
                                               <div class="progress">
-                                                  <div class="progress-bar-label">Observed</div>
+                                                  <!-- <div class="progress-bar-label">Observed</div> -->
                                                   <div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">
                                                       <span>N/A</span>
                                                       <div>
@@ -545,7 +545,7 @@
                                                 <div class="status-list">
                                                     <div class="commanded">
                                                         <div class="progress">
-                                                            <div class="progress-bar-label">Commanded</div>
+                                                            <!-- <div class="progress-bar-label">Commanded</div> -->
                                                             <div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div>
                                                         </div>
                                                         <ul class="list-group list-group-horizontal text-center">
@@ -562,7 +562,7 @@
                                                     </div>
                                                     <div class="observed">
                                                       <div class="progress">
-                                                          <div class="progress-bar-label">Observed</div>
+                                                          <!-- <div class="progress-bar-label">Observed</div> -->
                                                           <div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">
                                                               <span>N/A</span>
                                                               <div>
diff --git a/client/app/utilities/ros_scripts.js b/client/app/utilities/ros_scripts.js
index 45083db..de6e9f4 100644
--- a/client/app/utilities/ros_scripts.js
+++ b/client/app/utilities/ros_scripts.js
@@ -66,15 +66,7 @@ function disableUI() {
     }
     document.querySelector('.dropdown').classList.add("disabled");
 
-    document.querySelectorAll('.force-bar .force-value span').forEach(function(element){
-      element.innerHTML = 0.0
-    });
-
-    document.querySelectorAll('.force-bar .progress-bar').forEach(function(element){
-      element.style.width = "";
-      element.innerHTML = "";
-      element.setAttribute('aria-valuenow', 0);
-    });
+ 
 
   } catch(err) {
     console.log(err);

From c292db1193db57718f26dfd031f4cf8edc8933e1 Mon Sep 17 00:00:00 2001
From: Matt DiCicco <matt@aescape.co>
Date: Wed, 10 Jul 2019 14:18:59 -0400
Subject: [PATCH 3/4] dumb ass bug

---
 client/app/components/coordinator/js/ros_scripts.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/app/components/coordinator/js/ros_scripts.js b/client/app/components/coordinator/js/ros_scripts.js
index 3eb13ff..c5079a3 100644
--- a/client/app/components/coordinator/js/ros_scripts.js
+++ b/client/app/components/coordinator/js/ros_scripts.js
@@ -372,9 +372,11 @@ var playbackStatus = new ROSLIB.Topic({
 
 playbackStatus.subscribe(function(message) {
   message = JSON.parse(message.data);
+  console.log("message");
+  console.log(message);
   status = message.status;
   bagName = message.bag_file;
-  if (status != lastPlaybackStatus) {
+  if (true) {
     
     if (status === "playing") {
 

From a0629b980674f3af670760657d90637127ea93f4 Mon Sep 17 00:00:00 2001
From: Matt DiCicco <matt@aescape.co>
Date: Wed, 10 Jul 2019 14:22:10 -0400
Subject: [PATCH 4/4] fix slider options buttons on tablet

---
 client/app/main.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/app/main.css b/client/app/main.css
index 235f744..cf3ec5e 100644
--- a/client/app/main.css
+++ b/client/app/main.css
@@ -476,6 +476,11 @@ html, body {
         background : #3671F9;
         width: 100%;
         margin-bottom: 10px;
+        height: 30px;
+    }
+
+    .slider-options .col-md-2 {
+      padding: 0px;
     }
 
     .progress-bar {