diff --git a/apps/main/models.py b/apps/main/models.py index 142741e..1debab8 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -438,8 +438,10 @@ class Experiment(models.Model): for conf in confs: conf.stop_device() conf.write_device() + conf.device.conf_active = conf.pk + conf.device.save() conf.start_device() - time.sleep(0.1) + time.sleep(1) except: return 0 return 2 diff --git a/apps/main/urls.py b/apps/main/urls.py index edea0ac..c893cdc 100644 --- a/apps/main/urls.py +++ b/apps/main/urls.py @@ -61,7 +61,8 @@ urlpatterns = ( url(r'^operation/$', views.operation, name='url_operation'), url(r'^operation/(?P-?\d+)/$', views.operation, name='url_operation'), - url(r'^operation/(?P-?\d+)/revoke$', views.revoke_tasks, name='url_operation_revoke'), + url(r'^operation/(?P-?\d+)/revoke$', views.revoke_tasks, name='url_operation_revoke'), + url(r'^operation/(?P-?\d+)/show$', views.show_tasks, name='url_operation_show'), url(r'^operation/(?P-?\d+)/radar/(?P-?\d+)/start/$', views.radar_start, name='url_radar_start'), url(r'^operation/(?P-?\d+)/radar/(?P-?\d+)/stop/$', views.radar_stop, name='url_radar_stop'), url(r'^operation/(?P-?\d+)/radar/(?P-?\d+)/refresh/$', views.radar_refresh, name='url_radar_refresh'), diff --git a/apps/main/views.py b/apps/main/views.py index 1b07cd2..62dc6bb 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -1877,6 +1877,23 @@ def revoke_tasks(request, id_camp): return HttpResponseRedirect(reverse('url_operation', args=[id_camp])) +@login_required +def show_tasks(request, id_camp): + + i = app.control.inspect() + scheduled = i.scheduled().values()[0] + revoked = i.revoked().values()[0] + + for t in scheduled: + if t['request']['id'] in revoked: + continue + exp = Experiment.objects.get(pk=eval(t['request']['args'])[0]) + eta = t['eta'] + task = t['request']['name'].split('.')[-1] + messages.success(request, 'Task {} scheduled at {} for experiment {}'.format(task, eta, exp.name)) + + return HttpResponseRedirect(reverse('url_operation', args=[id_camp])) + def real_time(request): graphic_path = "/home/fiorella/Pictures/catwbeanie.jpg"