diff --git a/apps/jars/forms.py b/apps/jars/forms.py index 380d8bb..df81579 100644 --- a/apps/jars/forms.py +++ b/apps/jars/forms.py @@ -49,7 +49,7 @@ class JARSfilterForm(forms.ModelForm): instance = getattr(self, 'instance', None) self.fields['fch_decimal'].widget.attrs['readonly'] = True - + if 'initial' in kwargs: if 'filter_id' not in kwargs['initial']: self.fields.pop('name') @@ -64,9 +64,9 @@ class JARSfilterForm(forms.ModelForm): self.fields['name'].label = "Filter Template Name" else: 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']) + jars_filter = JARSfilter.objects.get(pk=kwargs['initial']['filter_id']) labels = [f.name for f in jars_filter._meta.get_fields()] - + for label in ['id']: labels.remove(label) for label in labels: diff --git a/apps/jars/views.py b/apps/jars/views.py index f53ac54..67f5562 100644 --- a/apps/jars/views.py +++ b/apps/jars/views.py @@ -25,19 +25,19 @@ def jars_conf(request, id_conf): kwargs['filter'] = filter_parms kwargs['filter_keys'] = ['clock', 'mult', 'fch', 'fch_decimal', 'filter_fir', 'filter_2', 'filter_5'] - + 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', 'cards_number', 'channels_number', 'channels', - 'ftp_interval', 'data_type','acq_profiles', + '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', @@ -117,7 +117,7 @@ def import_file(request, conf_id): 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: @@ -176,11 +176,11 @@ def read_conf(request, conf_id): def change_filter(request, conf_id, filter_id=None): conf = get_object_or_404(JARSConfiguration, pk=conf_id) - + if filter_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) @@ -224,17 +224,17 @@ def get_log(request, conf_id): 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 \ No newline at end of file + return response