radarsys_met Commit - r330:9627993550b8

Fix bugs and add revoke tasks method

Juan C. Espinoza -

r330:9627993550b8

parent child

Context file:

r330:9627993550b8

Collapse all files

apps/main/urls.py +1 0

                 url(r'^operation/$', views.operation, name='url_operation'),
                 url(r'^operation/(?P<id_camp>-?\d+)/$', views.operation, name='url_operation'),
+                url(r'^operation/(?P<id_camp>-?\d+)/revoke$', views.revoke_tasks, name='url_operation_revoke'),
                 url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/start/$', views.radar_start, name='url_radar_start'),
                 url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/stop/$', views.radar_stop, name='url_radar_stop'),
                 url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/refresh/$', views.radar_refresh, name='url_radar_refresh'),

apps/main/views.py +25 -8

             def dev_confs(request):
                 page = request.GET.get('page')
-                order = ('programmed_date', )
+                order = ('-programmed_date', )
                 filters = request.GET.copy()
                 if 'my configurations' in filters:
                     filters.pop('my configurations', None)
                     if start > campaign.end_date or start < campaign.start_date:
                         messages.warning(request, 'Experiment {} out of date'.format(exp))
                         continue
+                    app.control.revoke(exp.task)
                     if now > start and now <= end:
-                        exp.status = 3
-                        exp.save()
                         task = task_start.delay(exp.id)
                         exp.status = task.wait()
                         if exp.status == 0:
                 experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
                 i = app.control.inspect()
-                scheduled = i.scheduled().values[0]
+                scheduled = i.scheduled().values()[0]
-                revoked = i.revoked().values[0]
+                revoked = i.revoked().values()[0]
                 for exp in experiments:
                     if exp.task in revoked:
                         exp.status = 1
-                    elif exp.task in [t['request']['id'] for t in scheduled if 'task_start' in t['request']['name']]:
-                        exp.status = 2
                     elif exp.task in [t['request']['id'] for t in scheduled if 'task_stop' in t['request']['name']]:
+                        exp.status = 2
+                    elif exp.task in [t['request']['id'] for t in scheduled if 'task_start' in t['request']['name']]:
                         exp.status = 3
                     else:
                         exp.status = 4
                     exp.save()
                 return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
+            @login_required
+            def revoke_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
+                    app.control.revoke(t['request']['id'])
+                    exp = Experiment.objects.get(pk=eval(t['request']['args'])[0])
+                    eta = t['eta']
+                    task = t['request']['name'].split('.')[-1]
+                    messages.warning(request, 'Scheduled {} at {} for experiment {} revoked'.format(task, eta, exp.name))
+                return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
             def real_time(request):

apps/rc/static/js/cr.js +2 -2

             function str2unit(s){
-              var km2unit = (20/3)*(parseFloat($('#id_clock_in').val())/parseFloat($('#id_clock_divider').val()));
+              var km2unit = (20/3)*(parseFloat($('#id_frequency').val())/parseFloat($('#id_clock_divider').val()));
               var ret = "";
               values = s.split(",");
               for (i=0; i<values.length; i++) {
             function str2km(s){
-              var km2unit = (20/3)*(parseFloat($('#id_clock_in').val())/parseFloat($('#id_clock_divider').val()));
+              var km2unit = (20/3)*(parseFloat($('#id_frequency').val())/parseFloat($('#id_clock_divider').val()));
               var ret = "";
               values = s.split(",");
               for (i=0; i<values.length; i++) {

apps/rc/views.py +4 -1

                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 lines = RCLine.objects.filter(rc_configuration=conf).order_by('channel')
-                clk = RCClock.objects.get(rc_configuration=conf)
+                clk = RCClock.objects.filter(rc_configuration=conf).first()
+                if clk is None:
+                    clk = RCClock(rc_configuration=conf)
+                    clk.save()
                 for line in lines:
                     params = json.loads(line.params)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages