Make the footer images clickable

Highlight the visits counter Use a default interval up to 3 weeks in the future

Make the footer images clickable
Highlight the visits counter Use a default interval up to 3 weeks in the future
Goutte
1 parent ea6c8d5d
Showing 7 changed files with 62 additions and 29 deletions Show diff stats
CHANGELOG.md
config.yml
web/run.py
web/static/js/swapp.js
web/static/js/swapp.ls
web/view/home.html.jinja2
web/view/layout.html.jinja2
@@ -10,9 +10,7 @@
 - [ ] Give the future data another color
 - [ ] Sort times series by closeness to the sun
 - [ ] Generate a CDF file (not NetCDF)
-- [ ] Make the footer images clickable
 - [ ] Move the link to the source in the footer
-- [ ] Highlight the visits counter
 An heliospheric propagation 1D MHD model for solar wind prediction at planets, probes and comets.
@@ -20,6 +18,9 @@ An heliospheric propagation 1D MHD model for solar wind prediction at planets, p
 ## 1.0.0-rc4
+- [x] Make the footer images clickable
+- [x] Highlight the visits counter
+- [x] Use a default interval up to 3 weeks in the future
 - [x] Add interval constraints for orbit models (Rosetta uses P67 after a time)
 - [x] Make the download with a netcdf file instead of a tarball of CSVs
 - [x] Support having no position to display (for Rosetta in some intervals)
@@ -166,10 +166,13 @@ targets:
     - type: 'probe'
       slug: 'juno'
       name: 'Juno'
-      title: 'Juno (coming soon)'
+      title: 'Juno'
       orbit:
         models:
           - slug: 'juno_cruise_all'
+            stopped_at: '2016-07-01T00:00:00'
+          - slug: 'jupiter_orb_all'
+            started_at: '2016-07-01T00:00:00'
       models:
           - slug: 'tao_juno_sw'
       locked: false
@@ -46,10 +46,12 @@ FILE_DATE_FMT = &quot;%Y-%m-%dT%H:%M:%S&quot;
 # LOGGING #####################################################################
+LOG_FILE = get_path('run.log')
+
 log = logging.getLogger("HelioPropa")
 log.setLevel(logging.DEBUG)
 # log.setLevel(logging.ERROR)                        # <-- set log level here !
-logHandler = logging.FileHandler(get_path('run.log'))
+logHandler = logging.FileHandler(LOG_FILE)
 logHandler.setFormatter(logging.Formatter(
     "%(asctime)s - %(levelname)s - %(message)s"
 ))
@@ -265,6 +267,19 @@ def is_list_in_list(needle, haystack):
     return True
+def round_time(dt=None, round_to=60):
+    """
+    Round a datetime object to any time laps in seconds
+    dt : datetime.datetime object, default now.
+    roundTo : Closest number of seconds to round to, default 1 minute.
+    """
+    if dt is None:
+        dt = datetime.datetime.now()
+    seconds = (dt.replace(tzinfo=None) - dt.min).seconds
+    rounding = (seconds + round_to / 2) // round_to * round_to
+    return dt + datetime.timedelta(0, rounding-seconds, -dt.microsecond)
+
+
 def datetime_from_list(time_list):
     """
     Datetimes in retrieved CDFs are stored as lists of numbers,
@@ -465,9 +480,13 @@ def get_data_for_target(target_config, started_at, stopped_at):
             log.debug("%s: aggregating data from '%s'..." %
                       (target_config['name'], orbit_file))
             for time, datum_hee in zip(times, data_hee):
-                dtime = datetime_from_list(time)
+                try:
+                    dtime = datetime_from_list(time)
+                except Exception as e:
+                    log.error("Failed to parse time from %s." % time)
+                    raise e
                 if s0 <= dtime <= s1:
-                    dkey = dtime.strftime(precision)
+                    dkey = round_time(dtime, 60*60).strftime(precision)
                     orbit_data[dkey] = datum_hee
             cdf_handle.close()
@@ -490,9 +509,13 @@ def get_data_for_target(target_config, started_at, stopped_at):
                 in zip(times, data_v, data_b, data_t, data_n, data_p, data_d):
             vrad = datum_v[0]
             vtan = datum_v[1]
-            dtime = datetime_from_list(time)
+            try:
+                dtime = datetime_from_list(time)
+            except Exception as e:
+                log.error("Failed to parse time from %s." % time)
+                raise e
             if started_at <= dtime <= stopped_at:
-                dkey = dtime.strftime(precision)
+                dkey = round_time(dtime, 60*60).strftime(precision)
                 x_hee = None
                 y_hee = None
                 if dkey in orbit_data:
@@ -913,13 +936,20 @@ def cache_warmup():
     return "To Do"
-@app.route("/run.log")
-def run_log():
-    with open(get_path('run.log'), 'r') as f:
+@app.route("/log")
+def log_show():
+    with open(LOG_FILE, 'r') as f:
         contents = f.read()
     return contents
+@app.route("/log/clear")
+def log_clear():
+    with open(LOG_FILE, 'w') as f:
+        f.truncate()
+    return "Log cleared successfully."
+
+
 # DEV TOOLS ###################################################################
 # @app.route("/inspect")
@@ -951,6 +981,11 @@ def run_log():
 # MAIN ########################################################################
 if __name__ == "__main__":
+
+    a = "2015171150000001"
+
+
+
     # Debug mode on, as the production server does not use this but run.wsgi
     extra_files = [get_path('../config.yml')]
     app.run(debug=True, extra_files=extra_files)
@@ -43,7 +43,7 @@
       "This is called by the inline bootstrap javascript code.\nThis ain't in the constructor because it might return a Promise later on.\n(for the loader, for example)";
       var started_at, stopped_at, this$ = this;
       started_at = moment().subtract(1, 'year').hours(0).minutes(0).seconds(0);
-      stopped_at = moment().add(1, 'week').hours(0).minutes(0).seconds(0);
+      stopped_at = moment().add(3, 'week').hours(0).minutes(0).seconds(0);
       this.setStartAndStop(started_at, stopped_at);
       this.loadAndCreatePlots(started_at, stopped_at);
       return window.addEventListener('resize', function(){
@@ -75,7 +75,7 @@ https://gitlab.irap.omp.eu/CDPP/SPACEWEATHERONLINE
     # Default time interval is from two weeks ago to one week ahead.
     # We set the h/m/s to zero to benefit from a daily cache.
     started_at = moment().subtract(1, 'year').hours(0).minutes(0).seconds(0)
-    stopped_at = moment().add(1, 'week').hours(0).minutes(0).seconds(0)
+    stopped_at = moment().add(3, 'week').hours(0).minutes(0).seconds(0)
     @setStartAndStop(started_at, stopped_at)
     @loadAndCreatePlots(started_at, stopped_at)
@@ -298,7 +298,7 @@
     path.orbit.orbit_section {
       fill: none;
       stroke: steelblue;
-      stroke-width: 3px;
+      stroke-width: 1.5px;
     }
     ellipse.orbit.orbit_ellipse {
       fill: none;
@@ -70,36 +70,30 @@
       <footer class="mdl-mini-footer">
         <div class="mdl-mini-footer__left-section">
+          <p style="float: left; margin: 1.5em;">
+              {{ visits }} visits since 2017
+          </p>
           <p class="disclaimer">
               The <a href="http://www.europlanet-2020-ri.eu/">Europlanet 2020 Research Infrastructure</a> project has received funding
               <br>
               from the <a href="https://ec.europa.eu/programmes/horizon2020/">European Union's Horizon 2020</a> research and innovation programme
               under grant agreement N°&nbsp;654208.
               <br>
-              {{ visits }} visits since 2017
           </p>
         </div>
         <div class="mdl-mini-footer__right-section">
-          <img class="logo" src="{{ static('img/logo/logo_cdpp.png') }}" alt="CDPP" id="logo_cdpp" />
+          <a href="http://cdpp.irap.omp.eu">
+            <img class="logo" src="{{ static('img/logo/logo_cdpp.png') }}" alt="CDPP" id="logo_cdpp" />
+          </a>
           &nbsp;&nbsp;&nbsp;
-          <img class="logo" src="{{ static('img/logo/logo_europlanet.png') }}" alt="Europlanet" id="logo_europlanet" />
+          <a href="http://planetaryspaceweather-europlanet.irap.omp.eu/">
+            <img class="logo" src="{{ static('img/logo/logo_europlanet.png') }}" alt="Europlanet" id="logo_europlanet" />
+          </a>
         </div>
       </footer>
     </div>
-{#    <script type="application/javascript">#}
-{#      // fixme: GOOGLE ANALYTICS ?#}
-{#      /*#}
-{#      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){#}
-{#      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),#}
-{#      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)#}
-{#      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');#}
-{#      ga('create', 'UA-56037907-1', 'auto');#}
-{#      ga('send', 'pageview');#}
-{#      */#}
-{#    </script>#}
-
     <script type="application/javascript" src="{{ static('js/vendor/jquery-3.2.1.min.js') }}"></script>
     <script type="application/javascript" src="{{ static('js/vendor/material-custom.js') }}"></script>
     <script type="application/javascript">