PLC ACK + plc timeout

Quentin Durand
1 parent 6973f7df
Showing 10 changed files with 60 additions and 17 deletions Show diff stats
src/common/models.py
src/dashboard/templates/dashboard/observation_status_env.html
src/dashboard/views.py
src/misc/fixtures/initial_fixture.json
src/misc/static/media/cloud_no_plc.png
src/misc/static/media/rain_no_plc.png
src/misc/static/media/sun_no_plc.png
src/misc/static/media/wind_no_plc.png
src/misc/static/media/windsock_nowind_no_plc.png
src/misc/templates/base.html
@@ -840,10 +840,11 @@ class Config(models.Model):
     camera_ip_address = models.CharField(max_length=45, default="127.0.0.1")
     plc_ip_address = models.CharField(max_length=45, default="127.0.0.1")
     global_mode = models.BooleanField(default='True')
-    ack = models.BooleanField(default='True')
+    ack = models.BooleanField(default='False')
     bypass = models.BooleanField(default='True')
     scheduler_state = models.CharField(max_length=1, choices=SCHEDULER_STATE, default=0)
     force_passive_mode = models.BooleanField(default='False')
+    plc_timeout_seconds = models.PositiveIntegerField(default=60)
  
     class Meta:
         managed = True
@@ -28,12 +28,16 @@ figure figcaption {
         text-align: center;
         color: darkblue;
     }
+
+    #no_plc
+    {
+        color: red;
+    }
 </style>
- <h1 id="time"> Current site time : {{ t.hour }}h {{ t.minute }}min {{ t.second }}s</h1>
+<h1 id="time"> Current site time : {{ t.hour }}h {{ t.minute }}min {{ t.second }}s</h1>
 <div id="weather">
  
   <div class="element" id="day_night">
-
       {% if isDay %}
           <figure>
         <img src="{% static "media/rising_sun.png" %}" alt="" width="150" height="150">
@@ -50,7 +54,12 @@ figure figcaption {
   </div>
  
 <div class="element" id="sky_state">
-      {% if weather_status.rain > 10 %}
+      {% if timeout > plc_timeout %}
+        <figure>
+        <img src="{% static "media/rain_no_plc.png" %}" alt="" width="150" height="150">
+          <figcaption>Raining</figcaption>
+          </figure>
+      {% elif weather_status.rain > 10 %}
           <figure>
         <img src="{% static "media/rain.svg" %}" alt="" width="150" height="150">
           <figcaption>Raining</figcaption>
@@ -71,8 +80,12 @@ figure figcaption {
   </div>
  
     <div class="element" id="wind">
-
-      {% if weather_status.wind >= 60 %}
+      {% if timeout > plc_timeout %}
+        <figure>
+        <img src="{% static "media/wind_no_plc.png" %}" alt="" width="150" height="150">
+          <figcaption>Raining</figcaption>
+          </figure>
+      {% elif weather_status.wind >= 60 %}
           <figure>
         <img src="{% static "media/wind.png" %}" alt="" width="150" height="150">
           <figcaption>The Wind is too strong : {{ weather_status.wind }}km/h</figcaption>
@@ -83,7 +96,9 @@ figure figcaption {
           <figcaption>The Wind is acceptable : {{ weather_status.wind }}km/h</figcaption>
           </figure>
       {% endif %}
-
-
   </div>
+     {% if timeout > plc_timeout %}
+        <h2 id="no_plc">No plc online : last weather info received {{ timeout_affichage }} !</h2>
+     {% endif %}
+
 </div>
 \ No newline at end of file
@@ -19,6 +19,7 @@ from random import randint
 from devices.Telescope import TelescopeController
 from devices.TelescopeRemoteControl import TelescopeRemoteControl
 from django.core.mail import send_mail
+import time
  
 log = l.setupLogger("dashboard", "dashboard")
  
@@ -32,8 +33,15 @@ def index(request):
  #   return render(request, 'dashboard/observation_status.html')
  
 def retrieve_env(request):
+    '''
+        TODO: integrate Alain's code do determine day/night with sunelev and switch to utc time when the plc will use it
+    '''
+
     try:
         weather_status = WeatherWatch.objects.latest('updated')
+        plc_timeout = Config.objects.get(pk=1).plc_timeout_seconds
+        timeout = (datetime.datetime.now() - weather_status.updated).total_seconds()
+        timeout_affichage = datetime.datetime.now() - datetime.timedelta(seconds=timeout)
         t = datetime.datetime.now() + datetime.timedelta(hours=-7) #temporary method to demonstrate the day/night display
         isDay = False
         if t.hour > 5 and t.hour < 20:
@@ -48,11 +56,13 @@ def retrieve_env_navbar(request):
             weather_status = WeatherWatch.objects.latest('updated')
             plc_mode = PlcDeviceStatus.objects.latest('created').plc_mode
             is_safe = PlcDeviceStatus.objects.latest('created').is_safe
+            ack = Config.objects.get(id=1).ack
             weather = serializers.serialize('json', [weather_status])
             weather = json.loads(weather)
             weather[0]['sunelev'] = randint(-30, 30) #remplacer par l'appel au code d'Alain quand il sera dispo
             weather[0]["plc_mode"] = plc_mode
             weather[0]["is_safe"] = is_safe
+            weather[0]["ACK"] = ack
             return HttpResponse(json.dumps(weather), content_type="application/json")
         except WeatherWatch.DoesNotExist:
             raise Http404("No WeatherWatch matches the given query.")
@@ -570,8 +570,9 @@
         "camera_ip_address": "127.0.0.1",
         "plc_ip_address": "127.0.0.1",
         "global_mode": true,
-        "ack": false,
-        "bypass": false
+        "ack": true,
+        "bypass": false,
+        "plc_timeout_seconds": 60
     }
 }
 ]
@@ -3,7 +3,6 @@
 <head>
  
     {% load staticfiles %}
-  
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -78,7 +77,7 @@ a {
  
 #plc_state
 {
-    color: white;
+    color: black;
     font-size: 18px;
 }
  
@@ -139,8 +138,9 @@ a {
             <li><a class="nav-brand" id="hour">Sun elevation :</a></li>
             <li><a class="nav-brand" id="day_night" href="{% url "weather" %}"><img id="day_night_img"></a></li>
             <li><a class="nav-brand" id="wind" href="{% url "weather" %}"><img id="wind_img"></a></li>
-            <li><a class="nav-brand" id="globalmode" style="color: black;"> {% global_mode  request %} </a>              
             <li><a class="nav-brand" id="weather" href="{% url "weather" %}"><img id="weather_img"></a></li>
+            <li><a class="nav-brand" id="globalmode" style="color: black;"> {% global_mode  request %} </a>              
+
             <li>
                 <a class="nav-brand" href="{% url "profile" %}" style="color: black;"><i id="profile" class="fas fa-cog "></i></a>              
             </li>
@@ -155,6 +155,8 @@ a {
               var REFRESH_ICONS_FREQUENCE_MILLISECONDS = 1000;
               var MAX_RAIN_RATE = 10;
  
+              var check_change = true;
+
               $( document ).ready(function() {
               //get_hour();
               //setInterval(function() {get_hour();}, 900);
@@ -173,13 +175,28 @@ a {
                     color = "#6b69f3";
                 $("#topbar").css("background-color", color);
               }
-              function info_plc(is_safe, mode)
+              function info_plc(is_safe, mode, ack)
               {
+
+
                   var safe = "UNSAFE";
                   if (is_safe)
                       safe = "SAFE";
  
-                  $("#plc_state").text("PLC: " + mode + " " + safe);
+                  if (ack) {
+                      ack = "STAFF ACK: OK";
+                      if (!check_change)
+                          window.location.reload(true);
+                      check_change = true;
+                  }
+                  else
+                  {
+                      ack = "STAFF ACK: KO";
+                      $("#plc_state").css("background-color", "red");
+                      check_change = false;
+                  }
+
+                  $("#plc_state").text("PLC: " + mode + " " + safe + " " + ack);
               }
  
               ajax_request();
@@ -232,8 +249,7 @@ a {
  
                           set_elev(weather_status[0]['sunelev']);
                           change_color(parseInt(weather_status[0]['sunelev']));
-                          console.log(weather_status);
-                          info_plc(weather_status[0]["is_safe"], weather_status[0]["plc_mode"]);
+                          info_plc(weather_status[0]["is_safe"], weather_status[0]["plc_mode"], weather_status[0]["ACK"] );
                       }
                   }, 'json')
                       .fail(function () {