From 74ffee4b5884b0af964da198e28aeffe37ff09ea 2020-08-24 16:15:33
From: Juan C. Espinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2020-08-24 16:15:33
Subject: [PATCH] Fix utc time handling

---

diff --git a/plotter/static/js/jroplots.js b/plotter/static/js/jroplots.js
index f1099b3..15ceaa9 100644
--- a/plotter/static/js/jroplots.js
+++ b/plotter/static/js/jroplots.js
@@ -45,21 +45,18 @@ class PcolorBuffer {
         }
         var t = values.time.map(function (x) {
             var a = new Date(x * 1000);
-            // This condition is used to change from UTC to LT
-            //if (data.metadata.localtime == true){
-            a.setTime( a.getTime() + a.getTimezoneOffset()*60*1000 );
-            //}
+            if (data.metadata.localtime == 0){
+                a.setTime( a.getTime() + a.getTimezoneOffset()*60*1000 );
+            }
             return  a;
         });
 
         var label;
-        //if (data.metadata.localtime == true){
-        label = "[LT]";
-
-        //}
-        //else{
-        //    label = "[UTC]";
-        //}
+        if (data.metadata.localtime == 1){
+            label = "[LT]";
+        }else{
+            label = "[UTC]";
+        }
 
         for (var i = 0; i < data['data'].length; i++) {
             var layout = {
@@ -104,8 +101,9 @@ class PcolorBuffer {
             if (this.metadata.zmax) { trace.zmax = this.metadata.zmax }
 
             var tm = new Date(this.last * 1000);
-            tm.setTime( tm.getTime() + tm.getTimezoneOffset()*60*1000 );
-            
+            if (data.metadata.localtime == 0){
+                tm.setTime( tm.getTime() + tm.getTimezoneOffset()*60*1000 );
+            }
             if ('titles' in this.metadata){
                 layout.title = this.metadata.titles[i] + ' - ' + tm.toLocaleString();
             }else{
@@ -217,10 +215,9 @@ class PcolorBuffer {
             cnt += 1;
             this.last += this.interval;
             var newt = new Date((this.last) * 1000);
-            // This condition is used to change from UTC to LT
-            // if (obj.metadata.localtime == true){
-            newt.setTime( newt.getTime() + newt.getTimezoneOffset()*60*1000 );
-            //}
+            if (obj.metadata.localtime == 0){
+                newt.setTime( newt.getTime() + newt.getTimezoneOffset()*60*1000 );
+            }
             this.xbuffer.push(newt);
             for (var i = 0; i < obj['data'].length; i++) {
                 this.zbuffer[i].push(this.empty);
@@ -232,10 +229,9 @@ class PcolorBuffer {
         // update buffers
         this.last = parseFloat(obj.time[0]);
         var t = new Date(obj.time[0] * 1000);
-        // This condition is used to change from UTC to LT
-        //if (obj.metadata.localtime == true){
-        t.setTime( t.getTime() + t.getTimezoneOffset()*60*1000 );
-        //}
+        if (obj.metadata.localtime == 0){
+            t.setTime( t.getTime() + t.getTimezoneOffset()*60*1000 );
+        }
         this.xbuffer.push(t);
         for (var i = 0; i < obj['data'].length; i++) {
             this.zbuffer[i].push(obj['data'][i]);
@@ -348,9 +344,9 @@ class Pcolor {
             }
 
             var t = new Date(data.time * 1000);
-            //if (data.metadata.localtime == true){
-            t.setTime( t.getTime() + t.getTimezoneOffset()*60*1000 );
-            //}
+            if (data.metadata.localtime == 0){
+                t.setTime( t.getTime() + t.getTimezoneOffset()*60*1000 );
+            }
             if ('titles' in data.metadata){
                 layout.title = data.metadata.titles[i] + ' ' + t.toLocaleString();
             }else{
@@ -397,10 +393,9 @@ class Pcolor {
         // add new data to plots and empty buffers
         // // // console.log('Plotting...');
         var t = new Date(obj.time[0] * 1000);
-        // This condition is used to change from UTC to LT
-        //if (obj.metadata.localtime == true){
-        t.setTime( t.getTime() + t.getTimezoneOffset()*60*1000 );
-        //}
+        if (obj.metadata.localtime == 0){
+            t.setTime( t.getTime() + t.getTimezoneOffset()*60*1000 );
+        }
         for (var i = 0; i < this.n; i++) {
             var div = document.getElementById(this.divs[i]);
             
@@ -485,9 +480,9 @@ class ScatterBuffer {
         var t = values.time.map(function (x) {
             var a = new Date(x * 1000);
             // This condition is used to change from UTC to LT
-            //if (data.metadata.localtime == true){
-            a.setTime( a.getTime() + a.getTimezoneOffset()*60*1000 );
-            //}
+            if (data.metadata.localtime == 0){
+                a.setTime( a.getTime() + a.getTimezoneOffset()*60*1000 );
+            }
             return  a;
         });
 
@@ -508,7 +503,11 @@ class ScatterBuffer {
         }
 
         var label;
-        label = "[LT]";
+        if (data.metadata.localtime == 1){
+            label = "[LT]";
+        }else{
+            label = "[UTC]";
+        }
 
         var layout = {
             height: 300,
@@ -642,10 +641,9 @@ class ScatterBuffer {
             cnt += 1;
             this.last += this.interval;
             var newt = new Date((this.last) * 1000);
-            // This condition is used to change from UTC to LT
-            //if (obj.metadata.localtime == true){
-            newt.setTime( newt.getTime() + newt.getTimezoneOffset()*60*1000 );
-            //}
+            if (obj.metadata.localtime == 0){
+                newt.setTime( newt.getTime() + newt.getTimezoneOffset()*60*1000 );
+            }
             this.xbuffer.push(newt);
             for (var i = 0; i < this.n; i++) {
                 this.ybuffer[i].push(null);
@@ -657,10 +655,9 @@ class ScatterBuffer {
         // update buffers
         this.last = parseFloat(obj.time[0]);
         var t = new Date(obj.time[0] * 1000);
-        // This condition is used to change from UTC to LT
-        //if (obj.metadata.localtime == true){
-        t.setTime( t.getTime() + t.getTimezoneOffset()*60*1000 );
-        //}
+        if (obj.metadata.localtime == 0){
+            t.setTime( t.getTime() + t.getTimezoneOffset()*60*1000 );
+        }
         this.xbuffer.push(t);
         for (var i = 0; i < this.n; i++) {
             this.ybuffer[i].push(obj['data'][i][0]);
diff --git a/plotter/templates/tools.html b/plotter/templates/tools.html
index 584c494..27c238c 100644
--- a/plotter/templates/tools.html
+++ b/plotter/templates/tools.html
@@ -3,6 +3,21 @@
 {% block content %}
 <p>Useful tools and data from other partners/observatories.</p>
 <div class="card-columns p-2">
+
+  <div class="card text-justify">
+    <div class="card-body">
+      <h5 class="card-title">DOY Calendar</h5>
+      <p class="card-text">The day of year (DOY) is the sequential day number starting with day 1 on January 1st</p>
+      <input type="date" class="form-control tools-date" id="doy-date" placeholder="yyyy-mm-dd"
+          aria-describedby="validationTooltipSkynoiseDate" value="{% now 'Y-m-d' %}" required>
+        <div class="invalid-tooltip">
+          Please enter a valid date.
+        </div>
+        <p id="pdoy" class="card-text text-center" style="padding-top: 0.5em; font-weight:500; font-size:1.5em; color:var(--secondary);">DOY: {{doy}}</p>
+    </div>
+  </div>
+
+
   <div class="card text-justify">
     <img src="{% static 'images/skynoise.png' %}" class="card-img-top" alt="...">
     <div class="card-body">
@@ -101,8 +116,6 @@
     </div>
   </div>
 
-</div>
-
 <!-- Modal -->
 <div class="modal fade" id="toolModal" tabindex="-1" role="dialog" aria-labelledby="toolModalTitle" aria-hidden="true">
   <div class="modal-dialog modal-lg" role="document">
@@ -124,6 +137,7 @@
 
 {% block script %}
 <script>
+
   $('#toolModal').on('show.bs.modal', function (e) {
 
     //get data attribute of the clicked element
@@ -139,5 +153,18 @@
     $(e.currentTarget).find('h5').text(title);
     $(e.currentTarget).find('img').attr('src', image);
   });
+
+  $('#doy-date').change(function() {
+    var old = new Date($(this).val());
+    var now = new Date(old.getTime()+old.getTimezoneOffset()*60*1000);
+    var start = new Date(now.getFullYear(), 0, 0);
+    var diff = (now - start) // + ((start.getTimezoneOffset() - now.getTimezoneOffset()) * 60 * 1000);
+    var oneDay = 1000 * 60 * 60 * 24;
+    var doy = Math.floor(diff / oneDay);
+    $('#pdoy').text("DOY: " + doy);
+    console.log(now);
+    console.log(start);
+  });
+  
 </script>
 {% endblock script %}
\ No newline at end of file
diff --git a/plotter/views.py b/plotter/views.py
index 802ed62..490b1dd 100644
--- a/plotter/views.py
+++ b/plotter/views.py
@@ -71,7 +71,7 @@ class SPCSetupForm(forms.Form):
 def main(request, tag=None):
     
     kwargs = {}
-    date = request.GET.get('date', datetime.now().strftime('%d-%m-%Y'))
+    date = request.GET.get('date', datetime.utcnow().strftime('%d-%m-%Y'))
     exps = ExpDetail.objects(date=datetime.strptime(date, '%d-%m-%Y'))
     
     tmp = {}
@@ -101,31 +101,26 @@ def main(request, tag=None):
             dum['code'] = exp.experiment.code
             dum['plots'] = []
             dum['name'] = exp.experiment.name
-            dt = datetime.now()
-            
-            t = time.mktime(dt.timetuple())
-            t -= 5*60*60
+
+            t = time.time()
 
             if (t-exp['last_time']) > 6*exp['interval']:
                 status = 'Offline'
                 clase = 'alertas-offline'
                 style = 'danger'
-                lastDataDate = exp['last_time']
             elif (t-exp['last_time']) > 3*exp['interval']:
                 status = 'Delayed'
                 clase = 'alertas-delayed'
                 style = 'warning'
-                lastDataDate = exp['last_time']
             else:
                 status = 'Online'
                 clase = 'alertas-online'
                 style = 'success'
-                lastDataDate = exp['last_time']
 
             dum['status'] = status
             dum['class'] = clase
             dum['style']= style
-            dum['date']= datetime.utcfromtimestamp(lastDataDate)
+            dum['date']= datetime.fromtimestamp(exp['last_time'])
             for plot in exp.plots():
                 dum['plots'].append({'plot': plot.plot, 'name': plot.plot.replace('_', ' ').title(), 'id':plot.id})
             experiments.append(dum)
@@ -152,7 +147,8 @@ def tools(request):
     '''
     '''
     kwargs = {
-        'title': 'Tools'
+        'title': 'Tools',
+        'doy': (datetime.today().date()-datetime.today().date().replace(month=1, day=1)).days + 1
     }
     return render(request, 'tools.html', kwargs)
 
@@ -171,7 +167,7 @@ def plot(request, code=None, plot=None):
     realtime = False
     date = request.GET.get('date', None)
     if date is None:
-        date = datetime.now().strftime('%d-%m-%Y')
+        date = datetime.utcnow().strftime('%d-%m-%Y')
         realtime = True
     exp = Experiment.objects.get(code=int(code))
     detail = ExpDetail.objects.get(experiment=exp, date=datetime.strptime(date, '%d-%m-%Y'))
diff --git a/scripts/server.py b/scripts/server.py
index 63d81cd..9100be4 100644
--- a/scripts/server.py
+++ b/scripts/server.py
@@ -91,14 +91,11 @@ def check_times():
         for detail in exps:
             code = detail.experiment.code
             plot = detail.plots()[0]
-            data_time = detail['last_time']
-            t = time.mktime(dt.timetuple())
-            t -= 5*60*60
-            data_time = detail['last_time'] + 5*60*60
+            t = time.time()
 
             message = {
                 'code': code,
-                'time': data_time
+                'time': detail['last_time']
             }
 
             if (t-detail['last_time']) > 6*detail['interval']:
@@ -136,9 +133,6 @@ def main():
         if not isinstance(buffer, dict): 
             print('Invalid data received: {}').format(str(buffer))
             continue
-
-        if buffer['metadata']['localtime'] == True: # Ask which type of time is coming: LT o UTC
-            buffer['time'] -= 5*60*60
         
         if not update(buffer):
             print('Updating {} for code {}'.format(