Merge fixNovember

hitier
2 parents fd0f94e9 fd4c583f
Showing 4 changed files with 12 additions and 11 deletions Show diff stats
requirements.txt
web/run.py
web/static/js/main.js
web/view/home.html.jinja2
@@ -15,5 +15,5 @@ numpy==1.22.4
 python-dateutil==2.8.2
 Yaml8==0.1.2
 netCDF4==1.5.8
-unicode-slugify==0.1.5
+python-slugify==6.1.2
 gunicorn==20.1.0
@@ -328,6 +328,10 @@ def datetime_from_list(time_list):
     with DayOfYear starting at 0. We want it starting at 1 because it's what
     vendor parsers use, both in python and javascript.
     """
+    try:
+        time_list = [str(i, 'UTF8') for i in time_list]
+    except Exception as e:
+        log.error(e)
     # Day Of Year starts at 0, but for our datetime parser it starts at 1
     doy = '{:03d}'.format(int(''.join(time_list[4:7])) + 1)
     return datetime.datetime.strptime(
@@ -711,10 +715,6 @@ def get_data_for_target(target_config, input_slug,
                       (target_config['name'], orbit_file))
             for ltime, datum_hee in zip(times, data_hee):
                 try:
-                    try:
-                        ltime = [str(i, 'UTF8') for i in ltime]
-                    except Exception as e:
-                        print(e)
                     dtime = datetime_from_list(ltime)
                 except Exception:
                     log.error("Failed to parse time from get__data_for_target %s." % ltime)
@@ -776,10 +776,6 @@ def get_data_for_target(target_config, input_slug,
                     in zip(times, data_v, data_b, data_t, data_n, data_p, data_a):
                 try:
-                    try:
-                        ltime = [str(i, 'UTF8') for i in ltime]
-                    except Exception as e:
-                        print(e)
                     dtime = datetime_from_list(ltime)
                 except Exception:
                     log.error("Failed to parse time from %s." % ltime)
@@ -419,6 +419,8 @@
                 }
                 console.log(target['name'], id, data[id]);
                 if (data[id].length) {
+                    //console.log('-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+')
+                    console.log(id, title, target, data[id], container)
                     return app.time_series.push(new TimeSeries(id, title, target, data[id], app.parameters[id].active, container, {
                         'started_at': app.started_at,
                         'stopped_at': app.stopped_at
@@ -871,7 +873,10 @@
             this.plotWrapper.append('g').classed('x axis', true);
             this.plotWrapper.append('g').classed('y axis', true);
             this.yAxisText = this.plotWrapper.append("text").attr("transform", "rotate(-90)").attr("dy", "1em").style("text-anchor", "middle").text(this.title);
-            this.yAxisTextTarget = this.plotWrapper.append("text").attr("transform", "rotate(-90)").attr("dy", "1em").style("text-anchor", "middle").style("font-style", "oblique").text(this.target.name);
+            let y_title = this.target.name+" from "+$("input[name='input_slug']:checked").siblings(".mdl-radio__label").html();
+            this.yAxisTextTarget = this.plotWrapper.append("text").attr("transform", "rotate(-90)")
+                                        .attr("dy", "1em").style("text-anchor", "middle")
+                                        .style("font-style", "oblique").text(y_title);
             this.focus = this.plotWrapper.append('g').style("display", "none");
             this.cursorCircle = this.focus.append("circle").attr("class", "cursor-circle").attr("r", 3);
             dx = 8;
@@ -182,12 +182,12 @@
                   title="Send the data to a connected SAMP hub, such as TOPCAT.">
             SAMP
           </button>
-#}
           <button id="email_alert"
                   class="mdl-button mdl-button--raised mdl-button--primary"
                   title="Set an alert to receive an email when the data validates pre-defined conditions."
                   data-href="http://alerts-psws.irap.omp.eu/tao">
             Alert
+#}
           </button>
 {% endif %}