radarsys Commit - r306:026b526b64ec · Jicamarca Repository

Improve operation & search views

Juan C. Espinoza -

r306:026b526b64ec

parent child

Context file:

r306:026b526b64ec

Collapse all files

apps/main/forms.py +2 -2

                             if 'initial' in kwargs:
                                 self.fields[field].widget.attrs = {'start_date':kwargs['initial'].get('start_date', ''),
                                                                    'end_date':kwargs['initial'].get('end_date', '')}
-                        elif 'template' in field:
+                        elif  field in ('template', 'historical'):
-                            self.fields['template'] = forms.BooleanField(required=False)
+                            self.fields[field] = forms.BooleanField(required=False)
                         else:
                             self.fields[field] = forms.CharField(required=False)

apps/main/models.py +19 -31

                     data['end_time'] = data['end_time'].strftime('%H:%M:%S')
                     data['location'] = self.location.name
                     data['configurations'] = ['{}'.format(conf.pk) for
-                        conf in Configuration.objects.filter(experiment=self)]
+                        conf in Configuration.objects.filter(experiment=self, type=0)]
                     return data
                     result = 2
-                    confs = Configuration.objects.filter(experiment=self).filter(type = 0).order_by('-device__device_type__sequence')
+                    confs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
                     #Only Configured Devices.
                     for conf in confs:
-                        dev_status = conf.device.status
+                        if conf.device.status in (0, 4):
-                        if dev_status in [0,4]:
                             result = 0
                             return result
-                        else:
+                    for conf in confs:
-                            if conf.device.device_type.name != 'jars':
+                        conf.stop_device()
-                                conf.write_device()
+                        #conf.write_device()
-                                time.sleep(1)
+                        conf.start_device()
-                                print conf.device.name+' has started...'
+                        print conf.device.name+' has started...'
-                            else:
-                                conf.stop_device()
-                                conf.write_device()
-                                conf.start_device()
-                                print conf.device.name+' has started...'
                     return result
                     result = 1
-                    confs = Configuration.objects.filter(experiment=self).filter(type = 0).order_by('device__device_type__sequence')
+                    confs = Configuration.objects.filter(experiment=self, type = 0).order_by('device__device_type__sequence')
-                    for conf in confs:
-                        dev_status = conf.device.status
-                        if dev_status in [0,4]:
-                            result = 0
-                            return result
-                    #Stop Device
                     confs=confs.exclude(device__device_type__name='cgs')
                     for conf in confs:
-                        if conf.device.device_type.name != 'rc':
+                        if conf.device.status in (0, 4):
-                            conf.stop_device()
+                            result = 0
-                        else:
+                            continue
-                            conf.reset_device()
+                        conf.stop_device()
                         print conf.device.name+' has stopped...'
                     return result
                 def get_status(self):
-                    confs =  Configuration.objects.filter(experiment=self)
+                    if self.status == 3:
+                        return
+                    confs =  Configuration.objects.filter(experiment=self, type=0)
                     for conf in confs:
                         conf.status_device()
                     else:
                         status = 0
-                    if self.status<>3:
+                    self.status = status
-                        self.status = status
+                    self.save()
-                        self.save()
                 def status_color(self):
                     color = 'muted'

apps/main/tasks.py +7 0

                 return exp.stop()
+            def kill_tasks():
+                i = task.control.inspect()
+                tasks = i.scheduled()
+                print tasks
+                #if tasks:
+                #    print dir(tasks[0])
             #Task to get status
             @task

apps/main/templates/operation.html +33 -3

@@ -12,12 +12,42
12		12
13	{% block content %}	13	{% block content %}
14		14
15	{% bootstrap_form form layout='horizontal' size='medium' %}	15	<div class="clearfix"></div>
16	<div style="clear: both;"></div>	16
		17	{% if campaigns %}
		18
		19	<h3>Current Campaigns</h3>
		20	<br>
		21
		22	<div class="bootcards-list">
		23	<div class="panel panel-default">
		24	<div class="list-group">
		25	{% for item in campaigns %}
		26	<a class="list-group-item" href="{{item.pk}}">
		27	<div class="row">
		28	<div class="col-sm-6">
		29	<i class="fa fa-3x fa-calendar pull-left"></i>
		30	<h4 class="list-group-item-heading">{{item.name}}</h4>
		31	<p class="list-group-item-text">Radar: {% for radar in item.get_experiments_by_radar %}{{radar.name}},{% endfor %}</p>
		32	</div>
		33	<div class="col-sm-6">
		34	<p class="list-group-item-text">From: {{item.start_date}}</p>
		35	<p class="list-group-item-text">To: {{item.end_date}}</p>
		36	</div>
		37	</div>
		38	</a>
		39	{% endfor %}
		40	</div>
		41	</div>
		42	</div>
		43
		44
		45
		46	{% endif %}
		47
17		48
18	{% if campaign %}	49	{% if campaign %}
19		50
20	<div class="clearfix"></div>
21	<h3>Systems</h3>	51	<h3>Systems</h3>
22	<br>	52	<br>
23	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" >	53	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" >

apps/main/views.py +27 -17

             import ast
             import json
-            from datetime import datetime
+            from datetime import datetime, timedelta
             from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
             from django.utils.safestring import mark_safe
             from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm
             from .forms import OperationSearchForm, FilterForm, ChangeIpForm
-            from .tasks import task_start, task_stop, task_status
+            from .tasks import task_start, task_stop, task_status, kill_tasks
             from apps.rc.forms import RCConfigurationForm, RCLineCode, RCMixConfigurationForm
             from apps.dds.forms import DDSConfigurationForm
                             kwargs['experiment_keys'] = ['name', 'start_time', 'end_time']
                             camp = Campaign.objects.get(pk=request.GET['template'])
                             form = CampaignForm(instance=camp,
-                                                initial={'name':'{} [{:%Y/%m/%d}]'.format(camp.name, datetime.now()),
+                                                initial={'name':'{}_{:%Y%m%d}'.format(camp.name, datetime.now()),
                                                          'template':False})
                     elif 'blank' in request.GET:
                         kwargs['button'] = 'Create'
                 kwargs = get_paginator(Configuration, page, order, filters)
-                form = FilterForm(initial=request.GET, extra_fields=['tags','template'])
+                form = FilterForm(initial=request.GET, extra_fields=['tags', 'template', 'historical'])
                 kwargs['keys'] = ['name', 'experiment', 'type', 'programmed_date']
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'List'
                 else:
                     messages.error(request, conf.message)
-                return redirect(conf.get_absolute_url())
+                return redirect(get_object_or_404(Configuration, pk=id_conf).get_absolute_url())
             @user_passes_test(lambda u:u.is_staff)
                 [filters.pop(key) for key in filters.keys() if filters[key] in ('', ' ')]
                 filters.pop('page', None)
+                fields = [f.name for f in model._meta.get_fields()]
                 if 'template' in filters:
                     filters['template'] = True
+                if 'historical' in filters:
+                    filters.pop('historical')
+                    filters['type'] = 1
+                elif 'type' in fields:
+                    filters['type'] = 0
                 if 'start_date' in filters:
                     filters['start_date__gte'] = filters.pop('start_date')
                 if 'end_date' in filters:
                     filters['start_date__lte'] = filters.pop('end_date')
                 if 'tags' in filters:
                     tags = filters.pop('tags')
-                    fields = [f.name for f in model._meta.get_fields()]
                     if 'tags' in fields:
                         query = query | Q(tags__icontains=tags)
                     if 'name' in fields:
                     form = OperationForm(initial={'campaign': campaign.id}, campaigns=campaigns)
                     kwargs['campaign'] = campaign
                 else:
-                    form = OperationForm(campaigns=campaigns)
+                    # form = OperationForm(campaigns=campaigns)
-                    kwargs['form'] = form
+                    kwargs['campaigns'] = campaigns
                     return render(request, 'operation.html', kwargs)
                 #---Experiment
                 campaign = get_object_or_404(Campaign, pk = id_camp)
                 experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
-                now = datetime.utcnow()
+                now = datetime.now()
                 for exp in experiments:
-                    date = datetime.combine(datetime.now().date(), exp.start_time)
+                    start = datetime.combine(datetime.now().date(), exp.start_time)
+                    end = datetime.combine(datetime.now().date(), exp.start_time)
+                    if end < start:
+                        end += timedelta(1)
                     if exp.status == 2:
                         messages.warning(request, 'Experiment {} already running'.format(exp))
                         continue
                         messages.warning(request, 'Experiment {} already programmed'.format(exp))
                         continue
-                    if date>campaign.end_date or date<campaign.start_date:
+                    if start > campaign.end_date or start < campaign.start_date:
                         messages.warning(request, 'Experiment {} out of date'.format(exp))
                         continue
-                    if now>=date:
+                    if now > start and now <= end:
                         task = task_start.delay(exp.pk)
                         exp.status = task.wait()
                         if exp.status==0:
                             messages.error(request, 'Experiment {} not start'.format(exp))
                         if exp.status==2:
+                            task = task_stop.apply_async((exp.pk,), eta=end+timedelta(hours=5))
                             messages.success(request, 'Experiment {} started'.format(exp))
                     else:
-                        task = task_start.apply_async((exp.pk,), eta=date)
+                        task = task_start.apply_async((exp.pk,), eta=start+timedelta(hours=5))
+                        task = task_stop.apply_async((exp.pk,), eta=end+timedelta(hours=5))
                         exp.status = 3
-                        messages.success(request, 'Experiment {} programmed to start at {}'.format(exp, date))
+                        messages.success(request, 'Experiment {} programmed to start at {}'.format(exp, start))
                     exp.save()
                         exp.save()
                     else:
                         messages.error(request, 'Experiment {} not running'.format(exp))
+                kill_tasks()
                 return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))

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