Merge pull request #834 from oceanzus/redesign_sprint12

Sprint 12 Release
oceanobservatories · Mar 12, 2018 · 8a99d3b · 8a99d3b
2 parents 7f5faba + 38b9f7b
commit 8a99d3b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/ooiui/static/js/partials/science/plot/PlotControls.html b/ooiui/static/js/partials/science/plot/PlotControls.html
@@ -46,7 +46,12 @@
                 <% if (_.isNull(plotDefaultModel)){ %>
 
                   <% plotModel.get('plotTypeOptions').each(function(option){ %>
-                    <option value="<%=option.get('value')%>" <%= option.get('value') == plotModel.get('plotType') ? 'selected' : ''%>><%= option.get('name') %></option>
+                    <% //console.log(model.get('ref_des').indexOf('ZPLSC')); %>
+                    <% //console.log(option.get('value')); %>
+                    <!-- TODO: Remove this ZPLSC-specific check once we can retrieve data from uframe correctly -->
+                    <% if ((model.get('ref_des').indexOf('ZPLSC') > -1) && (option.get('value') == 'xy')){ %>
+                      <option value="<%=option.get('value')%>" <%= option.get('value') == plotModel.get('plotType') ? 'selected' : ''%>><%= option.get('name') %></option>
+                    <% } %>
                   <% }); %>
 
                 <% }else { %>

diff --git a/ooiui/static/js/views/science/plot/PlotControlView.js b/ooiui/static/js/views/science/plot/PlotControlView.js
@@ -59,6 +59,7 @@ var PlotControlView = Backbone.View.extend({
       //self.$el.find('.plot-control-view .row').append('<p class="initial-text"> Click the Plot tab above to configure and visualize your plot.</p>')
     }else{
       this.$el.html(this.template({plotModel:self.plotModel,
+                                   model: this.collection.models[0],
                                    isInterpolated: isInterpolated,
                                    plotDefaultModel: self.plotDefaultModel
                                   }));

diff --git a/ooiui/static/json/uiPatchNotes.json b/ooiui/static/json/uiPatchNotes.json
@@ -1,4 +1,15 @@
 [
+    {
+        "VersionNumber": "1.4.8",
+        "VersionDate": "2018-01-19",
+        "VersionDescription": [
+            "Gallery: Enhancements to UI gallery services and partitioned cache. (13090)",
+            "Gallery: Updates to UI gallery routes. (13091)",
+            "General: Updates to services for OSMOI dataset agent. (11473)",
+            "Plotting: Fixes ADCP binned pseudo color right vertical axis to display 95th percentile limits. (13074)",
+            "Plotting: Temporarily refactor Sprint12 UI to only allow XY plots for all reference designators containing \"ZPLSC\". (13254)"
+        ]
+    },
     {
         "VersionNumber": "1.4.7",
         "VersionDate": "2017-11-30",