Auto stash before merge of "dev" and "origin/dev"

Unknown
1 parent eebd68b3
Showing 13 changed files with 96 additions and 33 deletions Show diff stats
simulators/config/#test.py#
simulators/config/test.js
simulators/config/test.js~
simulators/config/test.py
simulators/config/test.py~
src/common/models.py
src/dashboard/templates/dashboard/operator_state.html
src/dashboard/templates/dashboard/send_command_telescope.html
src/dashboard/templatetags/tags.py
src/dashboard/views.py
src/misc/static/js/command_control.js
src/misc/templates/base.html
src/pyros/settings.py.bak
@@ -0,0 +1,4 @@
+import json
+
+def main():
+    with open with open('data.json') as
 \ No newline at end of file
@@ -0,0 +1,9 @@
+var fs = require("fs");
+var content = JSON.parse(fs.readFileSync("grammar.json"));
+ip = content["Telescope"]["set"][0]["input_label"][0];
+
+console.log(JSON.stringify(ip) + "\n\n");
+
+for (var tmp in ip){
+    console.log(ip[tmp][1] + '\n\n');}
+
@@ -0,0 +1,9 @@
+var fs = require("fs");
+var content = JSON.parse(fs.readFileSync("grammar.json"));
+ip = content["Telescope"]["set"][0]["input_label"][0];
+
+console.log(ip + "\n\n");
+
+for (var tmp in ip){
+    console.log(ip[tmp][1] + '\n\n');}
+
@@ -0,0 +1,14 @@
+import json
+
+def main():
+    with open('grammar.json', 'r') as f:
+        #print(f)
+        content = json.load(f)
+    content = content["Telescope"]["set"][0]["input_label"][0]["R.A."][0]
+    print(content)
+    #for c in content:
+        #print (c["R.A."])
+        #print("\n")
+        
+
+main()
@@ -0,0 +1,14 @@
+import json
+
+def main():
+    with open('grammar.json', 'r') as f:
+        #print(f)
+        content = json.load(f)
+    content = content["Telescope"]["set"][0]["input_label"][0]["R.A."]
+    print(content)
+    #for c in content:
+        #print (c["R.A."])
+        #print("\n")
+        
+
+main()
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
  
 from django.contrib.auth.models import AbstractUser
 from django.db import models
+from enum import Enum
  
 class Album(models.Model):
     sequence = models.ForeignKey(
@@ -819,14 +820,18 @@ class WeatherWatchHistory(models.Model):
         return (str(self.datetime))
  
  
+class PyrosState(Enum):
+    START = 'Starting'
+    PA = 'Passive'
+    INI = "INIT"
+    STAND = "Standby"
+    SCHED_START = 'Scheduler startup'
+    SCHED = 'Scheduler'
+    SCHED_CLOSE = 'Scheduler closing'
+
 class Config(models.Model):
-    SCHEDULER_STATE = (
-    ('0', 'init'),
-    ('1', 'sleeping'),
-    ('2', 'startup'),
-    ('3', 'observing'),
-    ('4', 'shutdown'),
-    )
+    SCHEDULER_STATE = ["Starting", 'Passive', "INIT", "Standby", 'Scheduler startup','Scheduler', 'Scheduler closing' ]
+
     id = models.IntegerField(default='1', primary_key=True)
     latitude = models.FloatField(default=1)
     local_time_zone = models.FloatField(default=1)
@@ -842,7 +847,7 @@ class Config(models.Model):
     global_mode = 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)
+    pyros_state = models.CharField(max_length=25, default=SCHEDULER_STATE[0])
     force_passive_mode = models.BooleanField(default='False')
     plc_timeout_seconds = models.PositiveIntegerField(default=60)
  
@@ -92,12 +92,8 @@
 <br><br><br>
 <div class="text-center">
     <a id="button" class="btn btn-primary btn-lg" href="{% url "change_globalMode" %}" onclick="return confirm('Are you sure you want to switch the controller mode ?')"> {% global_mode_state  request %} </a>
-    <br> <a id="button" class="btn btn-primary btn-lg" href="{% url "change_ack" %}" onclick="return confirm('Are you sure you want to acknowledge for the next night ?')"> {% ack  request %} </a>
-    {% if config.bypass == True %}
-        <br> <a id="button" class="btn btn-danger btn-lg" href="{% url "change_bypass" %}" onclick="return confirm('Are you sure you want to bypass the Plc ?')"> {% bypass request %} </a>
-    {% else %}
-        <br> <a id="button" class="btn btn-primary btn-lg" href="{% url "change_bypass" %}" onclick="return confirm('Are you sure you want to remove the plc bypass')"> {% bypass request %} </a>
-    {% endif %}
+    <br> <a id="button" class="btn btn-danger btn-lg" href="{% url "change_bypass" %}" onclick="return confirm('Are you sure you want to bypass the Plc ?')"> {% bypass request %} </a>
+
 </div>
  
 {% endblock %}
 \ No newline at end of file
@@ -98,9 +98,11 @@
                 </div>
         </div>
     </div>
+        <script> var data = {{ json_str | safe }}</script>
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 		<script src="{% static "/js/command_control.js" %}" type=text/javascript></script>
         <script>
+
             $( "#command_form" ).submit(function( event ) {
             alert( "Handler for .submit() called." );
             event.preventDefault();
 from django import template
-from common.models import Config, PyrosUser
+from common.models import Config, PyrosUser, PyrosState
  
 register = template.Library()
  
 @register.simple_tag
 def global_mode(request):
     try:
-        if (Config.objects.get(id=1).global_mode == True):
-            return("SCHEDULER MODE")
-        else:
-            return("REMOTE MODE")
+        state = Config.objects.get(id=1).pyros_state
+        if state:
+            return state
+        raise Config.DoesNotExist
     except Config.DoesNotExist:
         return ("NO CONFIG DB")
  
@@ -104,7 +104,7 @@ def retrieve_main_icon(request):
     if request.is_ajax():
         try:
             weather_status = WeatherWatch.objects.latest('updated')
-            plc_mode = PlcDeviceStatus.objects.latest('created').plc_mode
+            plc_mode = PlcDeviceStatus.objects.exclude(plc_mode=None).latest('created').plc_mode
  
             weather = serializers.serialize('json', [weather_status])
             weather = json.loads(weather)
@@ -274,7 +274,11 @@ def change_activate(request, pk):
  
 @login_required
 def send_command_to_telescope(request):
-    return render(request, "dashboard/send_command_telescope.html")
+    data = "lol"
+    with open('../simulators/config/grammar.json') as f:
+        data = json.load(f)
+        json_str = json.dumps(data)
+    return render(request, "dashboard/send_command_telescope.html", locals())
  
 @login_required
 def submit_command_to_telescope(request):
@@ -3,6 +3,14 @@ var expert_mode = false;
  
 jQuery(document).ready(function(){
  
+  var t = data["Telescope"]["set"][0]["input_label"][0];
+
+
+  t.forEach(function(entry) {
+    //console.log(entry);
+    console.log("-------------------");
+});
+
   function command_set()
   {
     var form = $("#command_form");
@@ -210,19 +210,13 @@ a {
                   $.get("{% url 'retrieve_env_navbar' %}", function (weather_status) {
                     if (weather_status)
                       {
-                          /*
-                          *** totally arbitrary method for day/night cycle, just for demonstration
-                           */
-                          //var hour = new Date().getTime();
-                          //var site_time = new Date(hour - 9 * 3600 * 1000).getHours();
-
-                          var sunelev = parseInt(weather_status[0]['sunelev']);
+                          var sunelev = parseFloat(weather_status[0]['sunelev']);
                           var max_sunelev = parseInt(weather_status[0]['max_sunelev']);
  
                           set_elev(sunelev);
                           change_color(sunelev, max_sunelev);
  
-                          var _img_day_night =document.createElement('img');
+                          var _img_day_night = document.createElement('img');
                           if (sunelev >= max_sunelev)
                               _img_day_night.src ="{% static 'media/rising_sun.png' %}";
                           else
@@ -53,7 +53,7 @@ SECRET_KEY = &#39;0*@w)$rq4x1c2w!c#gn58*$*u$w=s8uw2zpr_c3nj*u%qlxc23&#39;
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
  
-ALLOWED_HOSTS = ['localhost']
+ALLOWED_HOSTS = ['localhost', '127.0.0.1']
  
  
 # Application definition
@@ -85,13 +85,12 @@ INSTALLED_APPS = [
     #'kombu.transport.django'
 ]
  
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
@@ -120,12 +119,17 @@ FIXTURE_DIRS = (
     'misc/fixtures/',
 )
  
+EMAIL_HOST = 'smtp.gmail.com'
+EMAIL_PORT = 587
+EMAIL_HOST_USER = 'colibricontrolcenter'
+EMAIL_HOST_PASSWORD = '!ColibriCC31!'
+EMAIL_USE_TLS = True
 LOGIN_URL = "/"
  
 ''' DO NOT TOUCH THESE VARIABLES
 "$ pyros.py simulator_development" will automatically set them to "True"
 '''
-# FOR SIMULATOR (TODO: remove because not used)
+# FOR SIMULATOR (htopTODO: remove because not used)
 SIMULATOR = True
 # FOR SIMULATOR (and TESTS)
 CELERY_TEST = False