Merge pull request #308 from DanielJMaher/release4f2

Fixed UI components for DPA = True D/L Link

ooiui/core/routes/science.py

@@ -183,23 +183,23 @@ def metadata_times_proxy(stream_name,reference_designator):
 @app.route('/api/uframe/get_csv/<string:stream_name>/<string:reference_designator>/<string:start>/<string:end>')
 def get_csv(stream_name, reference_designator,start,end):
     token = get_login()
-    dpa = "0"
+    dpa = "1"
     url = app.config['SERVICES_URL'] + '/uframe/get_csv/%s/%s/%s/%s/%s' % (stream_name, reference_designator,start,end,dpa)
     req = requests.get(url, auth=(token, ''), stream=True,params=request.args)
     return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
 
 @app.route('/api/uframe/get_json/<string:stream_name>/<string:reference_designator>/<string:start>/<string:end>')
 def get_json(stream_name, reference_designator,start,end):
     token = get_login()
-    dpa = "0"
+    dpa = "1"
     url = app.config['SERVICES_URL'] + '/uframe/get_json/%s/%s/%s/%s/%s' % (stream_name, reference_designator,start,end,dpa)
     req = requests.get(url, auth=(token, ''), stream=True,params=request.args)
     return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
 
 @app.route('/api/uframe/get_netcdf/<string:stream_name>/<string:reference_designator>/<string:start>/<string:end>')
 def get_netcdf(stream_name, reference_designator,start,end):
     token = get_login()
-    dpa = "0"
+    dpa = "1"
     req = requests.get(app.config['SERVICES_URL'] + '/uframe/get_netcdf/%s/%s/%s/%s/%s' % (stream_name, reference_designator,start,end,dpa), auth=(token, ''), stream=True)
     return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
 
@@ -209,6 +209,26 @@ def get_profiles(stream_name, reference_designator):
     req = requests.get(app.config['SERVICES_URL'] + '/uframe/get_profiles/%s/%s/%s/%s' % (stream_name, reference_designator), auth=(token, ''), stream=True)
     return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
 
+@app.route('/api/uframe/get_csv/<string:stream_name>/<string:reference_designator>/<string:start>/<string:end>/<string:dpa>')
+def get_csv_dpaflag(stream_name, reference_designator,start,end,dpa):
+    token = get_login()
+    url = app.config['SERVICES_URL'] + '/uframe/get_csv/%s/%s/%s/%s/%s' % (stream_name, reference_designator,start,end,dpa)
+    req = requests.get(url, auth=(token, ''), stream=True,params=request.args)
+    return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
+
+@app.route('/api/uframe/get_json/<string:stream_name>/<string:reference_designator>/<string:start>/<string:end>/<string:dpa>')
+def get_json_dpaflag(stream_name, reference_designator,start,end,dpa):
+    token = get_login()
+    url = app.config['SERVICES_URL'] + '/uframe/get_json/%s/%s/%s/%s/%s' % (stream_name, reference_designator,start,end,dpa)
+    req = requests.get(url, auth=(token, ''), stream=True,params=request.args)
+    return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
+
+@app.route('/api/uframe/get_netcdf/<string:stream_name>/<string:reference_designator>/<string:start>/<string:end>/<string:dpa>')
+def get_netcdf_dpaflag(stream_name, reference_designator,start,end,dpa):
+    token = get_login()
+    req = requests.get(app.config['SERVICES_URL'] + '/uframe/get_netcdf/%s/%s/%s/%s/%s' % (stream_name, reference_designator,start,end,dpa), auth=(token, ''), stream=True)
+    return Response(stream_with_context(req.iter_content(chunk_size=1024*1024*4)), headers=dict(req.headers))
+
 @app.route('/svg/plot/<string:instrument>/<string:stream>', methods=['GET'])
 def get_plotdemo(instrument, stream):
     token = get_login()

ooiui/static/js/partials/SVGPlotControl.html

@@ -106,7 +106,7 @@
               <%  console.log(model.get('variables_shape')[varName])   %>
 
               <%  if(model.get('variables_shape')[varName] == "function"){ %>
-                <option data-subtext="L1 dpa true" class="dpa-function-variable" value="<%=varName%>"><%= varName %></option>
+                <option data-subtext="L1/L2 DPA" class="dpa-function-variable" value="<%=varName%>"><%= varName %></option>
               <%} else { %>               
                 <option value="<%=varName%>"><%= varName %></option>
               <% } %>