Pushing on dev

Jeremy
1 parent e39312f1
Showing 6 changed files with 17 additions and 2 deletions Show diff stats
src/dashboard/views.py
src/misc/static/media/arrow_green.png
src/misc/static/media/error.png
src/misc/static/media/validate.jpg
src/pyros/settings.py
src/scheduler/templates/scheduler/current_schedule.html
@@ -35,7 +35,7 @@ def devices(request):
 @login_required
 def system(request):
     return render(request, 'dashboard/system.html')
-    
+
  
 @login_required
 def system_retrieve_logs(request):
@@ -183,8 +183,12 @@ USE_L10N = True
 USE_TZ = True
  
  
+# To find the media files {{ MEDIA_URL }}
+MEDIA_URL = '/public/static/media/'
+
+
 # To find the static files in the app/static/ap/... folders
-STATIC_URL = '/static/'
+STATIC_URL = '/public/static/'
  
 # To find the static files in src/static/. Any local directory can be added to this list.
 STATICFILES_DIRS = (
@@ -67,6 +67,7 @@
                     	class="table table-bordered table-hover table-striped tablesorter">
                         <thead>
                         	<tr>
+															<th>State <i class="fa fa-sort"></i></th>
 	                            <th>ID <i class="fa fa-sort"></i></th>
 	                            <th>Owner <i class="fa fa-sort"></i></th>
 	                            <th>Start <i class="fa fa-sort"></i></th>
@@ -80,8 +81,18 @@
                         </thead>
 						<tbody>
 							<!-- sequence is a tuple (sequence, shs) -->
+							{% load static %}
                             {% for sequence in sequences %}
 	                            <tr>
+																	<td>
+																		{% if sequence.processing = 1 %}
+																		<img src="{% static "media/arrow_green.png" %}" alt="html5" height="30" width="30" style="margin-left:25%"/>
+																		{% elif sequence.processing = 0 and sequence.status = "EXECUTED" %}
+																		<img src="{% static "media/validate.jpg" %}" alt="html5" height="30" width="30" style="margin-left:25%"/>
+																		{% else %}
+																		<img src="{% static "media/error.png" %}" alt="{{sequence.processing}}" height="30" width="30" style="margin-left:25%"/>
+																		{% endif %}
+																	</td>
 	                                <td>{{ sequence.0.id }}</td>
 	                                <td>{{ sequence.0.request.pyros_user.user.username }}</td>
 	                                <td>{{ sequence.1.tsp|jdtodate }}</td>