Removing results tab from PI model. Addresses #585

sandialabs · Mar 3, 2016 · 8c7bcbb · 8c7bcbb
1 parent 55eb58a
commit 8c7bcbb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/web-server/plugins/slycat-parameter-image-plus-model/js/wizard-ui.js b/web-server/plugins/slycat-parameter-image-plus-model/js/wizard-ui.js
@@ -471,7 +471,7 @@ define(["slycat-server-root", "slycat-web-client", "slycat-dialog", "knockout",
               client.post_model_finish({
                 mid: component.model._id(),
                 success: function() {
-                  component.tab(7);
+                  component.go_to_model();
                 }
               });
             }

diff --git a/web-server/plugins/slycat-parameter-image-plus-model/wizard-ui.html b/web-server/plugins/slycat-parameter-image-plus-model/wizard-ui.html
@@ -1,6 +1,6 @@
 <div class="parameter-image-plus-model-wizard">
 <div class="modal-header">
-  <button type="button" class="close" data-bind="click: tab() != 7 ? cancel : false" data-dismiss="modal" aria-label="Close">
+  <button type="button" class="close" data-bind="click: cancel" data-dismiss="modal" aria-label="Close">
     <span aria-hidden="true">&times;</span>
   </button>
   <h3 class="modal-title">New Parameter Image Model</h3>
@@ -14,7 +14,6 @@ <h3 class="modal-title">New Parameter Image Model</h3>
     <li data-bind="css:{active:tab() == 4}, visible: matrix_type() == 'compute'" class="ps-tab-compute-matrix"><a>Compute Distances</a></li>
     <li data-bind="css:{active:tab() == 5}, visible: matrix_type() == 'remote'" class="ps-tab-remote-matrix"><a>Select Distances</a></li>
     <li data-bind="css:{active:tab() == 6}"><a>Name Model</a></li>
-    <li data-bind="css:{active:tab() == 7}"><a>Results</a></li>
   </ul>
 
   <div class="tab-content">
@@ -147,21 +146,16 @@ <h3 class="modal-title">New Parameter Image Model</h3>
 
       </form>
     </div>
-
-    <div data-bind="visible:tab() == 7">
-      <slycat-model-results params="{mid: model._id}"></slycat-model-results>
-    </div>
   </div>
 </div>
 <div class="modal-footer">
-  <button class="btn btn-default pull-left" data-bind="visible: [0,7].indexOf(tab()) == -1, click: back">Back</button>
+  <button class="btn btn-default pull-left" data-bind="visible: [0].indexOf(tab()) == -1, click: back">Back</button>
   <button class="btn btn-primary local-browser-continue-data browser-continue" data-bind="visible:tab() == 0,click:select_type"><i class="fa fa-spinner fa-pulse"></i> Continue</button>
   <button class="btn btn-primary remote-browser-continue-data browser-continue" data-bind="visible:tab() == 1,click:load_table"><i class="fa fa-spinner fa-pulse"></i> Continue</button>
   <button class="btn btn-primary" data-bind="visible:tab() == 2,click:select_columns">Continue</button>
   <button class="btn btn-primary local-browser-continue-matrix browser-continue" data-bind="visible:tab() == 3,click:select_matrix_type"><i class="fa fa-spinner fa-pulse"></i> Continue</button>
   <button class="btn btn-primary" data-bind="visible:tab() == 4,click:select_compute">Continue</button>
   <button class="btn btn-primary remote-browser-continue-matrix browser-continue" data-bind="visible:tab() == 5,click:load_distance_matrix"><i class="fa fa-spinner fa-pulse"></i> Continue</button>
-  <button class="btn btn-primary" data-bind="visible:tab() == 6,click:name_model">Finish</button>
-  <button class="btn btn-primary" data-bind="visible:tab() == 7,click:go_to_model">Go To Model</button>
+  <button class="btn btn-primary" data-bind="visible:tab() == 6,click:name_model">Finish & Go To Model</button>
 </div>
 </div>