radarsys Commit - r135:a54b798bbf44 · Jicamarca Repository

Task #99: View & Edit Jars Filters...

Fiorella Quino -

r135:a54b798bbf44

parent child

Context file:

r135:a54b798bbf44

Collapse all files

apps/jars/templates/jars_filter.html created 644 +55 0

@@ -0,0 +1,55
	1	{% extends "base.html" %}
	2	{% load bootstrap3 %}
	3	{% load static %}
	4	{% load main_tags %}
	5
	6	{% block search-active %}active{% endblock %}
	7
	8	{% block content-title %}{{title}}{% endblock %}
	9	{% block content-suptitle %}{{suptitle}}{% endblock %}
	10
	11	{% block content %}
	12
	13	{% block menu-actions %}
	14
	15	{% endblock %}
	16
	17	<table class="table table-bordered">
	18
	19	{% for key in dev_conf_keys %}
	20	<tr>
	21	<th>{% get_verbose_field_name dev_conf key %}</th>
	22	<td>{{dev_conf\|attr:key}}</td>
	23	</tr>
	24	{% endfor %}
	25	</table>
	26	{% if button %}
	27	<div class="pull-right">
	28	<button type="button" class="btn btn-primary" id="back_button">{% if cancel %}{{cancel}}{% else %}Back{% endif %}</button>
	29	<button type="button" id="edit_button" class="btn btn-primary">{{edit_button}}</button>
	30	<button type="button" id="add_button" class="btn btn-primary">{{add_button}}</button>
	31	</div>
	32	{% endif %}
	33
	34	{% block extra-content %}
	35	{% endblock %}
	36
	37	{% endblock %}
	38
	39	{% block sidebar%}
	40	{% include "sidebar_devices.html" %}
	41	{% endblock %}
	42
	43	{% block extra-js%}
	44	<script type="text/javascript">
	45
	46	$("#edit_button").click(function() {
	47	document.location = "{% url 'url_edit_jars_filter' conf.id filter.id%}";
	48	});
	49
	50	$("#back_button").click(function() {
	51	document.location = "{% url 'url_edit_jars_conf' conf.id%}";
	52	});
	53
	54	</script>
	55	{% endblock %} No newline at end of file

apps/jars/templates/jars_filter_edit.html created 644 +17 0

@@ -0,0 +1,17
	1	{% extends "dev_conf_edit.html" %}
	2	{% load bootstrap3 %}
	3	{% load static %}
	4	{% load main_tags %}
	5
	6	{% block content %}
	7	<form class="form" method="post">
	8	{% csrf_token %}
	9	{% bootstrap_form form layout='horizontal' size='medium' %}
	10	<div style="clear: both;"></div>
	11	<br>
	12	<div class="pull-right">
	13	<button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
	14	<button type="submit" class="btn btn-primary">{{button}}</button>
	15	</div>
	16	</form>
	17	{% endblock %} No newline at end of file

apps/jars/forms.py +11 -1

             from django import forms
             from apps.main.models import Device, Experiment
-            from .models import JARSConfiguration
+            from .models import JARSConfiguration, JARSfilter
             from .widgets import SpectralWidget
             class JARSConfigurationForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     super(JARSConfigurationForm, self).__init__(*args, **kwargs)
                     instance = getattr(self, 'instance', None)
                     if instance and instance.pk:
                         devices = Device.objects.filter(device_type__name='jars')
                         if instance.experiment:
                             experiments = Experiment.objects.filter(pk=instance.experiment.id)
                             self.fields['experiment'].widget.choices = [(experiment.id, experiment) for experiment in experiments]
                         self.fields['device'].widget.choices = [(device.id, device) for device in devices]
                         #self.fields['spectral'].widget = SpectralWidget()
                     self.fields['spectral'].widget = SpectralWidget()
                 #-------------JARS Configuration needs an Experiment-----------------
                 def clean(self):
                     cleaned_data = super(JARSConfigurationForm, self).clean()
                     experiment = cleaned_data.get('experiment')
                     if experiment == None:
                         msg = "Error: Jars Configuration needs an Experiment"
                         self.add_error('experiment', msg)
                 class Meta:
                     model = JARSConfiguration
+                    exclude = ('type', 'parameters', 'status')
+            class JARSfilterForm(forms.ModelForm):
+                def __init__(self, *args, **kwargs):
+                    super(JARSfilterForm, self).__init__(*args, **kwargs)
+                    instance = getattr(self, 'instance', None)
+                class Meta:
+                    model = JARSfilter
                     exclude = ('type', 'parameters', 'status')

apps/jars/models.py +1 -1

             from django.db import models
             from apps.main.models import Configuration
             from django.core.validators import MinValueValidator, MaxValueValidator
             from apps.rc.models import RCConfiguration
             # Create your models here.
             EXPERIMENT_TYPE = (
                                (0, 'RAW_DATA'),
                                (1, 'PDATA'),
                                )
             DATA_TYPE = (
                          (0, 'SHORT'),
                          (1, 'FLOAT'),
                          )
             class JARSfilter(models.Model):
                 name       = models.CharField(max_length=60, unique=True, default='')
                 clock      = models.FloatField(verbose_name='Clock Input (MHz)',validators=[MinValueValidator(5), MaxValueValidator(75)], null=True, default=60)
                 mult       = models.PositiveIntegerField(verbose_name='Multiplier',validators=[MinValueValidator(1), MaxValueValidator(20)], default=5)
                 fch        = models.DecimalField(verbose_name='Frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=19, decimal_places=16, null=True, default=49.9200)
                 filter_fir = models.PositiveIntegerField(verbose_name='FIR Filter',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 6)
                 filter_2   = models.PositiveIntegerField(verbose_name='Filter 2',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 10)
                 filter_5   = models.PositiveIntegerField(verbose_name='Filter 5',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 1)
                 speed      = models.PositiveIntegerField(verbose_name='Speed',validators=[MinValueValidator(0), MaxValueValidator(100000)], default = 0)
                 class Meta:
                     db_table = 'jars_filters'
                     #ordering = ['channel']
             class JARSConfiguration(Configuration):
                 ADC_RESOLUTION   = 8
                 PCI_DIO_BUSWIDTH = 32
                 HEADER_VERSION   = 1103
                 BEGIN_ON_START   = True
                 REFRESH_RATE     = 1
                 rc               = models.ForeignKey(RCConfiguration, on_delete=models.CASCADE, null=True)
                 exp_type         = models.PositiveIntegerField(verbose_name='Experiment Type', choices=EXPERIMENT_TYPE, default=0)
                 cards_number     = models.PositiveIntegerField(verbose_name='Number of Cards', validators=[MinValueValidator(1), MaxValueValidator(4)], default = 1)
                 channels_number  = models.PositiveIntegerField(verbose_name='Number of Channels', validators=[MinValueValidator(1), MaxValueValidator(8)], default = 5)
                 channels         = models.CharField(verbose_name='Channels', max_length=15, default = '1,2,3,4,5')
                 rd_directory     = models.CharField(verbose_name='Raw Data Directory', max_length=40, default='', blank=True, null=True)
                 raw_data_blocks  = models.PositiveIntegerField(verbose_name='Raw Data Blocks', validators=[MaxValueValidator(5000)], default=120)
                 data_type        = models.PositiveIntegerField(verbose_name='Data Type', choices=DATA_TYPE, default=0)
                 acq_profiles     = models.PositiveIntegerField(verbose_name='Acquired Profiles', validators=[MaxValueValidator(5000)], default=400)
                 profiles_block   = models.PositiveIntegerField(verbose_name='Profiles Per Block', validators=[MaxValueValidator(5000)], default=400)
                 fftpoints        = models.PositiveIntegerField(verbose_name='FFT Points',default=16)
                 incohe_integr    = models.PositiveIntegerField(verbose_name='Incoherent Integrations',validators=[MinValueValidator(1)], default=30)
-                filter           = models.ForeignKey(JARSfilter, on_delete=models.CASCADE, null=True, blank=True)
+                filter           = models.ForeignKey(JARSfilter, on_delete=models.CASCADE, null=True)
                 spectral_number  = models.PositiveIntegerField(verbose_name='# Spectral Combinations',validators=[MinValueValidator(1)], default=1)
                 spectral         = models.CharField(verbose_name='Combinations', max_length=5000, default = '[0, 0],')
                 create_directory = models.BooleanField(verbose_name='Create Directory Per Day', default=True)
                 include_expname  = models.BooleanField(verbose_name='Experiment Name in Directory', default=True)
                 acq_link         = models.BooleanField(verbose_name='Acquisition Link', default=True)
                 view_raw_data    = models.BooleanField(verbose_name='View Raw Data', default=True)
                 save_ch_dc       = models.BooleanField(verbose_name='Save Channels DC', default=True)
                 class Meta:
                     db_table = 'jars_configurations'
                 def parms_to_dict(self):
                     parameters = {}
                     parameters['name']             = self.name
                     parameters['rc']               = self.rc.name
                     parameters['exp_type']         = self.exp_type
                     parameters['cards_number']     = self.cards_number
                     parameters['channels_number']  = self.channels_number
                     parameters['channels']         = self.channels
                     parameters['rd_directory']     = self.rd_directory
                     parameters['raw_data_blocks']  = self.raw_data_blocks
                     parameters['data_type']        = self.data_type
                     parameters['acq_profiles']     = self.acq_profiles
                     parameters['profiles_block']   = self.profiles_block
                     parameters['filter']           = self.filter.name
                     parameters['create_directory'] = bool(self.create_directory)
                     parameters['include_expname']  = bool(self.include_expname)
                     parameters['acq_link']         = bool(self.acq_link)
                     parameters['view_raw_data']    = bool(self.view_raw_data)
                     return parameters
                 def dict_to_parms(self, parameters):
                     return
                 def status_device(self):
                     return
                 def read_device(self):
                     return
                 def write_device(self):
                     return

apps/jars/templates/jars_conf_edit.html +7 -1

             {% extends "dev_conf_edit.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block content %}
             <form class="form" method="post">
               {% csrf_token %}
               {% bootstrap_form form layout='horizontal' size='medium' %}
               <div style="clear: both;"></div>
               <br>
               <div class="pull-right">
-              <button type="button" class="btn btn-primary" id="bt_add_line">See Filter</button>
+              <button type="button" class="btn btn-primary" id="bt_view_filter">View Filter</button>
               <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
               <button type="submit" class="btn btn-primary">{{button}}</button>
               </div>
             </form>
             {% endblock %}
             {% block extra-js%}
             <script src="{% static 'js/jars.js' %}"></script>
+            <script type="text/javascript">
+            $("#bt_view_filter").click(function() {
+                document.location = "{% url 'url_jars_filter' id_dev filter_id%}";
+              });
+            </script>
             {% endblock %}

apps/jars/urls.py +2 0

             from django.conf.urls import url
             urlpatterns = (
                 url(r'^(?P<id_conf>-?\d+)/$', 'apps.jars.views.jars_conf', name='url_jars_conf'),
                 url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.jars.views.jars_conf_edit', name='url_edit_jars_conf'),
+                url(r'^(?P<conf_id>-?\d+)/view_filter/(?P<filter_id>-?\d+)/$', 'apps.jars.views.view_filter', name='url_jars_filter'),
+                url(r'^(?P<conf_id>-?\d+)/view_filter/(?P<filter_id>-?\d+)/edit$', 'apps.jars.views.edit_filter', name='url_edit_jars_filter'),
             )

apps/jars/views.py +56 -4

             from django.shortcuts import render_to_response
             from django.template import RequestContext
             from django.shortcuts import redirect, render, get_object_or_404
+            from django.contrib import messages
             from apps.main.models import Device
             from apps.main.views import sidebar
-            from .models import JARSConfiguration
+            from .models import JARSConfiguration, JARSfilter
-            from .forms import JARSConfigurationForm
+            from .forms import JARSConfigurationForm, JARSfilterForm
             # Create your views here.
             def jars_conf(request, id_conf):
                 conf = get_object_or_404(JARSConfiguration, pk=id_conf)
                 ip=conf.device.ip_address
                 port=conf.device.port_address
                 kwargs = {}
                 kwargs['status'] = conf.device.get_status_display()
                 kwargs['dev_conf'] = conf
                 kwargs['dev_conf_keys'] = ['experiment', 'device',
                                            'cards_number', 'channels_number',
                                            'rd_directory', 'create_directory',
                                            'include_expname', 'raw_data_blocks',
                                            'acq_profiles', 'profiles_block', 'filter']
                 kwargs['title'] = 'JARS Configuration'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Edit Configuration'
                 kwargs['no_play'] = True
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))
                 return render(request, 'jars_conf.html', kwargs)
             def jars_conf_edit(request, id_conf):
                 conf = get_object_or_404(JARSConfiguration, pk=id_conf)
                 if request.method=='GET':
                     form = JARSConfigurationForm(instance=conf)
                 if request.method=='POST':
                     form = JARSConfigurationForm(request.POST, instance=conf)
                     if form.is_valid():
                         conf = form.save(commit=False)
                         conf.save()
                         return redirect('url_jars_conf', id_conf=conf.id)
                         ##ERRORS
                 kwargs = {}
+                kwargs['filter_id'] = conf.filter.id
                 kwargs['id_dev'] = conf.id
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Save'
-                return render(request, 'jars_conf_edit.html', kwargs)
  No newline at end of file
+                return render(request, 'jars_conf_edit.html', kwargs)
+            def view_filter(request, conf_id, filter_id):
+                conf = get_object_or_404(JARSConfiguration, pk=conf_id)
+                filter = get_object_or_404(JARSfilter, pk=filter_id)
+                kwargs = {}
+                kwargs['conf']          = conf
+                kwargs['filter']        = filter
+                kwargs['dev_conf']      = filter
+                kwargs['dev_conf_keys'] = ['name', 'clock',
+                                           'mult', 'fch',
+                                           'filter_fir', 'filter_2',
+                                           'filter_5', 'speed']
+                kwargs['title']         = 'Filter View'
+                kwargs['suptitle']      = 'Details'
+                kwargs['button']        = 'SI'
+                kwargs['edit_button']   = 'Edit Filter'
+                kwargs['add_button']    = 'Add Filter'
+                return render(request, 'jars_filter.html', kwargs)
+            def edit_filter(request, conf_id, filter_id):
+                conf = get_object_or_404(JARSConfiguration, pk=conf_id)
+                if filter_id:
+                    filter = get_object_or_404(JARSfilter, pk=filter_id)
+                if request.method=='GET':
+                    form = JARSfilterForm(instance=filter)
+                if request.method=='POST':
+                    #form = JARSfilterForm(request.POST)
+                    form = JARSfilterForm(request.POST, instance=filter)
+                    if form.is_valid():
+                        form.save()
+                        messages.success(request, 'JARS Filter successfully updated')
+                        return redirect('url_jars_filter', conf.id, filter.id)
+                kwargs = {}
+                kwargs['form'] = form
+                kwargs['title'] = conf.name
+                kwargs['suptitle'] = 'Edit Filter'
+                kwargs['button'] = 'Save'
+               # kwargs['previous'] = conf.get_absolute_url_edit()
+                kwargs['dev_conf'] = conf
+                return render(request, 'jars_filter_edit.html', kwargs)
  No newline at end of file

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