Database changes (Enum + operator states)

theopuhl
1 parent eebd68b3
Showing 4 changed files with 12 additions and 17 deletions Show diff stats
src/common/models.py
src/dashboard/templates/dashboard/index.html
src/dashboard/templates/dashboard/operator_state.html
src/dashboard/views.py
@@ -821,11 +821,14 @@ class WeatherWatchHistory(models.Model):
  
 class Config(models.Model):
     SCHEDULER_STATE = (
-    ('0', 'init'),
-    ('1', 'sleeping'),
-    ('2', 'startup'),
-    ('3', 'observing'),
-    ('4', 'shutdown'),
+    ('0', 'starting'),
+    ('1', 'passive'), 
+    ('2', 'Init'),
+    ('3', 'Standby'),
+    ('4', 'Scheduler startup'),
+    ('5', 'Scheduler'),
+    ('6', 'Scheduler closing'),
+    ('7', 'Passive'),
     )
     id = models.IntegerField(default='1', primary_key=True)
     latitude = models.FloatField(default=1)
@@ -842,7 +845,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=1, choices=SCHEDULER_STATE, default=0)
     force_passive_mode = models.BooleanField(default='False')
     plc_timeout_seconds = models.PositiveIntegerField(default=60)
  
@@ -109,7 +109,7 @@
 					<a href="{% url "states" %}">
 					<div class="all-info">
 						<h3>Observatory</h3>
-						<img  src="{% static "media/state.png" %}" alt="html5" height="200" width="200"/>
+						<img src="{% static "media/state.png" %}" alt="html5" height="200" width="200"/>
 					</div></a>
 				</div>
 			</li>
@@ -91,12 +91,9 @@
 </div>
 <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>
+    <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>
     {% endif %}
 </div>
  
@@ -31,10 +31,6 @@ def index(request):
         return render(request, 'dashboard/index.html', {'level': request.user.user_level.priority, 'base_template' : "base.html", 'weather_img': "normal"})                              # return the initial view (the dashboard's one)
     return render(request, 'dashboard/index.html', {'level': 0, 'base_template' : "base_unlogged.html", 'weather_img': "red"})                              # return the initial view (the dashboard's one)
  
-#@login_required
-#def observation_status(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
@@ -175,7 +171,6 @@ def proposal(request):
     return render(request, 'dashboard/proposal.html', {'proposal_info' : proposal_info, 'nb_info_proposal' : nb_info_proposal})
  
 @login_required
-@superuser_only
 def configUpdate(request):
     instance = get_object_or_404(Config, id=1)
     form = ConfigForm(request.POST or None, instance=instance)