radarsys Commit - r345:cf456d2fb627 · Jicamarca Repository

apps/jars/templates/jars_new_filter.html created 644 +2 0

			@@ -0,0 +1,2
		1	{% extends "base_edit.html" %}
		2

README.md +1 -2

              The Integrated Radar System (SIR) is a web application that allows the configuration of the radar devices as required by the experiment,
              This app allows the creation of Campaigns, Experiment and Device Configurations.
-             For the python3.0 update please check the requeriments vrsion for each package. It depends on the python 3.7 or 3.8 version.
-             Special attention with the bokeh version.
+             For the python3.0 update please check the requeriments vrsion for each package. It depends on the python 3.7 or 3.8 version. Special attention with the bokeh version.
              For more information visit: http://jro-dev.igp.gob.pe:3000/projects/sistema-integrado-de-radar/wiki
              ## Installation

apps/abs/views.py +1 -2

                  #kwargs['dev_conf'] = conf.device
                  #kwargs['id_dev'] = conf.device
+                 #kwargs['previous']  = conf.get_absolute_url_edit()
                  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)

apps/jars/forms.py +10 -1

                  #instance = globals()[model]
                  choices = model.objects.all().values_list('pk', 'name')
-                 choices = add_empty_choice(choices)
+                 choices = add_empty_choice(choices,label="New Choice")
                  return choices
              class JARSConfigurationForm(forms.ModelForm):
                      model = JARSFilter
                      exclude = ('name', )
+             class JARSFilterFormNew(forms.ModelForm):
+                 def __init__(self, *args, **kwargs):
+                     super(JARSFilterFormNew, self).__init__(*args, **kwargs)
+                     self.fields['f_decimal'].widget.attrs['readonly'] = True
+                 class Meta:
+                     model = JARSFilter
+                     exclude = ()
              class ExtFileField(forms.FileField):
                  """

apps/jars/models.py +16 -1

                      self.cic_2 = parameters['cic_2']
                      self.cic_5 = parameters['cic_5']
+                 def dict_to_parms_new(self, parameters):
+                     self.name        = parameters['name']
+                     self.clock       = parameters['clock']
+                     self.multiplier  = parameters['multiplier']
+                     self.frequency   = parameters['frequency']
+                     self.f_decimal   = parameters['f_decimal']
+                     self.fir         = parameters['fir']
+                     self.cic_2       = parameters['cic_2']
+                     self.cic_5       = parameters['cic_5']
+                     self.scale_fir   = parameters['scale_fir']
+                     self.scale_cic_2 = parameters['scale_cic_2']
+                     self.scale_cic_5 = parameters['scale_cic_5']
+                     self.number_taps = parameters['number_taps']
+                     self.taps        = parameters['taps']
              class JARSConfiguration(Configuration):
                          return False
                      data = self.experiment.parms_to_dict()
+                     #print(data)
                      for key in data['configurations']['allIds']:
                          if data['configurations']['byId'][key]['device_type'] in ('dds', 'cgs'):
                              data['configurations']['allIds'].remove(key)

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

              {% extends "base.html" %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% block mainactive %}active{% endblock %}
              {% block content-title %}Acquisition System{% endblock %}

apps/jars/templates/jars_conf.html +1 -1

              {% extends "dev_conf.html" %}
              {% load static %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load main_tags %}
              {% block extra-menu-actions %}

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

              {% extends "dev_conf_edit.html" %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load static %}
              {% load main_tags %}
                });
                $("#id_filter_template").change(function () {
+                 if($("#id_filter_template").val()!=0)
                  document.location = "{% url 'url_change_jars_filter' id_dev %}" + $("#id_filter_template").val();
+                 else
+                   document.location = "{% url 'url_new_jars_filter' id_dev %}"
                });
              </script>

apps/jars/urls.py +1 0

                  path('<int:id_conf>/edit/', views.jars_conf_edit, name='url_edit_jars_conf'),
                  path('<int:conf_id>/change_filter/', views.change_filter, name='url_change_jars_filter'),
                  path('<int:conf_id>/change_filter/<int:filter_id>/', views.change_filter, name='url_change_jars_filter'),
+                 path('<int:conf_id>/new_filter/', views.new_filter, name='url_new_jars_filter'),
                  path('<int:conf_id>/import/', views.import_file, name='url_import_jars_conf'),
                  path('<int:conf_id>/read/', views.read_conf, name='url_read_jars_conf'),
                  path('<int:conf_id>/get_log/', views.get_log, name='url_get_jars_log'),

apps/jars/views.py +30 -3

              from apps.main.views import sidebar
              from .models import JARSConfiguration, JARSFilter
-             from .forms import JARSConfigurationForm, JARSFilterForm, JARSImportForm
+             from .forms import JARSConfigurationForm, JARSFilterForm, JARSImportForm,JARSFilterFormNew
              import json
              # Create your views here.
              def jars_conf_edit(request, id_conf):
                  conf = get_object_or_404(JARSConfiguration, pk=id_conf)
                  filter_parms = json.loads(conf.filter_parms)
                  if request.method=='GET':
                  return render(request, 'jars_conf_edit.html', kwargs)
+             def new_filter(request, conf_id):
+                 conf         = get_object_or_404(JARSConfiguration, pk=conf_id)
+                 form         = JARSFilterFormNew()
+                 if request.method=='POST':
+                     filter_form = JARSFilterFormNew(request.POST)
+                     if filter_form.is_valid():
+                        jars_filter       = filter_form.cleaned_data
+                        jars_filter['id'] = request.POST['name']
+                     else:
+                        messages.error(request, filter_form.errors)
+                     #print(json.dumps(jars_filter))
+                     jars_filter_obj       = JARSFilter()
+                     jars_filter_obj.dict_to_parms_new(request.POST)
+                     jars_filter_obj.save()
+                     return redirect('url_edit_jars_conf', id_conf=conf.id)
+                 kwargs = {}
+                 kwargs['id_dev']    = conf.id
+                 kwargs['form']      = form
+                 kwargs['title']     = 'New JARS Filter'
+                 kwargs['suptitle']  = 'Parameters'
+                 kwargs['button']    = 'Save'
+                 return render(request, 'jars_new_filter.html', kwargs)
              def change_filter(request, conf_id, filter_id):
                  conf = get_object_or_404(JARSConfiguration, pk=conf_id)
                      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.'
+                     message = 'Restarting Report.txt has been downloaded successfully.'+e
                  content = response
                  filename     =  'Log_%s_%s.txt' %(conf.experiment.name, conf.experiment.id)

apps/jars/widgets.py +2 -2

              class SpectralWidget(forms.widgets.TextInput):
-                 def render(self, label, value, attrs=None):
+                 def render(self, name, value, attrs=None, renderer=None):
+                     label = name
                      readonly = 'readonly' if attrs.get('readonly', False) else ''
                      name = attrs.get('name', label)
                      if value == None:

apps/main/models.py +8 0

                          data['phaseA'] = dds_data.phase_to_binary(data['phaseA_degrees'])
                          data['phaseB'] = dds_data.phase_to_binary(data['phaseB_degrees'])
+                     elif self.device.device_type.name == 'dds_rest':
+                         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'])
+                         data['delta_frequency_Mhz'] = float(data['delta_frequency_Mhz'] or 0.00)
+                         data['update_clock_Mhz']    = float(data['update_clock_Mhz'] or 0.00)
+                         data['ramp_rate_clock_Mhz'] = float(data['ramp_rate_clock_Mhz'] or 0.0)
                      return data
                  def clone(self, **kwargs):

apps/rc/widgets.py 0 -2

                      else:
                          return mark_safe(html+script)
                      return mark_safe(html)

radarsys/settings.py 0 0

NO CONTENT: modified file

	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