From dee31bc845f57f05f6fb9eece05da163d5117650 Mon Sep 17 00:00:00 2001
From: Rohit <rnand@aescape.co>
Date: Wed, 17 Jul 2019 20:22:42 -0400
Subject: [PATCH] fix

---
 .../components/coordinator/coordinator.html   |   2 +
 client/app/components/coordinator/play.html   |  70 -------
 client/app/components/coordinator/teach.html  | 179 +-----------------
 3 files changed, 3 insertions(+), 248 deletions(-)

diff --git a/client/app/components/coordinator/coordinator.html b/client/app/components/coordinator/coordinator.html
index 2550694..cddfb41 100644
--- a/client/app/components/coordinator/coordinator.html
+++ b/client/app/components/coordinator/coordinator.html
@@ -1,4 +1,6 @@
+<div class="status-bar" style="width:100%;height:30px;background:red;">
 
+</div>
     <div id="coordinator">                
         <div class="col-md-6">
             <div class="hand-panel hand-panel-left panel panel-default">
diff --git a/client/app/components/coordinator/play.html b/client/app/components/coordinator/play.html
index 2550694..c03d930 100644
--- a/client/app/components/coordinator/play.html
+++ b/client/app/components/coordinator/play.html
@@ -171,37 +171,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="status-container">
-                            <div class="robotiq force-bar panel panel-default panel-horizontal">
-                                <div class="panel-heading">
-                                    Robotiq
-                                </div>
-                                <div class="panel-body text-center">
-                                        <div class="status-list">
-                                                <div class="progress" id="robotiqForce">
-                                                    <div class="progress-bar bg-success" role="progressbar" id="robotiqForceBar" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div>
-                                                </div>
-                                                <ul class="list-group list-group-horizontal text-center">
-                                                    <li class="list-group-item force-value">
-                                                        <h4>X: <span id="robotiqX">0.0</span></h4>
-                                                    </li>
-                                                    <li class="list-group-item force-value">
-                                                        <h4>Y: <span id="robotiqY">0.0</span></h4>
-                                                    </li>
-                                                    <li class="list-group-item force-value">
-                                                        <h4>Z: <span id="robotiqZ">0.0</span></h4>
-                                                    </li>        
-                                                </ul>
-                                        </div>
-                                </div>
-
-                                <div class="action-button panel-footer">
-                                    <button id="calibrateButton" type="button" onclick="triggerService('/left/aescape/hardware/calibrateRobotiq')" class="btn">
-                                        Calibrate 
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
                     </div>
 
                     <div class="control-container col-md-6">
@@ -304,45 +273,6 @@
                         </div>                        
                     </div>
                     -->
-                    <div class="control-container teaching-mode-operations col-md-7">
-                        <div class="control-card panel panel-default">
-                            <div class="panel-heading">
-                                Teaching Mode Operations
-                                <i class="fas fa-info-circle" tabindex="0" data-toggle="popover" data-trigger="focus" data-content="This helps recoding a new massage!"></i>
-                            </div>
-                            <div class="panel-body text-center">
-                                <div class="button-area">
-                                        <button id="recordingStartButton" type="button" onclick="startTeachRecoding()" class="btn btn-primary col-md-6">
-                                            Start Recording
-                                        </button>
-                                        <button id="recordingStopButton" type="button" onclick="stopTeachRecording()" class="btn btn-primary col-md-6">
-                                            Stop Recording
-                                        </button>
-                                </div>
-                            </div>
-                            <div class="action-area panel-footer">
-                                <div id="RecordingStatusLabel" class="message">
-                                    <!-- TO DO: Show errors in bag manager -->
-                                </div>
-                                <div class="slider-options tagging-options" id="teachTags">
-                                    <div class="col-md-10">
-                                        <!--full with naming box search:no new:yes-->
-                                        <select id="teachBagFileName" placeholder="Filename"></select>
-                                        <!--full width category box search:yes new:yes-->
-                                        <select id="teachBagCategory" placeholder="Category"></select>
-                                        <!--full width tags box search:yes new:yes-->
-                                        <select id="teachBagTags" placeholder="Tags"></select>
-                                    </div>
-                                    <div class="col-md-2">
-                                        <button class="btn btn-primary" onclick="hideTaggingOptions('teach', true)">Tag</button>
-                                        <button class="btn btn-primary" onclick="hideTaggingOptions('teach', false)">Cancel</button>
-                                    </div>
-                                </div>
-                                <div id="teachTagError" class="col-md-10 error"></div>
-                                <div class="clearfix"></div>
-                            </div>
-                        </div>                        
-                    </div>
                         <div class="control-container play-mode-operations col-md-10">
                             <div class="control-card panel panel-default execution-control">
                                 <div class="panel-heading">
diff --git a/client/app/components/coordinator/teach.html b/client/app/components/coordinator/teach.html
index 2550694..6b56611 100644
--- a/client/app/components/coordinator/teach.html
+++ b/client/app/components/coordinator/teach.html
@@ -118,59 +118,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="status-container">
-                            <div class="franka-force force-bar panel panel-default panel-horizontal">
-                                <div class="panel-heading">
-                                    Franka Force
-                                </div>
-                                <div class="panel-body text-center">
-                                        <div class="status-list">
-                                            <div class="commanded">
-                                                <div class="progress">
-                                                    <!-- <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">
-                                                    <li class="list-group-item force-value">
-                                                        <h4>X: <span id="frankaForceLeftCommandedX">0.0</span></h4>
-                                                    </li>
-                                                    <li class="list-group-item force-value">
-                                                        <h4>Y: <span id="frankaForceLeftCommandedY">0.0</span></h4>
-                                                    </li>
-                                                    <li class="list-group-item force-value">
-                                                        <h4>Z: <span id="frankaForceLeftCommandedZ">0.0</span></h4>
-                                                    </li>        
-                                                </ul>
-                                            </div>
-                                            <div class="observed">
-                                              <div class="progress">
-                                                  <!-- <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>
-                                                          <span>Observed</span>
-                                                      </div>
-                                                  </div>
-                                              </div>
-                                              <ul class="list-group list-group-horizontal text-center">
-                                                  <li class="list-group-item force-value">
-                                                      <h4>X: <span id="frankaForceLeftObservedX">0.0</span></h4>
-                                                  </li>
-                                                  <li class="list-group-item force-value">
-                                                      <h4>Y: <span id="frankaForceLeftObservedY">0.0</span></h4>
-                                                  </li>
-                                                  <li class="list-group-item force-value">
-                                                      <h4>Z: <span id="frankaForceLeftObservedZ">0.0</span></h4>
-                                                  </li>        
-                                              </ul>
-                                          </div>
-                                        </div>
-                                </div>
-                                <div class="action-button panel-footer">
-
-                                </div>
-                            </div>
-                        </div>
                         <div class="status-container">
                             <div class="robotiq force-bar panel panel-default panel-horizontal">
                                 <div class="panel-heading">
@@ -343,78 +290,7 @@
                             </div>
                         </div>                        
                     </div>
-                        <div class="control-container play-mode-operations col-md-10">
-                            <div class="control-card panel panel-default execution-control">
-                                <div class="panel-heading">
-                                    Play Mode Operations
-                                    <i class="fas fa-info-circle" tabindex="0" data-toggle="popover" data-trigger="focus" data-content="This helps selecting and playback of recorded massages!"></i>
-                                </div>
-                                <div class="panel-body text-center">
-                                    <div class="button-area">
-                                        <button id="executionLoadButton" type="button" onclick="displayLoadingOptions()" class="btn btn-primary col-md-3">
-                                            Load Recording
-                                        </button>
-                                        <button id="executionLoadButton" type="button" onclick="triggerService('/aescape/massageReady')" class="btn btn-primary col-md-3">
-                                            Complete Body Scaling
-                                        </button>
-                                        <button id="executionStartButton" type="button" onclick="playLoadedRecording()" class="btn btn-primary col-md-3">
-                                            Play Loaded Recording
-                                        </button>
-                                        <button id="executionStopButton" type="button" onclick="stopPlayingRecording()" class="btn btn-primary col-md-3">
-                                            Stop Playing Recording
-                                        </button>
-                                    </div>
-                                    <div>
-                                        <!-- <div class="row-md-4">
-                                            <<div class="col-md-3"> -->
-                                                <!-- Bagfile name must not start with "/" 
-                                                <button class="btn btn-primary" type="button" onclick="updateRecordingsList()">
-                                                    Refresh List
-                                                </button>
-                                        </div> -->
-                                    </div>
-                                </div>
-                                <div class="action-area panel-footer">
-                                    <div class="message" id="ExecutionStatusLabel">
-                                        <!-- TO DO: Show errors in bag manager -->
-                                    </div>
-                                    <!-- TO DO: Bagfile name must not start with "/" -->
-                                    <div class="slider-options tagging-options" id="playTags">
-                                        <div class="col-md-10">
-                                            <!--full with naming box search:no new:yes-->
-                                            <select id="playBagFileName" placeholder="Filename"></select>
-                                            <!--full width category box search:yes new:yes-->
-                                            <select id="playBagCategory" placeholder="Category"></select>
-                                            <!--full width tags box search:yes new:yes-->
-                                            <select id="playBagTags" placeholder="Tags"></select>
-                                        </div>
-                                        <div class="col-md-2">
-                                            <button class="btn btn-primary" onclick="hideTaggingOptions('play', true)">Tag</button>
-                                            <button class="btn btn-primary" onclick="hideTaggingOptions('play', false)">Cancel</button>
-                                        </div>
-                                    </div>
-                                    <div class="slider-options loading-options" id="loadBags">
-                                        <div class="col-md-10">
-                                            <div class="dropdown">
-                                                <div>
-                                                        <select id="loadBagList" placeholder="Select bag to play"></select>
-                                                        <select id="armMode"></select>
-                                                </div>
-                                                <!-- <i class="fas fa-sync-alt" onclick="updateRecordingsList()"></i> -->
-                                            </div>
-                                        </div>
-                                        <div class="col-md-2">
-                                            <!-- <i class="fas fa-check-circle" onclick="hideLoadingOptions(true)"></i> -->
-                                            <button class="btn btn-primary" onclick="hideLoadingOptions(true)">Load</button>
-                                            <button class="btn btn-primary" onclick="hideLoadingOptions(false)">Cancel</button>
-                                        </div>
-                                    </div>
-                                    <div id="playTagError" class="col-md-10 error"></div>
-                                    <div class="clearfix"></div>
-                                </div>
-                            </div>                        
-                        </div>
-                        </div>
+                </div>
                 <div class="panel-footer">
 
                 </div>
@@ -539,59 +415,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="status-container">
-                                    <div class="franka-force force-bar panel panel-default panel-horizontal">
-                                        <div class="panel-heading">
-                                            Franka Force
-                                        </div>
-                                        <div class="panel-body text-center">
-                                                <div class="status-list">
-                                                    <div class="commanded">
-                                                        <div class="progress">
-                                                            <!-- <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">
-                                                            <li class="list-group-item force-value">
-                                                                <h4>X: <span id="frankaForceRightCommandedX">0.0</span></h4>
-                                                            </li>
-                                                            <li class="list-group-item force-value">
-                                                                <h4>Y: <span id="frankaForceRightCommandedY">0.0</span></h4>
-                                                            </li>
-                                                            <li class="list-group-item force-value">
-                                                                <h4>Z: <span id="frankaForceRightCommandedZ">0.0</span></h4>
-                                                            </li>        
-                                                        </ul>
-                                                    </div>
-                                                    <div class="observed">
-                                                      <div class="progress">
-                                                          <!-- <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>
-                                                                  <span>Observed</span>
-                                                              </div>
-                                                          </div>
-                                                      </div>
-                                                      <ul class="list-group list-group-horizontal text-center">
-                                                          <li class="list-group-item force-value">
-                                                              <h4>X: <span id="frankaForceRightObservedX">0.0</span></h4>
-                                                          </li>
-                                                          <li class="list-group-item force-value">
-                                                              <h4>Y: <span id="frankaForceRightObservedY">0.0</span></h4>
-                                                          </li>
-                                                          <li class="list-group-item force-value">
-                                                              <h4>Z: <span id="frankaForceRightObservedZ">0.0</span></h4>
-                                                          </li>        
-                                                      </ul>
-                                                  </div>
-                                                </div>
-                                        </div>
-                                        <div class="action-button panel-footer">
-        
-                                        </div>
-                                    </div>
-                                </div>
                             </div>
     
                             <div class="control-container col-md-6">