radarsys Commit - r91:620bd5874a5a · Jicamarca Repository

Update new and edit "views"...

Juan C. Espinoza -

r91:620bd5874a5a

parent child

Context file:

r91:620bd5874a5a

Collapse all files

apps/main/forms.py +3 0

                     self.fields['start_date'].widget = DatepickerWidget(self.fields['start_date'].widget.attrs)
                     self.fields['end_date'].widget = DatepickerWidget(self.fields['end_date'].widget.attrs)
                     self.fields['description'].widget.attrs = {'rows': 2}
+                    if self.instance:
+                        self.fields['experiments'].queryset |= self.instance.experiments.all()
                 class Meta:
                     model = Campaign

apps/main/models.py +6 -3

                 class Meta:
                     db_table = 'db_experiments'
-                    ordering = ('name',)
+                    ordering = ('template', 'name')
                 def __unicode__(self):
-                    return u'%s' % (self.name)
+                    if self.template:
+                        return u'%s (template)' % (self.name)
+                    else:
+                        return u'%s' % (self.name)
                 @property
                 def radar(self):
                     elif self.status == 1:
                         color = "info"
                     elif self.status == 2:
-                        color = "succes"
+                        color = "success"
                     elif self.status == 3:
                         color = "warning"
                     else:

apps/main/templates/experiment.html +1 -1

                   <table class="table table-hover">
             		<tr>
             		  <th>#</th>
-            		  {% for key in configuration_labels %}
+            		  {% for key in configuration_keys %}
             		  <th>{{ key|title }}</th>
             		  {% endfor%}
             		</tr>

apps/main/templates/experiment_edit.html +2 -24

@@ -1,4 +1,4
1	{% extends "base.html" %}	1	{% extends "base_edit.html" %}
2	{% load bootstrap3 %}	2	{% load bootstrap3 %}
3	{% load static %}	3	{% load static %}
4	{% load main_tags %}	4	{% load main_tags %}
@@ -6,28 +6,6
6	<link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">	6	<link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
7	{% endblock %}	7	{% endblock %}
8		8
9	{% block exp-active %}active{% endblock %}
10
11	{% block content-title %}{{title}}{% endblock %}
12	{% block content-suptitle %}{{suptitle}}{% endblock %}
13
14	{% block content %}
15	<form class="form" method="post" action="">
16	{% csrf_token %}
17	{% bootstrap_form form layout='horizontal' size='medium' %}
18	<div style="clear: both;"></div>
19	<br>
20	{% if button %}
21	<br>
22	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>
23	{% endif %}
24	</form>
25	{% endblock %}
26
27	{% block sidebar%}
28	{% include "sidebar_devices.html" %}
29	{% endblock %}
30
31	{% block extra-js%}	9	{% block extra-js%}
32	<script src="{% static 'js/moment.min.js' %}"></script>	10	<script src="{% static 'js/moment.min.js' %}"></script>
33	<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>	11	<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
@@ -41,7 +19,7
41		19
42	$('#id_create_from').change(function() {	20	$('#id_create_from').change(function() {
43	var url = "{% url 'url_add_experiment' %}";	21	var url = "{% url 'url_add_experiment' %}";
44	if ($(this).val()=="2"){	22	if ($(this).val()=="2"){
45	document.location = url+"?template=0";	23	document.location = url+"?template=0";
46	}else if ($(this).val()=="1"){	24	}else if ($(this).val()=="1"){
47	document.location = url+"?blank=0";	25	document.location = url+"?blank=0";

apps/main/templatetags/main_tags.py +1 -1

             @register.filter
             def title(s):
-                return s.replace('_', ' ').title()
+                return s.split('__')[-1].replace('_', ' ').title()
             @register.filter
             def value(instance, key):

apps/main/views.py +56 -33

                             kwargs['button'] = 'Create'
                             kwargs['experiments'] = Configuration.objects.filter(experiment=request.GET['template'])
                             kwargs['experiment_keys'] = ['name', 'start_time', 'end_time']
-                            form = CampaignForm(instance=Campaign.objects.get(pk=request.GET['template']),
+                            camp = Campaign.objects.get(pk=request.GET['template'])
-                                                initial={'template':False})
+                            form = CampaignForm(instance=camp,
+                                                initial={'name':'{} [{:%Y/%m/%d}]'.format(camp.name, datetime.now()),
+                                                         'template':False})
                     elif 'blank' in request.GET:
                         kwargs['button'] = 'Create'
                         form = CampaignForm()
                     form = CampaignForm(instance=campaign)
                 if request.method=='POST':
-                    form = CampaignForm(request.POST, instance=campaign)
+                    exps = campaign.experiments.all().values_list('pk', flat=True)
+                    post = request.POST.copy()
+                    new_exps = post.getlist('experiments')
+                    post.setlist('experiments', [])
+                    form = CampaignForm(post, instance=campaign)
                     if form.is_valid():
-                        form.save()
+                        camp = form.save()
+                        for id_exp in new_exps:
+                            if int(id_exp) in exps:
+                                exps.pop(id_exp)
+                            else:
+                                exp = Experiment.objects.get(pk=id_exp)
+                                if exp.template:
+                                    camp.experiments.add(exp.clone(template=False))
+                                else:
+                                    camp.experiments.add(exp)
+                        for id_exp in exps:
+                            camp.experiments.remove(Experiment.objects.get(pk=id_exp))
                         return redirect('url_campaign', id_camp=id_camp)
                 kwargs = {}
                 kwargs = {}
-                exp_keys = ['id', 'location', 'name', 'start_time', 'end_time']
+                kwargs['experiment_keys'] = ['template', 'radar', 'name', 'start_time', 'end_time']
-                conf_keys = ['id', 'device__name', 'device__device_type', 'device__ip_address', 'device__port_address']
-                conf_labels = ['id', 'device__name', 'device_type', 'ip_address', 'port_address']
-                kwargs['experiment_keys'] = exp_keys[1:]
                 kwargs['experiment'] = experiment
-                kwargs['configuration_labels'] = conf_labels[1:]
+                kwargs['configuration_keys'] = ['device__name', 'device__device_type', 'device__ip_address', 'device__port_address']
-                kwargs['configuration_keys'] = conf_keys[1:]
+                kwargs['configurations'] = configurations
-                kwargs['configurations'] = configurations #.values(*conf_keys)
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Details'
                             kwargs['button'] = 'Create'
                             kwargs['configurations'] = Configuration.objects.filter(experiment=request.GET['template'])
                             kwargs['configuration_keys'] = ['name', 'device__name', 'device__ip_address', 'device__port_address']
-                            form = ExperimentForm(instance=Experiment.objects.get(pk=request.GET['template']),
+                            exp=Experiment.objects.get(pk=request.GET['template'])
-                                                  initial={'template':False})
+                            form = ExperimentForm(instance=exp,
+                                                  initial={'name': '{} [{:%Y/%m/%d}]'.format(exp.name, datetime.now()),
+                                                           'template': False})
                     elif 'blank' in request.GET:
                         kwargs['button'] = 'Create'
                         form = ExperimentForm()
                 if request.method=='POST':
                     if request.user.is_staff:
+                        for conf in Configuration.objects.filter(experiment=experiment):
+                            conf.delete()
                         experiment.delete()
                         return redirect('url_experiments')
-                    return HttpResponse("Not enough permission to delete this object")
+                    messages.error(request, 'Not enough permission to delete this object')
+                    return redirect(experiment.get_absolute_url())
-                kwargs = {'object':experiment, 'exp_active':'active',
+                kwargs = {
-                          'url_cancel':'url_experiment', 'id_item':id_exp}
+                          'title': 'Delete',
+                          'suptitle': 'Experiment',
+                          'object': experiment,
+                          'previous': experiment.get_absolute_url(),
+                          'delete': True
+                          }
-                return render(request, 'item_delete.html', kwargs)
+                return render(request, 'confirm.html', kwargs)
             def dev_confs(request):
                 configurations = Configuration.objects.all().order_by('type', 'device__device_type', 'experiment')
-            #     keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
-                keys = ['id', 'device', 'experiment', 'type', 'programmed_date']
                 kwargs = {}
-                kwargs['configuration_keys'] = keys[1:]
+                kwargs['configuration_keys'] = ['device', 'experiment', 'type', 'programmed_date']
-                kwargs['configurations'] = configurations#.values(*keys)
+                kwargs['configurations'] = configurations
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'List'
-                kwargs['button'] = 'New Configuration'
                 return render(request, 'dev_confs.html', kwargs)
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))
-                return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
+                return render(request, '%s_conf_edit.html' % conf.device.device_type.name, kwargs)
             def dev_conf_start(request, id_conf):
                 if request.method=='POST':
                     if request.user.is_staff:
-                        id_exp = conf.experiment.id
                         conf.delete()
-                        return redirect('url_experiment', id_exp=id_exp)
+                        return redirect('url_dev_confs')
-                    return HttpResponse("Not enough permission to delete this object")
+                    messages.error(request, 'Not enough permission to delete this object')
+                    return redirect(conf.get_absolute_url())
-                kwargs = {'object':conf, 'conf_active':'active',
+                kwargs = {
-                      'url_cancel':'url_dev_conf', 'id_item':id_conf}
+                          'title': 'Delete',
+                          'suptitle': 'Experiment',
+                          'object': conf,
+                          'previous': conf.get_absolute_url(),
+                          'delete': True
+                          }
-                return render(request, 'item_delete.html', kwargs)
+                return render(request, 'confirm.html', kwargs)
             def sidebar(**kwargs):

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