radarsys Commit - r316:0d39f71bbf42 · Jicamarca Repository

Update Views y several improvements

Juan C. Espinoza -

r316:0d39f71bbf42

parent child

Context file:

r316:0d39f71bbf42

Expand all files

The requested changes are too big and content was truncated. Show full diff

.env +1 -1

             REDIS_HOST=radarsys-redis
             REDIS_PORT=6379
             POSTGRES_DB_NAME=radarsys
             POSTGRES_PORT_5432_TCP_ADDR=radarsys-postgres
             POSTGRES_PORT_5432_TCP_PORT=5432
             POSTGRES_USER=docker
             POSTGRES_PASSWORD=docker
             PGDATA=/var/lib/postgresql/data
             LC_ALL=C.UTF-8
             TZ=America/Lima
-            DOCKER_DATA=/data/dockers/radarsys/
+            DOCKER_DATA=/Volumes/dockers/radarsys/
             LOCAL_IP=192.168.1.128

.gitignore +1 0

             migrations/
             .DS_Store
             *.sqlite
             .vscode/
             *.pyc
             .env
+            remove_migrations.py

apps/abs/forms.py +3 -1

             from django import forms
             from .models import ABSConfiguration, ABSBeam
             from .widgets import UpDataWidget, DownDataWidget, EditUpDataWidget, EditDownDataWidget
             from apps.main.models import Configuration
             import os
             class ABSConfigurationForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     super(ABSConfigurationForm, self).__init__(*args, **kwargs)
                 class Meta:
                     model = ABSConfiguration
-                    exclude = ('type', 'status', 'parameters', 'active_beam', 'module_status', 'module_messages', 'module_mode')
+                    exclude = ('type', 'status', 'parameters', 'active_beam',
+                        'module_status', 'module_messages', 'module_mode',
+                        'author', 'hash')
             class ABSBeamAddForm(forms.Form):
                 up_data = forms.CharField(widget=UpDataWidget, label='')
                 down_data = forms.CharField(widget=DownDataWidget, label='')
                 def __init__(self, *args, **kwargs):
                     super(ABSBeamAddForm, self).__init__(*args, **kwargs)
             class ABSBeamEditForm(forms.Form):
                 up_data = forms.CharField(widget=EditUpDataWidget, label='')
                 down_data = forms.CharField(widget=EditDownDataWidget, label='')
                 def __init__(self, *args, **kwargs):
                     super(ABSBeamEditForm, self).__init__(*args, **kwargs)
                     if 'initial' in kwargs:
                         if 'beam' in self.initial:
                             self.fields['up_data'].initial  = self.initial['beam']
                             self.fields['down_data'].initial  = self.initial['beam']
             class ExtFileField(forms.FileField):
                 """
                 Same as forms.FileField, but you can specify a file extension whitelist.
                 >>> from django.core.files.uploadedfile import SimpleUploadedFile
                 >>>
                 >>> t = ExtFileField(ext_whitelist=(".pdf", ".txt"))
                 >>>
                 >>> t.clean(SimpleUploadedFile('filename.pdf', 'Some File Content'))
                 >>> t.clean(SimpleUploadedFile('filename.txt', 'Some File Content'))
                 >>>
                 >>> t.clean(SimpleUploadedFile('filename.exe', 'Some File Content'))
                 Traceback (most recent call last):
                 ...
                 ValidationError: [u'Not allowed filetype!']
                 """
                 def __init__(self, *args, **kwargs):
                     extensions = kwargs.pop("extensions")
                     self.extensions = [i.lower() for i in extensions]
                     super(ExtFileField, self).__init__(*args, **kwargs)
                 def clean(self, *args, **kwargs):
                     data = super(ExtFileField, self).clean(*args, **kwargs)
                     filename = data.name
                     ext = os.path.splitext(filename)[1]
                     ext = ext.lower()
                     if ext not in self.extensions:
                         raise forms.ValidationError('Not allowed file type: %s' % ext)
             class ABSImportForm(forms.Form):
                 file_name = ExtFileField(extensions=['.json'])

apps/abs/models.py +2 -2

             from django.db import models
             from apps.main.models import Configuration
             from django.core.urlresolvers import reverse
             # Create your models here.
             from celery.execute import send_task
             from datetime import datetime
             import ast
             import socket
             import json
             import requests
             import struct
             import os, sys, time
             import multiprocessing
             antenna_default = json.dumps({
                                 "antenna_up": [[0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
                                                 [0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
                                                 [0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
                                                 [0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
                                                 [0.5,0.5,0.5,0.5,1.0,1.0,1.0,1.0],
                                                 [0.5,0.5,0.5,0.5,1.0,1.0,1.0,1.0],
                                                 [0.5,0.5,0.5,0.5,1.0,1.0,1.0,1.0],
                                                 [0.5,0.5,0.5,0.5,1.0,1.0,1.0,1.0]
                                                 ]
                                                ,
                                 "antenna_down": [[0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
                                                 [0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
                                                 [0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
                                                 [0.0,0.0,0.0,0.0,0.5,0.5,0.5,0.5],
                                                 [0.5,0.5,0.5,0.5,3.0,3.0,3.0,3.0],
                                                 [0.5,0.5,0.5,0.5,3.0,3.0,3.0,3.0],
                                                 [0.5,0.5,0.5,0.5,3.0,3.0,3.0,3.0],
                                                 [0.5,0.5,0.5,0.5,3.0,3.0,3.0,3.0]],
                             })
             tx_default = json.dumps({
                             "up": [[1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1]],
                           "down": [[1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1]],
                          })
             rx_default = json.dumps({
                             "up": [[1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1]],
                           "down": [[1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [1,1,1,1,0,0,0,0],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1],
                                    [0,0,0,0,1,1,1,1]],
                          })
             status_default = '0000000000000000000000000000000000000000000000000000000000000000'
             default_messages = {}
             for i in range(1,65):
                 default_messages[str(i)] = "Module "+str(i)
             ues_default = json.dumps({
                             "up": [0.533333,0.00000,1.06667,0.00000],
                             "down": [0.533333,0.00000,1.06667,0.00000]
                         })
             onlyrx_default = json.dumps({
                                 "up": False,
                                 "down": False
                             })
             def up_convertion(cadena):
                 valores = []
                 for c in cadena:
                     if c == 1.0: valores=valores+['000']
                     if c == 2.0: valores=valores+['001']
                     if c == 3.0: valores=valores+['010']
                     if c == 0.0: valores=valores+['011']
                     if c == 0.5: valores=valores+['100']
                     if c == 1.5: valores=valores+['101']
                     if c == 2.5: valores=valores+['110']
                     if c == 3.5: valores=valores+['111']
                 return valores
             def up_conv_bits(value):
                 if value == 1.0: bits="000"
                 if value == 2.0: bits="001"
                 if value == 3.0: bits="010"
                 if value == 0.0: bits="011"
                 if value == 0.5: bits="100"
                 if value == 1.5: bits="101"
                 if value == 2.5: bits="110"
                 if value == 3.5: bits="111"
                 return bits
             def down_convertion(cadena):
                 valores = []
                 for c in cadena:
                     if c == 1.0: valores=valores+['000']
                     if c == 2.0: valores=valores+['001']
                     if c == 3.0: valores=valores+['010']
                     if c == 0.0: valores=valores+['011']
                     if c == 0.5: valores=valores+['100']
                     if c == 1.5: valores=valores+['101']
                     if c == 2.5: valores=valores+['110']
                     if c == 3.5: valores=valores+['111']
                 return valores
             def down_conv_bits(value):
                 if value == 1.0: bits="000"
                 if value == 2.0: bits="001"
                 if value == 3.0: bits="010"
                 if value == 0.0: bits="011"
                 if value == 0.5: bits="100"
                 if value == 1.5: bits="101"
                 if value == 2.5: bits="110"
                 if value == 3.5: bits="111"
                 return bits
             def up_conv_value(bits):
                 if bits == "000": value=1.0
                 if bits == "001": value=2.0
                 if bits == "010": value=3.0
                 if bits == "011": value=0.0
                 if bits == "100": value=0.5
                 if bits == "101": value=1.5
                 if bits == "110": value=2.5
                 if bits == "111": value=3.5
                 return value
             def down_conv_value(bits):
                 if bits == "000": value=1.0
                 if bits == "001": value=2.0
                 if bits == "010": value=3.0
                 if bits == "011": value=0.0
                 if bits == "100": value=0.5
                 if bits == "101": value=1.5
                 if bits == "110": value=2.5
                 if bits == "111": value=3.5
                 return value
             def ip2position(module_number):
                 j=0
                 i=0
                 for x in range(0,module_number-1):
                     j=j+1
                     if j==8:
                         i=i+1
                         j=0
                 pos = [i,j]
                 return pos
             def fromBinary2Char(binary_string):
                 number = int(binary_string, 2)
                 #Plus 33 to avoid more than 1 characters values such as: '\x01'-'\x1f'
                 number = number + 33
                 char = chr(number)
                 return char
             def fromChar2Binary(char):
                 number = ord(char) - 33
                 #Minus 33 to get the real value
                 bits = bin(number)[2:]
                 #To ensure we have a string with 6bits
                 if len(bits) < 6:
                     bits = bits.zfill(6)
                 return bits
             OPERATION_MODES = (
                              (0, 'Manual'),
                              (1, 'Automatic'),
                          )
             class ABSConfiguration(Configuration):
                 active_beam     = models.PositiveSmallIntegerField(verbose_name='Active Beam', default=0)
                 module_status   = models.CharField(verbose_name='Module Status', max_length=10000, default=json.dumps(status_default))
                 operation_mode  = models.PositiveSmallIntegerField(verbose_name='Operation Mode', choices=OPERATION_MODES, default = 0)
                 operation_value = models.FloatField(verbose_name='Periodic (seconds)', default="10", null=True, blank=True)
                 module_messages = models.CharField(verbose_name='Modules Messages', max_length=10000, default=json.dumps(default_messages))
                 class Meta:
                     db_table = 'abs_configurations'
                 def get_absolute_url_plot(self):
                     return reverse('url_plot_abs_patterns', args=[str(self.id)])
                 def parms_to_dict(self):
                     parameters = {}
                     parameters['device_id'] = self.device.id
-                    parameters['name']      = self.name
+                    parameters['label']      = self.label
                     parameters['device_type']      = self.device.device_type.name
                     parameters['beams']     = {}
                     beams = ABSBeam.objects.filter(abs_conf=self)
                     b=1
                     for beam in beams:
                         #absbeam = ABSBeam.objects.get(pk=beams[beam])
                         parameters['beams']['beam'+str(b)] = beam.parms_to_dict()#absbeam.parms_to_dict()
                         b+=1
                     return parameters
                 def dict_to_parms(self, parameters):
-                    self.name = parameters['name']
+                    self.label = parameters['label']
                     absbeams  = ABSBeam.objects.filter(abs_conf=self)
                     beams     = parameters['beams']
                     if absbeams:
                         beams_number    = len(beams)
                         absbeams_number = len(absbeams)
                         if beams_number==absbeams_number:
                             i = 1
                             for absbeam in absbeams:
                                 absbeam.dict_to_parms(beams['beam'+str(i)])
                                 i = i+1
                         elif beams_number > absbeams_number:
                             i = 1
                             for absbeam in absbeams:
                                 absbeam.dict_to_parms(beams['beam'+str(i)])
                                 i=i+1
                             for x in range(i,beams_number+1):
                                 new_beam = ABSBeam(
                                            name     =beams['beam'+str(i)]['name'],
                                            antenna  =json.dumps(beams['beam'+str(i)]['antenna']),
                                            abs_conf = self,
                                            tx       =json.dumps(beams['beam'+str(i)]['tx']),
                                            rx       =json.dumps(beams['beam'+str(i)]['rx']),
                                            ues      =json.dumps(beams['beam'+str(i)]['ues']),
                                            only_rx  =json.dumps(beams['beam'+str(i)]['only_rx'])
                                            )
                                 new_beam.save()
                                 i=i+1
                         else: #beams_number < absbeams_number:
                             i = 1
                             for absbeam in absbeams:
                                 if i <= beams_number:
                                     absbeam.dict_to_parms(beams['beam'+str(i)])
                                     i=i+1
                                 else:
                                     absbeam.delete()
                     else:
                         for beam in beams:
                             new_beam = ABSBeam(
                                        name     =beams[beam]['name'],
                                        antenna  =json.dumps(beams[beam]['antenna']),
                                        abs_conf = self,
                                        tx       =json.dumps(beams[beam]['tx']),
                                        rx       =json.dumps(beams[beam]['rx']),
                                        ues      =json.dumps(beams[beam]['ues']),
                                        only_rx  =json.dumps(beams[beam]['only_rx'])
                                        )
                             new_beam.save()
                 def update_from_file(self, parameters):
                     self.dict_to_parms(parameters)
                     self.save()
                 def get_beams(self, **kwargs):
                     '''
                     This function returns ABS Configuration beams
                     '''
                     return ABSBeam.objects.filter(abs_conf=self.pk, **kwargs)
                 def clone(self, **kwargs):
                     beams = self.get_beams()
                     self.pk = None
                     self.id = None
                     for attr, value in kwargs.items():
                         setattr(self, attr, value)
                     self.save()
                     for beam in beams:
                         beam.clone(abs_conf=self)
                     #-----For Active Beam-----
                     new_beams = ABSBeam.objects.filter(abs_conf=self)
                     self.active_beam = new_beams[0].id
                     self.save()
                     #-----For Active Beam-----
                     #-----For Device Status---
                     self.device.status = 3
                     self.device.save()
                     #-----For Device Status---
                     return self
                 def start_device(self):
                     if self.device.status == 3:
                         try:
                             #self.write_device()
                             send_task('task_change_beam', [self.id],)
                             self.message = 'ABS running'
                         except Exception as e:
                             self.message = str(e)
                             return False
                         return True
                     else:
                         self.message = 'Please, select Write ABS Device first.'
                         return False
                 def stop_device(self):
                     self.device.status = 2
                     self.device.save()
                     self.message = 'ABS has been stopped.'
                     self.save()
                     return True
                 def write_device(self):
                     """
                     This function sends the beams list to every abs module.
                     It needs 'module_conf' function
                     """
                     beams = ABSBeam.objects.filter(abs_conf=self)
                     nbeams = len(beams)
                     if self.connected_modules() == 0 :
                         self.message = "No ABS Module detected."
                         return False
                     #-------------Write each abs module-----------
                     if beams:
                         message = 'SNDF{:02d}'.format(nbeams)
                         for i, status in enumerate(self.module_status):
                             message += ''.join([fromBinary2Char(beam.module_6bits(i)) for beam in beams])
                         status = ['0'] * 64
                         n = 0
                         sock = self.send_multicast(message)
                         for i in range(64):
                             try:
                                 data, address = sock.recvfrom(1024)
                                 if data == '1':
                                     status[int(address[0][10:])-1] = '3'
                                 elif data == '0':
                                     status[int(address[0][10:])-1] = '1'
                             except:
                                 n += 1
                         sock.close()
                     else:
                         self.message = "ABS Configuration does not have beams"
                         return False
                     if n == 64:
                         self.message = "Could not write ABS Modules"
                         self.device.status = 0
                         self.module_status = ''.join(status)
                         self.save()
                         return False
                     else:
                         self.message = "ABS Beams List have been sent to ABS Modules"
                         self.active_beam = beams[0].pk
                     self.device.status = 3
                     self.module_status = ''.join(status)
                     self.save()
                     return True
                 def read_module(self, module):
                     """
                     Read out-bits (up-down) of 1 abs module NOT for Configuration
                     """
                     ip_address  = self.device.ip_address
                     ip_address  = ip_address.split('.')
                     module_seq  = (ip_address[0],ip_address[1],ip_address[2])
                     dot         = '.'
                     module_ip   = dot.join(module_seq)+'.'+str(module)
                     module_port = self.device.port_address
                     read_route = 'http://'+module_ip+':'+str(module_port)+'/read'
                     module_status = json.loads(self.module_status)
                     print(read_route)
                     module_bits = ''
                     try:
                         r_read      = requests.get(read_route, timeout=0.5)
                         answer      = r_read.json()
                         module_bits = answer['allbits']
                     except:
                         return {}
                     return module_bits
                 def read_device(self):
                     parms = {}
                     # Reads active modules.
                     module_status = json.loads(self.module_status)
                     total = 0
                     for status in module_status:
                         if module_status[status] != 0:
                             module_bits = self.read_module(int(status))
                             bits={}
                             if module_bits:
                                 bits = (str(module_bits['um2']) + str(module_bits['um1']) + str(module_bits['um0']) +
                                         str(module_bits['dm2']) + str(module_bits['dm1']) + str(module_bits['dm0']) )
                                 parms[str(status)] = bits
                             total +=1
                     if total==0:
                         self.message = "No ABS Module detected. Please select 'Status'."
                         return False
                     self.message = "ABS Modules have been read"
                     #monitoreo_tx = JROABSClnt_01CeCnMod000000MNTR10
                     return parms
                 def connected_modules(self):
                     """
                     This function returns the number of connected abs-modules without updating.
                     """
                     num = 0
                     print(self.module_status)
                     for i, status in  enumerate(self.module_status):
                         if status != '0':
                             num += 1
                             print('status {}:{}'.format(i+1, status))
                     return num
                 def send_multicast(self, message):
                     multicast_group = ('224.3.29.71', 10000)
                     # Create the datagram socket
                     sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
                     sock.settimeout(0.01)
                     local_ip = os.environ.get('LOCAL_IP', '127.0.0.1')
                     sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, socket.inet_aton(local_ip))
                     sent = sock.sendto(message, multicast_group)
                     print('Sending ' + message)
                     return sock
                 def status_device(self):
                     """
                     This function returns the status of all abs-modules as one.
                     If at least one module is connected, its answer is "1"
                     """
                     sock = self.send_multicast('MNTR')
                     n = 0
                     status = ['0'] * 64
                     for i in range(64):
                         try:
                             data, address = sock.recvfrom(1024)
                             if data == '1':
                                 status[int(address[0][10:])-1] = '3'
                             elif data == '0':
                                 status[int(address[0][10:])-1] = '1'
                             n += 1
                             print('Module: {} connected'.format(address))
                         except:
                             pass
                     sock.close()
                     if n > 0:
                         self.message = 'ABS modules Status have been updated.'
                         self.device.status = 1
                     else:
                         self.device.status = 0
                         self.message = 'No ABS module is connected.'
                     self.module_status = ''.join(status)
                     self.save()
                     return self.device.status
                 def send_beam(self, beam_pos):
                     """
                     This function connects to a multicast group and sends the beam number
                     to all abs modules.
                     """
                     # Se manda a cero RC para poder realizar cambio de beam
                     confs = Configuration.objects.filter(experiment = self.experiment).filter(type=0)
                     confdds  = ''
                     confjars = ''
                     confrc   = ''
                     #TO STOP DEVICES: DDS-JARS-RC
                     for i in range(0,len(confs)):
                         if i==0:
                             for conf in confs:
                                 if conf.device.device_type.name == 'dds':
                                     confdds = conf
                                     confdds.stop_device()
                                     break
                         if i==1:
                             for conf in confs:
                                 if conf.device.device_type.name == 'jars':
                                     confjars = conf
                                     confjars.stop_device()
                                     break
                         if i==2:
                             for conf in confs:
                                 if conf.device.device_type.name == 'rc':
                                     confrc = conf
                                     confrc.stop_device()
                                     break
                     if beam_pos > 0:
                         beam_pos = beam_pos - 1
                     else:
                         beam_pos = 0
                     #El indice del apunte debe ser menor que el numero total de apuntes
                     #El servidor tcp en el embebido comienza a contar desde 0
                     status = ['0'] * 64
                     message = 'CHGB{}'.format(beam_pos)
                     sock = self.send_multicast(message)
                     for i in range(64):
                         try:
                             data, address = sock.recvfrom(1024)
                             print address, data
                             if data == '1':
                                 status[int(address[0][10:])-1] = '3'
                             elif data == '0':
                                 status[int(address[0][10:])-1] = '1'
                         except:
                             pass
                     sock.close()
                     #Start DDS-RC-JARS
                     if confdds:
                         confdds.start_device()
                     if confrc:
                         #print confrc
                         confrc.start_device()
                     if confjars:
                         confjars.start_device()
                     self.message = "ABS Beam has been changed"
                     self.module_status = ''.join(status)
                     self.save()
                     return True
                 def get_absolute_url_import(self):
                     return reverse('url_import_abs_conf', args=[str(self.id)])
             class ABSBeam(models.Model):
                 name         = models.CharField(max_length=60, default='Beam')
                 antenna      = models.CharField(verbose_name='Antenna', max_length=1000, default=antenna_default)
                 abs_conf     = models.ForeignKey(ABSConfiguration, null=True, verbose_name='ABS Configuration')
                 tx           = models.CharField(verbose_name='Tx', max_length=1000, default=tx_default)
                 rx           = models.CharField(verbose_name='Rx', max_length=1000, default=rx_default)
                 s_time       = models.TimeField(verbose_name='Star Time', default='00:00:00')
                 e_time       = models.TimeField(verbose_name='End Time', default='23:59:59')
                 ues          = models.CharField(verbose_name='Ues', max_length=100, default=ues_default)
                 only_rx      = models.CharField(verbose_name='Only RX', max_length=40, default=onlyrx_default)
                 class Meta:
                     db_table = 'abs_beams'
                 def __unicode__(self):
                     return u'%s' % (self.name)
                 def parms_to_dict(self):
                     parameters = {}
                     parameters['name']          = self.name
                     parameters['antenna']       = ast.literal_eval(self.antenna)
                     parameters['abs_conf']      = self.abs_conf.name
                     parameters['tx']            = ast.literal_eval(self.tx)
                     parameters['rx']            = ast.literal_eval(self.rx)
                     parameters['s_time']        = self.s_time.strftime("%H:%M:%S")
                     parameters['e_time']        = self.e_time.strftime("%H:%M:%S")
                     parameters['ues']           = ast.literal_eval(self.ues)
                     parameters['only_rx']       = json.loads(self.only_rx)
                     return parameters
                 def dict_to_parms(self, parameters):
                     self.name     = parameters['name']
                     self.antenna  = json.dumps(parameters['antenna'])
                     #self.abs_conf = parameters['abs_conf']
                     self.tx       = json.dumps(parameters['tx'])
                     self.rx       = json.dumps(parameters['rx'])
                     #self.s_time = parameters['s_time']
                     #self.e_time = parameters['e_time']
                     self.ues      = json.dumps(parameters['ues'])
                     self.only_rx     = json.dumps(parameters['only_rx'])
                     self.save()
                 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 module_6bits(self, module):
                     """
                     This function reads antenna pattern and choose 6bits (upbits-downbits) for one abs module
                     """
                     if module > 64:
                         beam_bits = ""
                         return beam_bits
                     data      = ast.literal_eval(self.antenna)
                     up_data   = data['antenna_up']
                     down_data = data['antenna_down']
                     pos        = ip2position(module)
                     up_value   = up_data[pos[0]][pos[1]]
                     down_value = down_data[pos[0]][pos[1]]
                     up_bits   = up_conv_bits(up_value)
                     down_bits = down_conv_bits(down_value)
                     beam_bits = up_bits+down_bits
                     return beam_bits
                 @property
                 def get_upvalues(self):
                     """
                     This function reads antenna pattern and show the up-value of one abs module
                     """
                     data      = ast.literal_eval(self.antenna)
                     up_data   = data['antenna_up']
                     up_values = []
                     for data in up_data:
                         for i in range(0,8):
                             up_values.append(data[i])
                     return up_values
                 @property
                 def antenna_upvalues(self):
                     """
                     This function reads antenna pattern and show the up - values of one abs beam
                     in a particular order
                     """
                     data      = ast.literal_eval(self.antenna)
                     up_data   = data['antenna_up']
                     return up_data
                 @property
                 def antenna_downvalues(self):
                     """
                     This function reads antenna pattern and show the down - values of one abs beam
                     in a particular order
                     """
                     data      = ast.literal_eval(self.antenna)
                     down_data   = data['antenna_down']
                     return down_data
                 @property
                 def get_downvalues(self):
                     """
                     This function reads antenna pattern and show the down-value of one abs module
                     """
                     data      = ast.literal_eval(self.antenna)
                     down_data = data['antenna_down']
                     down_values = []
                     for data in down_data:
                         for i in range(0,8):
                             down_values.append(data[i])
                     return down_values
                 @property
                 def get_up_ues(self):
                     """
                     This function shows the up-ues-value of one beam
                     """
                     data      = ast.literal_eval(self.ues)
                     up_ues = data['up']
                     return up_ues
                 @property
                 def get_down_ues(self):
                     """
                     This function shows the down-ues-value of one beam
                     """
                     data      = ast.literal_eval(self.ues)
                     down_ues = data['down']
                     return down_ues
                 @property
                 def get_up_onlyrx(self):
                     """
                     This function shows the up-onlyrx-value of one beam
                     """
                     data      = json.loads(self.only_rx)
                     up_onlyrx = data['up']
                     return up_onlyrx
                 @property
                 def get_down_onlyrx(self):
                     """
                     This function shows the down-onlyrx-value of one beam
                     """
                     data      = json.loads(self.only_rx)
                     down_onlyrx = data['down']
                     return down_onlyrx
                 @property
                 def get_tx(self):
                     """
                     This function shows the tx-values of one beam
                     """
                     data = json.loads(self.tx)
                     return data
                 @property
                 def get_uptx(self):
                     """
                     This function shows the up-tx-values of one beam
                     """
                     data = json.loads(self.tx)
                     up_data = data['up']
                     up_values = []
                     for data in up_data:
                         for i in range(0,8):
                             up_values.append(data[i])
                     return up_values
                 @property
                 def get_downtx(self):
                     """
                     This function shows the down-tx-values of one beam
                     """
                     data = json.loads(self.tx)
                     down_data = data['down']
                     down_values = []
                     for data in down_data:
                         for i in range(0,8):
                             down_values.append(data[i])
                     return down_values
                 @property
                 def get_rx(self):
                     """
                     This function shows the rx-values of one beam
                     """
                     data = json.loads(self.rx)
                     return data
                 @property
                 def get_uprx(self):
                     """
                     This function shows the up-rx-values of one beam
                     """
                     data = json.loads(self.rx)
                     up_data = data['up']
                     up_values = []
                     for data in up_data:
                         for i in range(0,8):
                             up_values.append(data[i])
                     return up_values
                 @property
                 def get_downrx(self):
                     """
                     This function shows the down-rx-values of one beam
                     """
                     data = json.loads(self.rx)
                     down_data = data['down']
                     down_values = []
                     for data in down_data:
                         for i in range(0,8):
                             down_values.append(data[i])
                     return down_values

apps/abs/templates/abs_conf.html +16 -150

             {% extends "dev_conf.html" %} {% load static %} {% load bootstrap3 %} {% load main_tags %}
             {% block extra-head %}
             <style>
               .abs {
-                border: 2px solid #00334d;
+                width: auto;
-                vertical-align: center;
                 display: inline-block;
+                text-align: center;
-              .abs tr:nth-child(1) {
-                border-bottom: 1px dashed #00334d;
-              .abs tr {
-                border-bottom: 0px solid #00334d;
               }
               .abs td {
-                border-right: 1px dashed #00334d;
+                padding: 4px;
-                text-align: center;
-                padding: 5px;
               }
+              .module td {
+                padding: 4px 15px 4px 15px;
+                font-weight: bold;
+                border: 1px solid
+              }
               .legend {
                 margin-left: 15px;
                 display: inline-block;
-                border: 2px solid #00334d;
+                border: 2px solid;
                 vertical-align: top;
               }
               .legend th {
-                border-bottom: 1px dashed #00334d;
+                border-bottom: 1px dashed;
                 font-weight: bold;
                 vertical-align: center;
                 text-align: center;
               }
               .legend td {
                 padding: 2px;
                 text-align: center;
               }
-              .north {
-                border: 2px solid #00334d;
-                vertical-align: center;
-                font-weight: bold;
-              .north tr {
-                border: 1px solid #ffffff;
-              .north td {
-                border: 2px solid #e2e2e7;
-                text-align: center;
-                padding: 1px 15px 1px 15px;
-              .north tr:nth-child(even) td:nth-child(n) {
-                border-bottom: 12px solid #e2e2e7;
-              .north td:nth-child(n) {
-                border-right: 12px solid #e2e2e7;
-              .north td:nth-last-child(4n+1) {
-                border-right: 2px solid #e2e2e7;
-              .north tr:nth-last-child(1) td:nth-child(n) {
-                border-bottom: 3px solid #e2e2e7;
-              .east {
-                border: 2px solid #00334d;
-                vertical-align: center;
-                font-weight: bold;
-              .east tr {
-                border: 1px solid #ffffff;
-              .east td {
-                border: 2px solid #e2e2e7;
-                text-align: center;
-                padding: 1px 15px 1px 15px;
-              .east tr:nth-child(even) td:nth-child(n) {
-                border-bottom: 12px solid #e2e2e7;
-              .east td:nth-child(n) {
-                border-right: 12px solid #e2e2e7;
-              .east td:nth-last-child(4n+1) {
-                border-right: 2px solid #e2e2e7;
-              .east tr:nth-last-child(1) td:nth-child(n) {
-                border-bottom: 3px solid #e2e2e7;
-              .west {
-                border: 2px solid #00334d;
-                vertical-align: center;
-                font-weight: bold;
-              .west tr {
-                border: 1px solid #ffffff;
-              .west td {
-                border: 2px solid #e2e2e7;
-                text-align: center;
-                padding: 1px 15px 1px 15px;
-              .west tr:nth-child(even) td:nth-child(n) {
-                border-bottom: 12px solid #e2e2e7;
-              .west td:nth-child(n) {
-                border-right: 12px solid #e2e2e7;
-              .west td:nth-last-child(4n+1) {
-                border-right: 2px solid #e2e2e7;
-              .west tr:nth-last-child(1) td:nth-child(n) {
-                border-bottom: 3px solid #e2e2e7;
-              .south {
-                border: 2px solid #00334d;
-                vertical-align: center;
-                font-weight: bold;
-              .south tr {
-                border: 1px solid #ffffff;
-              .south td {
-                border: 2px solid #e2e2e7;
-                text-align: center;
-                padding: 1px 15px 1px 15px;
-              .south tr:nth-child(even) td:nth-child(n) {
-                border-bottom: 12px solid #e2e2e7;
-              .south td:nth-child(n) {
-                border-right: 12px solid #e2e2e7;
-              .south td:nth-last-child(4n+1) {
-                border-right: 2px solid #e2e2e7;
-              .south tr:nth-last-child(1) td:nth-child(n) {
-                border-bottom: 3px solid #e2e2e7;
             </style>
             {% endblock %}
             {% block extra-menu-actions %}
             <li>
               <a href="{{ dev_conf.get_absolute_url_plot }}" target="_blank">
                 <span class="glyphicon glyphicon-picture" aria-hidden="true"></span> View Patterns </a>
             </li>
             {% endblock %}
             {% block extra-content %}
             {% if beams %}
             <h4>Beams:</h4>
             <div class="container">
               <ul class="nav nav-pills">
                 {% for beam in beams %}
                 <li {%if beam.pk == active_beam %} class="active" {% endif %}>
                   <a data-toggle="pill" href="#menu{{forloop.counter}}">{{forloop.counter}}</a>
                 </li>
                 {% endfor %}
               </ul>
               <div class="tab-content">
                 {% for beam in beams %}
                 <div id="menu{{forloop.counter}}" class="tab-pane fade {%if beam.pk == active_beam %}active in{% endif %}">
                   <h3>{%if beam.pk == active_beam %}Active Beam: {%endif%}{{beam.name}}</h3>
                   <table id="abs_pattern{{forloop.counter}}" class="abs">
                     <tr>
                       <td>
                         <b>North Quarter</b>
-                        <table class="north ">
+                        <table class="module">
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.1}} t{%endif%} itle='{{module_messages.1}}'>{{beam.get_upvalues.0}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.2}} t{%endif%} itle='{{module_messages.2}}'>{{beam.get_upvalues.1}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.3}} t{%endif%} itle='{{module_messages.3}}'>{{beam.get_upvalues.2}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.4}} t{%endif%} itle='{{module_messages.4}}'>{{beam.get_upvalues.3}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.1}} t{%endif%} itle='{{module_messages.1}}'>{{beam.get_downvalues.0}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.2}} t{%endif%} itle='{{module_messages.2}}'>{{beam.get_downvalues.1}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.3}} t{%endif%} itle='{{module_messages.3}}'>{{beam.get_downvalues.2}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.4}} t{%endif%} itle='{{module_messages.4}}'>{{beam.get_downvalues.3}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.9}} t{%endif%} itle='{{module_messages.9}}'>{{beam.get_upvalues.8}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.10}} {%endif%} title='{{module_messages.10}}'>{{beam.get_upvalues.9}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.11}} {%endif%} title='{{module_messages.11}}'>{{beam.get_upvalues.10}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.12}} {%endif%} title='{{module_messages.12}}'>{{beam.get_upvalues.11}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.9}} t{%endif%} itle='{{module_messages.9}}'>{{beam.get_downvalues.8}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.10}} {%endif%} title='{{module_messages.10}}'>{{beam.get_downvalues.9}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.11}} {%endif%} title='{{module_messages.11}}'>{{beam.get_downvalues.10}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.12}} {%endif%} title='{{module_messages.12}}'>{{beam.get_downvalues.11}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.17}} {%endif%} title='{{module_messages.17}}'>{{beam.get_upvalues.16}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.18}} {%endif%} title='{{module_messages.18}}'>{{beam.get_upvalues.17}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.19}} {%endif%} title='{{module_messages.19}}'>{{beam.get_upvalues.18}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.20}} {%endif%} title='{{module_messages.20}}'>{{beam.get_upvalues.19}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.17}} {%endif%} title='{{module_messages.17}}'>{{beam.get_downvalues.16}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.18}} {%endif%} title='{{module_messages.18}}'>{{beam.get_downvalues.17}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.19}} {%endif%} title='{{module_messages.19}}'>{{beam.get_downvalues.18}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.20}} {%endif%} title='{{module_messages.20}}'>{{beam.get_downvalues.19}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.25}} {%endif%} title='{{module_messages.25}}'>{{beam.get_upvalues.24}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.26}} {%endif%} title='{{module_messages.26}}'>{{beam.get_upvalues.25}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.27}} {%endif%} title='{{module_messages.27}}'>{{beam.get_upvalues.26}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.28}} {%endif%} title='{{module_messages.28}}'>{{beam.get_upvalues.27}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.25}} {%endif%} title='{{module_messages.25}}'>{{beam.get_downvalues.24}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.26}} {%endif%} title='{{module_messages.26}}'>{{beam.get_downvalues.25}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.27}} {%endif%} title='{{module_messages.27}}'>{{beam.get_downvalues.26}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.28}} {%endif%} title='{{module_messages.28}}'>{{beam.get_downvalues.27}}</td>
                           </tr>
                         </table>
                       </td>
                       <td>
                         <b>East Quarter</b>
-                        <table class="east ">
+                        <table class="module">
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.5}} t{%endif%} itle='{{module_messages.5}}'>{{beam.get_upvalues.4}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.6}} t{%endif%} itle='{{module_messages.6}}'>{{beam.get_upvalues.5}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.7}} t{%endif%} itle='{{module_messages.7}}'>{{beam.get_upvalues.6}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.8}} t{%endif%} itle='{{module_messages.8}}'>{{beam.get_upvalues.7}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.5}} t{%endif%} itle='{{module_messages.5}}'>{{beam.get_downvalues.4}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.6}} t{%endif%} itle='{{module_messages.6}}'>{{beam.get_downvalues.5}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.7}} t{%endif%} itle='{{module_messages.7}}'>{{beam.get_downvalues.6}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.8}} t{%endif%} itle='{{module_messages.8}}'>{{beam.get_downvalues.7}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.13}} {%endif%} title='{{module_messages.13}}'>{{beam.get_upvalues.12}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.14}} {%endif%} title='{{module_messages.14}}'>{{beam.get_upvalues.13}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.15}} {%endif%} title='{{module_messages.15}}'>{{beam.get_upvalues.14}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.16}} {%endif%} title='{{module_messages.16}}'>{{beam.get_upvalues.15}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.13}} {%endif%} title='{{module_messages.13}}'>{{beam.get_downvalues.12}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.14}} {%endif%} title='{{module_messages.14}}'>{{beam.get_downvalues.13}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.15}} {%endif%} title='{{module_messages.15}}'>{{beam.get_downvalues.14}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.16}} {%endif%} title='{{module_messages.16}}'>{{beam.get_downvalues.15}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.21}} {%endif%} title='{{module_messages.21}}'>{{beam.get_upvalues.20}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.22}} {%endif%} title='{{module_messages.22}}'>{{beam.get_upvalues.21}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.23}} {%endif%} title='{{module_messages.23}}'>{{beam.get_upvalues.22}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.24}} {%endif%} title='{{module_messages.24}}'>{{beam.get_upvalues.23}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.21}} {%endif%} title='{{module_messages.21}}'>{{beam.get_downvalues.20}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.22}} {%endif%} title='{{module_messages.22}}'>{{beam.get_downvalues.21}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.23}} {%endif%} title='{{module_messages.23}}'>{{beam.get_downvalues.22}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.24}} {%endif%} title='{{module_messages.24}}'>{{beam.get_downvalues.23}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.29}} {%endif%} title='{{module_messages.29}}'>{{beam.get_upvalues.28}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.30}} {%endif%} title='{{module_messages.30}}'>{{beam.get_upvalues.29}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.31}} {%endif%} title='{{module_messages.31}}'>{{beam.get_upvalues.30}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.32}} {%endif%} title='{{module_messages.32}}'>{{beam.get_upvalues.31}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.29}} {%endif%} title='{{module_messages.29}}'>{{beam.get_downvalues.28}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.30}} {%endif%} title='{{module_messages.30}}'>{{beam.get_downvalues.29}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.31}} {%endif%} title='{{module_messages.31}}'>{{beam.get_downvalues.30}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.32}} {%endif%} title='{{module_messages.32}}'>{{beam.get_downvalues.31}}</td>
                           </tr>
                         </table>
                       </td>
                     </tr>
                     <tr>
                       <td>
                         <b>West Quarter</b>
-                        <table class="west ">
+                        <table class="module">
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.33}} {%endif%} title='{{module_messages.33}}'>{{beam.get_upvalues.32}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.34}} {%endif%} title='{{module_messages.34}}'>{{beam.get_upvalues.33}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.35}} {%endif%} title='{{module_messages.35}}'>{{beam.get_upvalues.34}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.36}} {%endif%} title='{{module_messages.36}}'>{{beam.get_upvalues.35}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.33}} {%endif%} title='{{module_messages.33}}'>{{beam.get_downvalues.32}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.34}} {%endif%} title='{{module_messages.34}}'>{{beam.get_downvalues.33}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.35}} {%endif%} title='{{module_messages.35}}'>{{beam.get_downvalues.34}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.36}} {%endif%} title='{{module_messages.36}}'>{{beam.get_downvalues.35}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.41}} {%endif%} title='{{module_messages.41}}'>{{beam.get_upvalues.40}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.42}} {%endif%} title='{{module_messages.42}}'>{{beam.get_upvalues.41}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.43}} {%endif%} title='{{module_messages.43}}'>{{beam.get_upvalues.42}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.44}} {%endif%} title='{{module_messages.44}}'>{{beam.get_upvalues.43}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.41}} {%endif%} title='{{module_messages.41}}'>{{beam.get_downvalues.40}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.42}} {%endif%} title='{{module_messages.42}}'>{{beam.get_downvalues.41}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.43}} {%endif%} title='{{module_messages.43}}'>{{beam.get_downvalues.42}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.44}} {%endif%} title='{{module_messages.44}}'>{{beam.get_downvalues.43}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.49}} {%endif%} title='{{module_messages.49}}'>{{beam.get_upvalues.48}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.50}} {%endif%} title='{{module_messages.50}}'>{{beam.get_upvalues.49}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.51}} {%endif%} title='{{module_messages.51}}'>{{beam.get_upvalues.50}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.52}} {%endif%} title='{{module_messages.52}}'>{{beam.get_upvalues.51}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.49}} {%endif%} title='{{module_messages.49}}'>{{beam.get_downvalues.48}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.50}} {%endif%} title='{{module_messages.50}}'>{{beam.get_downvalues.49}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.51}} {%endif%} title='{{module_messages.51}}'>{{beam.get_downvalues.50}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.52}} {%endif%} title='{{module_messages.52}}'>{{beam.get_downvalues.51}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.57}} {%endif%} title='{{module_messages.57}}'>{{beam.get_upvalues.56}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.58}} {%endif%} title='{{module_messages.58}}'>{{beam.get_upvalues.57}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.59}} {%endif%} title='{{module_messages.59}}'>{{beam.get_upvalues.58}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.60}} {%endif%} title='{{module_messages.60}}'>{{beam.get_upvalues.59}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.57}} {%endif%} title='{{module_messages.57}}'>{{beam.get_downvalues.56}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.58}} {%endif%} title='{{module_messages.58}}'>{{beam.get_downvalues.57}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.59}} {%endif%} title='{{module_messages.59}}'>{{beam.get_downvalues.58}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.60}} {%endif%} title='{{module_messages.60}}'>{{beam.get_downvalues.59}}</td>
                           </tr>
                         </table>
                       </td>
                       <td>
                         <b>South Quarter</b>
-                        <table class="south ">
+                        <table class="module">
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.37}} {%endif%} title='{{module_messages.37}}'>{{beam.get_upvalues.36}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.38}} {%endif%} title='{{module_messages.38}}'>{{beam.get_upvalues.37}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.39}} {%endif%} title='{{module_messages.39}}'>{{beam.get_upvalues.38}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.40}} {%endif%} title='{{module_messages.40}}'>{{beam.get_upvalues.39}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.37}} {%endif%} title='{{module_messages.37}}'>{{beam.get_downvalues.36}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.38}} {%endif%} title='{{module_messages.38}}'>{{beam.get_downvalues.37}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.39}} {%endif%} title='{{module_messages.39}}'>{{beam.get_downvalues.38}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.40}} {%endif%} title='{{module_messages.40}}'>{{beam.get_downvalues.39}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.45}} {%endif%} title='{{module_messages.45}}'>{{beam.get_upvalues.44}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.46}} {%endif%} title='{{module_messages.46}}'>{{beam.get_upvalues.45}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.47}} {%endif%} title='{{module_messages.47}}'>{{beam.get_upvalues.46}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.48}} {%endif%} title='{{module_messages.48}}'>{{beam.get_upvalues.47}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.45}} {%endif%} title='{{module_messages.45}}'>{{beam.get_downvalues.44}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.46}} {%endif%} title='{{module_messages.46}}'>{{beam.get_downvalues.45}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.47}} {%endif%} title='{{module_messages.47}}'>{{beam.get_downvalues.46}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.48}} {%endif%} title='{{module_messages.48}}'>{{beam.get_downvalues.47}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.53}} {%endif%} title='{{module_messages.53}}'>{{beam.get_upvalues.52}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.54}} {%endif%} title='{{module_messages.54}}'>{{beam.get_upvalues.53}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.55}} {%endif%} title='{{module_messages.55}}'>{{beam.get_upvalues.54}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.56}} {%endif%} title='{{module_messages.56}}'>{{beam.get_upvalues.55}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.53}} {%endif%} title='{{module_messages.53}}'>{{beam.get_downvalues.52}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.54}} {%endif%} title='{{module_messages.54}}'>{{beam.get_downvalues.53}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.55}} {%endif%} title='{{module_messages.55}}'>{{beam.get_downvalues.54}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.56}} {%endif%} title='{{module_messages.56}}'>{{beam.get_downvalues.55}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.61}} {%endif%} title='{{module_messages.61}}'>{{beam.get_upvalues.60}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.62}} {%endif%} title='{{module_messages.62}}'>{{beam.get_upvalues.61}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.63}} {%endif%} title='{{module_messages.63}}'>{{beam.get_upvalues.62}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.64}} {%endif%} title='{{module_messages.64}}'>{{beam.get_upvalues.63}}</td>
                           </tr>
                           <tr>
                             <td {%if beam.pk == active_beam %} {{color_status.61}} {%endif%} title='{{module_messages.61}}'>{{beam.get_downvalues.60}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.62}} {%endif%} title='{{module_messages.62}}'>{{beam.get_downvalues.61}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.63}} {%endif%} title='{{module_messages.63}}'>{{beam.get_downvalues.62}}</td>
                             <td {%if beam.pk == active_beam %} {{color_status.64}} {%endif%} title='{{module_messages.64}}'>{{beam.get_downvalues.63}}</td>
                           </tr>
                         </table>
                       </td>
                     </tr>
                   </table>
                   {% if beam.id == active_beam %}
                   <table class="legend">
                     <tr>
                       <th colspan="2">Legend</th>
                     </tr>
                     <tr>
                       <td class="text-danger">
                         <i>RED</i>
                       </td>
                       <td>Disconnected</td>
                     </tr>
                     <tr>
                       <td class="text-warning">
                         <i>ORANGE</i>
                       </td>
                       <td>Connected</td>
                     </tr>
                     <tr>
                       <td class="text-success">
                         <i>GREEN</i>
                       </td>
                       <td>Running
                       </td>
                     </tr>
                   </table>
                   {% else %}
                   <div style="vertical-align: top; display:inline-block;">
                     <button id="send_beam{{forloop.counter}}" type="button" class="btn btn-default">
                       <span class="glyphicon glyphicon-export" aria-hidden="true"></span>
                       Change Beam</button>
                   </div>
                   {% endif %}
                 </div>
                 {% endfor %}
               </div>
             </div>
             {% else %}
             <p style="color:#b4bcc2; margin-left: 5%;">
               <i>No Beams...</i>
             </p>
             {% endif %} {% endblock extra-content %} {% block extra-js%}
             <script>
               $(document).ready(function () {
                 {% for beam in beams %}
                 {% if dev_conf.operation_mode == 1 %}
                 $("#send_beam{{forloop.counter}}").prop('disabled', true)
                 {% else %}
                 $("#send_beam{{forloop.counter}}").click(function () {
                   document.location = "{% url 'url_send_beam' dev_conf.id beam.id %}";
                 });
                 {% endif %}
                 {% endfor %}
               });
             </script> {% endblock %}

apps/abs/views.py +2 -2

             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 django.conf import settings
             from django.http import HttpResponse
             from django.core.urlresolvers import reverse
             from datetime import datetime
             from time import sleep
             import os
             import io
             from apps.main.models import Device, Configuration, Experiment
             from apps.main.views import sidebar
             from .models import ABSConfiguration, ABSBeam
             from .forms import ABSConfigurationForm, ABSBeamEditForm, ABSBeamAddForm, ABSImportForm
             from .utils.overJroShow import overJroShow
             from .utils.OverJRO import OverJRO
             # Create your views here.
             import json, ast
             def get_values_from_form(form_data):
                 sublistup     = []
                 sublistdown   = []
                 subtxlistup   = []
                 subtxlistdown = []
                 subrxlistup   = []
                 subrxlistdown = []
                 up_values_list     = []
                 down_values_list   = []
                 up_txvalues_list   = []
                 down_txvalues_list = []
                 up_rxvalues_list   = []
                 down_rxvalues_list = []
                 values_list = {}
                 cont = 1
                 for i in range(1,65):
                     x = float(form_data['abs_up'+str(i)])
                     y = float(form_data['abs_down'+str(i)])
                     sublistup.append(x)
                     sublistdown.append(y)
                     if str(i) in form_data.getlist('uptx_checks'):
                         subtxlistup.append(1)
                     else:
                         subtxlistup.append(0)
                     if str(i) in form_data.getlist('downtx_checks'):
                         subtxlistdown.append(1)
                     else:
                         subtxlistdown.append(0)
                     if str(i) in form_data.getlist('uprx_checks'):
                         subrxlistup.append(1)
                     else:
                         subrxlistup.append(0)
                     if str(i) in form_data.getlist('downrx_checks'):
                         subrxlistdown.append(1)
                     else:
                         subrxlistdown.append(0)
                     cont = cont+1
                     if cont == 9:
                         up_values_list.append(sublistup)
                         down_values_list.append(sublistdown)
                         sublistup   = []
                         sublistdown = []
                         up_txvalues_list.append(subtxlistup)
                         down_txvalues_list.append(subtxlistdown)
                         subtxlistup   = []
                         subtxlistdown = []
                         up_rxvalues_list.append(subrxlistup)
                         down_rxvalues_list.append(subrxlistdown)
                         subrxlistup   = []
                         subrxlistdown = []
                         cont = 1
                 list_uesup   = []
                 list_uesdown = []
                 for i in range(1,5):
                     if form_data['ues_up'+str(i)] == '':
                         list_uesup.append(0.0)
                     else:
                         list_uesup.append(float(form_data['ues_up'+str(i)]))
                     if form_data['ues_down'+str(i)] == '':
                         list_uesdown.append(0.0)
                     else:
                         list_uesdown.append(float(form_data['ues_down'+str(i)]))
                 onlyrx_list = form_data.getlist('onlyrx')
                 only_rx = {}
                 if '1' in onlyrx_list:
                     only_rx['up'] = True
                 else:
                     only_rx['up'] = False
                 if '2' in onlyrx_list:
                     only_rx['down'] = True
                 else:
                     only_rx['down'] = False
                 antenna = {'antenna_up': up_values_list, 'antenna_down': down_values_list}
                 tx      = {'up': up_txvalues_list, 'down': down_txvalues_list}
                 rx      = {'up': up_rxvalues_list, 'down': down_rxvalues_list}
                 ues     = {'up': list_uesup, 'down': list_uesdown}
                 name    = str(form_data['beam_name'])
                 beam_data = {'name': name, 'antenna': antenna, 'tx': tx, 'rx': rx, 'ues': ues, 'only_rx': only_rx}
                 return beam_data
             def abs_conf(request, id_conf):
                 conf = get_object_or_404(ABSConfiguration, pk=id_conf)
                 beams = ABSBeam.objects.filter(abs_conf=conf)
                 #------------Colors for Active Beam:-------------
                 all_status = {}
                 module_messages = json.loads(conf.module_messages)
                 color_status   = {}
                 for i, status in enumerate(conf.module_status):
                     if status == '3':    #Running background-color: #00cc00;
                         all_status['{}'.format(i+1)] = 2
                         color_status['{}'.format(i+1)] = 'class=text-success'#'bgcolor=#00cc00'
                     elif status == '1':  #Connected background-color: #ee902c;
                         all_status['{}'.format(i+1)] = 1
                         color_status['{}'.format(i+1)] = 'class=text-warning'#'bgcolor=#ee902c'
                     else:                #Disconnected background-color: #ff0000;
                         all_status['{}'.format(i+1)] = 0
                         color_status['{}'.format(i+1)] = 'class=text-danger'#'bgcolor=#FF0000'
                 #------------------------------------------------
                 kwargs = {}
                 kwargs['connected_modules'] = str(conf.connected_modules())+'/64'
                 kwargs['dev_conf'] = conf
                 if conf.operation_mode == 0:
-                    kwargs['dev_conf_keys'] = ['name', 'operation_mode']
+                    kwargs['dev_conf_keys'] = ['label', 'operation_mode']
                 else:
-                    kwargs['dev_conf_keys'] = ['name', 'operation_mode', 'operation_value']
+                    kwargs['dev_conf_keys'] = ['label', 'operation_mode', 'operation_value']
                 kwargs['title'] = 'ABS Configuration'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Edit Configuration'
                 if conf.active_beam != 0:
                     kwargs['active_beam'] = int(conf.active_beam)
                 kwargs['beams'] = beams
                 kwargs['modules_status'] = all_status
                 kwargs['color_status']   = color_status
                 kwargs['module_messages'] = module_messages
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))
                 return render(request, 'abs_conf.html', kwargs)
             def abs_conf_edit(request, id_conf):
                 conf     = get_object_or_404(ABSConfiguration, pk=id_conf)
                 beams = ABSBeam.objects.filter(abs_conf=conf)
                 if request.method=='GET':
                     form = ABSConfigurationForm(instance=conf)
                 if request.method=='POST':
                     form = ABSConfigurationForm(request.POST, instance=conf)
                     if form.is_valid():
                         conf = form.save(commit=False)
                         conf.save()
                         return redirect('url_abs_conf', id_conf=conf.id)
                 ###### SIDEBAR ######
                 kwargs = {}
                 kwargs['dev_conf'] = conf
                 #kwargs['id_dev'] = conf.id
                 kwargs['id_conf'] = conf.id
                 kwargs['form'] = form
                 kwargs['abs_beams'] = beams
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Save'
                 kwargs['edit'] = True
                 return render(request, 'abs_conf_edit.html', kwargs)
             def import_file(request, id_conf):
                 conf = get_object_or_404(ABSConfiguration, pk=id_conf)
                 if request.method=='POST':
                     form = ABSImportForm(request.POST, request.FILES)
                     if form.is_valid():
                         try:
                             parms = conf.import_from_file(request.FILES['file_name'])
                             if parms:
                                 conf.update_from_file(parms)
                                 messages.success(request, 'Configuration "%s" loaded succesfully' % request.FILES['file_name'])
                                 return redirect(conf.get_absolute_url_edit())
                         except Exception as e:
                             messages.error(request, 'Error parsing file: "%s" - %s' % (request.FILES['file_name'], e))
                 else:
                     messages.warning(request, 'Your current configuration will be replaced')
                     form = ABSImportForm()
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'ABS Configuration'
                 kwargs['suptitle'] = 'Import file'
                 kwargs['button'] = 'Upload'
                 kwargs['previous'] = conf.get_absolute_url()
                 return render(request, 'abs_import.html', kwargs)
             def send_beam(request, id_conf, id_beam):
                 conf = get_object_or_404(ABSConfiguration, pk=id_conf)
                 beam = get_object_or_404(ABSBeam, pk=id_beam)
                 beams_list    = ABSBeam.objects.filter(abs_conf=conf)
                 conf.active_beam = id_beam
                 i = 0
                 for b in beams_list:
                     if b.id == int(id_beam):
                         break
                     else:
                         i += 1
                 beam_pos = i + 1 #Estandarizar
                 print '%s Position: %s' % (beam.name, str(beam_pos))
                 conf.send_beam(beam_pos)
                 return redirect('url_abs_conf', conf.id)
             def add_beam(request, id_conf):
                 conf     = get_object_or_404(ABSConfiguration, pk=id_conf)
                 confs    = Configuration.objects.all()
                 if request.method=='GET':
                     form = ABSBeamAddForm()
                 if request.method=='POST':
                     form = ABSBeamAddForm(request.POST)
                     beam_data = get_values_from_form(request.POST)
                     new_beam = ABSBeam(
                                name = beam_data['name'],
                                antenna = json.dumps(beam_data['antenna']),
                                abs_conf = conf,
                                tx = json.dumps(beam_data['tx']),
                                rx = json.dumps(beam_data['rx']),
                                ues = json.dumps(beam_data['ues']),
                                only_rx = json.dumps(beam_data['only_rx'])
                                )
                     new_beam.save()
                     messages.success(request, 'Beam: "%s" has been added.'  % new_beam.name)
                     return redirect('url_edit_abs_conf', conf.id)
                 ###### SIDEBAR ######
                 kwargs = {}
                 #kwargs['dev_conf'] = conf.device
                 #kwargs['id_dev'] = conf.device
                 kwargs['id_conf'] = conf.id
                 kwargs['form'] = form
                 kwargs['title'] = 'ABS Beams'
                 kwargs['suptitle'] = 'Add Beam'
                 kwargs['button'] = 'Add'
                 kwargs['no_sidebar'] = True
                 #kwargs['previous'] = conf.get_absolute_url_edit()
                 kwargs['edit'] = True
                 return render(request, 'abs_add_beam.html', kwargs)
             def edit_beam(request, id_conf, id_beam):
                 conf = get_object_or_404(ABSConfiguration, pk=id_conf)
                 beam = get_object_or_404(ABSBeam, pk=id_beam)
                 if request.method=='GET':
                     form = ABSBeamEditForm(initial={'beam': beam})
                 if request.method=='POST':
                     form = ABSBeamEditForm(request.POST)
                     beam_data = get_values_from_form(request.POST)
                     beam.dict_to_parms(beam_data)
                     beam.save()
                     messages.success(request, 'Beam: "%s" has been updated.'  % beam.name)
                     return redirect('url_edit_abs_conf', conf.id)
                 ###### SIDEBAR ######
                 kwargs = {}
                 kwargs['id_conf'] = conf.id
                 kwargs['form'] = form
                 kwargs['title'] = 'ABS Beams'
                 kwargs['suptitle'] = 'Edit Beam'
                 kwargs['button'] = 'Save'
                 kwargs['no_sidebar'] = True
                 #kwargs['previous'] = conf.get_absolute_url_edit()
                 kwargs['edit'] = True
                 return render(request, 'abs_edit_beam.html', kwargs)
             def remove_beam(request, id_conf, id_beam):
                 conf     = get_object_or_404(ABSConfiguration, pk=id_conf)
                 beam     = get_object_or_404(ABSBeam, pk=id_beam)
                 if request.method=='POST':
                     if beam:
                         try:
                             beam.remove_beamfromlist()
                             beam.delete()
                             messages.success(request, 'Beam: "%s" has been deleted.'  % beam)
                         except:
                             messages.error(request, 'Unable to delete beam: "%s".' % beam)
                     return redirect('url_edit_abs_conf', conf.id)
                 ###### SIDEBAR ######
                 kwargs = {}
                 kwargs['object'] = beam
                 kwargs['delete'] = True
                 kwargs['title'] = 'Delete'
                 kwargs['suptitle'] = 'Beam'
                 kwargs['previous'] = conf.get_absolute_url_edit()
                 return render(request, 'confirm.html', kwargs)
             def plot_patterns(request, id_conf, id_beam=None):
                 kwargs = {}
                 conf = get_object_or_404(ABSConfiguration, pk=id_conf)
                 beams = ABSBeam.objects.filter(abs_conf=conf)
                 if id_beam:
                     beam  = get_object_or_404(ABSBeam, pk=id_beam)
                     kwargs['beam'] = beam
                 ###### SIDEBAR ######
                 kwargs['dev_conf']   = conf.device
                 kwargs['id_dev']     = conf.device
                 kwargs['id_conf']    = conf.id
                 kwargs['abs_beams']  = beams
                 kwargs['title']      = 'ABS Patterns'
                 kwargs['suptitle']   = conf.name
                 kwargs['no_sidebar'] = True
                 return render(request, 'abs_patterns.html', kwargs)
             def plot_pattern(request, id_conf, id_beam, antenna):
                 if antenna=='down':
                     sleep(3)
                 conf = get_object_or_404(ABSConfiguration, pk=id_conf)
                 beam = get_object_or_404(ABSBeam, pk=id_beam)
                 just_rx = 1 if json.loads(beam.only_rx)[antenna] else 0
                 phases = json.loads(beam.antenna)['antenna_{}'.format(antenna)]
                 gain_tx = json.loads(beam.tx)[antenna]
                 gain_rx = json.loads(beam.rx)[antenna]
                 ues = json.loads(beam.ues)[antenna]
                 newOverJro = overJroShow(beam.name)
                 fig = newOverJro.plotPattern2(datetime.today(), phases, gain_tx, gain_rx, ues, just_rx)
                 buf = io.BytesIO()
                 fig.savefig(buf, format='png')
                 response = HttpResponse(buf.getvalue(), content_type='image/png')
                 return response
   No newline at end of file

apps/cgs/forms.py +1 -2

             from django import forms
             from apps.main.models import Device
             from .models import CGSConfiguration
             class CGSConfigurationForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     #request = kwargs.pop('request')
                     super(CGSConfigurationForm, self).__init__(*args, **kwargs)
                     instance = getattr(self, 'instance', None)
                     if instance and instance.pk:
                         devices = Device.objects.filter(device_type__name='cgs')
                         if instance.experiment:
                             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 = ('type', 'parameters', 'status')
+                    exclude = ('type', 'parameters', 'status', 'author', 'hash')
-                    #fields = ('experiment', 'device', 'freq0', 'freq1', 'freq2', 'freq3')
             class UploadFileForm(forms.Form):
                 title = forms.CharField(label='Extension Type', widget=forms.TextInput(attrs={'readonly':'readonly'}))
                 file = forms.FileField()

apps/dds/forms.py +1 -1

             from django import forms
             from apps.main.models import Device
             from .models import DDSConfiguration
             # from django.core.validators import MinValueValidator, MaxValueValidator
             class DDSConfigurationForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     super(DDSConfigurationForm, self).__init__(*args, **kwargs)
                     instance = getattr(self, 'instance', None)
                     if instance and instance.pk:
                         devices = Device.objects.filter(device_type__name='dds')
                         #if instance.experiment:
                         #    self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
                         self.fields['device'].widget.choices = [(device.id, device) for device in devices]
                 class Meta:
                     model = DDSConfiguration
-                    exclude = ('type', 'parameters', 'status')
  No newline at end of file
+                    exclude = ('type', 'parameters', 'status', 'author', 'hash')
  No newline at end of file

apps/dds/views.py +1 -1

             # Create your views here.
             from django.shortcuts import redirect, render, get_object_or_404
             # from apps.main.models import Experiment, Configuration
             from apps.main.views import sidebar
             from .models import DDSConfiguration
             from .forms import DDSConfigurationForm
             # Create your views here.
             def dds_conf(request, id_conf):
                 conf = get_object_or_404(DDSConfiguration, pk=id_conf)
                 kwargs = {}
                 kwargs['status'] = conf.device.get_status_display()
             #     if not kwargs['connected']:
             #         messages.error(request, message=answer)
                 kwargs['dev_conf'] = conf
-                kwargs['dev_conf_keys'] = ['name',
+                kwargs['dev_conf_keys'] = [
                                            'clock',
                                            'multiplier',
                                            'frequencyA_Mhz',
                                             'frequencyA',
                                             'frequencyB_Mhz',
                                             'frequencyB',
                                             'phaseA_degrees',
                                             'phaseB_degrees',
                                             'modulation',
                                             'amplitude_enabled',
                                             'amplitudeI',
                                             'amplitudeQ']
                 kwargs['title'] = 'DDS Configuration'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Edit Configuration'
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))
                 return render(request, 'dds_conf.html', kwargs)
             def dds_conf_edit(request, id_conf):
                 conf = get_object_or_404(DDSConfiguration, pk=id_conf)
                 if request.method=='GET':
                     form = DDSConfigurationForm(instance=conf)
                 if request.method=='POST':
                     form = DDSConfigurationForm(request.POST, instance=conf)
                     if form.is_valid():
                         conf = form.save(commit=False)
                         if conf.verify_frequencies():
                             conf.save()
                             return redirect('url_dds_conf', id_conf=conf.id)
                         ##ERRORS
                 kwargs = {}
                 kwargs['id_dev'] = conf.id
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Save'
                 return render(request, 'dds_conf_edit.html', kwargs)

apps/jars/admin.py +2 -2

             from django.contrib import admin
-            from .models import JARSConfiguration, JARSfilter
+            from .models import JARSConfiguration, JARSFilter
             # Register your models here.
             admin.site.register(JARSConfiguration)
-            admin.site.register(JARSfilter)
+            admin.site.register(JARSFilter)

apps/jars/fixtures/initial_filters_data.json +30 -3

@@ -1,3 +1,30
1	[{"fields": {"name": "49_92MHz_clock60MHz_F1KHz_12_25_2", "clock": 60, "mult": 5, "fch": 49.92, "fch_decimal": 721554506, "filter_fir": 2, "filter_2": 12, "filter_5": 25}, "model": "jars.jarsfilter", "pk": 1},	1	[
2	{"fields": {"name": "49_920MHz_clock60MHz_F1MHz_10_1_6", "clock": 60, "mult": 5, "fch": 49.92, "fch_decimal": 721554506, "filter_fir": 6, "filter_2": 10, "filter_5": 1}, "model": "jars.jarsfilter", "pk": 2}	2	{
3	]	3	"fields": {
		4	"name": "49_92MHz_clock60MHz_F1KHz_12_25_2",
		5	"clock": 60,
		6	"multiplier": 5,
		7	"frequency": 49.92,
		8	"f_decimal": 721554506,
		9	"fir": 2,
		10	"cic_2": 12,
		11	"cic_5": 25
		12	},
		13	"model": "jars.jarsfilter",
		14	"pk": 1
		15	},
		16	{
		17	"fields": {
		18	"name": "49_920MHz_clock60MHz_F1MHz_10_1_6",
		19	"clock": 60,
		20	"multiplier": 5,
		21	"frequency": 49.92,
		22	"f_decimal": 721554506,
		23	"fir": 6,
		24	"cic_2": 10,
		25	"cic_5": 1
		26	},
		27	"model": "jars.jarsfilter",
		28	"pk": 2
		29	}
		30	] No newline at end of file

apps/jars/forms.py +31 -44

             import os
             from django import forms
             from apps.main.models import Device, Experiment
-            from .models import JARSConfiguration, JARSfilter
+            from .models import JARSConfiguration, JARSFilter
             from .widgets import SpectralWidget
             from apps.main.forms import add_empty_choice
             def create_choices_from_model(model, filter_id=None):
                 #instance = globals()[model]
                 choices = model.objects.all().values_list('pk', 'name')
                 choices = add_empty_choice(choices)
                 return choices
             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_number'].widget.attrs['readonly'] = True
                     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 not experiment:
-                #        msg = "Error: Jars Configuration needs an Experiment"
-                #        self.add_error('experiment', msg)
                 class Meta:
                     model = JARSConfiguration
-                    exclude = ('type', 'parameters', 'status', 'filter_parms')
+                    exclude = ('type', 'parameters', 'status', 'filter_parms', 'author', 'hash', 'filter')
-            class JARSfilterForm(forms.ModelForm):
+            class JARSFilterForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
-                    super(JARSfilterForm, self).__init__(*args, **kwargs)
+                    super(JARSFilterForm, self).__init__(*args, **kwargs)
                     instance = getattr(self, 'instance', None)
-                    self.fields['fch_decimal'].widget.attrs['readonly'] = True
+                    self.fields['f_decimal'].widget.attrs['readonly'] = True
                     if 'initial' in kwargs:
-                        if 'filter_id' not in kwargs['initial']:
+                        self.fields['filter_template'] = forms.ChoiceField(
-                            self.fields.pop('name')
+                            choices=create_choices_from_model(JARSFilter),
-                        else:
+                            initial = kwargs['initial']['id']
-                            self.fields['name'] = forms.ChoiceField(choices=create_choices_from_model(JARSfilter))
-                            filter_id = kwargs['initial']['filter_id']
+                        # self.fields['name'].initial = kwargs['initial']['id']
-                            if filter_id == 0:
+                            # filter_id = kwargs['initial']['filter_id']
-                                for value in self.fields:
-                                    if value != 'name':
+                            # if filter_id == 0:
-                                        self.fields.pop(value)
+                            #     for value in self.fields:
-                                self.fields['name'].label = "Filter Template Name"
+                            #         if value != 'name':
-                            else:
+                            #             self.fields.pop(value)
-                                self.fields['name'] = forms.ChoiceField(choices=create_choices_from_model(JARSfilter, kwargs['initial']['filter_id']))
+                            #     self.fields['name'].label = "Filter Template Name"
-                                jars_filter = JARSfilter.objects.get(pk=kwargs['initial']['filter_id'])
+                            # else:
-                                labels = [f.name for f in jars_filter._meta.get_fields()]
+                            #     self.fields['name'] = forms.ChoiceField(choices=create_choices_from_model(JARSFilter, kwargs['initial']['filter_id']))
+                            #     jars_filter = JARSFilter.objects.get(pk=kwargs['initial']['filter_id'])
-                                for label in ['id']:
+                            #     labels = [f.name for f in jars_filter._meta.get_fields()]
-                                    labels.remove(label)
-                                for label in labels:
+                            #     for label in ['id']:
-                                    self.fields['name'].initial = kwargs['initial']['filter_id']
+                            #         labels.remove(label)
-                                    self.fields[label].initial = getattr(jars_filter,label)
+                            #     for label in labels:
-                                self.fields['name'].label = "Filter Template Name"
+                            #         self.fields['name'].initial = kwargs['initial']['filter_id']
+                            #         self.fields[label].initial = getattr(jars_filter,label)
+                            #     self.fields['name'].label = "Filter Template Name"
                 class Meta:
-                    model = JARSfilter
+                    model = JARSFilter
-                    exclude = ('type', 'parameters', 'status')
+                    exclude = ('name', )
             class ExtFileField(forms.FileField):
                 """
                 Same as forms.FileField, but you can specify a file extension whitelist.
                 >>> from django.core.files.uploadedfile import SimpleUploadedFile
                 >>>
                 >>> t = ExtFileField(ext_whitelist=(".pdf", ".txt"))
                 >>>
                 >>> t.clean(SimpleUploadedFile('filename.pdf', 'Some File Content'))
                 >>> t.clean(SimpleUploadedFile('filename.txt', 'Some File Content'))
                 >>>
                 >>> t.clean(SimpleUploadedFile('filename.exe', 'Some File Content'))
                 Traceback (most recent call last):
                 ...
                 ValidationError: [u'Not allowed filetype!']
                 """
                 def __init__(self, *args, **kwargs):
                     extensions = kwargs.pop("extensions")
                     self.extensions = [i.lower() for i in extensions]
                     super(ExtFileField, self).__init__(*args, **kwargs)
                 def clean(self, *args, **kwargs):
                     data = super(ExtFileField, self).clean(*args, **kwargs)
                     filename = data.name
                     ext = os.path.splitext(filename)[1]
                     ext = ext.lower()
                     if ext not in self.extensions:
                         raise forms.ValidationError('Not allowed file type: %s' % ext)
             class JARSImportForm(forms.Form):
                 file_name = ExtFileField(extensions=['.racp','.json'])

apps/jars/models.py +164 -110

             import json
             import requests
             from django.db import models
             from django.core.validators import MinValueValidator, MaxValueValidator
             from django.core.urlresolvers import reverse
             from apps.main.models import Configuration
             from apps.main.utils import Params
             from .utils import create_jarsfiles
             # Create your models here.
             EXPERIMENT_TYPE = (
-                               (0, 'RAW_DATA'),
+                (0, 'RAW_DATA'),
-                               (1, 'PDATA'),
+                (1, 'PDATA'),
+            )
             DATA_TYPE = (
-                         (0, 'SHORT'),
+                (0, 'SHORT'),
-                         (1, 'FLOAT'),
+                (1, 'FLOAT'),
+            )
             DECODE_TYPE = (
-                         (0, 'None'),
+                (0, 'None'),
-                         (1, 'TimeDomain'),
+                (1, 'TimeDomain'),
-                         (2, 'FreqDomain'),
+                (2, 'FreqDomain'),
-                         (3, 'InvFreqDomain'),
+                (3, 'InvFreqDomain'),
+            )
-            class JARSfilter(models.Model):
+            FILTER = '{"id":1, "clock": 60, "multiplier": 5, "frequency": 49.92, "f_decimal":	721554506, "fir": 2, "cic_2": 12, "cic_5": 25}'
+            class JARSFilter(models.Model):
                 JARS_NBITS = 32
-                name        = models.CharField(max_length=60, unique=True, default='')
+                name = models.CharField(verbose_name='Name', max_length=60, unique=True, default='')
-                clock       = models.FloatField(verbose_name='Clock In (MHz)',validators=[MinValueValidator(5), MaxValueValidator(75)], null=True, default=60)
+                clock = models.FloatField(verbose_name='Clock In (MHz)', validators=[
-                mult        = models.PositiveIntegerField(verbose_name='Multiplier',validators=[MinValueValidator(1), MaxValueValidator(20)], default=5)
+                                          MinValueValidator(5), MaxValueValidator(75)], null=True, default=60)
-                fch         = models.FloatField(verbose_name='Frequency (MHz)', validators=[MaxValueValidator(150)], null=True, default=49.9200)
+                multiplier = models.PositiveIntegerField(verbose_name='Multiplier', validators=[
-                fch_decimal = models.BigIntegerField(verbose_name='Frequency (Decimal)',validators=[MinValueValidator(-9223372036854775808), MaxValueValidator(2**JARS_NBITS-1)], null=True, default=721554505)
+                                                         MinValueValidator(1), MaxValueValidator(20)], default=5)
-                filter_2    = models.PositiveIntegerField(verbose_name='Filter 2',validators=[MinValueValidator(2), MaxValueValidator(100)], default = 10)
+                frequency = models.FloatField(verbose_name='Frequency (MHz)', validators=[
-                filter_5    = models.PositiveIntegerField(verbose_name='Filter 5',validators=[MinValueValidator(1), MaxValueValidator(100)], default = 1)
+                                              MaxValueValidator(150)], null=True, default=49.9200)
-                filter_fir  = models.PositiveIntegerField(verbose_name='FIR Filter',validators=[MinValueValidator(1), MaxValueValidator(100)], default = 6)
+                f_decimal = models.BigIntegerField(verbose_name='Frequency (Decimal)', validators=[
+                                                   MinValueValidator(-9223372036854775808), MaxValueValidator(2**JARS_NBITS-1)], null=True, default=721554505)
+                cic_2 = models.PositiveIntegerField(verbose_name='CIC2', validators=[
+                                                    MinValueValidator(2), MaxValueValidator(100)], default=10)
+                scale_cic_2 = models.PositiveIntegerField(verbose_name='Scale CIC2', validators=[
+                                                          MinValueValidator(0), MaxValueValidator(6)], default=1)
+                cic_5 = models.PositiveIntegerField(verbose_name='CIC5', validators=[
+                                                    MinValueValidator(1), MaxValueValidator(100)], default=1)
+                scale_cic_5 = models.PositiveIntegerField(verbose_name='Scale CIC5', validators=[
+                                                          MinValueValidator(0), MaxValueValidator(20)], default=5)
+                fir = models.PositiveIntegerField(verbose_name='FIR', validators=[
+                                                  MinValueValidator(1), MaxValueValidator(100)], default=6)
+                scale_fir = models.PositiveIntegerField(verbose_name='Scale FIR', validators=[
+                                                        MinValueValidator(0), MaxValueValidator(7)], default=3)
+                number_taps = models.PositiveIntegerField(verbose_name='Number of taps', validators=[
+                                                          MinValueValidator(1), MaxValueValidator(256)], default=4)
+                taps = models.CharField(verbose_name='Taps', max_length=256, default='')
                 class Meta:
                     db_table = 'jars_filters'
                 def __unicode__(self):
                     return u'%s' % (self.name)
+                def jsonify(self):
+                    data = {}
+                    ignored = ()
+                    for field in self._meta.fields:
+                        if field.name in ignored:
+                            continue
+                        data[field.name] = field.value_from_object(self)
+                    return data
                 def parms_to_dict(self):
                     parameters = {}
-                    #parameters['name']        = self.name
+                    parameters['name'] = self.name
-                    parameters['clock']       = float(self.clock)
+                    parameters['clock'] = float(self.clock)
-                    parameters['mult']        = int(self.mult)
+                    parameters['multiplier'] = int(self.multiplier)
-                    parameters['fch']         = float(self.fch)
+                    parameters['frequency'] = float(self.frequency)
-                    parameters['fch_decimal'] = int(self.fch)
+                    parameters['f_decimal'] = int(self.frequency)
-                    parameters['filter_fir']  = int(self.filter_fir)
+                    parameters['fir'] = int(self.fir)
-                    parameters['filter_2']    = int(self.filter_2)
+                    parameters['cic_2'] = int(self.cic_2)
-                    parameters['filter_5']    = int(self.filter_5)
+                    parameters['cic_5'] = int(self.cic_5)
                     return parameters
                 def dict_to_parms(self, parameters):
-                    #self.name        = parameters['name']
+                    self.name = parameters['name']
-                    self.clock       = parameters['clock']
+                    self.clock = parameters['clock']
-                    self.mult        = parameters['mult']
+                    self.multiplier = parameters['multiplier']
-                    self.fch         = parameters['fch']
+                    self.frequency = parameters['frequency']
-                    self.fch_decimal = parameters['fch_decimal']
+                    self.f_decimal = parameters['f_decimal']
-                    self.filter_fir  = parameters['filter_fir']
+                    self.fir = parameters['fir']
-                    self.filter_2    = parameters['filter_2']
+                    self.cic_2 = parameters['cic_2']
-                    self.filter_5    = parameters['filter_5']
+                    self.cic_5 = parameters['cic_5']
             class JARSConfiguration(Configuration):
-                ADC_RESOLUTION   = 8
+                ADC_RESOLUTION = 8
                 PCI_DIO_BUSWIDTH = 32
-                HEADER_VERSION   = 1103
+                HEADER_VERSION = 1103
-                BEGIN_ON_START   = True
+                BEGIN_ON_START = True
-                REFRESH_RATE     = 1
+                REFRESH_RATE = 1
-                exp_type         = models.PositiveIntegerField(verbose_name='Experiment Type', choices=EXPERIMENT_TYPE, default=0)
+                exp_type = models.PositiveIntegerField(
-                cards_number     = models.PositiveIntegerField(verbose_name='Number of Cards', validators=[MinValueValidator(1), MaxValueValidator(4)], default = 1)
+                    verbose_name='Experiment Type', choices=EXPERIMENT_TYPE, default=0)
-                channels_number  = models.PositiveIntegerField(verbose_name='Number of Channels', validators=[MinValueValidator(1), MaxValueValidator(8)], default = 5)
+                cards_number = models.PositiveIntegerField(verbose_name='Number of Cards', validators=[
-                channels         = models.CharField(verbose_name='Channels', max_length=15, default = '1,2,3,4,5')
+                                                           MinValueValidator(1), MaxValueValidator(4)], default=1)
-                data_type        = models.PositiveIntegerField(verbose_name='Data Type', choices=DATA_TYPE, default=0)
+                channels_number = models.PositiveIntegerField(verbose_name='Number of Channels', validators=[
-                raw_data_blocks  = models.PositiveIntegerField(verbose_name='Raw Data Blocks', validators=[MaxValueValidator(5000)], default=60)
+                                                              MinValueValidator(1), MaxValueValidator(8)], default=5)
-                profiles_block   = models.PositiveIntegerField(verbose_name='Profiles Per Block', default=400)
+                channels = models.CharField(
-                acq_profiles     = models.PositiveIntegerField(verbose_name='Acquired Profiles', default=400)
+                    verbose_name='Channels', max_length=15, default='1,2,3,4,5')
-                ftp_interval     = models.PositiveIntegerField(verbose_name='FTP Interval', default=60)
+                data_type = models.PositiveIntegerField(
-                fftpoints        = models.PositiveIntegerField(verbose_name='FFT Points',default=16)
+                    verbose_name='Data Type', choices=DATA_TYPE, default=0)
-                cohe_integr_str  = models.PositiveIntegerField(verbose_name='Coh. Int. Stride',validators=[MinValueValidator(1)], default=30)
+                raw_data_blocks = models.PositiveIntegerField(
-                cohe_integr      = models.PositiveIntegerField(verbose_name='Coherent Integrations',validators=[MinValueValidator(1)], default=30)
+                    verbose_name='Raw Data Blocks', validators=[MaxValueValidator(5000)], default=60)
-                incohe_integr    = models.PositiveIntegerField(verbose_name='Incoherent Integrations',validators=[MinValueValidator(1)], default=30)
+                profiles_block = models.PositiveIntegerField(
-                decode_data      = models.PositiveIntegerField(verbose_name='Decode Data', choices=DECODE_TYPE, default=0)
+                    verbose_name='Profiles Per Block', default=400)
-                post_coh_int     = models.BooleanField(verbose_name='Post Coherent Integration', default=False)
+                acq_profiles = models.PositiveIntegerField(
-                spectral_number  = models.PositiveIntegerField(verbose_name='# Spectral Combinations',validators=[MinValueValidator(1)], default=1)
+                    verbose_name='Acquired Profiles', default=400)
-                spectral         = models.CharField(verbose_name='Combinations', max_length=5000, default = '[0, 0],')
+                ftp_interval = models.PositiveIntegerField(
-                create_directory = models.BooleanField(verbose_name='Create Directory Per Day', default=True)
+                    verbose_name='FTP Interval', default=60)
-                include_expname  = models.BooleanField(verbose_name='Experiment Name in Directory', default=False)
+                fftpoints = models.PositiveIntegerField(
+                    verbose_name='FFT Points', default=16)
+                cohe_integr_str = models.PositiveIntegerField(
+                    verbose_name='Coh. Int. Stride', validators=[MinValueValidator(1)], default=30)
+                cohe_integr = models.PositiveIntegerField(
+                    verbose_name='Coherent Integrations', validators=[MinValueValidator(1)], default=30)
+                incohe_integr = models.PositiveIntegerField(
+                    verbose_name='Incoherent Integrations', validators=[MinValueValidator(1)], default=30)
+                decode_data = models.PositiveIntegerField(
+                    verbose_name='Decode Data', choices=DECODE_TYPE, default=0)
+                post_coh_int = models.BooleanField(
+                    verbose_name='Post Coherent Integration', default=False)
+                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=False)
                 #view_raw_data    = models.BooleanField(verbose_name='View Raw Data', default=True)
-                save_ch_dc       = models.BooleanField(verbose_name='Save Channels DC', default=True)
+                save_ch_dc = models.BooleanField(
-                save_data        = models.BooleanField(verbose_name='Save Data', default=True)
+                    verbose_name='Save Channels DC', default=True)
-                filter_parms     = models.CharField(max_length=10000, default='{"clock": 60, "mult": 5, "fch": 49.92, "fch_decimal":	721554506, "filter_fir": 2, "filter_2": 12, "filter_5": 25}')
+                save_data = models.BooleanField(verbose_name='Save Data', default=True)
+                filter_parms = models.CharField(
+                    max_length=10000, default=FILTER)
+                filter = models.ForeignKey(
+                    'JARSFilter', verbose_name='Filter', null=True, blank=True, on_delete=models.CASCADE)
                 class Meta:
                     db_table = 'jars_configurations'
                 def filter_resolution(self):
-                    filter_parms = eval(self.filter_parms)
+                    filter_parms = json.loads(self.filter_parms)
-                    if filter_parms.__class__.__name__=='str':
+                    clock = float(filter_parms['clock'])
-                        filter_parms = eval(filter_parms)
+                    cic_2 = filter_parms['cic_2']
+                    cic_5 = filter_parms['cic_5']
-                    filter_clock = float(filter_parms['clock'])
+                    fir = filter_parms['fir']
-                    filter_2 = filter_parms['filter_2']
+                    resolution = round((clock/(cic_2*cic_5*fir)), 2)
-                    filter_5 = filter_parms['filter_5']
-                    filter_fir = filter_parms['filter_fir']
-                    resolution = round((filter_clock/(filter_2*filter_5*filter_fir)),2)
                     return resolution
                 def dict_to_parms(self, params, id=None):
                     if id is not None:
                         data = Params(params).get_conf(id_conf=id)
                     else:
                         data = Params(params).get_conf(dtype='jars')
                         data['filter_parms'] = params['filter_parms']
-                    self.name           = data['name']
+                    # self.name = data['name']
-                    self.exp_type        = data['exp_type']
+                    self.exp_type = data['exp_type']
                     #----PDATA----
                     if self.exp_type == 1:
-                        self.incohe_integr   = data['incohe_integr']
+                        self.incohe_integr = data['incohe_integr']
                         self.spectral_number = data['spectral_number']
-                        self.spectral        = data['spectral']
+                        self.spectral = data['spectral']
-                        self.fftpoints       = data['fftpoints']
+                        self.fftpoints = data['fftpoints']
-                        self.save_ch_dc      = data['save_ch_dc']
+                        self.save_ch_dc = data['save_ch_dc']
                     else:
                         self.raw_data_blocks = data['raw_data_blocks']
                     #----PDATA----
-                    self.cards_number    = data['cards_number']
+                    self.cards_number = data['cards_number']
                     self.channels_number = data['channels_number']
-                    self.channels        = data['channels']
+                    self.channels = data['channels']
-                    self.data_type       = data['data_type']
+                    self.data_type = data['data_type']
-                    self.profiles_block  = data['profiles_block']
+                    self.profiles_block = data['profiles_block']
-                    self.acq_profiles    = data['acq_profiles']
+                    self.acq_profiles = data['acq_profiles']
-                    self.ftp_interval    = data['ftp_interval']
+                    self.ftp_interval = data['ftp_interval']
                     self.cohe_integr_str = data['cohe_integr_str']
-                    self.cohe_integr     = data['cohe_integr']
+                    self.cohe_integr = data['cohe_integr']
                     #----DECODE----
-                    self.decode_data     = data['decode_data']
+                    self.decode_data = data['decode_data']
-                    self.post_coh_int    = data['post_coh_int']
+                    self.post_coh_int = data['post_coh_int']
                     #----DECODE----
                     self.create_directory = data['create_directory']
-                    self.include_expname  = data['include_expname']
+                    self.include_expname = data['include_expname']
-                    self.save_data        = data['save_data']
+                    self.save_data = data['save_data']
-                    self.filter_parms     = json.dumps(data['filter_parms'])
+                    self.filter_parms = json.dumps(data['filter_parms'])
                     self.save()
                 def parms_to_text(self, file_format='jars'):
                     data = self.experiment.parms_to_dict()
                     for key in data['configurations']['allIds']:
                         if data['configurations']['byId'][key]['device_type'] in ('dds', 'cgs'):
                             data['configurations']['allIds'].remove(key)
                             data['configurations']['byId'].pop(key)
                         elif data['configurations']['byId'][key]['device_type'] == 'jars':
-                            data['configurations']['byId'][key] = self.parms_to_dict()['configurations']['byId'][str(self.pk)]
+                            data['configurations']['byId'][key] = self.parms_to_dict(
+                            )['configurations']['byId'][str(self.pk)]
                         elif data['configurations']['byId'][key]['device_type'] == 'rc':
                                 data['configurations']['byId'][key]['pulses'] = ''
                                 data['configurations']['byId'][key]['delays'] = ''
-                    rc_ids = [pk for pk in data['configurations']['allIds'] if data['configurations']['byId'][pk]['device_type']=='rc']
+                    rc_ids = [pk for pk in data['configurations']['allIds']
-                    mix_ids = [pk for pk in rc_ids if data['configurations']['byId'][pk]['mix']]
+                              if data['configurations']['byId'][pk]['device_type'] == 'rc']
+                    mix_ids = [pk for pk in rc_ids if data['configurations']
+                               ['byId'][pk]['mix']]
                     if mix_ids:
                         params = data['configurations']['byId'][mix_ids[0]]['parameters']
-                        rc = data['configurations']['byId'][params.split('-')[0].split('|')[0]]
+                        rc = data['configurations']['byId'][params.split(
+                            '-')[0].split('|')[0]]
                         rc['mix'] = True
                         data['configurations']['byId'][rc['id']] = rc
-                    elif len(rc_ids)==0:
+                    elif len(rc_ids) == 0:
                         self.message = 'File needs RC configuration'
                         return ''
                     json_data = json.dumps(data)
                     racp_file, filter_file = create_jarsfiles(json_data)
-                    if file_format=='racp':
+                    if file_format == 'racp':
                         return racp_file
                     return filter_file
                 def request(self, cmd, method='get', **kwargs):
                     req = getattr(requests, method)(self.device.url(cmd), **kwargs)
                     payload = req.json()
                     return payload
                 def status_device(self):
                     try:
                         payload = self.request('status',
                                                params={'name': self.experiment.name})
                         self.device.status = payload['status']
                         self.device.save()
                         self.message = payload['message']
                     except Exception as e:
                         self.device.status = 0
                         self.message = str(e)
                         self.device.save()
                         return False
                     return True
                 def stop_device(self):
                     try:
                         payload = self.request('stop', 'post')
                         self.device.status = payload['status']
                         self.device.save()
                         self.message = payload['message']
                     except Exception as e:
                         self.device.status = 0
                         self.message = str(e)
                         self.device.save()
                         return False
                     return True
                 def read_device(self):
                     try:
-                        payload = self.request('read', params={'name': self.experiment.name})
+                        payload = self.request(
+                            'read', params={'name': self.experiment.name})
                         self.message = 'Configuration loaded'
                     except:
                         self.device.status = 0
                         self.device.save()
                         self.message = 'Could not read JARS configuration.'
                         return False
                     return payload
                 def write_device(self):
                     if self.device.status == 3:
                         self.message = 'Could not configure device. Software Acquisition is running'
                         return False
                     data = self.experiment.parms_to_dict()
                     for key in data['configurations']['allIds']:
                         if data['configurations']['byId'][key]['device_type'] in ('dds', 'cgs'):
                             data['configurations']['allIds'].remove(key)
                             data['configurations']['byId'].pop(key)
                         elif data['configurations']['byId'][key]['device_type'] == 'rc':
                                 data['configurations']['byId'][key]['pulses'] = ''
                                 data['configurations']['byId'][key]['delays'] = ''
-                    rc_ids = [pk for pk in data['configurations']['allIds'] if data['configurations']['byId'][pk]['device_type']=='rc']
+                    rc_ids = [pk for pk in data['configurations']['allIds']
-                    if len(rc_ids)==0:
+                              if data['configurations']['byId'][pk]['device_type'] == 'rc']
+                    if len(rc_ids) == 0:
                         self.message = 'Missing RC configuration'
                         return False
                     json_data = json.dumps(data)
                     try:
                         payload = self.request('write', 'post', json=json_data)
                         self.device.status = payload['status']
                         self.message = payload['message']
                         self.device.save()
                         if self.device.status == 1:
                             return False
                     except Exception as e:
                         self.device.status = 0
                         self.message = str(e)
                         self.device.save()
                         return False
                     return True
                 def start_device(self):
                     try:
                         payload = self.request('start', 'post',
                                                json={'name': self.experiment.name})
                         self.device.status = payload['status']
                         self.message = payload['message']
                         self.device.save()
                         if self.device.status == 1:
                             return False
                     except Exception as e:
                         self.device.status = 0
                         self.message = str(e)
                         self.device.save()
                         return False
                     return True
                 def get_log(self):
                     payload = None
                     try:
-                        payload = requests.get(self.device.url('get_log'), params={'name':self.experiment.name})
+                        payload = requests.get(self.device.url('get_log'), params={
+                                               'name': self.experiment.name})
                     except:
                         self.device.status = 0
                         self.device.save()
                         self.message = 'Jars API is not running.'
                         return False
                     self.message = 'Jars API is running'
                     return payload
                 def update_from_file(self, filename):
                     f = JARSFile(filename)
                     self.dict_to_parms(f.data)
                     self.save()
                 def get_absolute_url_import(self):
                     return reverse('url_import_jars_conf', args=[str(self.id)])
                 def get_absolute_url_read(self):
                     return reverse('url_read_jars_conf', args=[str(self.id)])
                 def get_absolute_url_log(self):
                     return reverse('url_get_jars_log', args=[str(self.id)])

apps/jars/static/js/filters.js +9 -10

-            $("#id_fch").change(function() {
+            $("#id_frequency").change(function() {
             	 updateParameters()
             });
             $("#id_clock").change(function() {
             	 updateParameters()
             });
-            $("#id_mult").change(function() {
+            $("#id_multiplier").change(function() {
             	 updateParameters()
             });
             function updateParameters(){
-            	var fclock = $("#id_clock").val();  					// clock frequency (MHz)
+            	var clock = $("#id_clock").val();  					// clock frequency (MHz)
-            	var fch    = $("#id_fch").val();    					// RF frequency (MHz)
+            	var fch    = $("#id_frequency").val();    			// RF frequency (MHz)
-            	var m_dds  = $("#id_mult").val();   					// DDS multiplier
+            	var m_dds  = $("#id_multiplier").val();   			// DDS multiplier
-            	if (Math.abs(fch) < fclock/2){ 			    					// Si se cumple nyquist
+            	if (Math.abs(fch) < clock/2){ 			    		// Si se cumple nyquist
-            	    var nco   = Math.pow(2,32)*((fch/fclock)%1);
+            	    var nco   = Math.pow(2,32)*((fch/clock)%1);
             		//var nco_i = Math.round(nco/m_dds)*m_dds;
             		var nco_i = Math.round(nco)
             	}
             	else {
-            	    nco = Math.pow(2,32)*(fclock-fch)/(fclock);
+            	    nco = Math.pow(2,32)*(clock-fch)/(clock);
             	    //nco_i = Math.round(nco/m_dds)*m_dds;
             		var nco_i = Math.round(nco)
             	}
-            	fch_decimal = $("#id_fch_decimal")
+            	$("#id_f_decimal").val(nco_i)
-            	$(fch_decimal).val(nco_i)
             }

apps/jars/templates/jars_conf.html +13 -7

             {% extends "dev_conf.html" %}
             {% load static %}
             {% load bootstrap3 %}
             {% load main_tags %}
             {% block extra-menu-actions %}
-            <li><a href="{{ dev_conf.get_absolute_url_log }}"><span class="glyphicon glyphicon-save-file" aria-hidden="true"></span> Get Log File</a></li>
+            <li><a href="{{ dev_conf.get_absolute_url_log }}"><span class="glyphicon glyphicon-save-file" aria-hidden="true"></span>
+                    Get Log File</a></li>
             {% endblock %}
             {% block extra-content %}
             <div class="clearfix"></div>
-            <h2>JARS filter: {{resolution}}</h2>
+            <h2>Filter: {{resolution}}</h2>
-            <hr>
+            <br>
-            <div class="panel-group" id="div_lines" role="tablist" aria-multiselectable="true">
+            <table class="table table-bordered">
-            {% include "jars_filter.html" %}
+                {% for key in filter_keys %}
-            </div>
+                <tr>
+                    <th>{% get_verbose_field_name filter_obj key %}</th>
+                    <td>{{filter|attr:key}}</td>
+                </tr>
+                {% endfor %}
+            </table>
-            {% endblock extra-content%}
+            {% endblock extra-content%}
  No newline at end of file

apps/jars/templates/jars_conf_edit.html +17 -9

             {% 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>
-              <h2>JARS filter</h2>
+              <h2>Filter <small>{{filter_name}}</small></h2>
-              <hr>
+              <br>
-              <div class="panel-group" id="div_lines" role="tablist" aria-multiselectable="true">
+              {% bootstrap_form filter_form layout='horizontal' size='medium' %}
-              {% include "jars_filter_edit.html" %}
+              <div style="clear: both;"></div>
+              <br>
+              <div class="pull-right">
+                <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>
               <div style="clear: both;"></div>
               <br>
             </form>
             {% endblock %}
             {% block extra-js%}
             <script src="{% static 'js/jars.js' %}"></script>
+            <script src="{% static 'js/filters.js' %}"></script>
             <script type="text/javascript">
-            $("#bt_cancel").click(function() {
+              $("#bt_cancel").click(function () {
                 document.location = "{% url 'url_jars_conf' id_dev %}";
-            });
+              });
+              $("#id_filter_template").change(function () {
+                document.location = "{% url 'url_change_jars_filter' id_dev %}" + $("#id_filter_template").val();
+              });
             </script>
-            {% endblock %}
+            {% endblock %}
  No newline at end of file

apps/jars/views.py +23 -69

             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 django.http import HttpResponse
             from apps.main.models import Device
             from apps.main.views import sidebar
-            from .models import JARSConfiguration, JARSfilter
+            from .models import JARSConfiguration, JARSFilter
-            from .forms import JARSConfigurationForm, JARSfilterForm, JARSImportForm
+            from .forms import JARSConfigurationForm, JARSFilterForm, JARSImportForm
             import json
             # Create your views here.
             def jars_conf(request, id_conf):
                 conf = get_object_or_404(JARSConfiguration, pk=id_conf)
-                filter_parms = eval(conf.filter_parms)
+                filter_parms = json.loads(conf.filter_parms)
-                if filter_parms.__class__.__name__=='str':
-                    filter_parms = eval(filter_parms)
                 kwargs = {}
                 kwargs['filter'] = filter_parms
-                kwargs['filter_keys']  = ['clock', 'mult', 'fch', 'fch_decimal',
+                kwargs['filter_obj'] = JARSFilter.objects.get(pk=1)
-                                            'filter_fir', 'filter_2', 'filter_5']
+                kwargs['filter_keys']  = ['clock', 'multiplier', 'frequency', 'f_decimal',
+                                          'cic_2', 'scale_cic_2', 'cic_5', 'scale_cic_5', 'fir',
+                                          'scale_fir', 'number_taps', 'taps']
-                filter_resolution=conf.filter_resolution()
+                filter_resolution = conf.filter_resolution()
                 kwargs['resolution'] = '{} (MHz)'.format(filter_resolution)
                 if filter_resolution < 1:
                     kwargs['resolution'] = '{} (kHz)'.format(filter_resolution*1000)
                 kwargs['status'] = conf.device.get_status_display()
                 kwargs['dev_conf'] = conf
-                kwargs['dev_conf_keys'] = ['name',
+                kwargs['dev_conf_keys'] = ['cards_number', 'channels_number', 'channels',
-                                           'cards_number', 'channels_number', 'channels',
                                            'ftp_interval', 'data_type','acq_profiles',
                                            'profiles_block', 'raw_data_blocks', 'ftp_interval',
                                            'cohe_integr_str', 'cohe_integr', 'decode_data', 'post_coh_int',
                                            'incohe_integr', 'fftpoints', 'spectral_number',
                                            'spectral', 'create_directory', 'include_expname',
                                            'save_ch_dc', 'save_data']
                 if conf.exp_type == 0:
                     for field in ['incohe_integr','fftpoints','spectral_number', 'spectral', 'save_ch_dc']:
                         kwargs['dev_conf_keys'].remove(field)
                 if conf.decode_data == 0:
                     kwargs['dev_conf_keys'].remove('decode_data')
                     kwargs['dev_conf_keys'].remove('post_coh_int')
                 kwargs['title'] = 'JARS Configuration'
                 kwargs['suptitle'] = 'Details'
-                kwargs['button'] = 'Edit Configuration'
-                #kwargs['no_play'] = True
-                #kwargs['only_stop'] = 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)
-                filter_parms = eval(conf.filter_parms)
+                filter_parms = json.loads(conf.filter_parms)
-                if filter_parms.__class__.__name__=='str':
-                    filter_parms = eval(filter_parms)
                 if request.method=='GET':
                     form = JARSConfigurationForm(instance=conf)
-                    filter_form = JARSfilterForm(initial=filter_parms)
+                    filter_form = JARSFilterForm(initial=filter_parms)
                 if request.method=='POST':
                     form = JARSConfigurationForm(request.POST, instance=conf)
-                    filter_form = JARSfilterForm(request.POST)
+                    filter_form = JARSFilterForm(request.POST)
                     if filter_form.is_valid():
-                        jars_filter = filter_form.cleaned_data
+                       jars_filter = filter_form.cleaned_data
-                        try:
+                       jars_filter['id'] = request.POST['filter_template']
-                            jars_filter.pop('name')
+                    else:
-                        except:
+                       messages.error(request, filter_form.errors)
-                            pass
                     if form.is_valid():
                         conf = form.save(commit=False)
                         conf.filter_parms = json.dumps(jars_filter)
                         conf.save()
                         return redirect('url_jars_conf', id_conf=conf.id)
                 kwargs = {}
                 kwargs['id_dev'] = conf.id
                 kwargs['form'] = form
                 kwargs['filter_form'] = filter_form
+                kwargs['filter_name'] = JARSFilter.objects.get(pk=filter_parms['id']).name
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Save'
                 return render(request, 'jars_conf_edit.html', kwargs)
             def import_file(request, conf_id):
                 conf = get_object_or_404(JARSConfiguration, pk=conf_id)
                 if request.method=='POST':
                     form = JARSImportForm(request.POST, request.FILES)
                     if form.is_valid():
                         try:
                             data = conf.import_from_file(request.FILES['file_name'])
                             conf.dict_to_parms(data)
                             messages.success(request, 'Configuration "%s" loaded succesfully' % request.FILES['file_name'])
                             return redirect(conf.get_absolute_url_edit())
                         except Exception as e:
                             messages.error(request, 'Error parsing file: "%s" - %s' % (request.FILES['file_name'], repr(e)))
                 else:
                     messages.warning(request, 'Your current configuration will be replaced')
                     form = JARSImportForm()
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'JARS Configuration'
                 kwargs['suptitle'] = 'Import file'
                 kwargs['button'] = 'Upload'
                 kwargs['previous'] = conf.get_absolute_url()
                 return render(request, 'jars_import.html', kwargs)
             def read_conf(request, conf_id):
                 conf   = get_object_or_404(JARSConfiguration, pk=conf_id)
                 #filter = get_object_or_404(JARSfilter, pk=filter_id)
                 if request.method=='GET':
                     parms = conf.read_device()
                     conf.status_device()
                     if not parms:
                         messages.error(request, conf.message)
                         return redirect(conf.get_absolute_url())
                     form = JARSConfigurationForm(initial=parms, instance=conf)
                 if request.method=='POST':
                     form = JARSConfigurationForm(request.POST, instance=conf)
                     if form.is_valid():
                         form.save()
                         return redirect(conf.get_absolute_url())
                     messages.error(request, "Parameters could not be saved")
                 kwargs = {}
                 kwargs['id_dev'] = conf.id
                 kwargs['filter_id'] = conf.filter.id
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Parameters read from device'
                 kwargs['button'] = 'Save'
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))
                 return render(request, 'jars_conf_edit.html', kwargs)
+            def change_filter(request, conf_id, filter_id):
-            def change_filter(request, conf_id, filter_id=None):
                 conf = get_object_or_404(JARSConfiguration, pk=conf_id)
+                filter = get_object_or_404(JARSFilter, pk=filter_id)
+                conf.filter_parms = json.dumps(filter.jsonify())
+                conf.save()
-                if filter_id:
+                return redirect('url_edit_jars_conf', id_conf=conf.id)
-                    if filter_id.__class__.__name__ not in ['int', 'float']:
-                        filter_id = eval(filter_id)
-                if filter_id == 0:
-                    return redirect('url_change_jars_filter', conf_id=conf.id)
-                if request.method=='GET':
-                    if not filter_id:
-                        form = JARSfilterForm(initial={'filter_id': 0})
-                    else:
-                        form = JARSfilterForm(initial={'filter_id': filter_id})
-                if request.method=='POST':
-                    form = JARSfilterForm(request.POST)
-                    if form.is_valid():
-                        jars_filter = form.cleaned_data
-                        try:
-                            jars_filter.pop('name')
-                        except:
-                            pass
-                        conf.filter_parms = json.dumps(jars_filter)
-                        conf.save()
-                        return redirect('url_edit_jars_conf', id_conf=conf.id)
-                    else:
-                        messages.error(request, "Select a Filter Template")
-                        return redirect('url_change_jars_filter', conf_id=conf.id)
-                kwargs = {}
-                kwargs['title'] = 'JARS Configuration'
-                kwargs['suptitle'] = 'Change Filter'
-                kwargs['form'] = form
-                kwargs['button'] = 'Change'
-                kwargs['conf_id'] = conf.id
-                kwargs['filter_id'] = filter_id
-                return render(request, 'change_jars_filter.html', kwargs)
             def get_log(request, conf_id):
                 conf = get_object_or_404(JARSConfiguration, pk=conf_id)
                 response = conf.get_log()
                 if not response:
                     message = conf.message
                     messages.error(request, message)
                     return redirect('url_jars_conf', id_conf=conf.id)
                 try:
                     message = response.json()['message']
                     messages.error(request, message)
                     return redirect('url_jars_conf', id_conf=conf.id)
                 except Exception as e:
                     message = 'Restarting Report.txt has been downloaded successfully.'
                 content = response
                 filename     =  'Log_%s_%s.txt' %(conf.experiment.name, conf.experiment.id)
                 response = HttpResponse(content,content_type='text/plain')
                 response['Content-Disposition'] = 'attachment; filename="%s"' %filename
                 return response

apps/jars/widgets.py 0 -3

             import ast
             import json
             from itertools import chain
             from django import forms
             from django.utils.safestring import mark_safe
             from django.utils.html import conditional_escape
             class SpectralWidget(forms.widgets.TextInput):
                 def render(self, label, value, attrs=None):
                     readonly = 'readonly' if attrs.get('readonly', False) else ''
                     name = attrs.get('name', label)
-                    print 'ESTO!'
-                    print value
                     if value == None:
                         value = '[0, 0],'
-                    print readonly
                     if '[' in value:
                         if value[len(value)-1] == ",":
                             value = ast.literal_eval(value)
                         else:
                             value = value + ","
                             value = ast.literal_eval(value)
                     codes = value
                     if not isinstance(value, list):
                         text=''
                         #lista = []
                         #if len(value) > 1:
                         for val in value:
                             text = text+str(val)+','
                             #lista.append(val)
                         codes=text
                     else:
                         codes=''
                     html = '''<textarea rows="5" {0} class="form-control" id="id_{1}" name="{2}" style="white-space:nowrap; overflow:scroll;">{3}</textarea>
                               <input type="text" class="col-md-1 col-no-padding" id="num1" value=0>
                               <input type="text" class="col-md-1 col-no-padding" id="num2" value=0>
                               <button type="button" class="button" id="add_spectral_button"> Add </button>
                               <button type="button" class="button" id="delete_spectral_button"> Delete </button>
                               <button type="button" class="button pull-right" id="cross_spectral_button"> Cross </button>
                               <button type="button" class="button pull-right" id="self_spectral_button"> Self </button>
                               <button type="button" class="button pull-right" id="all_spectral_button"> All </button>
                               '''.format(readonly, label, name, codes)
                     script = '''
                             <script type="text/javascript">
                             $(document).ready(function () {{
                                 var spectral_number1 = $("#num1").val();
                                 var spectral_number2 = $("#num2").val();
                                 $("#all_spectral_button").click(function(){{
                                     var sequence1 = selfSpectral()
                                     var sequence2 = crossSpectral()
                                     $("#id_spectral").val(sequence1+sequence2)
                                     updateSpectralNumber()
                                 }});
                                 $("#add_spectral_button").click(function(){{
                                     var spectral_comb = $("#id_spectral").val();
                                     var spectral_number1 = $("#num1").val();
                                     var spectral_number2 = $("#num2").val();
                                     var str = spectral_number1+", "+spectral_number2;
                                     //not to duplicate
                                     var n = spectral_comb.search(str);
                                     if (n==-1){
                                         $("#id_spectral").val(spectral_comb+"["+$("#num1").val()+", "+$("#num2").val()+"],")
                                     }
                                     updateSpectralNumber()
                                 }});
                                 $("#self_spectral_button").click(function(){{
                                     var sequence = selfSpectral()
                                     $("#id_spectral").val(sequence)
                                     updateSpectralNumber()
                                 }});
                                 $("#cross_spectral_button").click(function(){{
                                     var sequence = crossSpectral()
                                     $("#id_spectral").val(sequence)
                                     updateSpectralNumber()
                                 }});
                                 function selfSpectral() {
                                     var channels = $("#id_channels").val();
                                     var n = (channels.length)-1;
                                     var num = parseInt(channels[n]);
                                     sequence = ""
                                     for (i = 0; i < num; i++) {
                                         sequence = sequence + "[" + i.toString() + ", " + i.toString() + "],"
                                     }
                                     return sequence
                                 }
                                 function crossSpectral() {
                                     var channels = $("#id_channels").val();
                                     var n = (channels.length)-1;
                                     var num = parseInt(channels[n]);
                                     sequence = ""
                                     for (i = 0; i < num; i++) {
                                         for (j = i+1; j < num; j++) {
                                         sequence = sequence + "[" + i.toString() + ", " + j.toString() + "],"
                                         }
                                     }
                                     return sequence
                                 }
                                 function updateSpectralNumber(){
                                     var spectral_comb = $("#id_spectral").val();
                                     var num = spectral_comb.length;
                                     var cont = 0
                                     for (i = 0; i < num; i++) {
                                         if (spectral_comb[i] == "]"){
                                             cont = cont + 1
                                         }
                                     }
                                     $("#id_spectral_number").val(cont)
                                 }
                                 $("#delete_spectral_button").click(function(){{
                                     var spectral_comb = $("#id_spectral").val();
                                     var spectral_number1 = $("#num1").val();
                                     var spectral_number2 = $("#num2").val();
                                     var str = spectral_number1+", "+spectral_number2;
                                     var n = spectral_comb.search(str);
                                     if (n==-1){
                                     }
                                     else {
                                         n= spectral_comb.length;
                                         if (n<8){
                                             var tuple = "["+$("#num1").val()+", "+$("#num2").val()+"],"
                                             var txt = spectral_comb.replace(tuple,'');
                                         }
                                         else {
                                             var tuple = ",["+$("#num1").val()+", "+$("#num2").val()+"]"
                                             var txt = spectral_comb.replace(tuple,'');
                                         }
                                         $("#id_spectral").val(txt)
                                         var tuple = "["+$("#num1").val()+", "+$("#num2").val()+"],"
                                         var txt = spectral_comb.replace(tuple,'');
                                         $("#id_spectral").val(txt)
                                     }
                                     updateSpectralNumber()
                                 }});
                             }});
                             </script>
                             '''
                     return mark_safe(html+script)

apps/main/fixtures/main_initial_data.json +121 -12

@@ -1,13 +1,122
1	[	1	[
2	{"fields": {"name": "JRO", "description": ""}, "model": "main.location", "pk": 1},	2	{
3	{"fields": {"name": "JASMET", "description": ""}, "model": "main.location", "pk": 2},	3	"fields": {
4	{"fields": {"name": "SOUSY", "description": ""}, "model": "main.location", "pk": 3},	4	"name": "JRO",
5	{"fields": {"name": "JULIA", "description": ""}, "model": "main.location", "pk": 4},	5	"description": ""
6	{"fields": {"name": "CLAIRE", "description": ""}, "model": "main.location", "pk": 4},	6	},
7	{"fields": {"name": "rc", "description": ""}, "model": "main.devicetype", "pk": 1},	7	"model": "main.location",
8	{"fields": {"name": "dds", "description": ""}, "model": "main.devicetype", "pk": 2},	8	"pk": 1
9	{"fields": {"name": "cgs", "description": ""}, "model": "main.devicetype", "pk": 3},	9	},
10	{"fields": {"name": "jars", "description": ""}, "model": "main.devicetype", "pk": 4},	10	{
11	{"fields": {"name": "abs", "description": ""}, "model": "main.devicetype", "pk": 5},	11	"fields": {
12	{"fields": {"password": "pbkdf2_sha256$24000$6RRL7xETgdgN$ORRPhrITZKzTTZHCm8T+Er6ght415kYKeU7QP3rry5M=", "last_login": null, "is_superuser": true, "username": "admin", "first_name": "", "last_name": "", "email": "admin@admin.com", "is_staff": true, "is_active": true, "date_joined": "2017-01-12T16:10:24.383", "groups": [], "user_permissions": []}, "model": "auth.user", "pk": 1}	12	"name": "JASMET",
13	]	13	"description": ""
		14	},
		15	"model": "main.location",
		16	"pk": 2
		17	},
		18	{
		19	"fields": {
		20	"name": "SOUSY",
		21	"description": ""
		22	},
		23	"model": "main.location",
		24	"pk": 3
		25	},
		26	{
		27	"fields": {
		28	"name": "JULIA",
		29	"description": ""
		30	},
		31	"model": "main.location",
		32	"pk": 4
		33	},
		34	{
		35	"fields": {
		36	"name": "CLAIRE",
		37	"description": ""
		38	},
		39	"model": "main.location",
		40	"pk": 5
		41	},
		42	{
		43	"fields": {
		44	"name": "IDI",
		45	"description": ""
		46	},
		47	"model": "main.location",
		48	"pk": 6
		49	},
		50	{
		51	"fields": {
		52	"name": "rc",
		53	"description": ""
		54	},
		55	"model": "main.devicetype",
		56	"pk": 1
		57	},
		58	{
		59	"fields": {
		60	"name": "dds",
		61	"description": ""
		62	},
		63	"model": "main.devicetype",
		64	"pk": 2
		65	},
		66	{
		67	"fields": {
		68	"name": "cgs",
		69	"description": ""
		70	},
		71	"model": "main.devicetype",
		72	"pk": 3
		73	},
		74	{
		75	"fields": {
		76	"name": "jars",
		77	"description": ""
		78	},
		79	"model": "main.devicetype",
		80	"pk": 4
		81	},
		82	{
		83	"fields": {
		84	"name": "abs",
		85	"description": ""
		86	},
		87	"model": "main.devicetype",
		88	"pk": 5
		89	},
		90	{
		91	"fields": {
		92	"name": "Operator"
		93	},
		94	"model": "auth.group",
		95	"pk": 1
		96	},
		97	{
		98	"fields": {
		99	"name": "Developer"
		100	},
		101	"model": "auth.group",
		102	"pk": 2
		103	},
		104	{
		105	"fields": {
		106	"password": "pbkdf2_sha256$24000$6RRL7xETgdgN$ORRPhrITZKzTTZHCm8T+Er6ght415kYKeU7QP3rry5M=",
		107	"last_login": null,
		108	"is_superuser": true,
		109	"username": "admin",
		110	"first_name": "Administrador",
		111	"last_name": "IDI",
		112	"email": "admin@admin.com",
		113	"is_staff": true,
		114	"is_active": true,
		115	"date_joined": "2017-01-12T16:10:24.383",
		116	"groups": [],
		117	"user_permissions": []
		118	},
		119	"model": "auth.user",
		120	"pk": 1
		121	}
		122	] No newline at end of file

apps/main/forms.py +6 -6

             from django import forms
             from django.utils.safestring import mark_safe
             from apps.main.models import Device, Experiment, Campaign, Location, Configuration
             from django.template.defaultfilters import default
             FILE_FORMAT = (
                             ('json', 'json'),
                             )
             DDS_FILE_FORMAT = (
                             ('json', 'json'),
                             ('text', 'dds')
                             )
             RC_FILE_FORMAT = (
                             ('json', 'json'),
                             ('text', 'racp'),
                             ('binary', 'dat'),
                             )
             JARS_FILE_FORMAT = (
                             ('json', 'json'),
                             ('racp', 'racp'),
                             ('text', 'jars'),
                             )
             def add_empty_choice(choices, pos=0, label='-----'):
                 if len(choices)>0:
                     choices = list(choices)
                     choices.insert(0, (0, label))
                     return choices
                 else:
                     return [(0, label)]
             class DatepickerWidget(forms.widgets.TextInput):
                 def render(self, name, value, attrs=None):
                     input_html = super(DatepickerWidget, self).render(name, value, attrs)
                     html = '<div class="input-group date">'+input_html+'<span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span></div>'
                     return mark_safe(html)
             class DateRangepickerWidget(forms.widgets.TextInput):
                 def render(self, name, value, attrs=None):
                     start = attrs['start_date']
                     end = attrs['end_date']
                     html = '''<div class="col-md-6 input-group date" style="float:inherit">
                     <input class="form-control" id="id_start_date" name="start_date" placeholder="Start" title="" type="text" value="{}">
                     <span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span>
                     </div>
                     <div class="col-md-6 input-group date" style="float:inherit">
                     <input class="form-control" id="id_end_date" name="end_date" placeholder="End" title="" type="text" value="{}">
                     <span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span>
                     </div>'''.format(start, end)
                     return mark_safe(html)
             class TimepickerWidget(forms.widgets.TextInput):
                 def render(self, name, value, attrs=None):
                     input_html = super(TimepickerWidget, self).render(name, value, attrs)
                     html = '<div class="input-group time">'+input_html+'<span class="input-group-addon"><i class="glyphicon glyphicon-time"></i></span></div>'
                     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}
                     if self.instance.pk:
                         self.fields['experiments'].queryset |= self.instance.experiments.all()
                 class Meta:
                     model = Campaign
-                    exclude = ['']
+                    exclude = ['author']
             class ExperimentForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     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)
-                def save(self):
+                def save(self, *args, **kwargs):
-                    exp = super(ExperimentForm, self).save()
+                    exp = super(ExperimentForm, self).save(*args, **kwargs)
                     exp.name = exp.name.replace(' ', '')
                     exp.save()
                     return exp
                 class Meta:
                     model = Experiment
-                    exclude = ['task', 'status']
+                    exclude = ['task', 'status', 'author', 'hash']
             class LocationForm(forms.ModelForm):
                 class Meta:
                     model = Location
                     exclude = ['']
             class DeviceForm(forms.ModelForm):
                 class Meta:
                     model = Device
                     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']
+                    exclude = ['type', 'created_date', 'programmed_date', 'parameters', 'author', 'hash']
             class UploadFileForm(forms.Form):
                 file = forms.FileField()
             class DownloadFileForm(forms.Form):
                 format = forms.ChoiceField(choices= ((0, 'json'),) )
                 def __init__(self, device_type, *args, **kwargs):
                     super(DownloadFileForm, self).__init__(*args, **kwargs)
                     self.fields['format'].choices = FILE_FORMAT
                     if device_type == 'dds':
                         self.fields['format'].choices = DDS_FILE_FORMAT
                     if device_type == 'rc':
                         self.fields['format'].choices = RC_FILE_FORMAT
                     if device_type == 'jars':
                         self.fields['format'].choices = JARS_FILE_FORMAT
             class OperationForm(forms.Form):
                 campaign = forms.ChoiceField(label="Campaign")
                 def __init__(self, *args, **kwargs):
                     campaigns = kwargs.pop('campaigns')
                     super(OperationForm, self).__init__(*args, **kwargs)
                     self.fields['campaign'].label = 'Current Campaigns'
                     self.fields['campaign'].choices = add_empty_choice(campaigns.values_list('id', 'name'))
             class OperationSearchForm(forms.Form):
                 # -----ALL Campaigns------
                 campaign = forms.ChoiceField(label="Campaign")
                 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)
             class FilterForm(forms.Form):
                 def __init__(self, *args, **kwargs):
                     extra_fields = kwargs.pop('extra_fields', [])
                     super(FilterForm, self).__init__(*args, **kwargs)
                     for field in extra_fields:
                         if 'range_date' in field:
                             self.fields[field] = forms.CharField(required=False)
                             self.fields[field].widget = DateRangepickerWidget()
                             if 'initial' in kwargs:
                                 self.fields[field].widget.attrs = {'start_date':kwargs['initial'].get('start_date', ''),
                                                                    'end_date':kwargs['initial'].get('end_date', '')}
-                        elif  field in ('template', 'historical'):
+                        elif  field in ('template', 'historical') or 'my ' in field:
                             self.fields[field] = forms.BooleanField(required=False)
                         else:
                             self.fields[field] = forms.CharField(required=False)
             class ChangeIpForm(forms.Form):
                 ip_address = forms.GenericIPAddressField()
                 mask = forms.GenericIPAddressField(initial='255.255.255.0')
                 gateway = forms.GenericIPAddressField(initial='0.0.0.0')
                 dns = forms.GenericIPAddressField(initial='0.0.0.0')

apps/main/models.py +50 -17

             import os
             import json
             import requests
             import time
             from datetime import datetime
             try:
                 from polymorphic.models import PolymorphicModel
             except:
                 from polymorphic import PolymorphicModel
             from django.template.base import kwarg_re
             from django.db import models
             from django.core.urlresolvers import reverse
             from django.core.validators import MinValueValidator, MaxValueValidator
             from django.shortcuts import get_object_or_404
+            from django.contrib.auth.models import User
             from apps.main.utils import Params
             from apps.rc.utils import RCFile
             from apps.jars.utils import RacpFile
             from devices.dds import api as dds_api
             from devices.dds import data as dds_data
             DEV_PORTS = {
                             'rc'    : 2000,
                             'dds'   : 2000,
                             'jars'  : 2000,
                             'usrp'  : 2000,
                             'cgs'   : 8080,
                             'abs'   : 8080
                         }
             RADAR_STATES = (
                              (0, 'No connected'),
                              (1, 'Connected'),
                              (2, 'Configured'),
                              (3, 'Running'),
                              (4, 'Scheduled'),
                          )
             EXPERIMENT_TYPE = (
                                (0, 'RAW_DATA'),
                                (1, 'PDATA'),
                                )
             DECODE_TYPE = (
                          (0, 'None'),
                          (1, 'TimeDomain'),
                          (2, 'FreqDomain'),
                          (3, 'InvFreqDomain'),
                          )
             DEV_STATES = (
                              (0, 'No connected'),
                              (1, 'Connected'),
                              (2, 'Configured'),
                              (3, 'Running'),
                              (4, 'Unknown'),
                          )
             DEV_TYPES = (
                             ('', 'Select a device type'),
                             ('rc', 'Radar Controller'),
                             ('dds', 'Direct Digital Synthesizer'),
                             ('jars', 'Jicamarca Radar Acquisition System'),
                             ('usrp', 'Universal Software Radio Peripheral'),
                             ('cgs', 'Clock Generator System'),
                             ('abs', 'Automatic Beam Switching'),
                         )
             EXP_STATES = (
                              (0,'Error'),                 #RED
                              (1,'Configured'),            #BLUE
                              (2,'Running'),               #GREEN
                              (3,'Scheduled'),             #YELLOW
                              (4,'Not Configured'),        #WHITE
                          )
             CONF_TYPES = (
                              (0, 'Active'),
                              (1, 'Historical'),
                          )
             class Location(models.Model):
                 name = models.CharField(max_length = 30)
                 description = models.TextField(blank=True, null=True)
                 class Meta:
                     db_table = 'db_location'
                 def __str__(self):
                     return u'%s' % self.name
                 def get_absolute_url(self):
                     return reverse('url_location', args=[str(self.id)])
             class DeviceType(models.Model):
                 name = models.CharField(max_length = 10, choices = DEV_TYPES, default = 'rc')
                 sequence = models.PositiveSmallIntegerField(default=1000)
                 description = models.TextField(blank=True, null=True)
                 class Meta:
                     db_table = 'db_device_types'
                 def __str__(self):
                     return u'%s' % self.get_name_display()
             class Device(models.Model):
                 device_type = models.ForeignKey(DeviceType, on_delete=models.CASCADE)
                 location = models.ForeignKey(Location, on_delete=models.CASCADE)
-                name = models.CharField(max_length=40, default='')
                 ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0')
                 port_address = models.PositiveSmallIntegerField(default=2000)
                 description = models.TextField(blank=True, null=True)
                 status = models.PositiveSmallIntegerField(default=0, choices=DEV_STATES)
                 class Meta:
                     db_table = 'db_devices'
                 def __str__(self):
-                    return u'[{}]: {}'.format(self.device_type.name.upper(),
+                    ret = u'{} [{}]'.format(self.device_type.name.upper(), self.location.name)
-                                                self.name)
+                    return ret
+                @property
+                def name(self):
+                    return str(self)
                 def get_status(self):
                     return self.status
                 @property
                 def status_color(self):
                     color = 'muted'
                     if self.status == 0:
                         color = "danger"
                     elif self.status == 1:
                         color = "warning"
                     elif self.status == 2:
                         color = "info"
                     elif self.status == 3:
                         color = "success"
                     return color
                 def url(self, path=None):
                     if path:
                         return 'http://{}:{}/{}/'.format(self.ip_address, self.port_address, path)
                     else:
                         return 'http://{}:{}/'.format(self.ip_address, self.port_address)
                 def get_absolute_url(self):
                     return reverse('url_device', args=[str(self.id)])
+                def get_absolute_url_edit(self):
+                    return reverse('url_edit_device', args=[str(self.id)])
+                def get_absolute_url_delete(self):
+                    return reverse('url_delete_device', args=[str(self.id)])
                 def change_ip(self, ip_address, mask, gateway, dns, **kwargs):
                     if self.device_type.name=='dds':
                         try:
                             answer = dds_api.change_ip(ip = self.ip_address,
                                                        port = self.port_address,
                                                        new_ip = ip_address,
                                                        mask = mask,
                                                        gateway = gateway)
                             if answer[0]=='1':
                                 self.message = '25|DDS - {}'.format(answer)
                                 self.ip_address = ip_address
                                 self.save()
                             else:
                                 self.message = '30|DDS - {}'.format(answer)
                                 return False
                         except Exception as e:
                             self.message = '40|{}'.format(str(e))
                             return False
                     elif self.device_type.name=='rc':
                         headers = {'content-type': "application/json",
                                    'cache-control': "no-cache"}
                         ip = [int(x) for x in ip_address.split('.')]
                         dns = [int(x) for x in dns.split('.')]
                         gateway = [int(x) for x in gateway.split('.')]
                         subnet = [int(x) for x in mask.split('.')]
                         payload = {
                             "ip": ip,
                             "dns": dns,
                             "gateway": gateway,
                             "subnet": subnet
                             }
                         req = requests.post(self.url('changeip'), data=json.dumps(payload), headers=headers)
                         try:
                             answer = req.json()
                             if answer['changeip']=='ok':
                                 self.message = '25|IP succesfully changed'
                                 self.ip_address = ip_address
                                 self.save()
                             else:
                                 self.message = '30|An error ocuur when changing IP'
                         except Exception as e:
                             self.message = '40|{}'.format(str(e))
                     else:
                         self.message = 'Not implemented'
                         return False
                     return True
             class Campaign(models.Model):
                 template = models.BooleanField(default=False)
                 name = models.CharField(max_length=60, unique=True)
                 start_date = models.DateTimeField(blank=True, null=True)
                 end_date = models.DateTimeField(blank=True, null=True)
-                tags = models.CharField(max_length=40)
+                tags = models.CharField(max_length=40, blank=True, null=True)
                 description = models.TextField(blank=True, null=True)
                 experiments = models.ManyToManyField('Experiment', blank=True)
+                author = models.ForeignKey(User, null=True, blank=True)
                 class Meta:
                     db_table = 'db_campaigns'
                     ordering = ('name',)
                 def __str__(self):
                     if self.template:
                         return u'{} (template)'.format(self.name)
                     else:
                         return u'{}'.format(self.name)
                 def jsonify(self):
                     data = {}
                     ignored = ('template')
                     for field in self._meta.fields:
                         if field.name in ignored:
                             continue
                         data[field.name] = field.value_from_object(self)
                     data['start_date'] = data['start_date'].strftime('%Y-%m-%d')
                     data['end_date'] = data['end_date'].strftime('%Y-%m-%d')
                     return data
                 def parms_to_dict(self):
                     params = Params({})
                     params.add(self.jsonify(), 'campaigns')
                     for exp in Experiment.objects.filter(campaign = self):
                         params.add(exp.jsonify(), 'experiments')
                         configurations = Configuration.objects.filter(experiment=exp, type=0)
                         for conf in configurations:
                             params.add(conf.jsonify(), 'configurations')
                             if conf.device.device_type.name=='rc':
                                 for line in conf.get_lines():
                                     params.add(line.jsonify(), 'lines')
                     return params.data
                 def dict_to_parms(self, parms, CONF_MODELS):
                     experiments = Experiment.objects.filter(campaign = self)
                     if experiments:
                         for experiment in experiments:
                             experiment.delete()
                     for id_exp in parms['experiments']['allIds']:
                         exp_parms = parms['experiments']['byId'][id_exp]
                         dum = (datetime.now() - datetime(1970, 1, 1)).total_seconds()
                         exp = Experiment(name='{}'.format(dum))
                         exp.save()
                         exp.dict_to_parms(parms, CONF_MODELS, id_exp=id_exp)
                         self.experiments.add(exp)
                     camp_parms = parms['campaigns']['byId'][parms['campaigns']['allIds'][0]]
                     self.name = '{}-{}'.format(camp_parms['name'], datetime.now().strftime('%y%m%d'))
                     self.start_date = camp_parms['start_date']
                     self.end_date = camp_parms['end_date']
                     self.tags = camp_parms['tags']
                     self.save()
                     return self
                 def get_experiments_by_radar(self, radar=None):
                     ret = []
                     if radar:
                         locations = Location.objects.filter(pk=radar)
                     else:
                         locations = set([e.location for e in self.experiments.all()])
                     for loc in locations:
                         dum = {}
                         dum['name'] = loc.name
                         dum['id'] = loc.pk
                         dum['experiments'] = [e for e in self.experiments.all() if e.location==loc]
                         ret.append(dum)
                     return ret
                 def get_absolute_url(self):
                     return reverse('url_campaign', args=[str(self.id)])
                 def get_absolute_url_edit(self):
                     return reverse('url_edit_campaign', args=[str(self.id)])
+                def get_absolute_url_delete(self):
+                    return reverse('url_delete_campaign', args=[str(self.id)])
                 def get_absolute_url_export(self):
                     return reverse('url_export_campaign', args=[str(self.id)])
                 def get_absolute_url_import(self):
                     return reverse('url_import_campaign', args=[str(self.id)])
             class RunningExperiment(models.Model):
                 radar = models.OneToOneField('Location', on_delete=models.CASCADE)
                 running_experiment = models.ManyToManyField('Experiment', blank = True)
                 status = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES)
             class Experiment(models.Model):
                 template = models.BooleanField(default=False)
                 name = models.CharField(max_length=40, default='', unique=True)
                 location = models.ForeignKey('Location', null=True, blank=True, on_delete=models.CASCADE)
                 freq = models.FloatField(verbose_name='Operating Freq. (MHz)', validators=[MinValueValidator(1), MaxValueValidator(10000)], default=49.9200)
                 start_time = models.TimeField(default='00:00:00')
                 end_time = models.TimeField(default='23:59:59')
                 task = models.CharField(max_length=36, default='', blank=True, null=True)
                 status = models.PositiveSmallIntegerField(default=4, choices=EXP_STATES)
+                author = models.ForeignKey(User, null=True, blank=True)
+                hash = models.CharField(default='', max_length=64, null=True, blank=True)
                 class Meta:
                     db_table = 'db_experiments'
                     ordering = ('template', 'name')
                 def __str__(self):
                     if self.template:
-                        return u'%s (template)' % (self.name)
+                        return u'%s (template)' % (self.name[:8])
                     else:
-                        return u'%s' % (self.name)
+                        return u'%s' % (self.name[:10])
                 def jsonify(self):
                     data = {}
                     ignored = ('template')
                     for field in self._meta.fields:
                         if field.name in ignored:
                             continue
                         data[field.name] = field.value_from_object(self)
                     data['start_time'] = data['start_time'].strftime('%H:%M:%S')
                     data['end_time'] = data['end_time'].strftime('%H:%M:%S')
                     data['location'] = self.location.name
                     data['configurations'] = ['{}'.format(conf.pk) for
                         conf in Configuration.objects.filter(experiment=self, type=0)]
                     return data
                 @property
                 def radar_system(self):
                     return self.location
                 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())
+                    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 start(self):
                     '''
                     Configure and start experiments's devices
                     ABS-CGS-DDS-RC-JARS
                     '''
                     result = 2
                     confs = []
                     allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
                     rc_mix = [conf for conf in allconfs if conf.device.device_type.name=='rc' and conf.mix]
                     if rc_mix:
                         for conf in allconfs:
                             if conf.device.device_type.name == 'rc' and  not conf.mix:
                                 continue
                             confs.append(conf)
                     else:
                         confs = allconfs
                     #Only Configured Devices.
                     for conf in confs:
                         if conf.device.status in (0, 4):
                             result = 0
                             return result
                     for conf in confs:
                         conf.stop_device()
                         conf.write_device()
                         conf.start_device()
                         time.sleep(1)
                     return result
                 def stop(self):
                     '''
                     Stop experiments's devices
                     DDS-JARS-RC-CGS-ABS
                     '''
                     result = 1
                     confs = Configuration.objects.filter(experiment=self, type = 0).order_by('device__device_type__sequence')
                     confs=confs.exclude(device__device_type__name='cgs')
                     for conf in confs:
                         if conf.device.status in (0, 4):
                             result = 0
                             continue
                         conf.stop_device()
                     return result
                 def get_status(self):
                     if self.status == 3:
                         return
                     confs =  Configuration.objects.filter(experiment=self, type=0)
                     for conf in confs:
                         conf.status_device()
                     total = confs.aggregate(models.Sum('device__status'))['device__status__sum']
                     if total==2*confs.count():
                         status = 1
                     elif total == 3*confs.count():
                         status = 2
                     else:
                         status = 0
                     self.status = status
                     self.save()
                 def status_color(self):
                     color = 'muted'
                     if self.status == 0:
                         color = "danger"
                     elif self.status == 1:
                         color = "info"
                     elif self.status == 2:
                         color = "success"
                     elif self.status == 3:
                         color = "warning"
                     return color
                 def parms_to_dict(self):
                     params = Params({})
                     params.add(self.jsonify(), 'experiments')
                     configurations = Configuration.objects.filter(experiment=self, type=0)
                     for conf in configurations:
                         params.add(conf.jsonify(), 'configurations')
                         if conf.device.device_type.name=='rc':
                             for line in conf.get_lines():
                                 params.add(line.jsonify(), 'lines')
                     return params.data
                 def dict_to_parms(self, parms, CONF_MODELS, id_exp=None):
                     configurations = Configuration.objects.filter(experiment=self)
                     if id_exp is not None:
                         exp_parms = parms['experiments']['byId'][id_exp]
                     else:
                         exp_parms = parms['experiments']['byId'][parms['experiments']['allIds'][0]]
                     if configurations:
                         for configuration in configurations:
                             configuration.delete()
                     for id_conf in exp_parms['configurations']:
                         conf_parms = parms['configurations']['byId'][id_conf]
                         device = Device.objects.filter(device_type__name=conf_parms['device_type'])[0]
                         model = CONF_MODELS[conf_parms['device_type']]
                         conf = model(
                             experiment = self,
                             device = device,
                             )
                         conf.dict_to_parms(parms, id=id_conf)
                     location, created = Location.objects.get_or_create(name=exp_parms['location'])
                     self.name = '{}-{}'.format(exp_parms['name'], datetime.now().strftime('%y%m%d'))
                     self.location = location
                     self.start_time = exp_parms['start_time']
                     self.end_time = exp_parms['end_time']
                     self.save()
                     return self
                 def get_absolute_url(self):
                     return reverse('url_experiment', args=[str(self.id)])
                 def get_absolute_url_edit(self):
                     return reverse('url_edit_experiment', args=[str(self.id)])
+                def get_absolute_url_delete(self):
+                    return reverse('url_delete_experiment', args=[str(self.id)])
                 def get_absolute_url_import(self):
                     return reverse('url_import_experiment', args=[str(self.id)])
                 def get_absolute_url_export(self):
                     return reverse('url_export_experiment', args=[str(self.id)])
                 def get_absolute_url_start(self):
                     return reverse('url_start_experiment', args=[str(self.id)])
                 def get_absolute_url_stop(self):
                     return reverse('url_stop_experiment', args=[str(self.id)])
             class Configuration(PolymorphicModel):
                 template = models.BooleanField(default=False)
-                name = models.CharField(verbose_name="Configuration Name", max_length=40, default='')
+                # name = models.CharField(verbose_name="Configuration Name", max_length=40, default='')
+                label = models.CharField(verbose_name="Label", max_length=40, default='', blank=True, null=True)
                 experiment = models.ForeignKey('Experiment', verbose_name='Experiment', null=True, blank=True, on_delete=models.CASCADE)
                 device = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE)
                 type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
                 created_date = models.DateTimeField(auto_now_add=True)
                 programmed_date = models.DateTimeField(auto_now=True)
                 parameters = models.TextField(default='{}')
+                author = models.ForeignKey(User, null=True, blank=True)
+                hash = models.CharField(default='', max_length=64, null=True, blank=True)
                 message = ""
                 class Meta:
                     db_table = 'db_configurations'
+                    ordering = ('device__device_type__name',)
                 def __str__(self):
-                    device = '{}:'.format(self.device.device_type.name.upper())
+                    ret = u'{} '.format(self.device.device_type.name.upper())
                     if 'mix' in [f.name for f in self._meta.get_fields()]:
                         if self.mix:
-                            device = '{} MIXED:'.format(self.device.device_type.name.upper())
+                            ret = '{} MIX '.format(self.device.device_type.name.upper())
+                    if 'label' in [f.name for f in self._meta.get_fields()]:
+                        ret += '{}'.format(self.label[:8])
+                    #ret += '[ {} ]'.format(self.device.location.name)
                     if self.template:
-                        return u'{} {} (template)'.format(device, self.name)
+                        ret += ' (template)'
-                    else:
-                        return u'{} {}'.format(device, self.name)
+                    return ret
+                @property
+                def name(self):
+                    return str(self)
                 def jsonify(self):
                     data = {}
                     ignored = ('type', 'polymorphic_ctype', 'configuration_ptr',
                                'created_date', 'programmed_date', 'template', 'device',
                                'experiment')
                     for field in self._meta.fields:
                         if field.name in ignored:
                             continue
                         data[field.name] = field.value_from_object(self)
                     data['device_type'] = self.device.device_type.name
                     if self.device.device_type.name == 'rc':
                         data['lines'] = ['{}'.format(line.pk) for line in self.get_lines()]
                         data['delays'] = self.get_delays()
                         data['pulses'] = self.get_pulses()
                     elif self.device.device_type.name == 'jars':
                         data['decode_type'] = DECODE_TYPE[self.decode_data][1]
                     elif self.device.device_type.name == 'dds':
                         data['frequencyA_Mhz'] = float(data['frequencyA_Mhz'])
                         data['frequencyB_Mhz'] = float(data['frequencyB_Mhz'])
                         data['phaseA'] = dds_data.phase_to_binary(data['phaseA_degrees'])
                         data['phaseB'] = dds_data.phase_to_binary(data['phaseB_degrees'])
                     return data
                 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):
                     params = Params({})
                     params.add(self.jsonify(), 'configurations')
                     if self.device.device_type.name=='rc':
                         for line in self.get_lines():
                             params.add(line.jsonify(), 'lines')
                     return params.data
                 def parms_to_text(self):
                     raise NotImplementedError("This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper())
                 def parms_to_binary(self):
                     raise NotImplementedError("This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper())
                 def dict_to_parms(self, parameters, id=None):
                     params = Params(parameters)
                     if id:
                         data = params.get_conf(id_conf=id)
                     else:
                         data = params.get_conf(dtype=self.device.device_type.name)
                     if data['device_type']=='rc':
                         self.clean_lines()
                         lines = data.pop('lines', None)
                         for line_id in lines:
                             pass
                     for key, value in data.items():
                         if key not in ('id', 'device_type'):
                             setattr(self, key, value)
                     self.save()
                 def export_to_file(self, format="json"):
                     content_type = ''
                     if format == 'racp':
                         content_type = 'text/plain'
                         filename = '%s_%s.%s' %(self.device.device_type.name, self.name, 'racp')
                         content = self.parms_to_text(file_format = 'racp')
                     if format == 'text':
                         content_type = 'text/plain'
                         filename = '%s_%s.%s' %(self.device.device_type.name, self.name, self.device.device_type.name)
                         content = self.parms_to_text()
                     if format == 'binary':
                         content_type = 'application/octet-stream'
                         filename = '%s_%s.bin' %(self.device.device_type.name, self.name)
                         content = self.parms_to_binary()
                     if not content_type:
                         content_type = 'application/json'
                         filename = '%s_%s.json' %(self.device.device_type.name, self.name)
                         content = json.dumps(self.parms_to_dict(), indent=2)
                     fields = {'content_type':content_type,
                               'filename':filename,
                               'content':content
                               }
                     return fields
                 def import_from_file(self, fp):
                     parms = {}
                     path, ext = os.path.splitext(fp.name)
                     if ext == '.json':
                         parms = json.load(fp)
                     if ext == '.dds':
                         lines = fp.readlines()
                         parms = dds_data.text_to_dict(lines)
                     if ext == '.racp':
                         if self.device.device_type.name == 'jars':
                             parms = RacpFile(fp).to_dict()
                             parms['filter_parms'] = json.loads(self.filter_parms)
                             return parms
                         parms = RCFile(fp).to_dict()
                     return parms
                 def status_device(self):
                     self.message = 'Function not implemented'
                     return False
                 def stop_device(self):
                     self.message = 'Function not implemented'
                     return False
                 def start_device(self):
                     self.message = 'Function not implemented'
                     return False
                 def write_device(self, parms):
                     self.message = 'Function not implemented'
                     return False
                 def read_device(self):
                     self.message = 'Function not implemented'
                     return False
                 def get_absolute_url(self):
                     return reverse('url_%s_conf' % self.device.device_type.name, args=[str(self.id)])
                 def get_absolute_url_edit(self):
                     return reverse('url_edit_%s_conf' % self.device.device_type.name, args=[str(self.id)])
+                def get_absolute_url_delete(self):
+                    return reverse('url_delete_dev_conf', args=[str(self.id)])
                 def get_absolute_url_import(self):
                     return reverse('url_import_dev_conf', args=[str(self.id)])
                 def get_absolute_url_export(self):
                     return reverse('url_export_dev_conf', args=[str(self.id)])
                 def get_absolute_url_write(self):
                     return reverse('url_write_dev_conf', args=[str(self.id)])
                 def get_absolute_url_read(self):
                     return reverse('url_read_dev_conf', args=[str(self.id)])
                 def get_absolute_url_start(self):
                     return reverse('url_start_dev_conf', args=[str(self.id)])
                 def get_absolute_url_stop(self):
                     return reverse('url_stop_dev_conf', args=[str(self.id)])
                 def get_absolute_url_status(self):
                     return reverse('url_status_dev_conf', args=[str(self.id)])

apps/main/static/css/bootstrap-spacelab.min.css 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/main/templates/base.html 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/main/templates/base_list.html 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/main/templates/dev_conf.html 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/main/templates/experiment_summary.html 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/main/views.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/forms.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/models.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/templates/rc_conf.html 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/urls.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/utils.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/views.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

docker-compose.yml 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

radarsys/settings.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/jars/templates/jars_filter.html removed 0 -27

NO CONTENT: file was removed

apps/jars/templates/jars_filter_edit.html removed 0 -29

NO CONTENT: file was removed

apps/main/static/css/bootstrap-paper.min.css removed 0 0

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff

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