radarsys Commit - r338:7377db7c77e8 · Jicamarca Repository

0

apps/abs/utils/pat.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/dds_rest/__init__.py created 644 0 0

1

NO CONTENT: new file 100644

0

apps/dds_rest/admin.py created 644 +6 0

			@@ -0,0 +1,6
		1	from django.contrib import admin
		2	from .models import DDSRestConfiguration
		3
		4	# Register your models here.
		5
		6	admin.site.register(DDSRestConfiguration)

0

apps/dds_rest/forms.py created 644 +27 0

			@@ -0,0 +1,27
		1	from django import forms
		2	from apps.main.models import Device
		3	from .models import DDSRestConfiguration
		4
		5	# from django.core.validators import MinValueValidator, MaxValueValidator
		6
		7	class DDSRestConfigurationForm(forms.ModelForm):
		8
		9	def __init__(self, args, *kwargs):
		10
		11	super(DDSRestConfigurationForm, self).__init__(args, *kwargs)
		12
		13	instance = getattr(self, 'instance', None)
		14
		15	if instance and instance.pk:
		16
		17	devices = Device.objects.filter(device_type__name='dds_rest')
		18
		19	#if instance.experiment:
		20	# self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
		21
		22	self.fields['device'].widget.choices = [(device.id, device) for device in devices]
		23
		24
		25	class Meta:
		26	model = DDSRestConfiguration
		27	exclude = ('type', 'parameters', 'status', 'author', 'hash')

0

apps/dds_rest/models.py created 644 +238 0

			@@ -0,0 +1,238
		1	import ast
		2	import json
		3	import requests
		4	import numpy as np
		5	from base64 import b64encode
		6	from struct import pack
		7
		8	from django.urls import reverse
		9	from django.db import models
		10	from apps.main.models import Configuration
		11	from apps.main.utils import Params
		12	# Create your models here.
		13
		14	from django.core.validators import MinValueValidator, MaxValueValidator
		15	from django.core.exceptions import ValidationError
		16
		17	from devices.dds_rest import api, data
		18
		19	ENABLE_TYPE = (
		20	(False, 'Disabled'),
		21	(True, 'Enabled'),
		22	)
		23	MOD_TYPES = (
		24	(0, 'Single Tone'),
		25	(1, 'FSK'),
		26	(2, 'Ramped FSK'),
		27	(3, 'Chirp'),
		28	(4, 'BPSK'),
		29	)
		30
		31	class DDSRestConfiguration(Configuration):
		32
		33	DDS_NBITS = 48
		34
		35	clock = models.FloatField(verbose_name='Clock In (MHz)',validators=[MinValueValidator(5), MaxValueValidator(75)], null=True, default=60)
		36	multiplier = models.PositiveIntegerField(verbose_name='Multiplier',validators=[MinValueValidator(1), MaxValueValidator(20)], default=4)
		37
		38	frequencyA_Mhz = models.DecimalField(verbose_name='Frequency A (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=19, decimal_places=16, null=True, default=49.9200)
		39	frequencyA = models.BigIntegerField(verbose_name='Frequency A (Decimal)',validators=[MinValueValidator(0), MaxValueValidator(2**DDS_NBITS-1)], blank=True, null=True)
		40
		41	frequencyB_Mhz = models.DecimalField(verbose_name='Frequency B (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=19, decimal_places=16, blank=True, null=True)
		42	frequencyB = models.BigIntegerField(verbose_name='Frequency B (Decimal)',validators=[MinValueValidator(0), MaxValueValidator(2**DDS_NBITS-1)], blank=True, null=True)
		43
		44	delta_frequency_Mhz = models.DecimalField(verbose_name='Delta frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=19, decimal_places=16, blank=True, null=True)
		45	delta_frequency = models.BigIntegerField(verbose_name='Delta frequency (Decimal)',validators=[MinValueValidator(0), MaxValueValidator(2**DDS_NBITS-1)], blank=True, null=True)
		46
		47	update_clock_Mhz = models.DecimalField(verbose_name='Update clock (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=19, decimal_places=16, blank=True, null=True)
		48	update_clock = models.BigIntegerField(verbose_name='Update clock (Decimal)',validators=[MinValueValidator(0), MaxValueValidator(2**32-1)], blank=True, null=True)
		49
		50	ramp_rate_clock_Mhz = models.DecimalField(verbose_name='Ramp rate clock (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=19, decimal_places=16, blank=True, null=True)
		51	ramp_rate_clock = models.BigIntegerField(verbose_name='Ramp rate clock (Decimal)',validators=[MinValueValidator(0), MaxValueValidator(2**18-1)], blank=True, null=True)
		52
		53	phaseA_degrees = models.FloatField(verbose_name='Phase A (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)], default=0)
		54
		55	phaseB_degrees = models.FloatField(verbose_name='Phase B (Degrees)', validators=[MinValueValidator(0), MaxValueValidator(360)], blank=True, null=True)
		56
		57	modulation = models.PositiveIntegerField(verbose_name='Modulation Type', choices = MOD_TYPES, default = 0)
		58
		59	amplitude_enabled = models.BooleanField(verbose_name='Amplitude Control', choices=ENABLE_TYPE, default=False)
		60
		61	amplitudeI = models.PositiveIntegerField(verbose_name='Amplitude CH1',validators=[MinValueValidator(0), MaxValueValidator(2**12-1)], blank=True, null=True)
		62	amplitudeQ = models.PositiveIntegerField(verbose_name='Amplitude CH2',validators=[MinValueValidator(0), MaxValueValidator(2**12-1)], blank=True, null=True)
		63
		64
		65	def get_nbits(self):
		66
		67	return self.DDS_NBITS
		68
		69	def clean(self):
		70
		71	if self.modulation in [1,2,3]:
		72	if self.frequencyB is None or self.frequencyB_Mhz is None:
		73	raise ValidationError({
		74	'frequencyB': 'Frequency modulation has to be defined when FSK or Chirp modulation is selected'
		75	})
		76
		77	if self.modulation in [4,]:
		78	if self.phaseB_degrees is None:
		79	raise ValidationError({
		80	'phaseB': 'Phase modulation has to be defined when BPSK modulation is selected'
		81	})
		82
		83	self.frequencyA_Mhz = data.binary_to_freq(self.frequencyA, self.clock*self.multiplier)
		84	self.frequencyB_Mhz = data.binary_to_freq(self.frequencyB, self.clock*self.multiplier)
		85
		86	def verify_frequencies(self):
		87
		88	return True
		89
		90	def parms_to_text(self):
		91
		92	my_dict = self.parms_to_dict()['configurations']['byId'][str(self.id)]
		93
		94	text = data.dict_to_text(my_dict)
		95
		96	return text
		97
		98	def status_device(self):
		99	print("Status ")
		100	try:
		101	answer = api.status(ip = self.device.ip_address,
		102	port = self.device.port_address)
		103	if 'clock' in answer:
		104	self.device.status = 1
		105	else:
		106	self.device.status = answer[0]
		107	self.message = 'DDS - {}'.format(answer[2:])
		108	except Exception as e:
		109	self.message = str(e)
		110	self.device.status = 0
		111
		112	self.device.save()
		113
		114	if self.device.status in (0, '0'):
		115	return False
		116	else:
		117	return True
		118
		119	def reset_device(self):
		120
		121	answer = api.reset(ip = self.device.ip_address,
		122	port = self.device.port_address)
		123
		124	if answer[0] != "1":
		125	self.message = 'DDS - {}'.format(answer[2:])
		126	return 0
		127
		128	self.message = 'DDS - {}'.format(answer[2:])
		129	return 1
		130
		131	def stop_device(self):
		132
		133	try:
		134	answer = api.disable_rf(ip = self.device.ip_address,
		135	port = self.device.port_address)
		136
		137	return self.status_device()
		138
		139	except Exception as e:
		140	self.message = str(e)
		141	return False
		142
		143	def start_device(self):
		144
		145	try:
		146	answer = api.enable_rf(ip = self.device.ip_address,
		147	port = self.device.port_address)
		148
		149	return self.status_device()
		150
		151	except Exception as e:
		152	self.message = str(e)
		153	return False
		154
		155	def read_device(self):
		156
		157	parms = api.read_config(ip = self.device.ip_address,
		158	port = self.device.port_address)
		159	if not parms:
		160	self.message = "Could not read DDS parameters from this device"
		161	return parms
		162
		163	self.message = ""
		164	return parms
		165
		166	def arma_data_write(self):
		167	#clock = RCClock.objects.get(rc_configuration=self)
		168	clock = self.clock
		169	print(clock)
		170	multiplier = self.multiplier
		171	print(multiplier)
		172	frequencyA_Mhz = self.frequencyA_Mhz
		173	print(frequencyA_Mhz)
		174	frequencyA = self.frequencyA
		175	print(frequencyA)
		176	frequencyB_Mhz = self.frequencyB_Mhz
		177	print(frequencyB_Mhz)
		178	frequencyB = self.frequencyB
		179	print(frequencyB)
		180	phaseA_degrees = self.phaseA_degrees
		181	print(phaseA_degrees)
		182	phaseB_degrees = self.phaseB_degrees
		183	print(phaseB_degrees)
		184	modulation = self.modulation
		185	print(modulation)
		186	amplitude_enabled = self.amplitude_enabled
		187	print(amplitude_enabled)
		188	amplitudeI = self.amplitudeI
		189	print(amplitudeI)
		190	amplitudeQ = self.amplitudeQ
		191	print(amplitudeQ)
		192
		193	cadena_json = {'clock': (b64encode(pack('<f',clock))).decode("UTF-8"),\
		194	'multiplier': (b64encode(pack('<B',multiplier))).decode("UTF-8"),\
		195	'frequencyA': (b64encode(pack('<6B',frequencyA))).decode("UTF-8"),\
		196	'frequencyB': (b64encode(pack('<6B',frequencyB))).decode("UTF-8")\
		197
		198	}
		199	return cadena_json
		200
		201	def write_device(self, raw=False):
		202	print("Ingreso a write")
		203	try:
		204
		205	if not raw:
		206	data = self.arma_data_write()
		207	print(data)
		208	payload = self.request('write', 'post', data=json.dumps(data))
		209	if payload['command'] != 'ok':
		210	self.message = 'DDS Rest write: {}'.format(payload['command'])
		211	else:
		212	self.message = payload['programming']
		213	if payload['programming'] == 'fail':
		214	self.message = 'DDS Rest write: error programming DDS chip'
		215	if raw:
		216	return b64encode(data)
		217
		218
		219	except Exception as e:
		220	if 'No route to host' not in str(e):
		221	self.device.status = 4
		222	else:
		223	self.device.status = 0
		224	self.message = 'DDS Rest write: {}'.format(str(e))
		225	self.device.save()
		226	return False
		227
		228	return True
		229
		230	def request(self, cmd, method='get', **kwargs):
		231	print("Ingreso a request")
		232	req = getattr(requests, method)(self.device.url(cmd), **kwargs)
		233	payload = req.json()
		234
		235	return payload
		236
		237	class Meta:
		238	db_table = 'ddsrest_configurations'

0

apps/dds_rest/static/js/dds_conversion.js created 644 +20 0

			@@ -0,0 +1,20
		1
		2	function freq2Binary(mclock, frequency) {
		3
		4	var freq_bin = parseInt(frequency * (Math.pow(2,48)/mclock));
		5	return freq_bin;
		6
		7	}
		8
		9	function binary2Freq(mclock, binary) {
		10
		11	var frequency = (1.0*binary) / (Math.pow(2,48)/mclock);
		12	return frequency;
		13	}
		14
		15
		16	function binary2FreqDelta(mclock, binary) {
		17
		18	var frequency = (1.0*binary) / (Math.pow(2,48)/mclock);
		19	return frequency;
		20	} No newline at end of file

0

apps/dds_rest/templates/dds_rest_conf.html created 644 +1 0

			@@ -0,0 +1,1
		1	{% extends "dev_conf.html" %} No newline at end of file

0

apps/dds_rest/templates/dds_rest_conf_edit.html created 644 +93 0

			@@ -0,0 +1,93
		1	{% extends "dev_conf_edit.html" %}
		2	{% load bootstrap4 %}
		3	{% load static %}
		4	{% load main_tags %}
		5
		6	{% block extra-js%}
		7	<script src="{% static 'js/dds_conversion.js' %}"></script>
		8	<script type="text/javascript">
		9
		10	$("#id_clock").on('change', function() {
		11	updateFrequencies();
		12	});
		13
		14	$("#id_multiplier").on('change', function() {
		15	updateFrequencies();
		16	});
		17
		18	$("#id_frequencyA_Mhz").on('change', function() {
		19	updateBinaryFrequencies();
		20	});
		21
		22	$("#id_frequencyA").on('change', function() {
		23	updateFrequencies();
		24	});
		25
		26	$("#id_frequencyB_Mhz").on('change', function() {
		27	updateBinaryFrequencies();
		28	});
		29
		30	$("#id_frequencyB").on('change', function() {
		31	updateFrequencies();
		32	});
		33
		34	$("#id_delta_frequency").on('change', function() {
		35	updateFrequencyDelta();
		36	});
		37
		38	function updateBinaryFrequencies() {
		39
		40	var clock = $("#id_clock").val();
		41	var multiplier = $("#id_multiplier").val();
		42	var freq = $("#id_frequencyA_Mhz").val();
		43	var freq_mod = $("#id_frequencyB_Mhz").val();
		44
		45	var mclock = clock*multiplier;
		46
		47	var freq_bin = freq2Binary(mclock, freq);
		48	var freq_mod_bin = freq2Binary(mclock, freq_mod);
		49
		50	$("#id_frequencyA").val(freq_bin);
		51	$("#id_frequencyB").val(freq_mod_bin);
		52
		53	freq = binary2Freq(mclock, freq_bin);
		54	freq_mod = binary2Freq(mclock, freq_mod_bin);
		55
		56	$("#id_frequencyA_Mhz").val(freq);
		57	$("#id_frequencyB_Mhz").val(freq_mod);
		58
		59	}
		60
		61	function updateFrequencies() {
		62	console.log("Ingreso a updateFrequencies");
		63	var clock = $("#id_clock").val();
		64	var multiplier = $("#id_multiplier").val();
		65	var freq_bin = $("#id_frequencyA").val();
		66	var freq_mod_bin = $("#id_frequencyB").val();
		67
		68	var mclock = clock*multiplier;
		69
		70	var freq = binary2Freq(mclock, freq_bin);
		71	var freq_mod = binary2Freq(mclock, freq_mod_bin);
		72
		73	$("#id_frequencyA_Mhz").val(freq);
		74	$("#id_frequencyB_Mhz").val(freq_mod);
		75
		76	}
		77
		78	function updateFrequencyDelta() {
		79	console.log("Ingreso a updateFrequencyDelta");
		80	var clock = $("#id_clock").val();
		81	var multiplier = $("#id_multiplier").val();
		82	var freq_bin = $("#id_delta_frequency").val();
		83
		84	var mclock = clock*multiplier;
		85
		86	var freq = binary2Freq(mclock, freq_bin);
		87	console.log(freq);
		88	$("#id_delta_frequency_Mhz").val(freq);
		89	}
		90
		91
		92	</script>
		93	{% endblock %} No newline at end of file

0

apps/dds_rest/templates/dds_rest_conf_import.html created 644 +7 0

			@@ -0,0 +1,7
		1	{% extends "dev_conf_edit.html" %}
		2	{% load bootstrap4 %}
		3	{% load static %}
		4	{% load main_tags %}
		5
		6	{% block extra-js%}
		7	{% endblock %} No newline at end of file

0

apps/dds_rest/tests.py created 644 +3 0

			@@ -0,0 +1,3
		1	from django.test import TestCase
		2
		3	# Create your tests here.

0

apps/dds_rest/urls.py created 644 +9 0

			@@ -0,0 +1,9
		1	from django.urls import path
		2
		3	from . import views
		4
		5	urlpatterns = (
		6	path('<int:id_conf>/', views.dds_rest_conf, name='url_dds_rest_conf'),
		7	path('<int:id_conf>/<int:message>/', views.dds_rest_conf, name='url_dds_rest_conf'),
		8	path('<int:id_conf>/edit/', views.dds_rest_conf_edit, name='url_edit_dds_rest_conf'),
		9	)

0

apps/dds_rest/views.py created 644 +80 0

			@@ -0,0 +1,80
		1	# Create your views here.
		2	from django.shortcuts import redirect, render, get_object_or_404
		3
		4	# from apps.main.models import Experiment, Configuration
		5	from apps.main.views import sidebar
		6
		7	from .models import DDSRestConfiguration
		8	from .forms import DDSRestConfigurationForm
		9	# Create your views here.
		10
		11	def dds_rest_conf(request, id_conf):
		12
		13	conf = get_object_or_404(DDSRestConfiguration, pk=id_conf)
		14
		15	kwargs = {}
		16
		17	kwargs['status'] = conf.device.get_status_display()
		18
		19	# if not kwargs['connected']:
		20	# messages.error(request, message=answer)
		21
		22	kwargs['dev_conf'] = conf
		23	kwargs['dev_conf_keys'] = [
		24	'clock',
		25	'multiplier',
		26	'frequencyA_Mhz',
		27	'frequencyA',
		28	'frequencyB_Mhz',
		29	'frequencyB',
		30	'delta_frequency_Mhz',
		31	'delta_frequency',
		32	'update_clock_Mhz',
		33	'update_clock',
		34	'ramp_rate_clock_Mhz',
		35	'ramp_rate_clock',
		36	'phaseA_degrees',
		37	'phaseB_degrees',
		38	'modulation',
		39	'amplitude_enabled',
		40	'amplitudeI',
		41	'amplitudeQ']
		42
		43	kwargs['title'] = 'DDS Rest Configuration'
		44	kwargs['suptitle'] = 'Details'
		45
		46	kwargs['button'] = 'Edit Configuration'
		47
		48	###### SIDEBAR ######
		49	kwargs.update(sidebar(conf=conf))
		50
		51	return render(request, 'dds_rest_conf.html', kwargs)
		52
		53	def dds_rest_conf_edit(request, id_conf):
		54
		55	conf = get_object_or_404(DDSRestConfiguration, pk=id_conf)
		56
		57	if request.method=='GET':
		58	form = DDSRestConfigurationForm(instance=conf)
		59
		60	if request.method=='POST':
		61	form = DDSRestConfigurationForm(request.POST, instance=conf)
		62
		63	if form.is_valid():
		64	conf = form.save(commit=False)
		65
		66	if conf.verify_frequencies():
		67
		68	conf.save()
		69	return redirect('url_dds_rest_conf', id_conf=conf.id)
		70
		71	##ERRORS
		72
		73	kwargs = {}
		74	kwargs['id_dev'] = conf.id
		75	kwargs['form'] = form
		76	kwargs['title'] = 'Device Configuration'
		77	kwargs['suptitle'] = 'Edit'
		78	kwargs['button'] = 'Save'
		79
		80	return render(request, 'dds_rest_conf_edit.html', kwargs)

0

apps/main/static/css/bootstrap-datetimepicker.min - mod1.css created 644 +5 0

			@@ -0,0 +1,5
		1	/*!
		2	* Datetimepicker for Bootstrap 3
		3	* version : 4.17.47
		4	* https://github.com/Eonasdan/bootstrap-datetimepicker/
		5	*/.bootstrap-datetimepicker-widget{list-style:none}.bootstrap-datetimepicker-widget.dropdown-menu{display:block;margin:2px 0;padding:4px;width:19em}@media (min-width:768px){.bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs{width:38em}}@media (min-width:992px){.bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs{width:38em}}@media (min-width:1200px){.bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs{width:38em}}.bootstrap-datetimepicker-widget.dropdown-menu:before,.bootstrap-datetimepicker-widget.dropdown-menu:after{content:'';display:inline-block;position:absolute}.bootstrap-datetimepicker-widget.dropdown-menu.bottom:before{border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,0.2);top:-7px;left:7px}.bootstrap-datetimepicker-widget.dropdown-menu.bottom:after{border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid white;top:-6px;left:8px}.bootstrap-datetimepicker-widget.dropdown-menu.top:before{border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,0.2);bottom:-7px;left:6px}.bootstrap-datetimepicker-widget.dropdown-menu.top:after{border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid white;bottom:-6px;left:7px}.bootstrap-datetimepicker-widget.dropdown-menu.pull-right:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.dropdown-menu.pull-right:after{left:auto;right:7px}.bootstrap-datetimepicker-widget .list-unstyled{margin:0}.bootstrap-datetimepicker-widget a[data-action]{padding:6px 0}.bootstrap-datetimepicker-widget a[data-action]:active{box-shadow:none}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{width:54px;font-weight:bold;font-size:1.2em;margin:0}.bootstrap-datetimepicker-widget button[data-action]{padding:6px}.bootstrap-datetimepicker-widget .btn[data-action="incrementHours"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Increment Hours"}.bootstrap-datetimepicker-widget .btn[data-action="incrementMinutes"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Increment Minutes"}.bootstrap-datetimepicker-widget .btn[data-action="decrementHours"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Decrement Hours"}.bootstrap-datetimepicker-widget .btn[data-action="decrementMinutes"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Decrement Minutes"}.bootstrap-datetimepicker-widget .btn[data-action="showHours"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Show Hours"}.bootstrap-datetimepicker-widget .btn[data-action="showMinutes"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Show Minutes"}.bootstrap-datetimepicker-widget .btn[data-action="togglePeriod"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Toggle AM/PM"}.bootstrap-datetimepicker-widget .btn[data-action="clear"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Clear the picker"}.bootstrap-datetimepicker-widget .btn[data-action="today"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Set the date to today"}.bootstrap-datetimepicker-widget .picker-switch{text-align:center}.bootstrap-datetimepicker-widget .picker-switch::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Toggle Date and Time Screens"}.bootstrap-datetimepicker-widget .picker-switch td{padding:0;margin:0;height:auto;width:auto;line-height:inherit}.bootstrap-datetimepicker-widget .picker-switch td span{line-height:2.5;height:2.5em;width:100%}.bootstrap-datetimepicker-widget table{width:100%;margin:0}.bootstrap-datetimepicker-widget table td,.bootstrap-datetimepicker-widget table th{text-align:center;border-radius:4px}.bootstrap-datetimepicker-widget table th{height:20px;line-height:20px;width:20px}.bootstrap-datetimepicker-widget table th.picker-switch{width:145px}.bootstrap-datetimepicker-widget table th.disabled,.bootstrap-datetimepicker-widget table th.disabled:hover{background:none;color:#777;cursor:not-allowed}.bootstrap-datetimepicker-widget table th.prev::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Previous Month"}.bootstrap-datetimepicker-widget table th.next::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Next Month"}.bootstrap-datetimepicker-widget table thead tr:first-child th{cursor:pointer}.bootstrap-datetimepicker-widget table thead tr:first-child th:hover{background:#eee}.bootstrap-datetimepicker-widget table td{height:54px;line-height:54px;width:54px}.bootstrap-datetimepicker-widget table td.cw{font-size:.8em;height:20px;line-height:20px;color:#777}.bootstrap-datetimepicker-widget table td.day{height:20px;line-height:20px;width:20px}.bootstrap-datetimepicker-widget table td.day:hover,.bootstrap-datetimepicker-widget table td.hour:hover,.bootstrap-datetimepicker-widget table td.minute:hover,.bootstrap-datetimepicker-widget table td.second:hover{background:#eee;cursor:pointer}.bootstrap-datetimepicker-widget table td.old,.bootstrap-datetimepicker-widget table td.new{color:#777}.bootstrap-datetimepicker-widget table td.today{position:relative}.bootstrap-datetimepicker-widget table td.today:before{content:'';display:inline-block;border:solid transparent;border-width:0 0 7px 7px;border-bottom-color:#337ab7;border-top-color:rgba(0,0,0,0.2);position:absolute;bottom:4px;right:4px}.bootstrap-datetimepicker-widget table td.active,.bootstrap-datetimepicker-widget table td.active:hover{background-color:#337ab7;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.bootstrap-datetimepicker-widget table td.active.today:before{border-bottom-color:#fff}.bootstrap-datetimepicker-widget table td.disabled,.bootstrap-datetimepicker-widget table td.disabled:hover{background:none;color:#777;cursor:not-allowed}.bootstrap-datetimepicker-widget table td span{display:inline-block;width:54px;height:54px;line-height:54px;margin:2px 1.5px;cursor:pointer;border-radius:4px}.bootstrap-datetimepicker-widget table td span:hover{background:#eee}.bootstrap-datetimepicker-widget table td span.active{background-color:#337ab7;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.bootstrap-datetimepicker-widget table td span.old{color:#777}.bootstrap-datetimepicker-widget table td span.disabled,.bootstrap-datetimepicker-widget table td span.disabled:hover{background:none;color:#777;cursor:not-allowed}.bootstrap-datetimepicker-widget.usetwentyfour td.hour{height:27px;line-height:27px}.bootstrap-datetimepicker-widget.wider{width:21em}.bootstrap-datetimepicker-widget .datepicker-decades .decade{line-height:1.8em !important}.input-group.date .input-group-addon{cursor:pointer}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0} No newline at end of file

0

apps/main/static/css/bootstrap-datetimepicker.min - original.css created 644 +5 0

			@@ -0,0 +1,5
		1	/*!
		2	* Datetimepicker for Bootstrap v3
		3	* https://github.com/Eonasdan/bootstrap-datetimepicker/
		4	*/
		5	.bootstrap-datetimepicker-widget{top:0;left:0;width:250px;padding:4px;margin-top:1px;z-index:99999!important;border-radius:4px}.bootstrap-datetimepicker-widget.timepicker-sbs{width:600px}.bootstrap-datetimepicker-widget.bottom:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:7px}.bootstrap-datetimepicker-widget.bottom:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:8px}.bootstrap-datetimepicker-widget.top:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,.2);position:absolute;bottom:-7px;left:6px}.bootstrap-datetimepicker-widget.top:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #fff;position:absolute;bottom:-6px;left:7px}.bootstrap-datetimepicker-widget .dow{width:14.2857%}.bootstrap-datetimepicker-widget.pull-right:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.pull-right:after{left:auto;right:7px}.bootstrap-datetimepicker-widget>ul{list-style-type:none;margin:0}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{width:100%;font-weight:bold;font-size:1.2em}.bootstrap-datetimepicker-widget table[data-hour-format="12"] .separator{width:4px;padding:0;margin:0}.bootstrap-datetimepicker-widget .datepicker>div{display:none}.bootstrap-datetimepicker-widget .picker-switch{text-align:center}.bootstrap-datetimepicker-widget table{width:100%;margin:0}.bootstrap-datetimepicker-widget td,.bootstrap-datetimepicker-widget th{text-align:center;width:20px;height:20px;border-radius:4px}.bootstrap-datetimepicker-widget td.day:hover,.bootstrap-datetimepicker-widget td.hour:hover,.bootstrap-datetimepicker-widget td.minute:hover,.bootstrap-datetimepicker-widget td.second:hover{background:#eee;cursor:pointer}.bootstrap-datetimepicker-widget td.old,.bootstrap-datetimepicker-widget td.new{color:#999}.bootstrap-datetimepicker-widget td.today{position:relative}.bootstrap-datetimepicker-widget td.today:before{content:'';display:inline-block;border-left:7px solid transparent;border-bottom:7px solid #428bca;border-top-color:rgba(0,0,0,.2);position:absolute;bottom:4px;right:4px}.bootstrap-datetimepicker-widget td.active,.bootstrap-datetimepicker-widget td.active:hover{background-color:#428bca;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25)}.bootstrap-datetimepicker-widget td.active.today:before{border-bottom-color:#fff}.bootstrap-datetimepicker-widget td.disabled,.bootstrap-datetimepicker-widget td.disabled:hover{background:none;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget td span{display:block;width:47px;height:54px;line-height:54px;float:left;margin:2px;cursor:pointer;border-radius:4px}.bootstrap-datetimepicker-widget td span:hover{background:#eee}.bootstrap-datetimepicker-widget td span.active{background-color:#428bca;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25)}.bootstrap-datetimepicker-widget td span.old{color:#999}.bootstrap-datetimepicker-widget td span.disabled,.bootstrap-datetimepicker-widget td span.disabled:hover{background:none;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget th.switch{width:145px}.bootstrap-datetimepicker-widget th.next,.bootstrap-datetimepicker-widget th.prev{font-size:21px}.bootstrap-datetimepicker-widget th.disabled,.bootstrap-datetimepicker-widget th.disabled:hover{background:none;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget thead tr:first-child th{cursor:pointer}.bootstrap-datetimepicker-widget thead tr:first-child th:hover{background:#eee}.input-group.date .input-group-addon span{display:block;cursor:pointer;width:16px;height:16px}.bootstrap-datetimepicker-widget.left-oriented:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.left-oriented:after{left:auto;right:7px}.bootstrap-datetimepicker-widget ul.list-unstyled li div.timepicker div.timepicker-picker table.table-condensed tbody>tr>td{padding:0!important} No newline at end of file

0

apps/main/static/css/bootstrap-yeti2.min.css created 644 0 0

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

0

apps/main/static/css/bootstrap.min.css.map created 644 0 0

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

0

apps/main/static/css/fontawesome.css created 644 0 0

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

0

apps/main/static/css/fonts.googleapi.css created 644 0 0

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

0

apps/main/static/css/footer.css created 644 0 0

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

0

apps/main/static/css/header.css created 644 0 0

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

0

apps/main/static/css/js/._bootstrap.min.js created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/css/js/._jquery-3.3.1.slim.min.js created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/css/js/._popper.min.js created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/css/js/bootstrap.min.js created 644 0 0

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

0

apps/main/static/css/js/jquery-3.3.1.slim.min.js created 644 0 0

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

0

apps/main/static/css/js/jroplots.js created 644 0 0

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

0

apps/main/static/css/js/moment.min.js created 644 0 0

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

0

apps/main/static/css/js/plotly-latest.min.js created 644 0 0

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

0

apps/main/static/css/js/popper.min.js created 644 0 0

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

0

apps/main/static/css/style.css created 644 0 0

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

0

apps/main/static/images/._.DS_Store created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._ico_footer_consultas.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._ico_footer_direccion.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._ico_footer_horario.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._ico_footer_tramites.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._kp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._logo-igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._logo-portal-transparencia.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._minam.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._peru_primero.jpeg created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/._skynoise.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/Thumbs.db created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/favicon.ico created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/ico_footer_consultas.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/ico_footer_direccion.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/ico_footer_horario.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/ico_footer_tramites.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/kp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/loader.gif created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/logo-igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/logo-minan.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/logo-portal-transparencia.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/logo-ro.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/logo_igp_normal.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/minam.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/peru_primero.jpeg created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/images/skynoise.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/._.DS_Store created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/._bootstrap.min.js created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/._jquery-3.3.1.slim.min.js created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/._popper.min.js created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/bootstrap-datetimepicker.min - mod1.js created 644 0 0

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

0

apps/main/static/js/bootstrap-datetimepicker.min - original.js created 644 0 0

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

0

apps/main/static/js/images/._.DS_Store created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._ico_footer_consultas.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._ico_footer_direccion.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._ico_footer_horario.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._ico_footer_tramites.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._kp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._logo-igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._logo-portal-transparencia.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._minam.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._peru_primero.jpeg created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/._skynoise.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/ico_footer_consultas.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/ico_footer_direccion.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/ico_footer_horario.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/ico_footer_tramites.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/kp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/loader.gif created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/logo-igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/logo-portal-transparencia.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/minam.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/peru_primero.jpeg created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/images/skynoise.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/js/jquery-3.3.1.slim.min.js created 644 0 0

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

0

apps/main/static/js/jroplots.js created 644 0 0

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

0

apps/main/static/js/moment.min - original.js created 644 0 0

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

0

apps/main/static/js/moment.min.1.js created 644 0 0

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

0

apps/main/static/js/plotly-latest.min.js created 644 0 0

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

0

apps/main/static/js/popper.min.js created 644 0 0

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

0

apps/main/static/webfonts/fa-brands-400.eot created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-brands-400.svg created 644 0 0

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

0

apps/main/static/webfonts/fa-brands-400.ttf created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-brands-400.woff created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-brands-400.woff2 created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-regular-400.eot created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-regular-400.svg created 644 0 0

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

0

apps/main/static/webfonts/fa-regular-400.ttf created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-regular-400.woff created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-regular-400.woff2 created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-solid-900.eot created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-solid-900.svg created 644 0 0

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

0

apps/main/static/webfonts/fa-solid-900.ttf created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-solid-900.woff created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/static/webfonts/fa-solid-900.woff2 created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

apps/main/templates/base - mod.html created 644 0 0

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

0

apps/main/templates/footer_igp.html created 644 0 0

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

0

apps/main/templates/header_igp.html created 644 0 0

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

0

devices/dds_rest/__init__.py created 644 0 0

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

0

devices/dds_rest/api.py created 644 0 0

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

0

devices/dds_rest/data.py created 644 0 0

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

0

radarsys/settings - mod.py created 644 0 0

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

0

static/admin/css/autocomplete.css created 644 0 0

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

0

static/admin/css/base.css created 644 0 0

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

0

static/admin/css/changelists.css created 644 0 0

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

0

static/admin/css/dashboard.css created 644 0 0

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

0

static/admin/css/fonts.css created 644 0 0

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

0

static/admin/css/forms.css created 644 0 0

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

0

static/admin/css/login.css created 644 0 0

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

0

static/admin/css/responsive.css created 644 0 0

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

0

static/admin/css/responsive_rtl.css created 644 0 0

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

0

static/admin/css/rtl.css created 644 0 0

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

0

static/admin/css/vendor/select2/LICENSE-SELECT2.md created 644 0 0

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

0

static/admin/css/vendor/select2/select2.css created 644 0 0

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

0

static/admin/css/vendor/select2/select2.min.css created 644 0 0

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

0

static/admin/css/widgets.css created 644 0 0

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

0

static/admin/fonts/LICENSE.txt created 644 0 0

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

0

static/admin/fonts/README.txt created 644 0 0

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

0

static/admin/fonts/Roboto-Bold-webfont.woff created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/admin/fonts/Roboto-Light-webfont.woff created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/admin/fonts/Roboto-Regular-webfont.woff created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/admin/img/LICENSE created 644 0 0

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

0

static/admin/img/README.txt created 644 0 0

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

0

static/admin/img/calendar-icons.svg created 644 0 0

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

0

static/admin/img/gis/move_vertex_off.svg created 644 0 0

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

0

static/admin/img/gis/move_vertex_on.svg created 644 0 0

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

0

static/admin/img/icon-addlink.svg created 644 0 0

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

0

static/admin/img/icon-alert.svg created 644 0 0

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

0

static/admin/img/icon-calendar.svg created 644 0 0

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

0

static/admin/img/icon-changelink.svg created 644 0 0

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

0

static/admin/img/icon-clock.svg created 644 0 0

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

0

static/admin/img/icon-deletelink.svg created 644 0 0

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

0

static/admin/img/icon-no.svg created 644 0 0

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

0

static/admin/img/icon-unknown-alt.svg created 644 0 0

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

0

static/admin/img/icon-unknown.svg created 644 0 0

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

0

static/admin/img/icon-viewlink.svg created 644 0 0

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

0

static/admin/img/icon-yes.svg created 644 0 0

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

0

static/admin/img/inline-delete.svg created 644 0 0

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

0

static/admin/img/search.svg created 644 0 0

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

0

static/admin/img/selector-icons.svg created 644 0 0

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

0

static/admin/img/sorting-icons.svg created 644 0 0

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

0

static/admin/img/tooltag-add.svg created 644 0 0

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

0

static/admin/img/tooltag-arrowright.svg created 644 0 0

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

0

static/admin/js/SelectBox.js created 644 0 0

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

0

static/admin/js/SelectFilter2.js created 644 0 0

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

0

static/admin/js/actions.js created 644 0 0

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

0

static/admin/js/actions.min.js created 644 0 0

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

0

static/admin/js/admin/DateTimeShortcuts.js created 644 0 0

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

0

static/admin/js/admin/RelatedObjectLookups.js created 644 0 0

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

0

static/admin/js/autocomplete.js created 644 0 0

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

0

static/admin/js/calendar.js created 644 0 0

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

0

static/admin/js/cancel.js created 644 0 0

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

0

static/admin/js/change_form.js created 644 0 0

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

0

static/admin/js/collapse.js created 644 0 0

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

0

static/admin/js/collapse.min.js created 644 0 0

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

0

static/admin/js/core.js created 644 0 0

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

0

static/admin/js/inlines.js created 644 0 0

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

0

static/admin/js/inlines.min.js created 644 0 0

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

0

static/admin/js/jquery.init.js created 644 0 0

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

0

static/admin/js/popup_response.js created 644 0 0

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

0

static/admin/js/prepopulate.js created 644 0 0

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

0

static/admin/js/prepopulate.min.js created 644 0 0

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

0

static/admin/js/prepopulate_init.js created 644 0 0

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

0

static/admin/js/timeparse.js created 644 0 0

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

0

static/admin/js/urlify.js created 644 0 0

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

0

static/admin/js/vendor/jquery/LICENSE.txt created 644 0 0

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

0

static/admin/js/vendor/jquery/jquery.js created 644 0 0

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

0

static/admin/js/vendor/jquery/jquery.min.js created 644 0 0

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

0

static/admin/js/vendor/select2/LICENSE.md created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/ar.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/az.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/bg.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/ca.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/cs.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/da.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/de.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/el.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/en.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/es.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/et.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/eu.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/fa.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/fi.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/fr.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/gl.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/he.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/hi.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/hr.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/hu.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/id.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/is.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/it.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/ja.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/km.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/ko.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/lt.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/lv.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/mk.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/ms.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/nb.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/nl.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/pl.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/pt-BR.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/pt.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/ro.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/ru.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/sk.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/sr-Cyrl.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/sr.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/sv.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/th.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/tr.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/uk.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/vi.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/zh-CN.js created 644 0 0

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

0

static/admin/js/vendor/select2/i18n/zh-TW.js created 644 0 0

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

0

static/admin/js/vendor/select2/select2.full.js created 644 0 0

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

0

static/admin/js/vendor/select2/select2.full.min.js created 644 0 0

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

0

static/admin/js/vendor/xregexp/LICENSE.txt created 644 0 0

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

0

static/admin/js/vendor/xregexp/xregexp.js created 644 0 0

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

0

static/admin/js/vendor/xregexp/xregexp.min.js created 644 0 0

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

0

static/css/bokeh-0.11.1.min.css created 644 0 0

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

0

static/css/bootcards-desktop.min.css created 644 0 0

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

0

static/css/bootstrap-cosmo.min.css created 644 0 0

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

0

static/css/bootstrap-custom.min.css created 644 0 0

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

0

static/css/bootstrap-datetimepicker.min.css created 644 0 0

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

0

static/css/bootstrap-flatly.min.css created 644 0 0

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

0

static/css/bootstrap-journal.min.css created 644 0 0

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

0

static/css/bootstrap-lumen.min.css created 644 0 0

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

0

static/css/bootstrap-sandstone.min.css created 644 0 0

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

0

static/css/bootstrap-simplex.min.css created 644 0 0

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

0

static/css/bootstrap-slate.min.css created 644 0 0

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

0

static/css/bootstrap-spacelab.min.css created 644 0 0

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

0

static/css/bootstrap-theme.css created 644 0 0

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

0

static/css/bootstrap-theme.css.map created 644 0 0

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

0

static/css/bootstrap-theme.min.css created 644 0 0

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

0

static/css/bootstrap-united.min.css created 644 0 0

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

0

static/css/bootstrap-yeti.min.css created 644 0 0

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

0

static/css/bootstrap.css created 644 0 0

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

0

static/css/bootstrap.css.map created 644 0 0

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

0

static/css/bootstrap.min.css created 644 0 0

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

0

static/css/bootstrap.min.css.map created 644 0 0

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

0

static/css/font-awesome.min.css created 644 0 0

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

0

static/css/footer.css created 644 0 0

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

0

static/css/header.css created 644 0 0

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

0

static/css/js/bootstrap.min.js created 644 0 0

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

0

static/css/js/jquery-3.3.1.slim.min.js created 644 0 0

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

0

static/css/js/jroplots.js created 644 0 0

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

0

static/css/js/moment.min.js created 644 0 0

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

0

static/css/js/plotly-latest.min.js created 644 0 0

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

0

static/css/js/popper.min.js created 644 0 0

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

0

static/css/style.css created 644 0 0

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

0

static/fonts/FontAwesome.otf created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/fonts/fontawesome-webfont.eot created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/fonts/fontawesome-webfont.svg created 644 0 0

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

0

static/fonts/fontawesome-webfont.ttf created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/fonts/fontawesome-webfont.woff created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/fonts/fontawesome-webfont.woff2 created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/fonts/glyphicons-halflings-regular.eot created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/fonts/glyphicons-halflings-regular.svg created 644 0 0

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

0

static/fonts/glyphicons-halflings-regular.ttf created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/fonts/glyphicons-halflings-regular.woff created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/fonts/glyphicons-halflings-regular.woff2 created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/ico_footer_consultas.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/ico_footer_direccion.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/ico_footer_horario.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/ico_footer_tramites.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/kp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/loader.gif created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/loading_loading.gif created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/logo-igp-jro-trans.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/logo-igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/logo-jro-color-trans.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/logo-jro-white-trans.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/logo-jro.jpg created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/logo-jro.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/logo-portal-transparencia.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/logo-ro.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/minam.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/peru_primero.jpeg created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/sir.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/images/skynoise.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/abs.js created 644 0 0

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

0

static/js/bokeh-0.11.1.min.js created 644 0 0

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

0

static/js/bokeh-0.12.1.min.js created 644 0 0

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

0

static/js/bootcards.min.js created 644 0 0

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

0

static/js/bootstrap-datetimepicker.min.js created 644 0 0

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

0

static/js/bootstrap.js created 644 0 0

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

0

static/js/bootstrap.min.js created 644 0 0

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

0

static/js/cr.js created 644 0 0

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

0

static/js/dds_conversion.js created 644 0 0

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

0

static/js/filters.js created 644 0 0

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

0

static/js/images/ico_footer_consultas.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/ico_footer_direccion.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/ico_footer_horario.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/ico_footer_tramites.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/kp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/loader.gif created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/logo-igp.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/logo-portal-transparencia.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/minam.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/peru_primero.jpeg created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/images/skynoise.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

static/js/jars.js created 644 0 0

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

0

static/js/jquery-3.3.1.slim.min.js created 644 0 0

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

0

static/js/jquery-ui.min.js created 644 0 0

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

0

static/js/jquery.min.js created 644 0 0

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

0

static/js/jroplots.js created 644 0 0

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

0

static/js/moment.min.1.js created 644 0 0

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

0

static/js/moment.min.js created 644 0 0

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

0

static/js/npm.js created 644 0 0

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

0

static/js/plotly-latest.min.js created 644 0 0

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

0

static/js/popper.min.js created 644 0 0

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

0

static/polymorphic/css/polymorphic_inlines.css created 644 0 0

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

0

static/polymorphic/js/polymorphic_inlines.js created 644 0 0

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

0

apps/abs/forms.py +1 -1

                  class Meta:
                      model = ABSConfiguration
-                     exclude = ('type', 'status', 'parameters', 'active_beam',
+                     exclude = ('type', 'status', 'parameters', 'active_beam',
                          'module_status', 'module_messages', 'module_mode',
                          'author', 'hash')

0

apps/abs/models.py +152 -33

              from django.db import models
-             from apps.main.models import Configuration, User
-             from django.core.urlresolvers import reverse
+             from apps.main.models import Configuration , User
+             from django.urls import reverse
              from celery.execute import send_task
              from datetime import datetime
              import ast
                               (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=status_default)
                      This function sends the beams list to every abs module.
                      It needs 'module_conf' function
                      """
+                     print("Write")
                      beams = ABSBeam.objects.filter(abs_conf=self)
                      nbeams = len(beams)
+                     # Se manda a cero RC para poder realizar cambio de beam
+                     if self.experiment is None:
+                         confs = []
+                     else:
+                         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 self.connected_modules() == 0 :
+                         print("No encuentra modulos")
                          self.message = "No ABS Module detected."
                          return False
+                     '''
                      #-------------Write each abs module-----------
                      if beams:
                              message += ''.join([fromBinary2Char(beam.module_6bits(i)) for beam in beams])
                          status = ['0'] * 64
                          n = 0
+                         print("Llega una antes entrar a multicast")
                          sock = self.send_multicast(message)
-                         for i in range(32):
+                         while True:
+                         #for i in range(32):
                              try:
                                  data, address = sock.recvfrom(1024)
-                                 print address, data
+                                 print (address, data)
                                  if data == '1':
                                      status[int(address[0][10:])-1] = '3'
                                  elif data == '0':
                                      status[int(address[0][10:])-1] = '1'
+                             except socket.timeout:
+                                 print('Timeout')
+                                 break
                              except Exception as e:
-                                 print 'Error {}'.format(e)
+                                 print ('Error {}'.format(e))
                                  n += 1
                          sock.close()
                      else:
                          self.message = "ABS Configuration does not have beams"
+                         #Start DDS-RC-JARS
+                         if confdds:
+                             confdds.start_device()
+                         if confrc:
+                             #print confrc
+                             confrc.start_device()
+                         if confjars:
+                             confjars.start_device()
                          return False
                      if n == 64:
                          self.device.status = 0
                          self.module_status = ''.join(status)
                          self.save()
+                         #Start DDS-RC-JARS
+                         if confdds:
+                             confdds.start_device()
+                         if confrc:
+                             #print confrc
+                             confrc.start_device()
+                         if confjars:
+                             confjars.start_device()
                          return False
                      else:
                          self.message = "ABS Beams List have been sent to ABS Modules"
                          self.active_beam = beams[0].pk
+                     #Start DDS-RC-JARS
+                     if confdds:
+                         confdds.start_device()
+                     if confrc:
+                         #print confrc
+                         confrc.start_device()
+                     if confjars:
+                         confjars.start_device()
                      self.device.status = 3
                      self.module_status = ''.join(status)
                      self.save()
+                     conf_active = ABSActive.objects.get(pk=1)
+                     conf_active.conf = self
+                     conf_active.save()
                      return True
                      return num
                  def send_multicast(self, message):
+                     #print("Send multicast")
                      multicast_group = ('224.3.29.71', 10000)
                      # Create the datagram socket
                      sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
                      sock.settimeout(1)
-                     local_ip = os.environ.get('LOCAL_IP', '192.168.1.128')
+                     local_ip = os.environ.get('LOCAL_IP', '192.168.2.128')
                      sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, socket.inet_aton(local_ip))
-                     sock.sendto(message, multicast_group)
+                     sock.sendto(message.encode(), multicast_group)
                      print('Sending ' + message)
                      return sock
                      This function returns the status of all abs-modules as one.
                      If at least one module is connected, its answer is "1"
                      """
+                     print ('Status device')
+                     print (self.active_beam)
+                     beams = ABSBeam.objects.filter(abs_conf=self)
+                     #print beams[self.active_beam-1].module_6bits(0)
+                     active = ABSActive.objects.get(pk=1)
+                     if active.conf != self:
+                         self.message = 'La configuracion actual es la del siguiente enlace %s.' % active.conf.get_absolute_url()
+                         self.message +=  "\n"
+                         self.message += 'Se debe realizar un write en esta configuracion para luego obtener un status valido.'
+                         return False
                      sock = self.send_multicast('MNTR')
                      n = 0
                      status = ['0'] * 64
-                     for i in range(32):
+                     while True:
+                     #for i in range(32):
                          #if True:
                          try:
+                             print("Recibiendo")
                              address = None
-                             data, address = sock.recvfrom(1024)
-                             x = int(address[0][10:])-1
+                             data, address = sock.recvfrom(2)
+                             print (address, data)
+                             print("!!!!")
+                             data = data.decode()
+                             aux_mon = "1"
+                             aux_expected = aux_mon
+                             if(len(data)==2):
+                                 print ("data[1]: ")
+                                 print (data[1])
+                                 aux_mon = fromChar2Binary(data[1])
+                                 print (aux_mon)
+                                 aux_i = (str(address[0]).split('.'))[3]
+                                 print (aux_i)
+                                 print ('Active beam')
+                                 beam_active = ABSBeam.objects.get(pk=self.active_beam)
+                                 print (beam_active)
+                                 aux_expected = beam_active.module_6bits(int(aux_i)-1)
+                                 print (aux_expected)
+                             print ("data[0]: ")
+                             print (data[0])
                              if data[0] == '1':
-                                 remote = fromChar2Binary(data[1])
-                                 local = ABSBeam.objects.get(pk=self.active_beam).module_6bits(x)
-                                 if local == remote:
-                                     status[x] = '3'
-                                     print('Module: {} connected...igual'.format(address))
+                                 status[int(address[0][10:])-1] = '3'
+                                 if aux_mon == aux_expected:
+                                     print ('Es igual')
                                  else:
-                                     status[x] = '2'
-                                     print('Module: {} connected...diferente'.format(address))
+                                     print ('Es diferente')
+                                     status[int(address[0][10:])-1] = '2'
                              elif data[0] == '0':
-                                 status[x] = '1'
+                                 status[int(address[0][10:])-1] = '1'
                              n += 1
+                             print('Module: {} connected'.format(address))
+                         except socket.timeout:
+                             print('Timeout')
+                             break
                          except:
                              print('Module: {} error'.format(address))
                              pass
                      sock.close()
                      if n > 0:
                          self.message = 'ABS modules Status have been updated.'
                          self.device.status = 1
                      This function connects to a multicast group and sends the beam number
                      to all abs modules.
                      """
+                     print ('Send beam')
+                     print (self.active_beam)
+                     beams = ABSBeam.objects.filter(abs_conf=self)
+                     #print beams[self.active_beam-1].module_6bits(0)
+                     active = ABSActive.objects.get(pk=1)
+                     if active.conf != self:
+                         self.message = 'La configuracion actual es la del siguiente enlace %s.' % active.conf.get_absolute_url()
+                         self.message +=  "\n"
+                         self.message += 'Se debe realizar un write en esta configuracion para luego obtener un status valido.'
+                         return False
                      # Se manda a cero RC para poder realizar cambio de beam
                      if self.experiment is None:
                      #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)
+                     message = 'CHGB{}'.format(beam_pos)
                      sock = self.send_multicast(message)
-                     for i in range(32):
+                     while True:
+                     #for i in range(32):
                          try:
                              data, address = sock.recvfrom(1024)
-                             print address, data
+                             print (address, data)
+                             data = data.decode()
                              if data == '1':
                                  status[int(address[0][10:])-1] = '3'
                              elif data == '0':
                                  status[int(address[0][10:])-1] = '1'
+                         except socket.timeout:
+                             print('Timeout')
+                             break
                          except  Exception as e:
-                             print 'Error {}'.format(e)
+                             print ('Error {}'.format(e))
                              pass
                      sock.close()
                  def get_absolute_url_import(self):
                      return reverse('url_import_abs_conf', args=[str(self.id)])
+             class ABSActive(models.Model):
+                 conf = models.ForeignKey(ABSConfiguration, null=True, verbose_name='ABS Configuration', on_delete=models.CASCADE)
              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')
+                 abs_conf     = models.ForeignKey('ABSConfiguration', null=True,
+                 verbose_name='ABS Configuration', on_delete=models.CASCADE)
                  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')

0

apps/abs/templates/abs_add_beam.html +3 -1

              {% extends "dev_conf_edit.html" %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load static %}
              {% load main_tags %}
              {% block content %}
              <form class="form" method="post">
                {% csrf_token %}

0

apps/abs/templates/abs_beam_values.html +3 -3

              {% load static %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load main_tags %}
              {% block content %}
              }
+             }
              .abs_tx tr:nth-last-child(1){
                  border-bottom: 0px solid #00334d;
              }
              }
+             }
              .abs_rx tr:nth-last-child(1){
                  border-bottom: 0px solid #00334d;
              }

0

apps/abs/templates/abs_beams_list.html +3 -3

-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% if abs_beams %}
                          #{{forloop.counter}}:  {{beam.name}}
                        </a>
                        {% if edit %}
-                         <button id="bt_remove_beam-{{ beam.id }}" type="button" class="btn-xs btn-default pull-right" name="bt_remove_beam" value="{{beam.pk}}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
-                         <button id="bt_edit_beam-{{ beam.id }}" type="button" class="btn-xs btn-default pull-right" name="bt_edit_beam" value="{{beam.pk}}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></button>
+                         <button id="bt_remove_beam-{{ beam.id }}" type="button" class="btn-xs btn-default pull-right" name="bt_remove_beam" value="{{beam.pk}}"><span class="far fa-trash-alt" aria-hidden="true"></span></button>
+                         <button id="bt_edit_beam-{{ beam.id }}" type="button" class="btn-xs btn-default pull-right" name="bt_edit_beam" value="{{beam.pk}}"><span class="fa fa-pencil" aria-hidden="true"></span></button>
                        {% endif %}
                      </h4>
                    </div>

0

apps/abs/templates/abs_conf.html +18 -15

-             {% extends "dev_conf.html" %} {% load static %} {% load bootstrap3 %} {% load main_tags %}
+             {% extends "dev_conf.html" %} {% load static %} {% load bootstrap4 %} {% load main_tags %}
              {% block extra-head %}
              <style>
                .abs {
              {% 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>
+                 <span class="far fa-image" aria-hidden="true"></span> View Patterns </a>
              </li>
              {% endblock %}
              {% block extra-content %}
              <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 class="nav-item">
+                     <a {%if beam.pk == active_beam %} class="nav-link active" {% else %} class="nav-link" {% endif %} 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 %}">
+                 <div id="menu{{forloop.counter}}" class="tab-pane fade {%if beam.pk == active_beam %}in active show{% endif %}">
                    <h3>{%if beam.pk == active_beam %}Active Beam: {%endif%}{{beam.name}}</h3>
                    <table id="abs_pattern{{forloop.counter}}" class="abs">
                      <tr>
                    {% 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>
+                       <span class="fas fa-external-link-square-alt" aria-hidden="true"></span>
                        Change Beam</button>
                    </div>
                    {% endif %}
              <p style="color:#b4bcc2; margin-left: 5%;">
                <i>No Beams...</i>
              </p>
-             {% endif %} {% endblock extra-content %} {% block extra-js%}
+             {% 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 %}
+                   {% 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 %}
  No newline at end of file
+             </script>
+             {% endblock %}

0

apps/abs/templates/abs_conf_edit.html +2 -2

              {% extends "dev_conf_edit.html" %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load static %}
              {% block extra-head %}
                  /* show the move cursor as the user moves the mouse over the panel header.*/
                  .panel-default { cursor: move; }
              </style>
-             <script src="{% static 'js/jquery-ui.min.js' %}"></script>
              {% endblock %}

0

apps/abs/templates/abs_downpattern_img.html +1 -1

              {% load static %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load main_tags %}
              {% block content %}

0

apps/abs/templates/abs_edit_beam.html +1 -1

              {% extends "dev_conf_edit.html" %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load static %}
              {% load main_tags %}

0

apps/abs/templates/abs_pattern.html +3 -3

              {% load static %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load main_tags %}
              {% block content %}
              }
+             }
              .abs_tx tr:nth-last-child(1){
                  border-bottom: 0px solid #00334d;
              }
              }
+             }
              .abs_rx tr:nth-last-child(1){
                  border-bottom: 0px solid #00334d;
              }

0

apps/abs/templates/abs_patterns.html +1 -1

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

0

apps/abs/templates/abs_uppattern_img.html +1 -1

              {% load static %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load main_tags %}
              {% block content %}

0

apps/abs/urls.py +12 -12

		@@ -1,18 +1,18
1		from django.~~conf.~~urls import ~~url~~
	1	from django.urls import path
2	2
3	3	from apps.abs import views
4	4
5	5	urlpatterns = (
6		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/$', views.abs_conf, name='url_abs_conf'),
7		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/edit/$', views.abs_conf_edit, name='url_edit_abs_conf'),
8		~~url~~(r'^alert/$', views.abs_conf_alert, name='url_alert_abs_conf'),
9		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/import/$', views.import_file, name='url_import_abs_conf'),
	6	path('<int:id_conf>/', views.abs_conf, name='url_abs_conf'),
	7	path('<int:id_conf>/edit/', views.abs_conf_edit, name='url_edit_abs_conf'),
	8	path('alert/', views.abs_conf_alert, name='url_alert_abs_conf'),
	9	path('<int:id_conf>/import/', views.import_file, name='url_import_abs_conf'),
10	10	#url(r'^(?P<id_conf>-?\d+)/status/', views.abs_conf, {'status_request':True},name='url_status_abs_conf'),
11		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/change_beam/~~(?P~~<id_beam>~~-?\d+)~~/$', views.send_beam, name='url_send_beam'),
12		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/plot/$', views.plot_patterns, name='url_plot_abs_patterns'),
13		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/plot/~~(?P~~<id_beam>~~-?\d+)~~/$', views.plot_patterns, name='url_plot_abs_patterns'),
14		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/plot/~~(?P~~<id_beam>~~-?\d+)~~/~~(?P~~<antenna>~~[\w\-]+)~~/pattern.png$', views.plot_pattern, name='url_plot_beam'),
15		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/add_beam/$', views.add_beam, name='url_add_abs_beam'),
16		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/beam/~~(?P~~<id_beam>~~-?\d+)~~/delete/$', views.remove_beam, name='url_remove_abs_beam'),
17		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/beam/~~(?P~~<id_beam>~~-?\d+)~~/edit/$', views.edit_beam, name='url_edit_abs_beam'),
	11	path('<int:id_conf>/change_beam/<int:id_beam>/', views.send_beam, name='url_send_beam'),
	12	path('<int:id_conf>/plot/', views.plot_patterns, name='url_plot_abs_patterns'),
	13	path('<int:id_conf>/plot/<int:id_beam>/', views.plot_patterns, name='url_plot_abs_patterns'),
	14	path('<int:id_conf>/plot/<int:id_beam>/<int:antenna>/pattern.png', views.plot_pattern, name='url_plot_beam'),
	15	path('<int:id_conf>/add_beam/', views.add_beam, name='url_add_abs_beam'),
	16	path('<int:id_conf>/beam/<int:id_beam>/delete/', views.remove_beam, name='url_remove_abs_beam'),
	17	path('<int:id_conf>/beam/<int:id_beam>/edit/', views.edit_beam, name='url_edit_abs_beam'),
18	18	)

0

apps/abs/utils/Astro_Coords.py +86 -86

              import scipy.interpolate
              import os
              import sys
-             import TimeTools
-             import Misc_Routines
+             from .TimeTools import Julian , Time
+             from .Misc_Routines import CoFactors
              class EquatorialCorrections():
                  def __init__(self):
                      eps0 = (23.4392911*3600.) - (46.8150*T) - (0.00059*T**2) + (0.001813*T**3)
                      # True obliquity of the ecliptic in radians
-                     eps = (eps0 + d_eps)/3600.*Misc_Routines.CoFactors.d2r
+                     eps = (eps0 + d_eps)/3600.*CoFactors.d2r
                      # Useful numbers
                      ce = numpy.cos(eps)
                      se = numpy.sin(eps)
                      # Convert Ra-Dec to equatorial rectangular coordinates
-                     x = numpy.cos(ra*Misc_Routines.CoFactors.d2r)*numpy.cos(dec*Misc_Routines.CoFactors.d2r)
-                     y = numpy.sin(ra*Misc_Routines.CoFactors.d2r)*numpy.cos(dec*Misc_Routines.CoFactors.d2r)
-                     z = numpy.sin(dec*Misc_Routines.CoFactors.d2r)
+                     x = numpy.cos(ra*CoFactors.d2r)*numpy.cos(dec*CoFactors.d2r)
+                     y = numpy.sin(ra*CoFactors.d2r)*numpy.cos(dec*CoFactors.d2r)
+                     z = numpy.sin(dec*CoFactors.d2r)
                      # Apply corrections to each rectangular coordinate
-                     x2 = x - (y*ce + z*se)*d_psi*Misc_Routines.CoFactors.s2r
-                     y2 = y + (x*ce*d_psi - z*d_eps)*Misc_Routines.CoFactors.s2r
-                     z2 = z + (x*se*d_psi + y*d_eps)*Misc_Routines.CoFactors.s2r
+                     x2 = x - (y*ce + z*se)*d_psi*CoFactors.s2r
+                     y2 = y + (x*ce*d_psi - z*d_eps)*CoFactors.s2r
+                     z2 = z + (x*se*d_psi + y*d_eps)*CoFactors.s2r
                      # Convert bask to equatorial spherical coordinates
                      r = numpy.sqrt(x2**2. + y2**2. + z2**2.)
                          dec2[w2] = numpy.arcsin(z2[w2]/r[w2])
                      # Converting to degree
-                     ra2 = ra2/Misc_Routines.CoFactors.d2r
-                     dec2 = dec2/Misc_Routines.CoFactors.d2r
+                     ra2 = ra2/CoFactors.d2r
+                     dec2 = dec2/CoFactors.d2r
                      w = numpy.where(ra2<0.)
                      if w[0].size>0:
                      # Mean elongation of the moon
                      coeff1 = numpy.array([1/189474.0,-0.0019142,445267.111480,297.85036])
                      d = numpy.poly1d(coeff1)
-                     d = d(t)*Misc_Routines.CoFactors.d2r
+                     d = d(t)*CoFactors.d2r
                      d = self.cirrange(d,rad=1)
                      # Sun's mean elongation
                      coeff2 = numpy.array([-1./3e5,-0.0001603,35999.050340,357.52772])
                      m = numpy.poly1d(coeff2)
-                     m = m(t)*Misc_Routines.CoFactors.d2r
+                     m = m(t)*CoFactors.d2r
                      m = self.cirrange(m,rad=1)
                      # Moon's mean elongation
                      coeff3 = numpy.array([1.0/5.625e4,0.0086972,477198.867398,134.96298])
                      mprime = numpy.poly1d(coeff3)
-                     mprime = mprime(t)*Misc_Routines.CoFactors.d2r
+                     mprime = mprime(t)*CoFactors.d2r
                      mprime = self.cirrange(mprime,rad=1)
                      # Moon's argument of latitude
                      coeff4 = numpy.array([-1.0/3.27270e5,-0.0036825,483202.017538,93.27191])
                      f = numpy.poly1d(coeff4)
-                     f = f(t)*Misc_Routines.CoFactors.d2r
+                     f = f(t)*CoFactors.d2r
                      f = self.cirrange(f,rad=1)
                      # Longitude fo the ascending node of the Moon's  mean orbit on the ecliptic, measu-
                      # red from the mean equinox of the date.
                      coeff5 = numpy.array([1.0/4.5e5,0.0020708,-1934.136261,125.04452])
                      omega = numpy.poly1d(coeff5)
-                     omega = omega(t)*Misc_Routines.CoFactors.d2r
+                     omega = omega(t)*CoFactors.d2r
                      omega = self.cirrange(omega,rad=1)
                      d_lng = numpy.array([0,-2,0,0,0,0,-2,0,0,-2,-2,-2,0,2,0,2,0,0,-2,0,2,0,0,-2,0,-2,0,0,\
                      coeff = 23 + 26/60. + 21.488/3600.
                      eps0 = coeff*3600. - 46.8150*T - 0.00059*T**2. + 0.001813*T**3.
                      # True obliquity of the ecliptic in radians
-                     eps = (eps0 + d_epsilon)/3600*Misc_Routines.CoFactors.d2r
+                     eps = (eps0 + d_epsilon)/3600*CoFactors.d2r
                      celestialbodies = CelestialBodies()
                      [sunra,sundec,sunlon,sunobliq] = celestialbodies.sunpos(jd)
                      # Constant of aberration, in arcseconds
                      k = 20.49552
-                     cd = numpy.cos(dec*Misc_Routines.CoFactors.d2r)    ; sd = numpy.sin(dec*Misc_Routines.CoFactors.d2r)
+                     cd = numpy.cos(dec*CoFactors.d2r)    ; sd = numpy.sin(dec*CoFactors.d2r)
                      ce = numpy.cos(eps)                  ; te = numpy.tan(eps)
-                     cp = numpy.cos(pi*Misc_Routines.CoFactors.d2r)     ; sp = numpy.sin(pi*Misc_Routines.CoFactors.d2r)
-                     cs = numpy.cos(sunlon*Misc_Routines.CoFactors.d2r) ; ss = numpy.sin(sunlon*Misc_Routines.CoFactors.d2r)
-                     ca = numpy.cos(ra*Misc_Routines.CoFactors.d2r)     ; sa = numpy.sin(ra*Misc_Routines.CoFactors.d2r)
+                     cp = numpy.cos(pi*CoFactors.d2r)     ; sp = numpy.sin(pi*CoFactors.d2r)
+                     cs = numpy.cos(sunlon*CoFactors.d2r) ; ss = numpy.sin(sunlon*CoFactors.d2r)
+                     ca = numpy.cos(ra*CoFactors.d2r)     ; sa = numpy.sin(ra*CoFactors.d2r)
                      term1 = (ca*cs*ce + sa*ss)/cd
                      term2 = (ca*cp*ce + sa*sp)/cd
                      dec = numpy.atleast_1d(dec)
                      if rad==0:
-                         ra_rad = ra*Misc_Routines.CoFactors.d2r
-                         dec_rad = dec*Misc_Routines.CoFactors.d2r
+                         ra_rad = ra*CoFactors.d2r
+                         dec_rad = dec*CoFactors.d2r
                      else:
                          ra_rad = ra
                          dec_rad = dec
                      dec_rad = numpy.arcsin(x2[2,:])
                      if rad==0:
-                         ra = ra_rad/Misc_Routines.CoFactors.d2r
+                         ra = ra_rad/CoFactors.d2r
                          ra = ra + (ra<0)*360.
-                         dec = dec_rad/Misc_Routines.CoFactors.d2r
+                         dec = dec_rad/CoFactors.d2r
                      else:
                          ra = ra_rad
                          ra = ra + (ra<0)*numpy.pi*2.
                      if FK4==0:
                          st=0.001*(equinox1 - 2000.)
                          # Computing 3 rotation angles.
-                         A=Misc_Routines.CoFactors.s2r*t*(23062.181+st*(139.656+0.0139*st)+t*(30.188-0.344*st+17.998*t))
-                         B=Misc_Routines.CoFactors.s2r*t*t*(79.280+0.410*st+0.205*t)+A
-                         C=Misc_Routines.CoFactors.s2r*t*(20043.109-st*(85.33+0.217*st)+ t*(-42.665-0.217*st-41.833*t))
+                         A=CoFactors.s2r*t*(23062.181+st*(139.656+0.0139*st)+t*(30.188-0.344*st+17.998*t))
+                         B=CoFactors.s2r*t*t*(79.280+0.410*st+0.205*t)+A
+                         C=CoFactors.s2r*t*(20043.109-st*(85.33+0.217*st)+ t*(-42.665-0.217*st-41.833*t))
                      else:
                          st=0.001*(equinox1 - 1900)
                          # Computing 3 rotation angles
-                         A=Misc_Routines.CoFactors.s2r*t*(23042.53+st*(139.75+0.06*st)+t*(30.23-0.27*st+18.0*t))
-                         B=Misc_Routines.CoFactors.s2r*t*t*(79.27+0.66*st+0.32*t)+A
-                         C=Misc_Routines.CoFactors.s2r*t*(20046.85-st*(85.33+0.37*st)+t*(-42.67-0.37*st-41.8*t))
+                         A=CoFactors.s2r*t*(23042.53+st*(139.75+0.06*st)+t*(30.23-0.27*st+18.0*t))
+                         B=CoFactors.s2r*t*t*(79.27+0.66*st+0.32*t)+A
+                         C=CoFactors.s2r*t*(20046.85-st*(85.33+0.37*st)+t*(-42.67-0.37*st-41.8*t))
                      sina = numpy.sin(A); sinb = numpy.sin(B); sinc = numpy.sin(C)
                      cosa = numpy.cos(A); cosb = numpy.cos(B); cosc = numpy.cos(C)
                      # Allow for  ellipticity of the orbit  (equation of centre)  using the Earth's mean
                      # anomoly ME
                      me = 358.475844 + ((35999.049750*t) % 360.0)
-                     ellcor = (6910.1 - 17.2*t)*numpy.sin(me*Misc_Routines.CoFactors.d2r) + 72.3*numpy.sin(2.0*me*Misc_Routines.CoFactors.d2r)
+                     ellcor = (6910.1 - 17.2*t)*numpy.sin(me*CoFactors.d2r) + 72.3*numpy.sin(2.0*me*CoFactors.d2r)
                      l = l + ellcor
                      # Allow for the Venus perturbations using the mean anomaly of Venus MV
                      mv = 212.603219 + ((58517.803875*t) % 360.0)
-                     vencorr = 4.8*numpy.cos((299.1017 + mv - me)*Misc_Routines.CoFactors.d2r) + \
-.5*numpy.cos((148.3133 +  2.0*mv  -  2.0*me )*Misc_Routines.CoFactors.d2r) + \
-.5*numpy.cos((315.9433 +  2.0*mv  -  3.0*me )*Misc_Routines.CoFactors.d2r) + \
-.6*numpy.cos((345.2533 +  3.0*mv  -  4.0*me )*Misc_Routines.CoFactors.d2r) + \
-.0*numpy.cos((318.15   +  3.0*mv  -  5.0*me )*Misc_Routines.CoFactors.d2r)
+                     vencorr = 4.8*numpy.cos((299.1017 + mv - me)*CoFactors.d2r) + \
+.5*numpy.cos((148.3133 +  2.0*mv  -  2.0*me )*CoFactors.d2r) + \
+.5*numpy.cos((315.9433 +  2.0*mv  -  3.0*me )*CoFactors.d2r) + \
+.6*numpy.cos((345.2533 +  3.0*mv  -  4.0*me )*CoFactors.d2r) + \
+.0*numpy.cos((318.15   +  3.0*mv  -  5.0*me )*CoFactors.d2r)
                      l = l + vencorr
                      # Allow for the Mars perturbations using the mean anomaly of Mars MM
                      mm = 319.529425 + ((19139.858500*t) % 360.0)
-                     marscorr = 2.0*numpy.cos((343.8883 - 2.0*mm + 2.0*me)*Misc_Routines.CoFactors.d2r ) + \
-.8*numpy.cos((200.4017 -  2.0*mm  + me)*Misc_Routines.CoFactors.d2r)
+                     marscorr = 2.0*numpy.cos((343.8883 - 2.0*mm + 2.0*me)*CoFactors.d2r ) + \
+.8*numpy.cos((200.4017 -  2.0*mm  + me)*CoFactors.d2r)
                      l = l + marscorr
                      # Allow for the Jupiter perturbations using the mean anomaly of Jupiter MJ
                      mj = 225.328328 + ((3034.6920239*t) % 360.0)
-                     jupcorr = 7.2*numpy.cos((179.5317 - mj + me )*Misc_Routines.CoFactors.d2r) + \
-.6*numpy.cos((263.2167 - mj)*Misc_Routines.CoFactors.d2r) + \
-.7*numpy.cos((87.1450 - 2.0*mj + 2.0*me)*Misc_Routines.CoFactors.d2r) + \
-.6*numpy.cos((109.4933 - 2.0*mj + me)*Misc_Routines.CoFactors.d2r)
+                     jupcorr = 7.2*numpy.cos((179.5317 - mj + me )*CoFactors.d2r) + \
+.6*numpy.cos((263.2167 - mj)*CoFactors.d2r) + \
+.7*numpy.cos((87.1450 - 2.0*mj + 2.0*me)*CoFactors.d2r) + \
+.6*numpy.cos((109.4933 - 2.0*mj + me)*CoFactors.d2r)
                      l = l + jupcorr
                      # Allow for Moons perturbations using mean elongation of the Moon from the Sun D
                      d = 350.7376814 + ((445267.11422*t) % 360.0)
-                     mooncorr  = 6.5*numpy.sin(d*Misc_Routines.CoFactors.d2r)
+                     mooncorr  = 6.5*numpy.sin(d*CoFactors.d2r)
                      l = l + mooncorr
                      # Allow for long period terms
-                     longterm  = + 6.4*numpy.sin((231.19 + 20.20*t)*Misc_Routines.CoFactors.d2r)
+                     longterm  = + 6.4*numpy.sin((231.19 + 20.20*t)*CoFactors.d2r)
                      l = l + longterm
                      l = (l + 2592000.0) % 1296000.0
                      longmed = l/3600.0
                      # Allow for Nutation using the longitude of the Moons mean node OMEGA
                      omega = 259.183275 - ((1934.142008*t) % 360.0)
-                     l = l - 17.2*numpy.sin(omega*Misc_Routines.CoFactors.d2r)
+                     l = l - 17.2*numpy.sin(omega*CoFactors.d2r)
                      # Form the True Obliquity
-                     oblt = 23.452294 - 0.0130125*t + (9.2*numpy.cos(omega*Misc_Routines.CoFactors.d2r))/3600.0
+                     oblt = 23.452294 - 0.0130125*t + (9.2*numpy.cos(omega*CoFactors.d2r))/3600.0
                      # Form Right Ascension and Declination
                      l = l/3600.0
-                     ra  = numpy.arctan2((numpy.sin(l*Misc_Routines.CoFactors.d2r)*numpy.cos(oblt*Misc_Routines.CoFactors.d2r)),numpy.cos(l*Misc_Routines.CoFactors.d2r))
+                     ra  = numpy.arctan2((numpy.sin(l*CoFactors.d2r)*numpy.cos(oblt*CoFactors.d2r)),numpy.cos(l*CoFactors.d2r))
                      neg = numpy.where(ra < 0.0)
                      if neg[0].size > 0: ra[neg] = ra[neg] + 2.0*numpy.pi
-                     dec = numpy.arcsin(numpy.sin(l*Misc_Routines.CoFactors.d2r)*numpy.sin(oblt*Misc_Routines.CoFactors.d2r))
+                     dec = numpy.arcsin(numpy.sin(l*CoFactors.d2r)*numpy.sin(oblt*CoFactors.d2r))
                      if rad==1:
-                         oblt = oblt*Misc_Routines.CoFactors.d2r
-                         longmed = longmed*Misc_Routines.CoFactors.d2r
+                         oblt = oblt*CoFactors.d2r
+                         longmed = longmed*CoFactors.d2r
                      else:
-                         ra = ra/Misc_Routines.CoFactors.d2r
-                         dec = dec/Misc_Routines.CoFactors.d2r
+                         ra = ra/CoFactors.d2r
+                         dec = dec/CoFactors.d2r
                      return ra, dec, longmed, oblt
                      lprimed = numpy.poly1d(coeff0)
                      lprimed = lprimed(t)
                      lprimed = self.cirrange(lprimed,rad=0)
-                     lprime = lprimed*Misc_Routines.CoFactors.d2r
+                     lprime = lprimed*CoFactors.d2r
                      # Mean elongation of the moon
                      coeff1 = numpy.array([-1./1.13065e8,1./545868.,-0.0018819,445267.1114034,297.8501921])
                      d = numpy.poly1d(coeff1)
-                     d = d(t)*Misc_Routines.CoFactors.d2r
+                     d = d(t)*CoFactors.d2r
                      d = self.cirrange(d,rad=1)
                      # Sun's mean anomaly
                      coeff2 = numpy.array([1.0/2.449e7,-0.0001536,35999.0502909,357.5291092])
                      M = numpy.poly1d(coeff2)
-                     M = M(t)*Misc_Routines.CoFactors.d2r
+                     M = M(t)*CoFactors.d2r
                      M = self.cirrange(M,rad=1)
                      # Moon's mean anomaly
                      coeff3 = numpy.array([-1.0/1.4712e7,1.0/6.9699e4,0.0087414,477198.8675055,134.9633964])
                      Mprime = numpy.poly1d(coeff3)
-                     Mprime = Mprime(t)*Misc_Routines.CoFactors.d2r
+                     Mprime = Mprime(t)*CoFactors.d2r
                      Mprime = self.cirrange(Mprime,rad=1)
                      # Moon's argument of latitude
                      coeff4 = numpy.array([1.0/8.6331e8,-1.0/3.526e7,-0.0036539,483202.0175233,93.2720950])
                      F = numpy.poly1d(coeff4)
-                     F = F(t)*Misc_Routines.CoFactors.d2r
+                     F = F(t)*CoFactors.d2r
                      F = self.cirrange(F,rad=1)
                      # Eccentricity of Earth's orbit around the sun
                      ecorr4 = numpy.where((numpy.abs(m_lat))==2)
                      # Additional arguments.
-                     A1 = (119.75 + 131.849*t)*Misc_Routines.CoFactors.d2r
-                     A2 = (53.09 + 479264.290*t)*Misc_Routines.CoFactors.d2r
-                     A3 = (313.45 + 481266.484*t)*Misc_Routines.CoFactors.d2r
+                     A1 = (119.75 + 131.849*t)*CoFactors.d2r
+                     A2 = (53.09 + 479264.290*t)*CoFactors.d2r
+                     A3 = (313.45 + 481266.484*t)*CoFactors.d2r
                      suml_add = 3958.*numpy.sin(A1) + 1962.*numpy.sin(lprime - F) + 318*numpy.sin(A2)
                      sumb_add = -2235.*numpy.sin(lprime) + 382.*numpy.sin(A3) + 175.*numpy.sin(A1-F) + \
 .*numpy.sin(A1 + F) + 127.*numpy.sin(lprime - Mprime) - 115.*numpy.sin(lprime + Mprime)
                      [nlon, elon] = self.nutate(jd)
                      geolon =  geolon + nlon/3.6e3
                      geolon = self.cirrange(geolon,rad=0)
-                     lamb = geolon*Misc_Routines.CoFactors.d2r
-                     beta = geolat*Misc_Routines.CoFactors.d2r
+                     lamb = geolon*CoFactors.d2r
+                     beta = geolat*CoFactors.d2r
                      # Find mean obliquity and convert lamb, beta to RA, Dec
                      c = numpy.array([2.45,5.79,27.87,7.12,-39.05,-249.67,-51.38,1999.25,-1.55,-4680.93, \
                      junk = numpy.poly1d(c);
                      epsilon = 23. + (26./60.) + (junk(t/1.e2)/3600.)
                      # True obliquity in radians
-                     eps = (epsilon + elon/3600. )*Misc_Routines.CoFactors.d2r
+                     eps = (epsilon + elon/3600. )*CoFactors.d2r
                      ra = numpy.arctan2(numpy.sin(lamb)*numpy.cos(eps)-numpy.tan(beta)*numpy.sin(eps),numpy.cos(lamb))
                      ra = self.cirrange(ra,rad=1)
                          geolon = lamb
                          geolat = beta
                      else:
-                         ra = ra/Misc_Routines.CoFactors.d2r
-                         dec = dec/Misc_Routines.CoFactors.d2r
+                         ra = ra/CoFactors.d2r
+                         dec = dec/CoFactors.d2r
                      return ra, dec, dist, geolon, geolat
                      """
                      # Defining date to compute SkyNoise.
-                     [year, month, dom, hour, mis, secs] = TimeTools.Julian(jd).change2time()
+                     [year, month, dom, hour, mis, secs] = Julian(jd).change2time()
                      is_dom = (month==9) & (dom==21)
                      if is_dom:
                          tmp = jd
-                         jd = TimeTools.Time(year,9,22).change2julian()
+                         jd = Time(year,9,22).change2julian()
                          dom = 22
                      # Reading SkyNoise
                      hour = numpy.array([0,23]);
                      mins = numpy.array([0,59]);
                      secs = numpy.array([0,59]);
-                     LTrange = TimeTools.Time(year,month,dom,hour,mins,secs).change2julday()
+                     LTrange = Time(year,month,dom,hour,mins,secs).change2julday()
                      LTtime  = LTrange[0] + numpy.arange(1440)*((LTrange[1] - LTrange[0])/(1440.-1))
-                     lst = TimeTools.Julian(LTtime + (-3600.*ut/86400.)).change2lst()
+                     lst = Julian(LTtime + (-3600.*ut/86400.)).change2lst()
                      ipowr = lst*0.0
                      # Interpolating using scipy (inside max and min "x")
                      [dra1,ddec1,eps,d_psi,d_eps] = self.co_nutate(self.jd,ra_tmp, dec_tmp)
                      # Getting local mean sidereal time (lmst)
-                     lmst = TimeTools.Julian(self.jd[0]).change2lst()
-                     lmst = lmst*Misc_Routines.CoFactors.h2d
+                     lmst = Julian(self.jd[0]).change2lst()
+                     lmst = lmst*CoFactors.h2d
                      # Getting local apparent sidereal time (last)
                      last = lmst + d_psi*numpy.cos(eps)/3600.
                      Converted to Python by Freddy R. Galindo, ROJ, 26 September 2009.
                      """
-                     alt_r = numpy.atleast_1d(self.alt*Misc_Routines.CoFactors.d2r)
-                     az_r = numpy.atleast_1d(self.az*Misc_Routines.CoFactors.d2r)
-                     lat_r = numpy.atleast_1d(self.lat*Misc_Routines.CoFactors.d2r)
+                     alt_r = numpy.atleast_1d(self.alt*CoFactors.d2r)
+                     az_r = numpy.atleast_1d(self.az*CoFactors.d2r)
+                     lat_r = numpy.atleast_1d(self.lat*CoFactors.d2r)
                      # Find local hour angle (in degrees, from 0 to 360.)
                      y_ha = -1*numpy.sin(az_r)*numpy.cos(alt_r)
                      x_ha = -1*numpy.cos(az_r)*numpy.sin(lat_r)*numpy.cos(alt_r) +  numpy.sin(alt_r)*numpy.cos(lat_r)
                      ha = numpy.arctan2(y_ha,x_ha)
-                     ha = ha/Misc_Routines.CoFactors.d2r
+                     ha = ha/CoFactors.d2r
                      w = numpy.where(ha<0.)
                      if w[0].size>0:ha[w] = ha[w] + 360.
                      # Find declination (positive if north of celestial equatorial, negative if south)
                      sindec = numpy.sin(lat_r)*numpy.sin(alt_r) + numpy.cos(lat_r)*numpy.cos(alt_r)*numpy.cos(az_r)
-                     dec = numpy.arcsin(sindec)/Misc_Routines.CoFactors.d2r
+                     dec = numpy.arcsin(sindec)/CoFactors.d2r
                      return ha, dec
                      dec = dec + (ddec1*self.nutate_ + ddec2*self.aberration_)/3600.
                      # Getting local mean sidereal time (lmst)
-                     lmst = TimeTools.Julian(self.jd).change2lst()
+                     lmst = Julian(self.jd).change2lst()
-                     lmst = lmst*Misc_Routines.CoFactors.h2d
+                     lmst = lmst*CoFactors.h2d
                      # Getting local apparent sidereal time (last)
                      last = lmst + d_psi*numpy.cos(eps)/3600.
                      Converted to Python by Freddy R. Galindo, ROJ, 26 September 2009.
                      """
-                     sh = numpy.sin(ha*Misc_Routines.CoFactors.d2r) ; ch = numpy.cos(ha*Misc_Routines.CoFactors.d2r)
-                     sd = numpy.sin(dec*Misc_Routines.CoFactors.d2r) ; cd = numpy.cos(dec*Misc_Routines.CoFactors.d2r)
-                     sl = numpy.sin(self.lat*Misc_Routines.CoFactors.d2r) ; cl = numpy.cos(self.lat*Misc_Routines.CoFactors.d2r)
+                     sh = numpy.sin(ha*CoFactors.d2r) ; ch = numpy.cos(ha*CoFactors.d2r)
+                     sd = numpy.sin(dec*CoFactors.d2r) ; cd = numpy.cos(dec*CoFactors.d2r)
+                     sl = numpy.sin(self.lat*CoFactors.d2r) ; cl = numpy.cos(self.lat*CoFactors.d2r)
                      x = -1*ch*cd*sl + sd*cl
                      y = -1*sh*cd
                      z = ch*cd*cl + sd*sl
                      r = numpy.sqrt(x**2. + y**2.)
-                     az = numpy.arctan2(y,x)/Misc_Routines.CoFactors.d2r
-                     alt = numpy.arctan2(z,r)/Misc_Routines.CoFactors.d2r
+                     az = numpy.arctan2(y,x)/CoFactors.d2r
+                     alt = numpy.arctan2(z,r)/CoFactors.d2r
                      # correct for negative az.
                      w = numpy.where(az<0.)
                      Converted to Python by Freddy R. Galindo, ROJ, 02 October 2009.
                      """
-                     gdl = self.lat*Misc_Routines.CoFactors.d2r
+                     gdl = self.lat*CoFactors.d2r
                      slat = numpy.sin(gdl)
                      clat = numpy.cos(gdl)
                      slat2 = slat**2.
                      y =  rgeoid*sbet + self.alt*slat
                      gcalt = numpy.sqrt(x**2. + y**2.)
-                     gclat = numpy.arctan2(y,x)/Misc_Routines.CoFactors.d2r
+                     gclat = numpy.arctan2(y,x)/CoFactors.d2r
                      return gclat, gcalt

0

apps/abs/utils/Graphics_OverJro.py +13 -14

              #import scipy
              import scipy.interpolate
-             import Astro_Coords
-             import TimeTools
-             import Graphics_Miscens
-             import Misc_Routines
+             from .Astro_Coords import Equatorial , CelestialBodies
+             from .TimeTools import Time , Julian
+             from .Graphics_Miscens import ColorTable
+             from .Misc_Routines import CoFactors,Vector
              class AntPatternPlot:
                  def __init__(self):
                      levels = numpy.array([1e-3,1e-2,1e-1,0.5,1.0])
                      tmp = numpy.round(10*numpy.log10(levels),decimals=1)
-                     labels = range(5)
-                     for i in numpy.arange(5):labels[i] = str(numpy.int(tmp[i]))
+                     labels = []
+                     for i in numpy.arange(5):labels.append(str(numpy.int(tmp[i])))
                      colors = ((0,0,1.),(0,170/255.,0),(127/255.,1.,0),(1.,109/255.,0),(128/255.,0,0))
                      dec_axes = numpy.dot(ones_ra,dec_axes.transpose())
                      dec_axes2 = numpy.array(dec_axes)
-                     ObjHor = Astro_Coords.Equatorial(ha_axes2,dec_axes2,jd)
+                     ObjHor = Equatorial(ha_axes2,dec_axes2,jd)
                      [alt,az,ha] = ObjHor.change2AltAz()
-                     z = numpy.transpose(alt)*Misc_Routines.CoFactors.d2r  ; z = z.flatten()
-                     az = numpy.transpose(az)*Misc_Routines.CoFactors.d2r  ; az = az.flatten()
+                     z = numpy.transpose(alt)*CoFactors.d2r  ; z = z.flatten()
+                     az = numpy.transpose(az)*CoFactors.d2r  ; az = az.flatten()
                      vect = numpy.array([numpy.cos(z)*numpy.sin(az),numpy.cos(z)*numpy.cos(az),numpy.sin(z)])
                      marker = ['--^','--s','--*','--o']
                      # Getting RGB table to plot celestial object over Jicamarca
-                     colortable = Graphics_Miscens.ColorTable(table=1).readTable()
+                     colortable = ColorTable(table=1).readTable()
                      for io in (numpy.arange(4)+1):
                          if self.show_object[io]!=0:
-                             ObjBodies = Astro_Coords.CelestialBodies()
+                             ObjBodies = CelestialBodies()
                              if io==1:
                                  [ra,dec,sunlon,sunobliq] = ObjBodies.sunpos(jd)
                              elif io==2:
                                  ra = maxra*15.
                                  dec = main_dec
-                             ObjEq = Astro_Coords.Equatorial(ra,dec,jd,lat=glat,lon=glon)
+                             ObjEq = Equatorial(ra,dec,jd,lat=glat,lon=glon)
                              [alt, az, ha] = ObjEq.change2AltAz()
                              vect = numpy.array([az,alt]).transpose()
-                             vect = Misc_Routines.Vector(vect,direction=0).Polar2Rect()
+                             vect = Vector(vect,direction=0).Polar2Rect()
                              dcosx = numpy.array(numpy.dot(vect,xg))
                              dcosy = numpy.array(numpy.dot(vect,yg))

0

apps/abs/utils/Misc_Routines.py +13 -8

              import numpy
              import sys
-             class CoFactors():
+             class CoFactors(object):
                  """
                  CoFactor class used to call pre-defined conversion factor (e.g. degree to radian).  The cu-
                  The current available factor are:
                  h2r = numpy.pi/12.
                  h2d = 15.
-             class Redirect:
-                 def __init__(self,stdout):
+             class Redirect(object):
+                 def __init__(self,stdout=None):
                      self.stdout = stdout
                  def write(self,message):
                      self.stdout.insertPlainText(message)
-             class WidgetPrint:
+             class WidgetPrint(object):
                  """
                  WidgetPrint class allows to define the standard output.
                  """
                      if self.textid != None: sys.stdout = Redirect(self.textid)
                      print ("")
-             class Vector:
+             class Vector(object):
                  """
                  direction = 0 Polar to rectangular; direction=1 rectangular to polar
                  """
-                 def __init__(self,vect,direction=0):
+                 def __init__(self,vect=numpy.array([]),direction=0):
                      nsize = numpy.size(vect)
                      if nsize <= 3:
                          vect = vect.reshape(1,nsize)
                      return mm
+             if __name__ == "__main__":
+                 a=CoFactors()
+                 a=Redirect()
+                 a=WidgetPrint()
+                 a=WidgetPrint()
+                 a=Vector()

0

apps/abs/utils/OverJRO.py +1 -1

                  def saveFile(self, contentFile):
                      filename = self.setFilename()
                      finalpath = os.path.join(self.path, self.setFileExtension(filename))
-                     print "HAHAH"
+                     print ("HAHAH")
                      finalpath = "apps/abs/static/data/"+finalpath
                      self.save(finalpath, contentFile)
                      return finalpath

0

apps/abs/utils/overJroShow.py +146 -125

              #!/usr/bin/python
              import sys, os, os.path
              import traceback
-             import cgi, Cookie
+             import cgi
+             from http import cookies
              import time, datetime
              import types
              import numpy
              import numpy.fft
              import scipy.linalg
              import scipy.special
-             from StringIO import StringIO
-             #import Numeric
+             from io import StringIO
-             import Misc_Routines
-             import TimeTools
-             import JroAntSetup
-             import Graphics_OverJro
-             import Astro_Coords
+             #import Misc_Routines
+             from .Misc_Routines import CoFactors
+             #import TimeTools
+             from .TimeTools import Time , Julian ,Doy2Date
+             #import JroAntSetup
+             from .JroAntSetup import ReturnSetup
+             #import Graphics_OverJro
+             from .Graphics_OverJro import AntPatternPlot ,BFieldPlot,CelestialObjectsPlot,PatternCutPlot,SkyNoisePlot
+             #import Astro_Coords
+             from .Astro_Coords import Geodetic ,AltAz ,CelestialBodies
              class JroPattern():
                  def __init__(self,pattern=0,path=None,filename=None,nptsx=101,nptsy=101,maxphi=5,fftopt=0, \
                      # Getting antenna configuration.
                      if filename:
-                         setup = JroAntSetup.ReturnSetup(path=path,filename=filename,pattern=pattern)
+                         setup = ReturnSetup(path=path,filename=filename,pattern=pattern)
                          ues = setup["ues"]
                          phase = setup["phase"]
                      # To get a cut of the pattern.
                      self.getcut = getcut
-                     maxdcos = numpy.sin(maxphi*Misc_Routines.CoFactors.d2r)
+                     maxdcos = numpy.sin(maxphi*CoFactors.d2r)
                      if dcosx==None:dcosx = ((numpy.arange(nptsx,dtype=float)/(nptsx-1))-0.5)*2*maxdcos
                      if dcosy==None:dcosy = ((numpy.arange(nptsy,dtype=float)/(nptsy-1))-0.5)*2*maxdcos
                      self.dcosx = dcosx
                              fft_phase[ix1:ix1+ndx-1,iy1:iy1+ndy-1] = phase[ix,ny-1-iy]
-                     fft_phase = fft_phase*Misc_Routines.CoFactors.d2r
+                     fft_phase = fft_phase*CoFactors.d2r
                      pattern = numpy.abs(numpy.fft.fft2(fft_gain*numpy.exp(numpy.complex(0,1)*fft_phase)))**2
                      pattern = numpy.fft.fftshift(pattern)
                      Converted to Python by Freddy R. Galindo, ROJ, 20 September 2009.
                      """
-                     attenuation = None
-             #        foldr = sys.path[-1] + os.sep + "resource" + os.sep
-                     base_path = os.path.dirname(os.path.abspath(__file__))
-                     #foldr = './resource'
-                     #filen = "attenuation.txt"
-                     attenuationFile = os.path.join(base_path,"resource","attenuation.txt")
-                     #ff = open(os.path.join(foldr,filen),'r')
-                     ff = open(attenuationFile,'r')
-                     exec(ff.read())
-                     ff.close()
+             #         attenuation = None
+             # #        foldr = sys.path[-1] + os.sep + "resource" + os.sep
+             #         base_path = os.path.dirname(os.path.abspath(__file__))
+             #         #foldr = './resource'
+             #         #filen = "attenuation.txt"
+             #         attenuationFile = os.path.join(base_path,"resource","attenuation.txt")
+             #         #ff = open(os.path.join(foldr,filen),'r')
+             #         ff = open(attenuationFile,'r')
+             #         print(ff.read())
+             #         exec(ff.read())
+             #         ff.close()
+                     attenuation = numpy.array([[[-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],
+             		         [-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],
+                		         [-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],
+             		         [-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],
+             		         [-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],
+             		         [-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],
+             		         [-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],
+             		         [-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25]],
+                    		         [[21.25,21.25,21.25,21.25,21.25,21.25,21.25,21.25],
+             		         [15.25,15.25,15.25,15.25,15.25,15.25,15.25,15.25],
+             		         [09.25,09.25,09.25,09.25,09.25,09.25,09.25,09.25],
+             		         [03.25,03.25,03.25,03.25,03.25,03.25,03.25,03.25],
+             		         [-03.25,-03.25,-03.25,-03.25,-03.25,-03.25,-03.25,-03.25],
+             		         [-09.25,-09.25,-09.25,-09.25,-09.25,-09.25,-09.25,-09.25],
+             		         [-15.25,-15.25,-15.25,-15.25,-15.25,-15.25,-15.25,-15.25],
+                 		         [-21.25,-21.25,-21.25,-21.25,-21.25,-21.25,-21.25,-21.25]]])
                      return attenuation
                      Converted to Python by Freddy R. Galindo, ROJ, 20 September 2009.
                      """
-                     pos = self.eomwl*self.__readAttenuation()
+                     pos  = self.eomwl*self.__readAttenuation()
                      posx = pos[0,:,:]
                      posy = pos[1,:,:]
-                     phase = phase*Misc_Routines.CoFactors.d2r
+                     phase = phase*CoFactors.d2r
                      module = numpy.zeros((self.nx,self.ny),dtype=complex)
                      for iy in range(self.ny):
                          for ix in range(self.nx):
                      # Tranforming from indexes to axis' values
                      xcenter = xx1[0] + (((xx1[xx1.size-1] - xx1[0])/(xx1.size -1))*(params[1]))
                      ycenter = yy1[0] + (((yy1[yy1.size-1] - yy1[0])/(yy1.size -1))*(params[2]))
-                     xwidth  = ((xx1[xx1.size-1] - xx1[0])/(xx1.size-1))*(params[3])*(1/Misc_Routines.CoFactors.d2r)
-                     ywidth  = ((yy1[yy1.size-1] - yy1[0])/(yy1.size-1))*(params[4])*(1/Misc_Routines.CoFactors.d2r)
+                     xwidth  = ((xx1[xx1.size-1] - xx1[0])/(xx1.size-1))*(params[3])*(1/CoFactors.d2r)
+                     ywidth  = ((yy1[yy1.size-1] - yy1[0])/(yy1.size-1))*(params[4])*(1/CoFactors.d2r)
                      meanwx = (xwidth*ywidth)
                      meanpos = numpy.array([xcenter,ycenter])
                                          self.path = self.madForm.getvalue('path') #path donde se encuentra el archivo: patron de radiacion del usuario
                                  else:
-                                     print "Content-Type: text/html\n"
-                                     print '<h3> This cgi plot script was called without the proper arguments.</h3>'
-                                     print '<p> This is a script used to plot Antenna Cuts over Jicamarca Antenna</p>'
-                                     print '<p> Required arguments:</p>'
-                                     print '<p>    pattern - chekbox indicating objects over jicamarca antenna</p>'
-                                     print '<p> or'
-                                     print '<p>    filename - The pattern defined by users is a file text'
-                                     print '<p>    path - folder with pattern files'
+                                     print ("Content-Type: text/html\n")
+                                     print ('<h3> This cgi plot script was called without the proper arguments.</h3>')
+                                     print ('<p> This is a script used to plot Antenna Cuts over Jicamarca Antenna</p>')
+                                     print ('<p> Required arguments:</p>')
+                                     print ('<p>    pattern - chekbox indicating objects over jicamarca antenna</p>')
+                                     print ('<p> or')
+                                     print ('<p>    filename - The pattern defined by users is a file text')
+                                     print ('<p>    path - folder with pattern files')
                                      sys.exit(0)
                                  if self.showType == 1:
                                      if numpy.sum(self.objects) == 0:
                                          if  self.scriptHeaders == 0:
-                                             print "Content-Type: text/html\n"
-                                         print '<h3> This cgi plot script was called without the proper arguments.</h3>'
-                                         print '<p> This is a script used to plot Antenna Cuts over Jicamarca Antenna</p>'
-                                         print '<p> Required arguments:</p>'
-                                         print '<p>    objects - chekbox indicating objects over jicamarca antenna</p>'
-                                         print '<p> Please, options in "Select Object" must be checked'
+                                             print ("Content-Type: text/html\n")
+                                         print ('<h3> This cgi plot script was called without the proper arguments.</h3>')
+                                         print ('<p> This is a script used to plot Antenna Cuts over Jicamarca Antenna</p>')
+                                         print ('<p> Required arguments:</p>')
+                                         print ('<p>    objects - chekbox indicating objects over jicamarca antenna</p>')
+                                         print ('<p> Please, options in "Select Object" must be checked')
                                          sys.exit(0)
                                  #considerar para futura implementacion
                          else:
                              if  self.scriptHeaders == 0:
-                                 print "Content-Type: text/html\n"
-                             print '<h3> This cgi plot script was called without the proper arguments.</h3>'
-                             print '<p> This is a script used to plot Pattern Field and Celestial Objects over Jicamarca Antenna</p>'
-                             print '<p> Required arguments:</p>'
-                             print '<p>    year - year of event</p>'
-                             print '<p>    month - month of event</p>'
-                             print '<p>    dom - day of month</p>'
-                             print '<p>    pattern - pattern is defined by "Select an Experiment" list box</p>'
-                             print '<p>    maxphi - maxphi is defined by "Max Angle" text box</p>'
-                             print '<p>    objects - objects is a list defined by checkbox in "Select Object"</p>'
-                             print '<p>    heights - heights is defined by "Heights" text box, for default heights=[100,500,1000]</p>'
-                             print '<p>    showType - showType is a hidden element for show plot of Pattern&Object or Antenna Cuts or Sky Noise</p>'
+                                 print ("Content-Type: text/html\n")
+                             print ('<h3> This cgi plot script was called without the proper arguments.</h3>')
+                             print ('<p> This is a script used to plot Pattern Field and Celestial Objects over Jicamarca Antenna</p>')
+                             print ('<p> Required arguments:</p>')
+                             print ('<p>    year - year of event</p>')
+                             print ('<p>    month - month of event</p>')
+                             print ('<p>    dom - day of month</p>')
+                             print ('<p>    pattern - pattern is defined by "Select an Experiment" list box</p>')
+                             print ('<p>    maxphi - maxphi is defined by "Max Angle" text box</p>')
+                             print ('<p>    objects - objects is a list defined by checkbox in "Select Object"</p>')
+                             print ('<p>    heights - heights is defined by "Heights" text box, for default heights=[100,500,1000]</p>')
+                             print ('<p>    showType - showType is a hidden element for show plot of Pattern&Object or Antenna Cuts or Sky Noise</p>')
                              sys.exit(0)
                          else:
                              if  self.scriptHeaders == 0:
-                                 print "Content-Type: text/html\n"
-                             print '<h3> This cgi plot script was called without the proper arguments.</h3>'
-                             print '<p> This is a script used to plot Sky Noise over Jicamarca Antenna</p>'
-                             print '<p> Required arguments:</p>'
-                             print '<p>    year - year of event</p>'
-                             print '<p>    month - month of event</p>'
-                             print '<p>    dom - day of month</p>'
+                                 print ("Content-Type: text/html\n")
+                             print ('<h3> This cgi plot script was called without the proper arguments.</h3>')
+                             print ('<p> This is a script used to plot Sky Noise over Jicamarca Antenna</p>')
+                             print ('<p> Required arguments:</p>')
+                             print ('<p>    year - year of event</p>')
+                             print ('<p>    month - month of event</p>')
+                             print ('<p>    dom - day of month</p>')
                              sys.exit(0)
                      self.glon = -76.874383
-                     self.junkjd = TimeTools.Time(self.year,self.month,self.dom).change2julday()
-                     self.junklst = TimeTools.Julian(self.junkjd).change2lst(longitude=self.glon)
+                     self.junkjd = Time(self.year,self.month,self.dom).change2julday()
+                     self.junklst = Julian(self.junkjd).change2lst(longitude=self.glon)
                      # Finding RA of observatory for a specific date
-                     self.ra_obs = self.junklst*Misc_Routines.CoFactors.h2d
+                     self.ra_obs = self.junklst*CoFactors.h2d
                  def initParameters(self):
              #        alfa = 1.46*Misc_Routines.CoFactors.d2r
              #        theta = 51.01*Misc_Routines.CoFactors.d2r
-                     alfa = 1.488312*Misc_Routines.CoFactors.d2r
+                     alfa = 1.488312*CoFactors.d2r
                      th = 6.166710 + 45.0
-                     theta = th*Misc_Routines.CoFactors.d2r
+                     theta = th*CoFactors.d2r
                      sina = numpy.sin(alfa)
                      cosa = numpy.cos(alfa)
                      self.initParameters()
                      self.doy = datetime.datetime(date.year,date.month,date.day).timetuple().tm_yday
-                     self.junkjd = TimeTools.Time(self.year,self.month,self.dom).change2julday()
-                     self.junklst = TimeTools.Julian(self.junkjd).change2lst(longitude=self.glon)
-                     self.ra_obs = self.junklst*Misc_Routines.CoFactors.h2d
+                     self.junkjd = Time(self.year,self.month,self.dom).change2julday()
+                     self.junklst = Julian(self.junkjd).change2lst(longitude=self.glon)
+                     self.ra_obs = self.junklst*CoFactors.h2d
-                     date = TimeTools.Time(date.year,date.month,date.day).change2strdate(mode=2)
+                     date = Time(date.year,date.month,date.day).change2strdate(mode=2)
                      mesg = 'Over Jicamarca: ' + date[0]
                                          just_rx=just_rx
                                          )
-                     dum = Graphics_OverJro.AntPatternPlot()
+                     dum = AntPatternPlot()
                      dum.contPattern(iplot=0,
                                      gpath=self.path4plotname,
                          # Plotting Contour Map
                          self.path4plotname = '/home/jespinoza/workspace/radarsys/trunk/webapp/apps/abs/static/images'
-                         dum = Graphics_OverJro.AntPatternPlot()
+                         dum = AntPatternPlot()
                          dum.contPattern(iplot=ii,
                                                                      gpath=self.path4plotname,
                                                                      filename=self.plotname0,
                          [ra,dec,ha] = Astro_Coords.AltAz(vect_polar[1],vect_polar[0],self.junkjd).change2equatorial()
-                         print'Main beam position (HA(min), DEC(degrees)): %f %f'%(ha*4.,dec)
+                         print('Main beam position (HA(min), DEC(degrees)): %f %f')%(ha*4.,dec)
                          self.main_dec = dec
                      self.ptitle = title
-                     Graphics_OverJro.AntPatternPlot().plotRaDec(gpath=self.path4plotname,
+                     AntPatternPlot().plotRaDec(gpath=self.path4plotname,
                                                                  filename=self.plotname0,
                                                                  jd=self.junkjd,
                                                                  ra_obs=self.ra_obs,
                          # Plotting B field.
              #            print "Drawing magnetic field over Observatory"
-                         Obj = Graphics_OverJro.BFieldPlot()
+                         Obj = BFieldPlot()
                          Obj.plotBField(self.path4plotname,self.plotname0,dcos,alpha,nlon,nlat,self.dcosxrange,self.dcosyrange,ObjB.heights,ObjB.alpha_i)
                      tod = numpy.arange(ntod)/ntod*24.
-                     [month,dom] = TimeTools.Doy2Date(self.year,self.doy).change2date()
+                     [month,dom] = Doy2Date(self.year,self.doy).change2date()
-                     jd = TimeTools.Time(self.year,month,dom,tod+self.UT).change2julday()
+                     jd = Time(self.year,month,dom,tod+self.UT).change2julday()
                      if numpy.sum(self.show_object[1:]>0)!=0:
-                         self.ObjC = Graphics_OverJro.CelestialObjectsPlot(jd,self.main_dec,tod,self.maxha_min,self.show_object)
+                         self.ObjC = CelestialObjectsPlot(jd,self.main_dec,tod,self.maxha_min,self.show_object)
                          self.ObjC.drawObject(self.glat,
                                          self.glon,
                      #Init ObjCut for PatternCutPlot()
                      view_objects = numpy.where(self.show_object>0)
                      subplots = len(view_objects[0])
-                     ObjCut = Graphics_OverJro.PatternCutPlot(subplots)
+                     ObjCut = PatternCutPlot(subplots)
                      for io in (numpy.arange(5)):
                          if self.show_object[io]==2:
                                      m_distance = 404114.6  # distance to the Earth in km
                                      m_diameter = 1734.4    # diameter in km.
                                      width_star = numpy.arctan(m_distance/m_diameter)
-                                     width_star = width_star/2./Misc_Routines.CoFactors.d2r*4.
+                                     width_star = width_star/2./CoFactors.d2r*4.
                                      otitle = 'Moon cut'
              #                    else:
              #                        print "Moon is not passing over Observatory"
                              mins = numpy.int32((time - hour)*60.)
                              secs = numpy.int32(((time - hour)*60. - mins)*60.)
-                             ObjT = TimeTools.Time(self.year,self.month,self.dom,hour,mins,secs)
+                             ObjT = Time(self.year,self.month,self.dom,hour,mins,secs)
                              subtitle = ObjT.change2strdate()
                              star_cut = numpy.exp(-(star_ha/width_star)**2./2.)
                      month = self.month
                      year = self.year
-                     julian = TimeTools.Time(year,month,dom).change2julday()
+                     julian = Time(year,month,dom).change2julday()
                      [powr,time, lst] = Astro_Coords.CelestialBodies().skyNoise(julian)
-                     Graphics_OverJro.SkyNoisePlot([year,month,dom],powr,time,lst).getPlot(self.path4plotname,self.plotname2)
+                     SkyNoisePlot([year,month,dom],powr,time,lst).getPlot(self.path4plotname,self.plotname2)
                  def outputHead(self,title):
-                     print "Content-Type: text/html"
-                     print
-                     self.scriptHeaders = 1
-                     print '<html>'
-                     print '<head>'
-                     print '\t<title>' + title + '</title>'
-                     print '<style type="text/css">'
-                     print 'body'
-                     print '{'
-                     print 'background-color:#ffffff;'
-                     print '}'
-                     print 'h1'
-                     print '{'
-                     print 'color:black;'
-                     print 'font-size:18px;'
-                     print 'text-align:center;'
-                     print '}'
-                     print 'p'
-                     print '{'
-                     print 'font-family:"Arial";'
-                     print 'font-size:16px;'
-                     print 'color:black;'
-                     print '}'
-                     print '</style>'
+                     print ("Content-Type: text/html")
+                     print (self).scriptHeaders = 1
+                     print ('<html>')
+                     print ('<head>')
+                     print ('\t<title>' + title + '</title>')
+                     print ('<style type="text/css">')
+                     print ('body')
+                     print ('{')
+                     print ('background-color:#ffffff;')
+                     print ('}')
+                     print ('h1')
+                     print ('{')
+                     print ('color:black;')
+                     print ('font-size:18px;')
+                     print ('text-align:center;')
+                     print ('}')
+                     print ('p')
+                     print ('{')
+                     print ('font-family:"Arial";')
+                     print ('font-size:16px;')
+                     print ('color:black;')
+                     print ('}')
+                     print ('</style>')
              #        self.printJavaScript()
-                     print '</head>'
+                     print ('</head>')
                  def printJavaScript(self):
                      print
                  def printBody(self):
-                     print '<body>'
+                     print ('<body>')
              #        print '<h1>Test Input Parms</h1>'
              #        for key in self.madForm.keys():
              #                #print '<p> name=' + str(key)
              #                    print '<p> name=' + str(key) + \
              #                              ' value=' + str(cgi.escape(self.madForm.getvalue(key))) + ''
-                     print '<form name="form1" method="post" target="showFrame">'
-                     print '    <div align="center">'
-                     print '        <table width=98% border="1" cellpadding="1">'
-                     print '            <tr>'
-                     print '                <td colspan="2" align="center">'
+                     print ('<form name="form1" method="post" target="showFrame">')
+                     print ('    <div align="center">')
+                     print ('        <table width=98% border="1" cellpadding="1">')
+                     print ('            <tr>')
+                     print ('                <td colspan="2" align="center">')
                      if self.showType == 0:
-                         print '                    <IMG SRC="%s" BORDER="0" >'%(os.path.join(os.sep + self.__tmpDir,self.plotname0))
+                         print ('                    <IMG SRC="%s" BORDER="0" >')%(os.path.join(os.sep + self.__tmpDir,self.plotname0))
                      if self.showType == 1:
-                         print '                    <IMG SRC="%s" BORDER="0" >'%(os.path.join(os.sep + self.__tmpDir,self.plotname1))
+                         print ('                    <IMG SRC="%s" BORDER="0" >')%(os.path.join(os.sep + self.__tmpDir,self.plotname1))
                      if self.showType == 2:
-                         print '                    <IMG SRC="%s" BORDER="0" >'%(os.path.join(os.sep + self.__tmpDir,self.plotname2))
-                     print '                </td>'
-                     print '            </tr>'
-                     print '        </table>'
-                     print '    </div>'
-                     print '</form>'
-                     print '</body>'
-                     print '</html>'
+                         print ('                    <IMG SRC="%s" BORDER="0" >')%(os.path.join(os.sep + self.__tmpDir,self.plotname2))
+                     print ('                </td>')
+                     print ('            </tr>')
+                     print ('        </table>')
+                     print ('    </div>')
+                     print ('</form>')
+                     print ('</body>')
+                     print ('</html>')
                  #def execute(self, serverdocspath, tmpdir, currentdate, finalpath, showType=0, maxphi=5.0, objects="[1,1]", heights="[150,500,1000]"):
                  def setInputParameters(self, serverpath, currentdate, finalpath, showType=0, maxphi=5.0, objects="[1,1]", heights="[150,500,1000]"):

0

apps/abs/utils/resource/attenuation.txt +1 0

              attenuation = numpy.array([[[-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],
              		         [-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],
                 		         [-21.25,-15.25,-9.25,-3.25,03.25,09.25,15.25,21.25],

0

apps/abs/views.py +5 -5

              from django.contrib import messages
              from django.conf import settings
              from django.http import HttpResponse
-             from django.core.urlresolvers import reverse
+             from django.urls import reverse
              from django.views.decorators.csrf import csrf_exempt
              from django.utils.safestring import mark_safe
              from .forms import ABSConfigurationForm, ABSBeamEditForm, ABSBeamAddForm, ABSImportForm
              from .utils.overJroShow import overJroShow
-             from .utils.OverJRO import OverJRO
+             #from .utils.OverJRO import OverJRO
              # Create your views here.
              import json, ast
              def abs_conf_alert(request):
                  if request.method == 'POST':
-                     print request.POST
+                     print (request.POST)
                      return HttpResponse(json.dumps({'result':1}), content_type='application/json')
                  else:
                      return redirect('index')
                  conf = get_object_or_404(ABSConfiguration, pk=id_conf)
                  abs = Configuration.objects.filter(pk=conf.device.conf_active).first()
-                 if abs<>conf:
+                 if abs!=conf:
                      url = '#' if abs is None else abs.get_absolute_url()
                      label = 'None' if abs is None else abs.label
                      messages.warning(
                          else:
                              i += 1
                      beam_pos = i + 1 #Estandarizar
-                     print '%s Position: %s' % (beam.name, str(beam_pos))
+                     print ('%s Position: %s') % (beam.name, str(beam_pos))
                      conf.send_beam(beam_pos)
                      return redirect('url_abs_conf', conf.id)

0

apps/abs/widgets.py +17 -15

              class EditUpDataWidget(forms.widgets.TextInput):
-                 def render(self, label, value, attrs=None):
+                 def render(self, name, value, attrs=None, renderer=None):
                      try:
                          beam     = attrs.get('beam', value)
              class EditDownDataWidget(forms.widgets.TextInput):
-                 def render(self, label, value, attrs=None):
+                 def render(self, name, value, attrs=None, renderer=None):
                      try:
                          beam     = attrs.get('beam', value)
              class UpDataWidget(forms.widgets.TextInput):
-                 def render(self, label, value, attrs=None):
+                 def render(self, name, value, attrs=None, renderer=None):
                      html = '''
                              <div id="id_ues_up" class="container">
                                <h5>Ues</h5>
-                                 <div class="col-xs-2">
-                                   <input name="ues_up1" value="0" class="form-control" id="input1" type="number" step="any">
-                                 </div>
-                                 <div class="col-xs-2">
-                                   <input name="ues_up2" value="0" class="form-control" id="input2" type="number" step="any">
-                                 </div>
-                                 <div class="col-xs-2">
-                                   <input name="ues_up3" value="0" class="form-control" id="input3" type="number" step="any">
-                                 </div>
-                                 <div class="col-xs-2">
-                                   <input name="ues_up4" value="0" class="form-control" id="input4" type="number" step="any">
+                               <div class="row">
+                                     <div class="col-xs-2">
+                                       <input name="ues_up1" value="0" class="form-control" id="input1" type="number" step="any">
+                                     </div>
+                                     <div class="col-xs-2">
+                                       <input name="ues_up2" value="0" class="form-control" id="input2" type="number" step="any">
+                                     </div>
+                                     <div class="col-xs-2">
+                                       <input name="ues_up3" value="0" class="form-control" id="input3" type="number" step="any">
+                                     </div>
+                                     <div class="col-xs-2">
+                                       <input name="ues_up4" value="0" class="form-control" id="input4" type="number" step="any">
+                                     </div>
                                  </div>
                                  <div style="vertical-align:center; margin-top:20px;">
                                    <label class="checkbox-inline"><input name="onlyrx" style="vertical-align:bottom" id="onlyrx_up"  type="checkbox" value=1>Only RX</label>
              class DownDataWidget(forms.widgets.TextInput):
-                 def render(self, label, value, attrs=None):
+                 def render(self, name, value, attrs=None, renderer=None):
                      html = '''
                      <br>

0

apps/accounts/templates/login.html +1 -1

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

0

apps/accounts/urls.py +4 -3

-             from django.conf.urls import url
+             from django.urls import path
              from django.contrib.auth import views as auth_views
              urlpatterns = (
-                 url(r'^logout/$', auth_views.logout, {'next_page': '/'}, name='url_logout'),
-                 url(r'^login/$', auth_views.login, {'template_name': 'login.html'}, name='url_login'),
+                 path('logout/', auth_views.LogoutView.as_view(next_page='/'), name='url_logout'),
+                 path('login/', auth_views.LoginView.as_view(template_name='login.html'), name='url_login'),
              )

0

apps/cgs/models.py +1 -1

                              post_data[data] = frequencies[data]
                      route = "http://" + str(ip) + ":" + str(port) + "/write/"
-                     print post_data
+                     print (post_data)
                      try:
                          r = requests.post(route, post_data, timeout=0.7)
                      except:

0

apps/cgs/templates/cgs_conf_edit.html +1 -1

              {% extends "dev_conf_edit.html" %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load static %}
              {% load main_tags %}

0

apps/cgs/templates/cgs_conf_import.html +1 -1

              {% extends "dev_conf_edit.html" %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load static %}
              {% load main_tags %}

0

apps/cgs/templates/index_cgs.html +1 -1

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

0

apps/cgs/urls.py +4 -4

-             from django.conf.urls import url
+             from django.urls import path
-             from apps.cgs import views
+             from . import views
              urlpatterns = (
-                 url(r'^(?P<id_conf>-?\d+)/$', views.cgs_conf, name='url_cgs_conf'),
-                 url(r'^(?P<id_conf>-?\d+)/edit/$', views.cgs_conf_edit, name='url_edit_cgs_conf'),
+                 path('<int:id_conf>/', views.cgs_conf, name='url_cgs_conf'),
+                 path('<int:id_conf>/edit/', views.cgs_conf_edit, name='url_edit_cgs_conf'),
              )

0

apps/dds/templates/dds_conf_edit.html +1 -1

              {% extends "dev_conf_edit.html" %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load static %}
              {% load main_tags %}

0

apps/dds/templates/dds_conf_import.html +1 -1

              {% extends "dev_conf_edit.html" %}
-             {% load bootstrap3 %}
+             {% load bootstrap4 %}
              {% load static %}
              {% load main_tags %}

0

apps/dds/urls.py +5 -5

-             from django.conf.urls import url
+             from django.urls import path
-             from apps.dds import views
+             from . import views
              urlpatterns = (
-                 url(r'^(?P<id_conf>-?\d+)/$', views.dds_conf, name='url_dds_conf'),
-                 url(r'^(?P<id_conf>-?\d+)/(?P<message>-?\d+)/$', views.dds_conf, name='url_dds_conf'),
-                 url(r'^(?P<id_conf>-?\d+)/edit/$', views.dds_conf_edit, name='url_edit_dds_conf'),
+                 path('<int:id_conf>/', views.dds_conf, name='url_dds_conf'),
+                 path('<int:id_conf>/<int:message>/', views.dds_conf, name='url_dds_conf'),
+                 path('<int:id_conf>/edit/', views.dds_conf_edit, name='url_edit_dds_conf'),
              )

0

apps/jars/models.py +1 -1

              from django.db import models
              from django.core.validators import MinValueValidator, MaxValueValidator
-             from django.core.urlresolvers import reverse
+             from django.urls import reverse
              from apps.main.models import Configuration
              from apps.main.utils import Params

0

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

              {% 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>
+             <li><a href="{{ dev_conf.get_absolute_url_log }}"><span class="fas fa-save" aria-hidden="true"></span>
                      Get Log File</a></li>
              {% endblock %}

0

apps/jars/urls.py +9 -9

		@@ -1,13 +1,13
1		from django.~~conf.~~urls import ~~url~~
	1	from django.urls import path
2	2
3		from ~~apps~~.~~jars~~ import views
	3	from . import views
4	4
5	5	urlpatterns = (
6		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/$', views.jars_conf, name='url_jars_conf'),
7		~~url~~(r'~~^(?P~~<id_conf>~~-?\d+)~~/edit/$', views.jars_conf_edit, name='url_edit_jars_conf'),
8		~~url~~(r'~~^(?P~~<conf_id>~~-?\d+)~~/change_filter/$', views.change_filter, name='url_change_jars_filter'),
9		~~url~~(r'~~^(?P~~<conf_id>~~-?\d+)~~/change_filter/~~(?P~~<filter_id>~~-?\d+)~~/$', views.change_filter, name='url_change_jars_filter'),
10		~~url~~(r'~~^(?P~~<conf_id>~~-?\d+)~~/import/$', views.import_file, name='url_import_jars_conf'),
11		~~url~~(r'~~^(?P~~<conf_id>~~-?\d+)~~/read/$', views.read_conf, name='url_read_jars_conf'),
12		~~url~~(r'~~^(?P~~<conf_id>~~-?\d+)~~/get_log/$', views.get_log, name='url_get_jars_log'),
	6	path('<int:id_conf>/', views.jars_conf, name='url_jars_conf'),
	7	path('<int:id_conf>/edit/', views.jars_conf_edit, name='url_edit_jars_conf'),
	8	path('<int:conf_id>/change_filter/', views.change_filter, name='url_change_jars_filter'),
	9	path('<int:conf_id>/change_filter/<int:filter_id>/', views.change_filter, name='url_change_jars_filter'),
	10	path('<int:conf_id>/import/', views.import_file, name='url_import_jars_conf'),
	11	path('<int:conf_id>/read/', views.read_conf, name='url_read_jars_conf'),
	12	path('<int:conf_id>/get_log/', views.get_log, name='url_get_jars_log'),
13	13	)

0

apps/jars/utils.py +10 -10

                      racp_text += 'Pulse selection_TR={}\n'.format(
                          data['lines']['byId'][idTR]['name'][-1]
                      )
-                 print 'TR OK'
+                 print ('TR OK')
                  rangeTXA = data['lines']['byId'][rc['lines'][1]]['params']['range']
                  if rangeTXA != '0':
                  rangeTXB = data['lines']['byId'][rc['lines'][2]]['params']['range']
                  if rangeTXB != '0': #if rangeTXB == '0':
                      racp_text += 'Pulse selection_TXB={}\n'.format(rangeTXB)
-                 print 'Pulse selection OK'
+                 print ('Pulse selection OK')
                  for n in range(3, 6):
                      racp_text += parse_line(n, data, rc['lines'])
                      racp_text += 'Number of Taus={}\n'.format(len(taus))
                      for n, tau in enumerate(taus):
                          racp_text += 'TAU({})={}\n'.format(n, tau)
-                 print 'Taus OK'
+                 print ('Taus OK')
                  racp_text += parse_line(6, data, rc['lines'])
                  racp_text += 'SAMPLING REFERENCE=MIDDLE OF FIRST SUB-BAUD\n'
                      racp_text += 'Number of Channels={}\n'.format(len(channels))
                      for i, channel in enumerate(channels):
                          racp_text += 'Channel({})={}\n'.format(i, channel)
-                 print 'Channels OK'
+                 print ('Channels OK')
                  if exp_type == 'EXP_RAW_DATA':
                      racp_text += 'RAW DATA DIRECTORY={}\n'.format(os.path.join(folder_name, 'DATA'))
                      racp_text += 'DATATYPE=SHORT\n'
                  elif data_type == 1:
                      racp_text += 'DATATYPE=FLOAT\n'
-                 print 'Datatype OK'
+                 print ('Datatype OK')
                  racp_text += 'DATA ARRANGE=CONTIGUOUS_CH\n'
                      if jars['post_coh_int'] == True:
                          decode_text += 'POST COHERENT INTEGRATIONS=YES\n'
                      decode_text += '------------------------------------------\n'
-                 print 'Decode OK'
+                 print ('Decode OK')
                  racp_text += 'COHERENT INTEGRATION STRIDE={}\n'.format(jars['cohe_integr_str'])
                  racp_text += '------------------------------------------\n'
                      filter_parms = eval(filter_parms)
                  if filter_parms.__class__.__name__ == 'str':
                      filter_parms = eval(filter_parms)
-                 print 'Filter loaded OK'
+                 print ('Filter loaded OK')
                  try:
                      fclock = float(filter_parms['clock'])
                      fch = float(filter_parms['fch'])
                      M_CIC2 = float(filter_parms['filter_2'])
                      M_CIC5 = float(filter_parms['filter_5'])
                      M_RCF = float(filter_parms['filter_fir'])
-                     print 'Filter parameters float OK'
+                     print ('Filter parameters float OK')
                  except:
                      fclock = eval(filter_parms['clock'])
                      fch = eval(filter_parms['fch'])
                      M_CIC2 = eval(filter_parms['filter_2'])
                      M_CIC5 = eval(filter_parms['filter_5'])
                      M_RCF = eval(filter_parms['filter_fir'])
-                     print 'Filter parameters eval OK'
+                     print ('Filter parameters eval OK')
                  filter_text = 'Loading\n'
                  filter_text += 'Impulse file found -> C:\jars\F1MHZ_8_MATCH.imp\n'
                  #jars_file = open(os.path.join(folder_name, filter_name), 'wb')
                  #jars_file.write(filter_text)
                  #jars_file.close()
-                 print 'Filter .jars has been created'
+                 print ('Filter .jars has been created')
                  racp_text += 'JARS_FILTER={}\n'.format(os.path.join(folder_name, filter_name))
                  racp_text += 'MARK WIDTH=2\n'
                  racp_text += 'GENERATE OWN SAMPLING WINDOW=NO\n'

0

apps/main/fixtures/main_initial_data.json +1 -1

                      "model": "main.profile",
                      "pk": 1
                  }
-             ]
  No newline at end of file
+             ]

0

apps/main/forms.py +12 -8

                      return [(0, label)]
              class DatepickerWidget(forms.widgets.TextInput):
-                 def render(self, name, value, attrs=None):
+                 def render(self, name, value, attrs=None, renderer=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>'
+                     html = '<div class="input-group date">'+input_html+'<span class="input-group-addon"><i class="far fa-calendar-alt"></i></span></div>'
                      return mark_safe(html)
              class DateRangepickerWidget(forms.widgets.TextInput):
-                 def render(self, name, value, attrs=None):
+                 def render(self, name, value, attrs=None, renderer=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>
+                     <span class="input-group-addon"><i class="far fa-calendar-alt"></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>
+                     <span class="input-group-addon"><i class="far fa-calendar-alt"></i></span>
                      </div>'''.format(start, end)
                      return mark_safe(html)
              class TimepickerWidget(forms.widgets.TextInput):
-                 def render(self, name, value, attrs=None):
+                 def render(self, name, value, attrs=None, renderer=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>'
+                     html = '<div class="input-group time">'+input_html+'<span class="input-group-addon"><i class="far fa-clock"></i></span></div>'
                      return mark_safe(html)
              class CampaignForm(forms.ModelForm):
                      if device_type == 'dds':
                          self.fields['format'].choices = DDS_FILE_FORMAT
+                     if device_type == 'dds_rest':
+                         self.fields['format'].choices = DDS_FILE_FORMAT
                      if device_type == 'rc':
                          self.fields['format'].choices = RC_FILE_FORMAT
                  mask = forms.GenericIPAddressField(initial='255.255.255.0')
                  gateway = forms.GenericIPAddressField(initial='0.0.0.0')
                  dns = forms.GenericIPAddressField(initial='0.0.0.0')

0

apps/main/models.py +18 -16

              from django.template.base import kwarg_re
              from django.db import models
-             from django.core.urlresolvers import reverse
+             from django.urls import reverse
              from django.core.validators import MinValueValidator, MaxValueValidator
              from django.shortcuts import get_object_or_404
              from django.contrib.auth.models import User
                              'jars'  : 2000,
                              'usrp'  : 2000,
                              'cgs'   : 8080,
-                             'abs'   : 8080
+                             'abs'   : 8080,
+                             'dds_rest': 80
                          }
              RADAR_STATES = (
                              ('usrp', 'Universal Software Radio Peripheral'),
                              ('cgs', 'Clock Generator System'),
                              ('abs', 'Automatic Beam Switching'),
+                             ('dds_rest', 'Direct Digital Synthesizer_REST'),
                          )
              EXP_STATES = (
              class DeviceType(models.Model):
-                 name = models.CharField(max_length = 10, choices = DEV_TYPES, default = 'rc')
-                 sequence = models.PositiveSmallIntegerField(default=1000)
+                 name = models.CharField(max_length = 10, choices = DEV_TYPES, default = 'dds_rest')
+                 sequence = models.PositiveSmallIntegerField(default=55)
                  description = models.TextField(blank=True, null=True)
                  class Meta:
              class Device(models.Model):
-                 device_type = models.ForeignKey(DeviceType, on_delete=models.CASCADE)
-                 location = models.ForeignKey(Location, on_delete=models.CASCADE)
+                 device_type = models.ForeignKey('DeviceType', on_delete=models.CASCADE)
+                 location = models.ForeignKey('Location', on_delete=models.CASCADE)
                  ip_address = models.GenericIPAddressField(protocol='IPv4', default='0.0.0.0')
                  port_address = models.PositiveSmallIntegerField(default=2000)
                  description = models.TextField(blank=True, null=True)
                  def __str__(self):
                      ret = u'{} [{}]'.format(self.device_type.name.upper(), self.location.name)
                      return ret
                  @property
                  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)
+                 author = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
                  class Meta:
                      db_table = 'db_campaigns'
                      ordering = ('name',)
                  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)
+                 author = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
                  hash = models.CharField(default='', max_length=64, null=True, blank=True)
                  class Meta:
                              confs.append(conf)
                      else:
                          confs = allconfs
                      try:
                          for conf in confs:
                              conf.stop_device()
                  template = models.BooleanField(default=False)
                  # name = models.CharField(verbose_name="Configuration Name", max_length=40, default='')
                  device = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE)
-                 label = models.CharField(verbose_name="Label", max_length=40, default='', blank=True, null=True)
+                 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)
                  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)
+                 author = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
                  hash = models.CharField(default='', max_length=64, null=True, blank=True)
                  message = ""
                      if 'mix' in [f.name for f in self._meta.get_fields()]:
                          if self.mix:
                              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)
                      if self.template:
                          ret += ' (template)'
                      return ret
                  @property
                  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)])

0

apps/main/static/css/bootstrap-datetimepicker.min.css +3 -3

		@@ -1,5 +1,5
1	1	/*!
2		* Datetimepicker for Bootstrap v3
	2	* Datetimepicker for Bootstrap 3
	3	* version : 4.17.47
3	4	* https://github.com/Eonasdan/bootstrap-datetimepicker/
4		*/
5		.bootstrap-datetimepicker-widget{top:0;left:0;width:250px;padding:4px;margin-top:1px;z-index:99999!important;border-radius:4px}.bootstrap-datetimepicker-widget.timepicker-sbs{width:600px}.bootstrap-datetimepicker-widget.bottom:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:7px}.bootstrap-datetimepicker-widget.bottom:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:8px}.bootstrap-datetimepicker-widget.top:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,.2);position:absolute;bottom:-7px;left:6px}.bootstrap-datetimepicker-widget.top:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid #fff;position:absolute;bottom:-6px;left:7px}.bootstrap-datetimepicker-widget .dow{width:14.2857%}.bootstrap-datetimepicker-widget.pull-right:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.pull-right:after{left:auto;right:7px}.bootstrap-datetimepicker-widget>ul{list-style-type:none;margin:0}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{width:100%;font-weight:bold;font-size:1.2em}.bootstrap-datetimepicker-widget table[data-hour-format="12"] .separator{width:4px;padding:0;margin:0}.bootstrap-datetimepicker-widget .datepicker>div{display:none}.bootstrap-datetimepicker-widget .picker-switch{text-align:center}.bootstrap-datetimepicker-widget table{width:100%;margin:0}.bootstrap-datetimepicker-widget td,.bootstrap-datetimepicker-widget th{text-align:center;width:20px;height:20px;border-radius:4px}.bootstrap-datetimepicker-widget td.day:hover,.bootstrap-datetimepicker-widget td.hour:hover,.bootstrap-datetimepicker-widget td.minute:hover,.bootstrap-datetimepicker-widget td.second:hover{background:#eee;cursor:pointer}.bootstrap-datetimepicker-widget td.old,.bootstrap-datetimepicker-widget td.new{color:#999}.bootstrap-datetimepicker-widget td.today{position:relative}.bootstrap-datetimepicker-widget td.today:before{content:'';display:inline-block;border-left:7px solid transparent;border-bottom:7px solid #428bca;border-top-color:rgba(0,0,0,.2);position:absolute;bottom:4px;right:4px}.bootstrap-datetimepicker-widget td.active,.bootstrap-datetimepicker-widget td.active:hover{background-color:#428bca;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25)}.bootstrap-datetimepicker-widget td.active.today:before{border-bottom-color:#fff}.bootstrap-datetimepicker-widget td.disabled,.bootstrap-datetimepicker-widget td.disabled:hover{background:none;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget td span{display:block;width:47px;height:54px;line-height:54px;float:left;margin:2px;cursor:pointer;border-radius:4px}.bootstrap-datetimepicker-widget td span:hover{background:#eee}.bootstrap-datetimepicker-widget td span.active{background-color:#428bca;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25)}.bootstrap-datetimepicker-widget td span.old{color:#999}.bootstrap-datetimepicker-widget td span.disabled,.bootstrap-datetimepicker-widget td span.disabled:hover{background:none;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget th.switch{width:145px}.bootstrap-datetimepicker-widget th.next,.bootstrap-datetimepicker-widget th.prev{font-size:21px}.bootstrap-datetimepicker-widget th.disabled,.bootstrap-datetimepicker-widget th.disabled:hover{background:none;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget thead tr:first-child th{cursor:pointer}.bootstrap-datetimepicker-widget thead tr:first-child th:hover{background:#eee}.input-group.date .input-group-addon span{display:block;cursor:pointer;width:16px;height:16px}.bootstrap-datetimepicker-widget.left-oriented:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.left-oriented:after{left:auto;right:7px}.bootstrap-datetimepicker-widget ul.list-unstyled li div.timepicker div.timepicker-picker table.table-condensed tbody>tr>td{padding:0!important} No newline at end of file
	5	*/.bootstrap-datetimepicker-widget{list-style:none}.bootstrap-datetimepicker-widget.dropdown-menu{display:block;margin:2px 0;padding:4px;width:19em}@media (min-width:768px){.bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs{width:38em}}@media (min-width:992px){.bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs{width:38em}}@media (min-width:1200px){.bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs{width:38em}}.bootstrap-datetimepicker-widget.dropdown-menu:before,.bootstrap-datetimepicker-widget.dropdown-menu:after{content:'';display:inline-block;position:absolute}.bootstrap-datetimepicker-widget.dropdown-menu.bottom:before{border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,0.2);top:-7px;left:7px}.bootstrap-datetimepicker-widget.dropdown-menu.bottom:after{border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid white;top:-6px;left:8px}.bootstrap-datetimepicker-widget.dropdown-menu.top:before{border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #ccc;border-top-color:rgba(0,0,0,0.2);bottom:-7px;left:6px}.bootstrap-datetimepicker-widget.dropdown-menu.top:after{border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid white;bottom:-6px;left:7px}.bootstrap-datetimepicker-widget.dropdown-menu.pull-right:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.dropdown-menu.pull-right:after{left:auto;right:7px}.bootstrap-datetimepicker-widget .list-unstyled{margin:0}.bootstrap-datetimepicker-widget a[data-action]{padding:6px 0}.bootstrap-datetimepicker-widget a[data-action]:active{box-shadow:none}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{width:54px;font-weight:bold;font-size:1.2em;margin:0}.bootstrap-datetimepicker-widget button[data-action]{padding:6px}.bootstrap-datetimepicker-widget .btn[data-action="incrementHours"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Increment Hours"}.bootstrap-datetimepicker-widget .btn[data-action="incrementMinutes"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Increment Minutes"}.bootstrap-datetimepicker-widget .btn[data-action="decrementHours"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Decrement Hours"}.bootstrap-datetimepicker-widget .btn[data-action="decrementMinutes"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Decrement Minutes"}.bootstrap-datetimepicker-widget .btn[data-action="showHours"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Show Hours"}.bootstrap-datetimepicker-widget .btn[data-action="showMinutes"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Show Minutes"}.bootstrap-datetimepicker-widget .btn[data-action="togglePeriod"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Toggle AM/PM"}.bootstrap-datetimepicker-widget .btn[data-action="clear"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Clear the picker"}.bootstrap-datetimepicker-widget .btn[data-action="today"]::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Set the date to today"}.bootstrap-datetimepicker-widget .picker-switch{text-align:center}.bootstrap-datetimepicker-widget .picker-switch::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Toggle Date and Time Screens"}.bootstrap-datetimepicker-widget .picker-switch td{padding:0;margin:0;height:auto;width:auto;line-height:inherit}.bootstrap-datetimepicker-widget .picker-switch td span{line-height:2.5;height:2.5em;width:100%}.bootstrap-datetimepicker-widget table{width:100%;margin:0}.bootstrap-datetimepicker-widget table td,.bootstrap-datetimepicker-widget table th{text-align:center;border-radius:4px}.bootstrap-datetimepicker-widget table th{height:20px;line-height:20px;width:20px}.bootstrap-datetimepicker-widget table th.picker-switch{width:145px}.bootstrap-datetimepicker-widget table th.disabled,.bootstrap-datetimepicker-widget table th.disabled:hover{background:none;color:#777;cursor:not-allowed}.bootstrap-datetimepicker-widget table th.prev::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Previous Month"}.bootstrap-datetimepicker-widget table th.next::after{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0;content:"Next Month"}.bootstrap-datetimepicker-widget table thead tr:first-child th{cursor:pointer}.bootstrap-datetimepicker-widget table thead tr:first-child th:hover{background:#eee}.bootstrap-datetimepicker-widget table td{height:54px;line-height:54px;width:54px}.bootstrap-datetimepicker-widget table td.cw{font-size:.8em;height:20px;line-height:20px;color:#777}.bootstrap-datetimepicker-widget table td.day{height:20px;line-height:20px;width:20px}.bootstrap-datetimepicker-widget table td.day:hover,.bootstrap-datetimepicker-widget table td.hour:hover,.bootstrap-datetimepicker-widget table td.minute:hover,.bootstrap-datetimepicker-widget table td.second:hover{background:#eee;cursor:pointer}.bootstrap-datetimepicker-widget table td.old,.bootstrap-datetimepicker-widget table td.new{color:#777}.bootstrap-datetimepicker-widget table td.today{position:relative}.bootstrap-datetimepicker-widget table td.today:before{content:'';display:inline-block;border:solid transparent;border-width:0 0 7px 7px;border-bottom-color:#337ab7;border-top-color:rgba(0,0,0,0.2);position:absolute;bottom:4px;right:4px}.bootstrap-datetimepicker-widget table td.active,.bootstrap-datetimepicker-widget table td.active:hover{background-color:#337ab7;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.bootstrap-datetimepicker-widget table td.active.today:before{border-bottom-color:#fff}.bootstrap-datetimepicker-widget table td.disabled,.bootstrap-datetimepicker-widget table td.disabled:hover{background:none;color:#777;cursor:not-allowed}.bootstrap-datetimepicker-widget table td span{display:inline-block;width:54px;height:54px;line-height:54px;margin:2px 1.5px;cursor:pointer;border-radius:4px}.bootstrap-datetimepicker-widget table td span:hover{background:#eee}.bootstrap-datetimepicker-widget table td span.active{background-color:#337ab7;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.bootstrap-datetimepicker-widget table td span.old{color:#777}.bootstrap-datetimepicker-widget table td span.disabled,.bootstrap-datetimepicker-widget table td span.disabled:hover{background:none;color:#777;cursor:not-allowed}.bootstrap-datetimepicker-widget.usetwentyfour td.hour{height:27px;line-height:27px}.bootstrap-datetimepicker-widget.wider{width:21em}.bootstrap-datetimepicker-widget .datepicker-decades .decade{line-height:1.8em !important}.input-group.date .input-group-addon{cursor:pointer}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0} No newline at end of file

0

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

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

0

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

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

0

apps/main/static/js/bootstrap-datetimepicker.min.js 0 0

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

0

apps/main/static/js/bootstrap.min.js 0 0

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

0

apps/main/static/js/moment.min.js 0 0

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

0

apps/main/tasks.py 0 0

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

0

apps/main/templates/base.html 0 0

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

0

apps/main/templates/base_edit.html 0 0

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

0

apps/main/templates/base_list.html 0 0

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

0

apps/main/templates/campaign.html 0 0

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

0

apps/main/templates/campaign_edit.html 0 0

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

0

apps/main/templates/confirm.html 0 0

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

0

apps/main/templates/dev_conf.html 0 0

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

0

apps/main/templates/dev_conf_edit.html 0 0

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

0

apps/main/templates/device.html 0 0

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

0

apps/main/templates/experiment.html 0 0

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

0

apps/main/templates/experiment_edit.html 0 0

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

0

apps/main/templates/experiment_mix.html 0 0

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

0

apps/main/templates/experiment_summary.html 0 0

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

0

apps/main/templates/experiment_verify.html 0 0

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

0

apps/main/templates/index.html 0 0

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

0

apps/main/templates/location.html 0 0

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

0

apps/main/templates/operation.html 0 0

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

0

apps/main/urls.py 0 0

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

0

apps/main/views.py 0 0

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

0

apps/misc/urls.py 0 0

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

0

apps/rc/models.py 0 0

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

0

apps/rc/templates/rc_conf.html 0 0

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

0

apps/rc/templates/rc_conf_edit.html 0 0

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

0

apps/rc/templates/rc_lines.html 0 0

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

0

apps/rc/templates/rc_pulses.html 0 0

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

0

apps/rc/urls.py 0 0

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

0

apps/usrp/urls.py 0 0

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

0

devices/rc/api.py 0 0

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

0

radarsys/settings.py 0 0

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

0

radarsys/urls.py 0 0

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

0

requirements.txt 0 0

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

	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

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