From 40ee3b96c32990c7862103257f9230c96c69a675 Mon Sep 17 00:00:00 2001
From: Quentin Durand <jayecon96@gmail.com>
Date: Thu, 14 Jun 2018 17:15:33 +0200
Subject: [PATCH] adding sunelevation front

---
 simulators/config/grammar.json | 13 ++++++++++---
 src/dashboard/views.py         |  7 +++++--
 src/misc/templates/base.html   | 15 +++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/simulators/config/grammar.json b/simulators/config/grammar.json
index 82b02c7..c5a739b 100644
--- a/simulators/config/grammar.json
+++ b/simulators/config/grammar.json
@@ -4,17 +4,24 @@
 			{
 				"name": "SPEED",
 				"nb_param": [2, 3],
-				"param_type": "float"
+				"param_type": "float",
+				"desc": "description",
+				"desc": "description",
+				"help": "help"
 			},
 			{
 				"name": "COORDS",
 				"nb_param": [2, 3],
-				"param_type": "float"
+				"param_type": "float",
+				"desc": "description",
+				"help": "help"
 			},
 			{
 				"name": "TRACKING_SPEED",
 				"nb_param": [2, 3],
-				"param_type": "float"
+				"param_type": "float",
+				"desc": "description",
+				"help": "help"
 			},
 			{
 				"name": "ACCEL",
diff --git a/src/dashboard/views.py b/src/dashboard/views.py
index f15e0e5..c45dd9e 100644
--- a/src/dashboard/views.py
+++ b/src/dashboard/views.py
@@ -15,6 +15,7 @@ from django.utils.decorators import method_decorator
 from django.urls import reverse_lazy, reverse
 from django.http import Http404
 import json
+from random import randint
 from devices.Telescope import TelescopeController
 from devices.TelescopeRemoteControl import TelescopeRemoteControl
 
@@ -39,7 +40,7 @@ def retrieve_env(request):
         isDay = False
         if t.hour > 5 and t.hour < 20:
             isDay = True
-        return render(request, 'dashboard/observation_status_env.html', )
+        return render(request, 'dashboard/observation_status_env.html', locals())
     except WeatherWatch.DoesNotExist:
             raise Http404("No WeatherWatch matches the given query.")
 
@@ -48,7 +49,9 @@ def retrieve_env_navbar(request):
         try:
             weather_status = WeatherWatch.objects.latest('updated')
             weather = serializers.serialize('json', [weather_status])
-            return HttpResponse(weather, content_type="application/json")
+            weather = json.loads(weather)
+            weather[0]['sunelev'] = randint(-30, 30)
+            return HttpResponse(json.dumps(weather), content_type="application/json")
         except WeatherWatch.DoesNotExist:
             raise Http404("No WeatherWatch matches the given query.")
 
diff --git a/src/misc/templates/base.html b/src/misc/templates/base.html
index 551c99a..25c944f 100644
--- a/src/misc/templates/base.html
+++ b/src/misc/templates/base.html
@@ -112,7 +112,7 @@ a {
             <li><a href="#">Images</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right navbar-user">
-              <li><a id="hour">lol</a></li>
+              <li><a id="hour">Sun elevation :</a></li>
             <li><a id="day_night" href="{% url "weather" %}"><img id="day_night_img"></a></li>
             <li><a id="wind" href="{% url "weather" %}"><img id="wind_img"></a></li>
             <li><a id="weather" href="{% url "weather" %}"><img id="weather_img"></a></li>
@@ -130,16 +130,16 @@ a {
             <script>
               var TOO_STRONG_WIND = 60; //Totally arbitrary values, just for demonstration
               var MAX_CLOUD_VALUE = 1;
-              var REFRESH_ICONS_FREQUENCE_MILLISECONDS = 60000;
+              var REFRESH_ICONS_FREQUENCE_MILLISECONDS = 1000;
               var MAX_RAIN_RATE = 10;
 
               $( document ).ready(function() {
-              get_hour();
-              setInterval(function() {get_hour();}, 900);
+              //get_hour();
+              //setInterval(function() {get_hour();}, 900);
 
-              function get_hour()
+              function set_elev(sun_elev)
               {
-                  $("#hour").text("Site time: " + moment().tz("America/Tijuana").format('LTS (Z UTC)'));
+                  $("#hour").text("Sun elevation : " + sun_elev);
               }
 
               ajax_request();
@@ -189,6 +189,9 @@ a {
                           else
                             _im.src= "{% static 'media/white_windsock_nowind_new.png' %}";
                           $("#wind_img").replaceWith(_im);
+
+                          set_elev(weather_status[0]['sunelev']);
+                          console.log(weather_status);
                       }
                   }, 'json')
                       .fail(function () {
--
libgit2 0.21.2