radarsys Commit - r25:f193286b21f7 · Jicamarca Repository

Updates to models, views & forms for CR...

Juan C. Espinoza -

r25:f193286b21f7

parent child

Context file:

r25:f193286b21f7

Collapse all files

apps/rc/templates/rc_edit_lines.html created 644 +18 0

@@ -0,0 +1,18
	1	{% extends "dev_conf_edit.html" %}
	2
	3	{% block content %}
	4	<form class="form" method="post" action="">
	5	{% csrf_token %}
	6
	7	<div class="panel-group" id="div_lines" role="tablist" aria-multiselectable="true">
	8	{% include "rc_lines.html" %}
	9	</div>
	10
	11	<div style="clear: both;"></div>
	12	<br>
	13	<div class="pull-right">
	14	<button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
	15	<button type="submit" class="btn btn-primary">{{button}}</button>
	16	</div>
	17	</form>
	18	{% endblock %} No newline at end of file

apps/rc/templates/rc_lines.html created 644 +21 0

@@ -0,0 +1,21
	1	{% load bootstrap3 %}
	2
	3	{% for line in rc_lines %}
	4	<div class="panel panel-default" id="panel-{{line.id}}">
	5	<div class="panel-heading" role="tab" id="heading{{line.id}}">
	6	<h4 class="panel-title">
	7	<a role="button" data-toggle="collapse" data-parent="#div_lines" href="#collapse{{line.id}}" aria-expanded="true" aria-controls="collapse{{line.id}}">
	8	CH{{line.channel}} - {{line.get_name}}
	9	</a>
	10	{% if not edit %}
	11	<button class="btn-xs btn-default pull-right" name="bt_remove_line" value="{{line.pk}}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
	12	{% endif %}
	13	</h4>
	14	</div>
	15	<div id="collapse{{line.id}}" class="panel-collapse collapse{% if edit %} in{% endif %}" role="tabpanel" aria-labelledby="heading{{line.id}}">
	16	<div class="panel-body">
	17	{% bootstrap_form line.form layout='horizontal' size='small' %}
	18	</div>
	19	</div>
	20	</div>
	21	{% endfor%}

apps/main/views.py +18 -1

             from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
             from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm
             from apps.cgs.forms import CGSConfigurationForm
             from apps.jars.forms import JARSConfigurationForm
             from apps.usrp.forms import USRPConfigurationForm
             from apps.abs.forms import ABSConfigurationForm
             from apps.rc.forms import RCConfigurationForm
             from apps.dds.forms import DDSConfigurationForm
             from .models import Campaign, Experiment, Device, Configuration
             from apps.cgs.models import CGSConfiguration
             from apps.jars.models import JARSConfiguration
             from apps.usrp.models import USRPConfiguration
             from apps.abs.models import ABSConfiguration
             from apps.rc.models import RCConfiguration
             from apps.dds.models import DDSConfiguration
             # Create your views here.
             CONF_FORMS = {
                 'rc': RCConfigurationForm,
                 'dds': DDSConfigurationForm,
                 'jars': JARSConfigurationForm,
                 'cgs': CGSConfigurationForm,
                 'abs': ABSConfigurationForm,
                 'usrp': USRPConfigurationForm,
             }
             CONF_MODELS = {
                 'rc': RCConfiguration,
                 'dds': DDSConfiguration,
                 'jars': JARSConfiguration,
                 'cgs': CGSConfiguration,
                 'abs': ABSConfiguration,
                 'usrp': USRPConfiguration,
             }
             def index(request):
                 kwargs = {}
                 return render(request, 'index.html', kwargs)
             def devices(request):
                 devices = Device.objects.all().order_by('device_type__name')
             #     keys = ['id', 'device_type__name', 'name', 'ip_address']
                 keys = ['id', 'name', 'ip_address', 'device_type']
                 kwargs = {}
                 kwargs['device_keys'] = keys[1:]
                 kwargs['devices'] = devices#.values(*keys)
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Device'
                 return render(request, 'devices.html', kwargs)
             def device(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 kwargs = {}
                 kwargs['device'] = device
                 kwargs['device_keys'] = ['device_type', 'name', 'ip_address', 'port_address', 'description']
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Add Device'
                 return render(request, 'device.html', kwargs)
             def device_new(request):
                 if request.method == 'GET':
                     form = DeviceForm()
                 if request.method == 'POST':
                     form = DeviceForm(request.POST)
                     if form.is_valid():
                         form.save()
                         return redirect('url_devices')
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'device_edit.html', kwargs)
             def device_edit(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 if request.method=='GET':
                     form = DeviceForm(instance=device)
                 if request.method=='POST':
                     form = DeviceForm(request.POST, instance=device)
                     if form.is_valid():
                         form.save()
                         return redirect('url_devices')
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'device_edit.html', kwargs)
             def device_delete(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 if request.method=='POST':
                     if request.user.is_staff:
                         device.delete()
                         return redirect('url_devices')
                     return HttpResponse("Not enough permission to delete this object")
                 kwargs = {'object':device, 'dev_active':'active',
                           'url_cancel':'url_device', 'id_item':id_dev}
                 return render(request, 'item_delete.html', kwargs)
             def campaigns(request):
                 campaigns = Campaign.objects.all().order_by('start_date')
                 keys = ['id', 'name', 'start_date', 'end_date']
                 kwargs = {}
                 kwargs['campaign_keys'] = keys[1:]
                 kwargs['campaigns'] = campaigns#.values(*keys)
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Campaign'
                 return render(request, 'campaigns.html', kwargs)
             def campaign(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 experiments = Experiment.objects.filter(campaign=campaign)
                 form = CampaignForm(instance=campaign)
                 kwargs = {}
                 kwargs['campaign'] = campaign
                 kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
                 keys = ['id', 'name', 'start_time', 'end_time']
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = experiments.values(*keys)
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'Details'
                 kwargs['form'] = form
                 kwargs['button'] = 'Add Experiment'
                 return render(request, 'campaign.html', kwargs)
             def campaign_new(request):
                 if request.method == 'GET':
                     form = CampaignForm()
                 if request.method == 'POST':
                     form = CampaignForm(request.POST)
                     if form.is_valid():
                         campaign = form.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)
             def campaign_edit(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 if request.method=='GET':
                     form = CampaignForm(instance=campaign)
                 if request.method=='POST':
                     form = CampaignForm(request.POST, instance=campaign)
                     if form.is_valid():
                         form.save()
                         return redirect('url_campaign', id_camp=id_camp)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'campaign_edit.html', kwargs)
             def campaign_delete(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 if request.method=='POST':
                     if request.user.is_staff:
                         campaign.delete()
                         return redirect('url_campaigns')
                     return HttpResponse("Not enough permission to delete this object")
                 kwargs = {'object':campaign, 'camp_active':'active',
                           'url_cancel':'url_campaign', 'id_item':id_camp}
                 return render(request, 'item_delete.html', kwargs)
             def experiments(request):
                 experiment_list = Experiment.objects.all().order_by('campaign')
                 keys = ['id', 'name', 'start_time', 'end_time', 'campaign']
                 kwargs = {}
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = experiment_list#.values(*keys)
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Experiment'
                 return render(request, 'experiments.html', kwargs)
             def experiment(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 experiments = Experiment.objects.filter(campaign=experiment.campaign)
                 configurations = Configuration.objects.filter(experiment=experiment)
                 kwargs = {}
                 exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
                 conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
                 kwargs['experiment_keys'] = exp_keys[1:]
                 kwargs['experiment'] = experiment
                 kwargs['experiments'] = experiments.values(*exp_keys)
                 kwargs['configuration_keys'] = conf_keys[1:]
                 kwargs['configurations'] = configurations.values(*conf_keys)
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Add Device'
                 return render(request, 'experiment.html', kwargs)
             def experiment_new(request, id_camp=0):
                 if request.method == 'GET':
                     form = ExperimentForm(initial={'campaign':id_camp})
                 if request.method == 'POST':
                     form = ExperimentForm(request.POST, initial={'campaign':id_camp})
                     if form.is_valid():
                         experiment = form.save()
                         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)
             def experiment_edit(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 if request.method == 'GET':
                     form = ExperimentForm(instance=experiment)
                 if request.method=='POST':
                     form = ExperimentForm(request.POST, instance=experiment)
                     if form.is_valid():
                         experiment = form.save()
                         return redirect('url_experiment', id_exp=experiment.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'experiment_edit.html', kwargs)
             def experiment_delete(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 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 HttpResponse("Not enough permission to delete this object")
                 kwargs = {'object':experiment, 'exp_active':'active',
                           'url_cancel':'url_experiment', 'id_item':id_exp}
                 return render(request, 'item_delete.html', kwargs)
             def dev_confs(request):
                 configurations = Configuration.objects.all().order_by('experiment')
             #     keys = ['id', 'device__device_type__name', 'device__name', 'experiment__campaign__name', 'experiment__name']
                 keys = ['id', 'device', 'experiment']
                 kwargs = {}
                 kwargs['configuration_keys'] = keys[1:]
                 kwargs['configurations'] = configurations#.values(*keys)
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Configuration'
                 return render(request, 'dev_confs.html', kwargs)
             def dev_conf(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 dev_conf = DevConfModel.objects.get(pk=id_conf)
                 kwargs = {}
                 kwargs['dev_conf'] = dev_conf
                 kwargs['dev_conf_keys'] = ['experiment', 'device']
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Edit Configuration'
                 ###### SIDEBAR ######
                 experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
                 configurations = Configuration.objects.filter(experiment=conf.experiment)
                 exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
                 conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
                 kwargs['experiment_keys'] = exp_keys[1:]
                 kwargs['experiments'] = experiments.values(*exp_keys)
                 kwargs['configuration_keys'] = conf_keys[1:]
                 kwargs['configurations'] = configurations.values(*conf_keys)
                 return render(request, 'dev_conf.html', kwargs)
             def dev_conf_new(request, id_exp=0):
                 if request.method == 'GET':
                     form = ConfigurationForm(initial={'experiment':id_exp})
                 if request.method == 'POST':
                     form = ConfigurationForm(request.POST)
                     if form.is_valid():
                         experiment = Experiment.objects.get(pk=request.POST['experiment'])
                         device = Device.objects.get(pk=request.POST['device'])
                         exp_devices = Device.objects.filter(configuration__experiment=experiment)
                         if device.id not in exp_devices.values('id',):
                             DevConfModel = CONF_MODELS[device.device_type.name]
                             conf = DevConfModel(experiment=experiment, device=device)
                             conf.save()
                             return redirect('url_experiment', id_exp=experiment.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'dev_conf_edit.html', kwargs)
             def dev_conf_edit(request, id_conf):
                 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]
                 dev_conf = DevConfModel.objects.get(pk=id_conf)
                 if request.method=='GET':
                     form = DevConfForm(instance=dev_conf)
                 if request.method=='POST':
                     form = DevConfForm(request.POST, instance=dev_conf)
                     if form.is_valid():
                         form.save()
                         return redirect('url_dev_conf', id_conf=id_conf)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'dev_conf_edit.html', kwargs)
             def dev_conf_delete(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=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 HttpResponse("Not enough permission to delete this object")
                 kwargs = {'object':conf, 'conf_active':'active',
                       'url_cancel':'url_dev_conf', 'id_item':id_conf}
-                return render(request, 'item_delete.html', kwargs)
  No newline at end of file
+                return render(request, 'item_delete.html', kwargs)
+            def sidebar(conf):
+                experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
+                configurations = Configuration.objects.filter(experiment=conf.experiment)
+                exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
+                conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
+                kwargs = {}
+                kwargs['experiment_keys'] = exp_keys[1:]
+                kwargs['experiments'] = experiments.values(*exp_keys)
+                kwargs['configuration_keys'] = conf_keys[1:]
+                kwargs['configurations'] = configurations.values(*conf_keys)
+                return kwargs
  No newline at end of file

apps/rc/admin.py +2 -1

             from django.contrib import admin
-            from .models import RCConfiguration, RCLine, RCLineType
+            from .models import RCConfiguration, RCLine, RCLineType, RCLineCode
             # Register your models here.
             admin.site.register(RCConfiguration)
             admin.site.register(RCLine)
             admin.site.register(RCLineType)
+            admin.site.register(RCLineCode)

apps/rc/forms.py +50 -6

             import json
             from django import forms
-            from .models import RCConfiguration, RCLine, RCLineType
+            from .models import RCConfiguration, RCLine, RCLineType, RCLineCode
+            def create_choices_from_model(model, conf_id):
+                if model=='RCLine':
+                    instance = RCConfiguration.objects.get(pk=conf_id)
+                    return instance.get_refs_lines()
+                else:
+                    instance = globals()[model]
+                    return instance.objects.all().values_list('pk', 'name')
             class RCConfigurationForm(forms.ModelForm):
                 class Meta:
                     model = RCConfiguration
                     exclude = ('clock', 'ipp', 'ntx', 'clock_divider')
             class RCLineForm(forms.ModelForm):
+                def __init__(self, *args, **kwargs):
+                    self.extra_fields = kwargs.pop('extra_fields', [])
+                    super(RCLineForm, self).__init__(*args, **kwargs)
+                    if 'initial'in kwargs:
+                        for item in self.extra_fields:
+                            if 'model' in item:
+                                self.fields[item['name']] = forms.ChoiceField(choices=create_choices_from_model(item['model'],
+                                                                                                                kwargs['initial']['rc_configuration']))
+                            else:
+                                self.fields[item['name']] = forms.CharField(initial=item['value'])
                 class Meta:
                     model = RCLine
                     fields = ('rc_configuration', 'line_type', 'channel')
                     widgets = {
                         'channel': forms.HiddenInput(),
                     }
                 def save(self):
                     line = super(RCLineForm, self).save()
                     #auto add channel
                     line.channel = RCLine.objects.filter(rc_configuration=line.rc_configuration).count()-1
                     #auto add position for TX, TR & CODE
-                    if line.line_type.name in ('tx', 'tr', 'code'):
+                    if line.line_type.name in ('tx', 'tr', 'codes', 'windows'):
                         line.position = RCLine.objects.filter(rc_configuration=line.rc_configuration, line_type=line.line_type).count()-1
-                    #add default params
+                    #save extra fields in params
                     params = {}
-                    for field in json.loads(line.line_type.params):
+                    for item in self.extra_fields:
-                        params[field['name']] = field['value']
+                        params[item['name']] = self.data[item['name']]
                     line.params = json.dumps(params)
                     line.save()
                     return
             class RCLineViewForm(forms.Form):
                 def __init__(self, *args, **kwargs):
                     extra_fields = kwargs.pop('extra_fields')
                     super(RCLineViewForm, self).__init__(*args, **kwargs)
                     for label, value in extra_fields.items():
-                        self.fields[label] = forms.CharField(initial=value)
  No newline at end of file
+                        if 'ref' in label:
+                            value = RCLine.objects.get(pk=value).get_name()
+                        elif 'code' in label:
+                            value = RCLineCode.objects.get(pk=value).name
+                        self.fields[label] = forms.CharField(initial=value)
+            class RCLineEditForm(forms.Form):
+                def __init__(self, *args, **kwargs):
+                    self.extra_fields = kwargs.pop('extra_fields', [])
+                    super(RCLineEditForm, self).__init__(*args, **kwargs)
+                    if 'initial'in kwargs:
+                        for item in self.extra_fields:
+                            if 'model' in item:
+                                self.fields[item['name']] = forms.ChoiceField(choices=create_choices_from_model(item['model'],
+                                                                                                                kwargs['initial']['rc_configuration']),
+                                                                              initial=item['value'],
+                                                                              widget=forms.Select(attrs={'name':'%s|%s' % (kwargs['initial']['line'], item['name'])}))
+                            else:
+                                self.fields[item['name']] = forms.CharField(initial=item['value'],
+                                                                            widget=forms.TextInput(attrs={'name':'%s|%s' % (kwargs['initial']['line'], item['name'])}))
+  No newline at end of file

apps/rc/models.py +20 -8

+            import json
             from polymorphic import PolymorphicModel
             from django.db import models
             from django.core.validators import MinValueValidator, MaxValueValidator
             from apps.main.models import Configuration
             # Create your models here.
             LINE_TYPES = (
                 ('tr', 'Transmission/reception selector signal'),
                 ('tx', 'A modulating signal (Transmission pulse)'),
                 ('codes', 'BPSK modulating signal'),
                 ('windows', 'Sample window signal'),
                 ('sync', 'Synchronizing signal'),
                 ('flip', 'IPP related periodic signal'),
                 ('prog_pulses', 'Programmable pulse'),
                 )
             LINE_PARAMS = {
                 "tr": [{"name":"time_after", "value": 0}],
                 "tx": [{"name": "pulse_width", "value": 0},{"name":"delays", "value":""}],
                 "codes": [{"name":"tx_ref", "value": ""},{"name":"code", "value": "", "choices":"RCLineCode"}],
                 "windows": [{"name":"tx_ref","value":""}, {"name":"first_height", "value":0}, {"name":"number_of_samples","value":0}, {"name":"resolution","value":0}, {"name":"last_height","value":0}],
                 "sync": [{"name": "delay", "value": 0}],
                 "flip": [{"name":"number_of_flips", "value": 0}],
                 "prog_pulses": [{"name": "begin", "value": 0}, {"name": "end","value": 0}],
                 }
             class RCConfiguration(Configuration):
                 clock = models.FloatField(verbose_name='Clock Master (MHz)', validators=[MinValueValidator(0), MaxValueValidator(80)], blank=True, null=True)
                 clock_divider = models.PositiveIntegerField(verbose_name='Clock divider', validators=[MinValueValidator(0), MaxValueValidator(256)], blank=True, null=True)
                 ipp = models.PositiveIntegerField(verbose_name='Inter pulse period (Km)', default=10)
                 ntx = models.PositiveIntegerField(verbose_name='Number of pulse of transmit', default=1)
                 time_before = models.PositiveIntegerField(verbose_name='Number of pulse of transmit', default=0)
                 class Meta:
                     db_table = 'rc_configurations'
                 def get_number_position(self):
                     lines = RCLine.objects.filter(rc_configuration=self.rc_configuration)
                     if lines:
                         return max([line.position for line in lines])
+                def get_refs_lines(self):
+                    lines = RCLine.objects.filter(rc_configuration=self.pk, line_type__name='tx')
+                    return [(line.pk, line.get_name()) for line in lines]
             class RCLineCode(models.Model):
-                name = models.CharField(choices=LINE_TYPES, max_length=40)
+                name = models.CharField(max_length=40)
                 bits_per_code = models.PositiveIntegerField(default=0)
                 number_of_codes = models.PositiveIntegerField(default=0)
                 codes = models.TextField(blank=True, null=True)
                 class Meta:
                     db_table = 'rc_line_codes'
+                    ordering = ('name',)
+                def __unicode__(self):
+                    return u'%s' % self.name
             class RCLineType(models.Model):
                 name = models.CharField(choices=LINE_TYPES, max_length=40)
                 description = models.TextField(blank=True, null=True)
                 params = models.TextField(default='[]')
                 class Meta:
                     db_table = 'rc_line_types'
                 def __unicode__(self):
                     return u'%s - %s' % (self.name.upper(), self.get_name_display())
             class RCLine(models.Model):
                 rc_configuration = models.ForeignKey(RCConfiguration)
                 line_type = models.ForeignKey(RCLineType)
                 channel = models.PositiveIntegerField(default=0)
                 position = models.PositiveIntegerField(default=0)
                 params = models.TextField(default='{}')
                 class Meta:
                     db_table = 'rc_lines'
                 def __unicode__(self):
                     return u'%s - %s' % (self.rc_configuration, self.get_name())
                 def get_name(self):
                     chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-                    if self.line_type.name in ('tx', 'code', 'tr'):
+                    if self.line_type.name in ('tx', 'tr',):
-                        return '%s%s' % (self.line_type.name.upper(), chars[self.position])
+                        return '%s %s' % (self.line_type.name.upper(), chars[self.position])
+                    elif self.line_type.name in ('codes', 'windows',):
-                    return self.line_type.name.upper()
+                        pk = json.loads(self.params)['TX_ref']
+                        ref = RCLine.objects.get(pk=pk)
+                        return '%s %s' % (self.line_type.name.upper(), chars[ref.position])
+                    else:
+                        return self.line_type.name.upper()

apps/rc/templates/rc_add_line.html +13 -1

@@ -1,1 +1,13
1	{% extends "dev_conf_edit.html" %} No newline at end of file	1	{% extends "dev_conf_edit.html" %}
		2
		3	{% block extra-js%}
		4
		5	<script type="text/javascript">
		6
		7	$("#id_line_type").change(function() {
		8	var url = "{% url 'url_add_rc_line' dev_conf.id %}";
		9	document.location = url + $(this).val()+"/";
		10	});
		11
		12	</script>
		13	{% endblock %} No newline at end of file

apps/rc/templates/rc_conf.html +28 -39

             {% extends "dev_conf.html" %}
             {% load static %}
             {% load bootstrap3 %}
+            {% load main_tags %}s
             {% block extra-head %}
             <style type="text/css">
                 /* show the move cursor as the user moves the mouse over the panel header.*/
                 .panel-default { cursor: move; }
             </style>
             {% endblock %}
             {% block content %}
             <table class="table table-bordered">
             {% for key in dev_conf_keys %}
             <tr><th>{{key|title}}</th><td>{{dev_conf|attr:key}}</td></tr>
             {% endfor %}
             </table>
             <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_send">Send</button>
             <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_export">Export</button>
             <button class="btn btn-primary pull-right" style="margin-left: 10px" id="bt_edit">Edit</button>
             <br>
             <h2>RC Lines</h2><hr>
-            <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+            <div class="panel-group" id="div_lines" role="tablist" aria-multiselectable="true">
-            {% for line in rc_lines %}
+            {% include "rc_lines.html" %}
-              <div class="panel panel-default" >
-                <div class="panel-heading" role="tab" id="headingOne">
-                  <h4 class="panel-title">
-                    <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{{line.id}}" aria-expanded="true" aria-controls="collapseOne">
-                      CH{{line.channel}} - {{line.get_name}}
-                    </a>
-                  <button class="btn-xs btn-danger pull-right" name="bt_remove_line" value="{{line.pk}}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
-                  <button class="btn-xs btn-info pull-right" name="bt_line_down" value="{{line.pk}}"><span class="glyphicon glyphicon-arrow-down" aria-hidden="true"></span></button>
-                  <button class="btn-xs btn-info pull-right" name="bt_line_up" value="{{line.pk}}"><span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span></button>
-                  </h4>
-                </div>
-                <div id="collapse{{line.id}}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
-                  <div class="panel-body">
-                    {% bootstrap_form line.form layout='horizontal' size='small' %}
-                  </div>
-                </div>
-              </div>
-            {% endfor%}
             </div>
             <br>
             <div class="pull-right">
             <button class="btn btn-primary" id="bt_add_line">Add Line</button>
-            <button class="btn btn-primary" id="bt_add_line">  Edit  </button>
+            <button class="btn btn-primary" id="bt_edit_lines">  Edit  </button>
             <button class="btn btn-primary" id="bt_pulses">Pulses</button>
             </div>
             {% endblock %}
             {% block extra-js%}
             <script type="text/javascript">
-                $(document).ready(function() {
               $("#bt_edit").click(function() {
-                document.location = "{% url 'url_edit_rc_conf' dev_conf.id%}";
+                document.location = "{% url 'url_edit_rc_conf' dev_conf.id %}";
-              });
-              $("#bt_add_line").click(function() {
-                document.location = "{% url 'url_add_rc_line' dev_conf.id%}";
               });
-              $("button[name=bt_remove_line]").click(function(){
+              $("#div_lines").on("click", "button[name=bt_remove_line]", function(){
                 document.location = "line/"+$(this).val()+"/delete/";
               });
-              $("button[name=bt_line_up]").click(function(){
-                document.location = "line/"+$(this).val()+"/up/";
-              });
-              $("button[name=bt_line_down]").click(function(){
+              $(".panel-group").sortable({
-                document.location = "line/"+$(this).val()+"/down/";
+                //placeholder: "ui-state-highlight",
-              });
+                update: function( event, ui ) {
+                    var sorted = $( ".panel-group" ).sortable( "serialize", { key: "item" } );
+                    var url = "{% url 'url_update_rc_lines' dev_conf.id %}";
+                    var csrf_token = "{{csrf_token}}";
+                    $.post( url, { 'items': sorted, 'csrfmiddlewaretoken': csrf_token }, function(data){
+                       $("#div_lines").html(data.html);
+                    });
+                }
+              });
+              $("#bt_add_line").click(function() {
+                document.location = "{% url 'url_add_rc_line' dev_conf.id%}";
+              });
-                $(".panel-group").sortable();
+              $("#bt_edit_lines").click(function() {
+                document.location = "{% url 'url_edit_rc_lines' dev_conf.id %}";
+              });
-              });
             </script>
             {% endblock %}

apps/rc/urls.py +4 -3

             from django.conf.urls import url
             urlpatterns = (
                 url(r'^(?P<id>-?\d+)/$', 'apps.rc.views.conf', name='url_rc_conf'),
                 url(r'^(?P<id>-?\d+)/edit/$', 'apps.rc.views.conf_edit', name='url_edit_rc_conf'),
-                url(r'^(?P<id>-?\d+)/add_line/$', 'apps.rc.views.add_line', name='url_add_rc_line'),
+                url(r'^(?P<conf_id>-?\d+)/add_line/$', 'apps.rc.views.add_line', name='url_add_rc_line'),
+                url(r'^(?P<conf_id>-?\d+)/update_lines/$', 'apps.rc.views.update_lines', name='url_update_rc_lines'),
+                url(r'^(?P<conf_id>-?\d+)/edit_lines/$', 'apps.rc.views.edit_lines', name='url_edit_rc_lines'),
+                url(r'^(?P<conf_id>-?\d+)/add_line/(?P<line_type_id>-?\d+)/$', 'apps.rc.views.add_line', name='url_add_rc_line'),
                 url(r'^(?P<conf_id>-?\d+)/line/(?P<line_id>-?\d+)/delete/$', 'apps.rc.views.remove_line', name='url_remove_rc_line'),
-                url(r'^(?P<conf_id>-?\d+)/line/(?P<line_id>-?\d+)/up/$', 'apps.rc.views.line_up', name='url_rc_line_up'),
-                url(r'^(?P<conf_id>-?\d+)/line/(?P<line_id>-?\d+)/down/$', 'apps.rc.views.line_down', name='url_rc_line_down'),
             )

apps/rc/views.py +88 -42

             import json
             from django.contrib import messages
-            from django.shortcuts import render, redirect, get_object_or_404
+            from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
             from apps.main.models import Configuration, Experiment
+            from apps.main.views import sidebar
-            from .models import RCConfiguration, RCLine
+            from .models import RCConfiguration, RCLine, RCLineType
-            from .forms import RCConfigurationForm, RCLineForm, RCLineViewForm
+            from .forms import RCConfigurationForm, RCLineForm, RCLineViewForm, RCLineEditForm
             def conf(request, id):
                 conf = get_object_or_404(RCConfiguration, pk=id)
                 lines = RCLine.objects.filter(rc_configuration=conf).order_by('channel')
                 for line in lines:
                     line.form = RCLineViewForm(extra_fields=json.loads(line.params))
                 kwargs = {}
                 kwargs['dev_conf'] = conf
                 kwargs['rc_lines'] = lines
                 kwargs['dev_conf_keys'] = ['clock', 'ipp', 'ntx','clock_divider']
                 kwargs['title'] = 'RC Configuration'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Edit Configuration'
                 ###### SIDEBAR ######
-                experiments = Experiment.objects.filter(campaign=conf.experiment.campaign)
+                kwargs.update(sidebar(conf))
-                configurations = Configuration.objects.filter(experiment=conf.experiment)
-                exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time']
-                conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address']
-                kwargs['experiment_keys'] = exp_keys[1:]
-                kwargs['experiments'] = experiments.values(*exp_keys)
-                kwargs['configuration_keys'] = conf_keys[1:]
-                kwargs['configurations'] = configurations.values(*conf_keys)
                 return render(request, 'rc_conf.html', kwargs)
             def conf_edit(request, id):
                 conf = get_object_or_404(RCConfiguration, pk=id)
                 if request.method=='GET':
                     form = RCConfigurationForm(instance=conf)
                 if request.method=='POST':
                     form = RCConfigurationForm(request.POST, instance=conf)
                     if form.is_valid():
                         form.save()
-                        return redirect('url_rc_conf', id=id)
+                        return redirect('url_dev_conf', id=id)
                 kwargs = {}
+                kwargs['dev_conf'] = conf
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 kwargs['previous'] = conf.get_absolute_url()
+                kwargs.update(sidebar(conf))
                 return render(request, 'rc_conf_edit.html', kwargs)
-            def add_line(request, id):
+            def add_line(request, conf_id, line_type_id=None):
-                conf = get_object_or_404(RCConfiguration, pk=id)
+                conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 if request.method=='GET':
-                    form = RCLineForm(initial={'rc_configuration':conf.id})
+                    if line_type_id:
+                        line_type = get_object_or_404(RCLineType, pk=line_type_id)
+                        form = RCLineForm(initial={'rc_configuration':conf_id, 'line_type': line_type_id},
+                                          extra_fields=json.loads(line_type.params))
+                    else:
+                        form = RCLineForm(initial={'rc_configuration':conf_id})
                 if request.method=='POST':
-                    form = RCLineForm(request.POST)
+                    line_type = get_object_or_404(RCLineType, pk=line_type_id)
+                    form = RCLineForm(request.POST, extra_fields=json.loads(line_type.params))
                     if form.is_valid():
                         form.save()
-                        return redirect('url_rc_conf', id=id)
+                        return redirect(conf.get_absolute_url())
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'RC Configuration'
                 kwargs['suptitle'] = 'Add Line'
                 kwargs['button'] = 'Add'
                 kwargs['previous'] = conf.get_absolute_url()
+                kwargs['dev_conf'] = conf
+                kwargs.update(sidebar(conf))
                 return render(request, 'rc_add_line.html', kwargs)
             def remove_line(request, conf_id, line_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 line = get_object_or_404(RCLine, pk=line_id)
                 if request.method == 'POST':
                     if line:
                         try:
                             channel = line.channel
                             line.delete()
                             for ch in range(channel+1, RCLine.objects.filter(rc_configuration=conf).count()+1):
                                 l = RCLine.objects.get(rc_configuration=conf, channel=ch)
                                 l.channel = l.channel-1
                                 l.save()
                             messages.success(request, 'Line: "%s" has been deleted.'  % line)
                         except:
                             messages.error(request, 'Unable to delete line: "%s".' % line)
                     return redirect(conf.get_absolute_url())
                 kwargs = {}
                 kwargs['object'] = line
                 kwargs['delete_view'] = True
                 kwargs['title'] = 'Confirm delete'
                 kwargs['previous'] = conf.get_absolute_url()
                 return render(request, 'confirm.html', kwargs)
-            def line_up(request, conf_id, line_id):
+            def edit_lines(request, conf_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
-                line = get_object_or_404(RCLine, pk=line_id)
-                if line:
+                if request.method=='GET':
-                    ch = line.channel
+                    lines = RCLine.objects.filter(rc_configuration=conf).order_by('channel')
-                    if ch-1>=0:
+                    for line in lines:
-                        line0 = RCLine.objects.get(rc_configuration=conf, channel=ch-1)
+                        line_type = get_object_or_404(RCLineType, pk=line.line_type.id)
-                        line0.channel = ch
+                        extra_fields = json.loads(line_type.params)
-                        line0.save()
+                        for item in extra_fields:
-                        line.channel = ch-1
+                            params = json.loads(line.params)
-                        line.save()
+                            item['value'] = params[item['name']]
+                        line.form = RCLineEditForm(initial={'rc_configuration':conf_id, 'line_type': line.line_type.id, 'line': line.id},
+                                               extra_fields=extra_fields)
+                elif request.method=='POST':
+                    data = {}
+                    for label,value in request.POST.items():
+                        if '|' not in label:
+                            continue
+                        id, name = label.split('|')
+                        if id in data:
+                            data[id][name]=value
+                        else:
+                            data[id] = {name:value}
+                    for id, params in data.items():
+                        line = RCLine.objects.get(pk=id)
+                        line.params = json.dumps(params)
+                        line.save()
+                    return redirect(conf.get_absolute_url())
-                return redirect(conf.get_absolute_url())
+                kwargs = {}
+                kwargs['dev_conf'] = conf
+                kwargs['rc_lines'] = lines
+                kwargs['edit'] = True
+                kwargs['title'] = 'RC Configuration'
+                kwargs['suptitle'] = 'Edit Lines'
+                kwargs['button'] = 'Update'
+                kwargs['previous'] = conf.get_absolute_url()
+                kwargs.update(sidebar(conf))
+                return render(request, 'rc_edit_lines.html', kwargs)
-            def line_down(request, conf_id, line_id):
+            def update_lines(request, conf_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
-                line = get_object_or_404(RCLine, pk=line_id)
+                if request.method=='POST':
-                if line:
+                    ch = 0
-                    ch = line.channel
+                    for item in request.POST['items'].split('&'):
-                    if ch+1<RCLine.objects.filter(rc_configuration=conf).count():
+                        line = RCLine.objects.get(pk=item.split('=')[-1])
-                        line1 = RCLine.objects.get(rc_configuration=conf, channel=ch+1)
+                        line.channel = ch
-                        line1.channel = ch
-                        line1.save()
-                        line.channel = ch+1
                         line.save()
+                        ch += 1
+                    lines = RCLine.objects.filter(rc_configuration=conf).order_by('channel')
+                    for line in lines:
+                        line.form = RCLineViewForm(extra_fields=json.loads(line.params))
+                    html = render(request, 'rc_lines.html', {'rc_lines':lines})
+                    data = {'html': html.content}
+                    return HttpResponse(json.dumps(data), content_type="application/json")
                 return redirect(conf.get_absolute_url())

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