radarsys Commit - r85:d4fe0e132735 · Jicamarca Repository

Update several views and models in main app...

Juan C. Espinoza -

r85:d4fe0e132735

parent child

Context file:

r85:d4fe0e132735

Expand all files

apache/apache_radarsys.conf +2 -7

             WSGIScriptAlias / /usr/local/radarsys/radarsys/wsgi.py
             WSGIPythonPath /usr/local/radarsys/:/usr/local/virtuals/radarsys/lib/python2.7/site-packages
-            Alias /static/ /usr/local/radarsys/apps/main/static/
+            Alias /static/ /var/www/html/static/
-            <Directory /usr/local/radarsys/apps/main/static>
-                Require all granted
-            </Directory>
             <Directory /usr/local/radarsys/>
               <Files wsgi.py>
                 Require all granted
                 #Allow from all
               </Files>
-            </Directory>
+            </Directory>
  No newline at end of file

apps/cgs/forms.py +7 -7

             from .models import CGSConfiguration
             class CGSConfigurationForm(forms.ModelForm):
-                #freq0.widget = te
                 def __init__(self, *args, **kwargs):
                     #request = kwargs.pop('request')
                     super(CGSConfigurationForm, self).__init__(*args, **kwargs)
                     if instance and instance.pk:
                         devices = Device.objects.filter(device_type__name='cgs')
-                        items = devices.values('id', 'name', 'device_type__name', 'ip_address')
-                        self.fields['experiment'].widget.attrs['readonly'] = True
+                        if instance.experiment:
-                        self.fields['device'].widget.choices = [(item['id'], '[%s]: %s | %s' % (item['device_type__name'], item['name'], item['ip_address'])) for item in items]
+                            self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
+                        self.fields['device'].widget.choices = [(device.id, device) for device in devices]
                 def clean(self):
                     return
                 class Meta:
                     model = CGSConfiguration
-                    #exclude = ('freqs', 'clk_in', 'mult','div',)
+                    exclude = ('type', 'parameters', 'status')
-            #         exclude = ('freqs',)
+                    #fields = ('experiment', 'device', 'freq0', 'freq1', 'freq2', 'freq3')
-                    fields = ('experiment', 'device', 'freq0', 'freq1', 'freq2', 'freq3')
             class UploadFileForm(forms.Form):

apps/cgs/models.py 0 -2

                 freq1 = models.IntegerField(verbose_name='Frequency 1',validators=[MinValueValidator(0), MaxValueValidator(450e6)], blank=True, null=True)
                 freq2 = models.IntegerField(verbose_name='Frequency 2',validators=[MinValueValidator(0), MaxValueValidator(450e6)], blank=True, null=True)
                 freq3 = models.IntegerField(verbose_name='Frequency 3',validators=[MinValueValidator(0), MaxValueValidator(450e6)], blank=True, null=True)
-                #jfreqs = JSONField(default={"frequencies":[{"f0":freq0,"f1":freq1,"f2":freq2,"f3":freq3}]}, blank=True)
                 def verify_frequencies(self):

apps/cgs/views.py +1 -5

                 kwargs['no_play'] = True
                 ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
+                kwargs.update(sidebar(conf=conf))
                 return render(request, 'cgs_conf.html', kwargs)
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Save'
-                ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
                 return render(request, 'cgs_conf_edit.html', kwargs)
             #
             # def cgs_conf_write(request, id_conf):

apps/dds/forms.py +2 -4

                         devices = Device.objects.filter(device_type__name='dds')
-                        self.fields['experiment'].widget.attrs['readonly'] = True
+                        if instance.experiment:
+                            self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
-                        if instance.experiment is not None:
-                            self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
                         self.fields['device'].widget.choices = [(device.id, device) for device in devices]

apps/dds/views.py +1 -4

                 kwargs['button'] = 'Edit Configuration'
                 ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
+                kwargs.update(sidebar(conf=conf))
                 return render(request, 'dds_conf.html', kwargs)
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Save'
-                ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
                 return render(request, 'dds_conf_edit.html', kwargs)
             # def dds_conf_import(request, id_conf):

apps/main/fixtures/main_initial_data.json +4 -3

             [
-            {"fields": {"name": "JRO", "description": ""}, "model": "main.location", "pk": 1},
+            {"fields": {"name": "MAIN RADAR", "description": ""}, "model": "main.location", "pk": 1},
             {"fields": {"name": "JASMET", "description": ""}, "model": "main.location", "pk": 2},
             {"fields": {"name": "SOUSY", "description": ""}, "model": "main.location", "pk": 3},
+            {"fields": {"name": "JULIA", "description": ""}, "model": "main.location", "pk": 4},
             {"fields": {"name": "rc", "description": ""}, "model": "main.devicetype", "pk": 1},
             {"fields": {"name": "dds", "description": ""}, "model": "main.devicetype", "pk": 2},
             {"fields": {"name": "cgs", "description": ""}, "model": "main.devicetype", "pk": 3},

apps/main/forms.py +26 -2

                     return mark_safe(html)
             class CampaignForm(forms.ModelForm):
+                experiments = forms.ModelMultipleChoiceField(widget=forms.CheckboxSelectMultiple(),
+                                                             queryset=Experiment.objects.filter(template=True),
+                                                             required=False)
                 def __init__(self, *args, **kwargs):
                     super(CampaignForm, self).__init__(*args, **kwargs)
                     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}
                 class Meta:
                     model = Campaign
                     super(ExperimentForm, self).__init__(*args, **kwargs)
                     self.fields['start_time'].widget = TimepickerWidget(self.fields['start_time'].widget.attrs)
                     self.fields['end_time'].widget = TimepickerWidget(self.fields['end_time'].widget.attrs)
-                    self.fields['campaign'].widget.attrs['readonly'] = True
                 class Meta:
                     model = Experiment
                     exclude = ['status']
             class ConfigurationForm(forms.ModelForm):
+                def __init__(self, *args, **kwargs):
+                    super(ConfigurationForm, self).__init__(*args, **kwargs)
+                    if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
+                        self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
                 class Meta:
                     model = Configuration
                     exclude = ['type', 'created_date', 'programmed_date', 'parameters']
                 def __init__(self, *args, **kwargs):
                     super(OperationSearchForm, self).__init__(*args, **kwargs)
                     self.fields['campaign'].choices=Campaign.objects.all().order_by('-start_date').values_list('id', 'name')
+            class NewForm(forms.Form):
+                create_from = forms.ChoiceField(choices=((0, '-----'),
+                                                         (1, 'Empty (blank)'),
+                                                         (2, 'Template')))
+                choose_template = forms.ChoiceField()
+                def __init__(self, *args, **kwargs):
+                    template_choices = kwargs.pop('template_choices', [])
+                    super(NewForm, self).__init__(*args, **kwargs)
+                    self.fields['choose_template'].choices = add_empty_choice(template_choices)
   No newline at end of file

apps/main/models.py +36 -23

+            from datetime import datetime
             from django.db import models
             from polymorphic import PolymorphicModel
             class Campaign(models.Model):
                 template = models.BooleanField(default=False)
+                name = models.CharField(max_length=60, unique=True)
-                name = models.CharField(max_length=40, unique=True)
-                experiment = models.ManyToManyField('Experiment')
                 start_date = models.DateTimeField(blank=True, null=True)
                 end_date = models.DateTimeField(blank=True, null=True)
                 tags = models.CharField(max_length=40)
                 description = models.TextField(blank=True, null=True)
+                experiments = models.ManyToManyField('Experiment', blank=True)
                 class Meta:
                     db_table = 'db_campaigns'
+                    ordering = ('name',)
                 def __unicode__(self):
                     return u'%s' % (self.name)
-            # class Radar(models.Model):
-            # #     name = models.CharField(max_length = 30)
-            #     experiment = models.ForeignKey('Experiment', on_delete=models.CASCADE)
-            #     location = models.OneToOneField('Location', on_delete=models.CASCADE)
-            #     status = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES)
-            #     class Meta:
-            #         db_table = 'db_radar'
-            #     def __unicode__(self):
-            #         return u'%s' % self.location
             class RunningExperiment(models.Model):
                 radar = models.OneToOneField('Location', on_delete=models.CASCADE)
                 running_experiment = models.ManyToManyField('Experiment')
             class Experiment(models.Model):
                 template = models.BooleanField(default=False)
+                location = models.ForeignKey('Location', null=True, blank=True, on_delete=models.CASCADE)
-                #campaign = models.ForeignKey('Campaign', null=True, blank=True, on_delete=models.CASCADE)
+                name = models.CharField(max_length=40, default='', unique=True)
                 location = models.ForeignKey('Location', null=True, blank=True, on_delete=models.CASCADE)
-                name = models.CharField(max_length=40, default='')
                 start_time = models.TimeField(default='00:00:00')
                 end_time = models.TimeField(default='23:59:59')
                 status = models.PositiveSmallIntegerField(default=0, choices=EXP_STATES)
                 class Meta:
                     db_table = 'db_experiments'
+                    ordering = ('name',)
                 def __unicode__(self):
                     return u'%s' % (self.name)
+                def clone(self, **kwargs):
+                    confs = Configuration.objects.filter(experiment=self, type=0)
+                    self.pk = None
+                    self.name = '{} [{:%Y/%m/%d}]'.format(self.name, datetime.now())
+                    for attr, value in kwargs.items():
+                        setattr(self, attr, value)
+                    self.save()
+                    for conf in confs:
+                        conf.clone(experiment=self, template=False)
+                    return self
                 def get_status(self):
                     configurations =  Configuration.objects.filter(experiment=self)
                     return color
             class Configuration(PolymorphicModel):
                 template = models.BooleanField(default=False)
                     else:
                         return u'%s' % self.device.name
+                def clone(self, **kwargs):
+                    self.pk = None
+                    self.id = None
+                    for attr, value in kwargs.items():
+                        setattr(self, attr, value)
+                    self.save()
+                    return self
                 def parms_to_dict(self):

apps/main/templates/base.html +9 -12

                   body {padding-top: 60px}
                   .logo {padding-top: 5px; height: 50px}
                   .clickable-row {cursor: pointer;}
-                  .col-no-padding { padding-left:0; }
+                  .col-no-padding { padding-left:0;}
+                  .gi-2x{font-size: 2em;}
+                  .gi-3x{font-size: 3em;}
+                  .gi-4x{font-size: 4em;}
+                  .gi-5x{font-size: 5em;}
                 </style>
                 <!--[if lt IE 9]>
             	<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
                     <ul class="nav navbar-nav">
                       <li class=" dropdown {% block operation-active %}{% endblock %}"><a href="{% url 'url_operation'%}">Operation</a>
                       </li>
-                      <li class=" dropdown {% block conf-active %}{% endblock %}">
+                      <li class=" dropdown {% block new-active %}{% endblock %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">New<span class="caret"></span></a>
                         <ul class="dropdown-menu" role="menu">
                           <li><a href="{% url 'url_add_campaign' %}">Campaign</a></li>
-                          <li><a href="{% url 'url_add_experiment' 0%}">Experiment</a></li>
+                          <li><a href="{% url 'url_add_experiment' %}">Experiment</a></li>
                           <li><a href="{% url 'url_add_dev_conf' 0%}">Device Configuration</a></li>
-                          <li><a href="{% url 'url_add_device'%}">Radar/Device</a></li>
+                          <li><a href="{% url 'url_add_device'%}">Device</a></li>
                         </ul>
                       </li>
-                      <li class=" dropdown {% block test-active %}{% endblock %}">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Test<span class="caret"></span></a>
-                        <ul class="dropdown-menu" role="menu">
-                          <li><a href="{% url 'url_experiments' %}">Experiments</a></li>
-                          <li><a href="{% url 'url_devices' %}">Devices</a></li>
-                        </ul>
-                      </li>
                       <li class=" dropdown {% block search-active %}{% endblock %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Search<span class="caret"></span></a>
                         <ul class="dropdown-menu" role="menu">
                           <li><a href="{% url 'url_campaigns' %}">Campaigns</a></li>
                           <li><a href="{% url 'url_experiments' %}">Experiments</a></li>
                           <li><a href="{% url 'url_dev_confs' %}">Configurations</a></li>
+                          <li><a href="{% url 'url_devices' %}">Devices</a></li>
                         </ul>
                       </li>
                     </ul>

apps/main/templates/campaign.html +2 -7

             			  {% endfor %}
             			</tr>
             			{% endfor %}
             		  </table>
-            		  <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             	      </div>
             	    </div>
             	  </div>
             	  });
               $("#bt_edit").click(function() {
-            	    document.location = "{% url 'url_edit_campaign' campaign.id%}";
+            	    document.location = "{% url 'url_edit_campaign' campaign.id %}";
             	  });
-              $("#bt_add").click(function() {
-                document.location = "{% url 'url_add_experiment' campaign.id%}";
-              });
             </script>
             {% endblock %}

apps/main/templates/campaign_edit.html +20 -2

@@ -16,8 +16,10
16	{% csrf_token %}	16	{% csrf_token %}
17	{% bootstrap_form form layout='horizontal' size='medium' %}	17	{% bootstrap_form form layout='horizontal' size='medium' %}
18	<div style="clear: both;"></div>	18	<div style="clear: both;"></div>
19	<br>	19	{% if button %}
20	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>	20	<br>
		21	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>
		22	{% endif %}
21	</form>	23	</form>
22	{% endblock %}	24	{% endblock %}
23		25
@@ -32,5 +34,21
32		34
33	$('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});	35	$('.input-group.date').datetimepicker({"format": "YYYY-MM-DD HH:mm"});
34		36
		37	$('#id_create_from').change(function() {
		38	var url = "{% url 'url_add_campaign' %}";
		39	if ($(this).val()=="2"){
		40	document.location = url+"?template=0";
		41	}else if ($(this).val()=="1"){
		42	document.location = url+"?blank=0";
		43	}else{
		44	document.location = url;
		45	}
		46	});
		47
		48	$('#id_choose_template').change(function() {
		49	var url = "{% url 'url_add_campaign' %}";
		50	document.location = url+"?template="+$(this).val();
		51	});
		52
35	</script>	53	</script>
36	{% endblock %} No newline at end of file	54	{% endblock %}

apps/main/templates/campaigns.html +2 -6

             	</tr>
               {% endfor %}
             </table>
-            <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             {% endblock %}
             {% block sidebar%}
             {% block extra-js%}
             <script type="text/javascript">
-              $("#bt_add").click(function() {
-                document.location = "{% url 'url_add_campaign' %}";
-              });
               $(".clickable-row").click(function() {
             	    document.location = $(this).data("href");
-            	  });
+              });
             </script>
             {% endblock %}

apps/main/templates/dev_conf.html +2 -2

             {% load static %}
             {% load main_tags %}
-            {% block conf-active %}active{% endblock %}
+            {% block search-active %}active{% endblock %}
             {% block content-title %}{{title}}{% endblock %}
             {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block menu-actions %}
             <span class=" dropdown pull-right">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span></a>
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-menu-hamburger gi-2x" aria-hidden="true"></span></a>
               <ul class="dropdown-menu" role="menu">
                 <li><a href="{{ dev_conf.get_absolute_url_edit }}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit</a></li>
                 <li><a href="{{ dev_conf.get_absolute_url_import }}"><span class="glyphicon glyphicon-import" aria-hidden="true"></span> Import </a></li>

apps/main/templates/dev_conf_edit.html +3 -1

             {% endblock %}
             {% block extra-js%}
+            {% if id_exp %}
             <script type="text/javascript">
               $("#id_device").change(function() {
                 var url = "{% url 'url_add_dev_conf' id_exp  %}";
                 document.location = url+ $(this).val() + "/";
               });
-             </script>
+            </script>
+            {% endif %}
             {% endblock %}

apps/main/templates/dev_confs.html +1 -6

             	</tr>
               {% endfor %}
             </table>
-            <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             {% endblock %}
             {% block sidebar%}
             {% block extra-js%}
             <script type="text/javascript">
-              $("#bt_add").click(function() {
-                document.location = "{% url 'url_add_dev_conf' 0%}";
-              });
               $(".clickable-row").click(function() {
             	    document.location = $(this).data("href");
-            	  });
+              });
             </script>
             {% endblock %}

apps/main/templates/devices.html +2 -6

             	</tr>
               {% endfor %}
             </table>
-            <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             {% endblock %}
             {% block sidebar%}
             {% block extra-js%}
             <script type="text/javascript">
-              $("#bt_add").click(function() {
-                document.location = "{% url 'url_add_device' %}";
-              });
               $(".clickable-row").click(function() {
             	    document.location = $(this).data("href");
-            	  });
+              });
             </script>
             {% endblock %}

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

             	  });
               $("#bt_add_conf").click(function() {
-                document.location = "{% url 'url_add_dev_conf' experiment.id%}";
+                document.location = "{% url 'url_add_dev_conf' experiment.id %}";
               });
             </script>

apps/main/templates/experiment_edit.html +56 -1

@@ -17,7 +17,44
17	{% bootstrap_form form layout='horizontal' size='medium' %}	17	{% bootstrap_form form layout='horizontal' size='medium' %}
18	<div style="clear: both;"></div>	18	<div style="clear: both;"></div>
19	<br>	19	<br>
20	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>	20	{% if configurations %}
		21	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
		22	<div class="panel panel-default">
		23	<div class="panel-heading" role="tab" id="headingTwo">
		24	<h4 class="panel-title">
		25	<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseThree">
		26	Device Configurations
		27	</a>
		28	</h4>
		29	</div>
		30	<div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingTwo">
		31	<div class="panel-body">
		32	<table class="table table-hover">
		33	<tr>
		34	<th>#</th>
		35	{% for key in configuration_keys %}
		36	<th>{{ key\|title }}</th>
		37	{% endfor%}
		38	</tr>
		39	{% for item in configurations %}
		40	<tr class="clickable-row" data-href="{{item.get_absolute_url}}">
		41	<td>{{ forloop.counter }}</td>
		42	{% for key in configuration_keys %}
		43	<td>{{ item\|value:key }}</td>
		44	{% endfor %}
		45	</tr>
		46	{% endfor %}
		47	</table>
		48	</div>
		49	</div>
		50	</div>
		51	</div>
		52	{% endif %}
		53
		54	{% if button %}
		55	<br>
		56	<button type="submit" class="btn btn-primary pull-right">{{button}}</button>
		57	{% endif %}
21	</form>	58	</form>
22	{% endblock %}	59	{% endblock %}
23		60
@@ -29,10 +66,28
29	<script src="{% static 'js/moment.min.js' %}"></script>	66	<script src="{% static 'js/moment.min.js' %}"></script>
30	<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>	67	<script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
31	<script type="text/javascript">	68	<script type="text/javascript">
		69
32	$('.input-group.time').datetimepicker({	70	$('.input-group.time').datetimepicker({
33	format: 'HH:mm:ss',	71	format: 'HH:mm:ss',
34	pickDate: false,	72	pickDate: false,
35	pickSeconds: true	73	pickSeconds: true
36	});	74	});
		75
		76	$('#id_create_from').change(function() {
		77	var url = "{% url 'url_add_experiment' %}";
		78	if ($(this).val()=="2"){
		79	document.location = url+"?template=0";
		80	}else if ($(this).val()=="1"){
		81	document.location = url+"?blank=0";
		82	}else{
		83	document.location = url;
		84	}
		85	});
		86
		87	$('#id_choose_template').change(function() {
		88	var url = "{% url 'url_add_experiment' %}";
		89	document.location = url+"?template="+$(this).val();
		90	});
		91
37	</script>	92	</script>
38	{% endblock %} No newline at end of file	93	{% endblock %}

apps/main/templates/experiments.html 0 -5

             	</tr>
               {% endfor %}
             </table>
-            <button class="btn btn-primary pull-right" id="bt_add">{{button}}</button>
             {% endblock %}
             {% block sidebar%}
                 document.location = $(this).data("href");
               });
-              $("#bt_add").click(function() {
-                document.location = "{% url 'url_add_experiment' 0 %}";
-              });
             </script>
             {% endblock %}

apps/main/templates/sidebar_devices.html +6 -72

@@ -1,66 +1,3
1	{% if campaign %}
2	<div class="panel panel-default">
3	<div class="panel-heading">
4	<h4>Campaign</h4>
5	</div>
6	<div class="list-group">
7	<a href="{% url 'url_campaign' campaign.id %}" class="list-group-item active" >{{ campaign.name }}</a>
8	</div>
9	</div>
10
11	{% if experiments %}
12	<div class="panel panel-default">
13	<div class="panel-heading">
14	<h4>Experiments</h4>
15	</div>
16	<div class="list-group">
17	{% for item in experiments %}
18	<a href="{% url 'url_experiment' item.id %}" class="list-group-item {{item.active}}">{{item.name}}</a>
19	{% endfor %}
20	</div>
21	</div>
22	{% endif %}
23	{% endif %}
24
25	{% if experiment %}
26	<div class="panel panel-default">
27	<div class="panel-heading">
28	<h4>Campaign</h4>
29	</div>
30	<div class="list-group">
31	<a href="{% url 'url_campaign' experiment.campaign.id %}" class="list-group-item active" >{{ experiment.campaign.name }}</a>
32	</div>
33	</div>
34
35	{% if experiments %}
36	<div class="panel panel-default">
37	<div class="panel-heading">
38	<h4>Experiments</h4>
39	</div>
40	<div class="list-group">
41	{% for item in experiments %}
42	<a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == experiment.id%}active{%endif%}">{{item.name}}</a>
43	{% endfor %}
44	</div>
45	</div>
46	{% endif %}
47
48	{% if configurations %}
49	<div class="panel panel-default">
50	<div class="panel-heading">
51	<h4>Device Configurations</h4>
52	</div>
53	<div class="list-group">
54	{% for item in configurations %}
55	<a href="{{item.get_absolute_url}}" class="list-group-item {{item.active}}">{{item.device.name}}</a>
56	{% endfor %}
57	</div>
58	</div>
59	{% endif %}
60
61	{% endif %}
62
63	{% if dev_conf %}
64		1
65	{% if campaign %}	2	{% if campaign %}
66	<div class="panel panel-default">	3	<div class="panel panel-default">
@@ -68,36 +5,33
68	<h4>Campaign</h4>	5	<h4>Campaign</h4>
69	</div>	6	</div>
70	<div class="list-group">	7	<div class="list-group">
71	<a href="{% url 'url_campaign' ~~dev_conf.experiment.~~campaign.id %}" class="list-group-item active" >{{ ~~dev_conf.experiment.~~campaign.name }}</a>	8	<a href="{% url 'url_campaign' campaign.id %}" class="list-group-item active" >{{ campaign.name }}</a>
72	</div>	9	</div>
73	</div>	10	</div>
74	{% endif %}	11	{% endif %}
75		12
76	{% if experiments %}	13	{% if experiment %}
77	<div class="panel panel-default">	14	<div class="panel panel-default">
78	<div class="panel-heading">	15	<div class="panel-heading">
79	<h4>Experiments</h4>	16	<h4>Experiments</h4>
80	</div>	17	</div>
81	<div class="list-group">	18	<div class="list-group">
82	{% for item in experiments %}	19	{% for item in side_experiments %}
83	<a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == ~~dev_conf.~~experiment.id%}active{%endif%}">{{item.name}}</a>	20	<a href="{% url 'url_experiment' item.id %}" class="list-group-item {%if item.id == experiment.id%}active{%endif%}">{{item.name}}</a>
84	{% endfor %}	21	{% endfor %}
85	</div>	22	</div>
86	</div>	23	</div>
87	{% endif %}	24	{% endif %}
88		25
89	{% if conf~~igurations~~ %}	26	{% if dev_conf %}
90	<div class="panel panel-default">	27	<div class="panel panel-default">
91	<div class="panel-heading">	28	<div class="panel-heading">
92	<h4>Device Configurations</h4>	29	<h4>Device Configurations</h4>
93	</div>	30	</div>
94	<div class="list-group">	31	<div class="list-group">
95	{% for item in configurations %}	32	{% for item in side_configurations %}
96	<a href="{{item.get_absolute_url}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item.device.name}}</a>	33	<a href="{{item.get_absolute_url}}" class="list-group-item {%if item.id == dev_conf.id%}active{%endif%}">{{item.device.name}}</a>
97	{% endfor %}	34	{% endfor %}
98	</div>	35	</div>
99	</div>	36	</div>
100	{% endif %}	37	{% endif %}
101
102
103	{% endif %}

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

                 for my_key in key.split("__"):
                     item = attr(item, my_key)
-                print item
                 return item
             @register.simple_tag

apps/main/urls.py +1 -1

                 url(r'^campaign/(?P<id_camp>-?\d+)/edit/$', 'apps.main.views.campaign_edit', name='url_edit_campaign'),
                 url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', 'apps.main.views.campaign_delete', name='url_delete_campaign'),
-                url(r'^campaign/(?P<id_camp>-?\d+)/new_experiment/$', 'apps.main.views.experiment_new', name='url_add_experiment'),
+                url(r'^experiment/new/$', 'apps.main.views.experiment_new', name='url_add_experiment'),
                 url(r'^experiment/$', 'apps.main.views.experiments', name='url_experiments'),
                 url(r'^experiment/(?P<id_exp>-?\d+)/$', 'apps.main.views.experiment', name='url_experiment'),
                 url(r'^experiment/(?P<id_exp>-?\d+)/edit/$', 'apps.main.views.experiment_edit', name='url_edit_experiment'),

apps/main/views.py +106 -51

             from django.core.urlresolvers import reverse
             from django.contrib import messages
-            from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm
+            from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm
             from .forms import OperationSearchForm
             from apps.cgs.forms import CGSConfigurationForm
             from apps.jars.forms import JARSConfigurationForm
             def campaign_new(request):
+                kwargs = {}
                 if request.method == 'GET':
-                    form = CampaignForm()
+                    if 'template' in request.GET:
+                        if request.GET['template']=='0':
+                            form = NewForm(initial={'create_from':2},
+                                           template_choices=Campaign.objects.filter(template=True).values_list('id', 'name'))
+                        else:
+                            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']),
+                                                initial={'template':False})
+                    elif 'blank' in request.GET:
+                        kwargs['button'] = 'Create'
+                        form = CampaignForm()
+                    else:
+                        form = NewForm()
                 if request.method == 'POST':
-                    form = CampaignForm(request.POST)
+                    kwargs['button'] = 'Create'
+                    post = request.POST.copy()
+                    experiments = []
+                    for id_exp in post.getlist('experiments'):
+                        exp = Experiment.objects.get(pk=id_exp)
+                        new_exp = exp.clone(template=False)
+                        experiments.append(new_exp)
+                    post.setlist('experiments', [])
+                    form = CampaignForm(post)
                     if form.is_valid():
                         campaign = form.save()
+                        for exp in experiments:
+                            campaign.experiments.add(exp)
+                        campaign.save()
                         return redirect('url_campaign', id_camp=campaign.id)
-                kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'New'
-                kwargs['button'] = 'Create'
                 return render(request, 'campaign_edit.html', kwargs)
                 if request.method=='POST':
                     if request.user.is_staff:
+                        for exp in campaign.experiments.all():
+                            for conf in Configuration.objects.filter(experiment=exp):
+                                conf.delete()
+                            exp.delete()
                         campaign.delete()
                         return redirect('url_campaigns')
                     return HttpResponse("Not enough permission to delete this object")
             def experiments(request):
-                experiment_list = Experiment.objects.all().order_by('campaign')
+                experiment_list = Experiment.objects.all()
-                keys = ['id', 'name', 'start_time', 'end_time', 'campaign']
+                keys = ['id', 'name', 'start_time', 'end_time']
                 kwargs = {}
                 kwargs['experiment_keys'] = keys[1:]
-                kwargs['experiments'] = experiment_list#.values(*keys)
+                kwargs['experiments'] = experiment_list
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'List'
                 experiment = get_object_or_404(Experiment, pk=id_exp)
-                experiments = Experiment.objects.filter(campaign=experiment.campaign)
                 configurations = Configuration.objects.filter(experiment=experiment, type=0)
                 kwargs = {}
-                exp_keys = ['id', 'campaign', 'location', 'name', 'start_time', 'end_time']
+                exp_keys = ['id', 'location', '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['experiments'] = experiments.values(*exp_keys)
                 kwargs['configuration_labels'] = conf_labels[1:]
                 kwargs['configuration_keys'] = conf_keys[1:]
                 kwargs['configurations'] = configurations #.values(*conf_keys)
                 kwargs['button'] = 'Add Configuration'
+                ###### SIDEBAR ######
+                kwargs.update(sidebar(experiment=experiment))
                 return render(request, 'experiment.html', kwargs)
             def experiment_new(request, id_camp=None):
+                kwargs = {}
                 if request.method == 'GET':
-                    form = ExperimentForm(initial={'campaign':id_camp})
+                    if 'template' in request.GET:
+                        if request.GET['template']=='0':
+                            form = NewForm(initial={'create_from':2},
+                                           template_choices=Experiment.objects.filter(template=True).values_list('id', 'name'))
+                        else:
+                            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']),
+                                                  initial={'template':False})
+                    elif 'blank' in request.GET:
+                        kwargs['button'] = 'Create'
+                        form = ExperimentForm()
+                    else:
+                        form = NewForm()
                 if request.method == 'POST':
-                    form = ExperimentForm(request.POST, initial={'campaign':id_camp})
+                    form = ExperimentForm(request.POST)
                     if form.is_valid():
                         experiment = form.save()
+                        if 'template' in request.GET:
+                            configurations = Configuration.objects.filter(experiment=request.GET['template'], type=0)
+                            for conf in configurations:
+                                conf.clone(experiment=experiment, template=False)
                         return redirect('url_experiment', id_exp=experiment.id)
-                kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'New'
-                kwargs['button'] = 'Create'
                 return render(request, 'experiment_edit.html', kwargs)
                 if request.method=='POST':
                     if request.user.is_staff:
-                        id_camp = experiment.campaign.id
                         experiment.delete()
-                        return redirect('url_campaign', id_camp=id_camp)
+                        return redirect('url_experiments')
                     return HttpResponse("Not enough permission to delete this object")
                 initial = {}
-                if id_exp==0:
+                if id_exp<>0:
                     initial['experiment'] = id_exp
                 if id_dev<>0:
                 kwargs['button'] = 'Update'
                 ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
+                kwargs.update(sidebar(conf=conf))
                 return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
                 if answer:
                     messages.success(request, conf.message)
                     #Creating a historical configuration
-                    conf.pk = None
+                    conf.clone(type=0, template=False)
-                    conf.id = None
-                    conf.type = 1
-                    conf.template = 0
-                    conf.save()
                     #Original configuration
                     conf = DevConfModel.objects.get(pk=id_conf)
                 kwargs['button'] = 'Save'
                 ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
+                kwargs.update(sidebar(conf=conf))
                 return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 DevConfForm = CONF_FORMS[conf.device.device_type.name]
                 conf = DevConfModel.objects.get(pk=id_conf)
                 if request.method == 'GET':
                         if parms:
                             messages.success(request, "Parameters imported from: '%s'." %request.FILES['file'].name)
-                            print parms
                             form = DevConfForm(initial=parms, instance=conf)
                             kwargs = {}
                             kwargs['previous'] = conf.get_absolute_url()
                             ###### SIDEBAR ######
-                            kwargs.update(sidebar(conf))
+                            kwargs.update(sidebar(conf=conf))
                             return render(request, '%s_conf_edit.html' % conf.device.device_type.name, kwargs)
                 kwargs['suptitle'] = 'Importing file'
                 kwargs['button'] = 'Import'
-                kwargs.update(sidebar(conf))
+                kwargs.update(sidebar(conf=conf))
                 return render(request, 'dev_conf_import.html', kwargs)
                 kwargs = {'object':conf, 'conf_active':'active',
                       'url_cancel':'url_dev_conf', 'id_item':id_conf}
-                ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
                 return render(request, 'item_delete.html', kwargs)
-            def sidebar(conf):
+            def sidebar(**kwargs):
-                kwargs = {}
+                side_data = {}
+                conf = kwargs.get('conf', None)
+                experiment = kwargs.get('experiment', None)
-                if conf.experiment:
+                if not experiment:
-                    experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
+                    experiment = conf.experiment
-                    configurations = Configuration.objects.filter(experiment=conf.experiment, type=0)
-                    exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
+                if experiment:
-                    kwargs['experiment_keys'] = exp_keys[1:]
+                    side_data['experiment'] = experiment
-                    kwargs['experiments'] = experiments.values(*exp_keys)
+                    campaign = experiment.campaign_set.all()
-                    conf_keys = ['id', 'device']
+                    if campaign:
-                    kwargs['configuration_keys'] = conf_keys[1:]
+                        side_data['campaign'] = campaign[0]
-                    kwargs['configurations'] = configurations #.values(*conf_keys)
+                        experiments = campaign[0].experiments.all()
+                    else:
+                        experiments = [experiment]
+                    configurations = experiment.configuration_set.filter(type=0)
+                    side_data['side_experiments'] = experiments
+                    side_data['side_configurations'] = configurations
-                return kwargs
+                return side_data
             def operation(request, id_camp=None):
                     return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
             def radar_stop(request, id_camp, id_radar):
                 route = request.META['HTTP_REFERER']
                 route = str(route)
                 if 'search' in route:
                     return HttpResponseRedirect(reverse('url_operation_search', args=[id_camp]))
                 else:
-                    return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
  No newline at end of file
+                    return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))

apps/rc/forms.py +4 -2

                         devices = Device.objects.filter(device_type__name='rc')
                         if instance.experiment:
-                            self.fields['experiment'].widget.attrs['readonly'] = True
+                            self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
-                            self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
+                            #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
                         self.fields['device'].widget.choices = [(device.id, device) for device in devices]
                         self.fields['ipp'].widget = KmUnitHzWidget(attrs={'km2unit':instance.km2unit})
                         self.fields['clock'].widget.attrs['readonly'] = True
                     self.fields['time_before'].label = mark_safe(self.fields['time_before'].label)
                     self.fields['time_after'].label = mark_safe(self.fields['time_after'].label)
+                    if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
+                        self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
                 class Meta:
                     model = RCConfiguration

apps/rc/models.py +30 -1

                     return 20./3*(self.clock_in/self.clock_divider)
+                def clone(self, **kwargs):
+                    lines = self.get_lines()
+                    self.pk = None
+                    self.id = None
+                    for attr, value in kwargs.items():
+                        setattr(self, attr, value)
+                    self.save()
+                    for line in lines:
+                        line.clone(rc_configuration=self)
+                    return self
                 def get_lines(self, type=None):
                     '''
                     Retrieve configuration lines
                             line.save()
+                def status_device(self):
+                    return 0
             class RCLineCode(models.Model):
                 name = models.CharField(max_length=40)
             class RCLine(models.Model):
-                rc_configuration = models.ForeignKey(RCConfiguration)
+                rc_configuration = models.ForeignKey(RCConfiguration, on_delete=models.CASCADE)
                 line_type = models.ForeignKey(RCLineType)
                 channel = models.PositiveIntegerField(default=0)
                 position = models.PositiveIntegerField(default=0)
                     if self.rc_configuration:
                         return u'%s - %s' % (self.rc_configuration, self.get_name())
+                def clone(self, **kwargs):
+                    self.pk = None
+                    for attr, value in kwargs.items():
+                        setattr(self, attr, value)
+                    self.save()
+                    return self
                 def get_name(self):
                     chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'

apps/rc/views.py +1 -5

                 kwargs['button'] = 'Edit Configuration'
                 ###### SIDEBAR ######
-                kwargs.update(sidebar(conf))
+                kwargs.update(sidebar(conf=conf))
                 return render(request, 'rc_conf.html', kwargs)
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 kwargs['previous'] = conf.get_absolute_url()
-                kwargs.update(sidebar(conf))
                 return render(request, 'rc_conf_edit.html', kwargs)
                 kwargs['dev_conf'] = conf
                 kwargs['line_type'] = line_type
-                kwargs.update(sidebar(conf))
                 return render(request, 'rc_add_line.html', kwargs)
             def edit_codes(request, conf_id, line_id, code_id=None):

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