diff --git a/apps/cgs/templates/cgs_conf_import.html b/apps/cgs/templates/cgs_conf_import.html new file mode 100644 index 0000000..f67538a --- /dev/null +++ b/apps/cgs/templates/cgs_conf_import.html @@ -0,0 +1,7 @@ +{% extends "dev_conf_edit.html" %} +{% load bootstrap3 %} +{% load static %} +{% load main_tags %} + +{% block extra-js%} +{% endblock %} \ No newline at end of file diff --git a/apps/cgs/urls.py b/apps/cgs/urls.py index 0e94589..7d85fd8 100644 --- a/apps/cgs/urls.py +++ b/apps/cgs/urls.py @@ -10,6 +10,7 @@ urlpatterns = ( #url(r'^(?P-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_cgs_conf'), #url(r'^(?P-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_cgs_conf'), url(r'^(?P-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_cgs_conf'), + #url(r'^(?P-?\d+)/export/$', 'apps.cgs.views.cgs_conf_export', name='url_export_cgs_conf'), url(r'^(?P-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_cgs_conf'), ) diff --git a/apps/cgs/views.py b/apps/cgs/views.py index 972df18..8aeb20a 100644 --- a/apps/cgs/views.py +++ b/apps/cgs/views.py @@ -126,7 +126,9 @@ def cgs_conf_read(request, id_conf): else: messages.error(request, status) #Get Frequencies - frequencies = requests.get('http://10.10.10.175:8080/frequencies/') + route = "http://" + str(ip) + ":" + str(port) + "/frequencies/" + #frequencies = requests.get('http://10.10.10.175:8080/frequencies/') + frequencies = requests.get(route) frequencies = frequencies.json() frequencies = frequencies.get("Frecuencias") f0 = frequencies.get("f0") @@ -159,4 +161,12 @@ def cgs_conf_read(request, id_conf): ###### SIDEBAR ###### kwargs.update(sidebar(conf)) - return render(request, 'cgs_conf_edit.html', kwargs) \ No newline at end of file + return render(request, 'cgs_conf_edit.html', kwargs) + +#def cgs_conf_export(request, id_conf): + +# conf = get_object_or_404(CGSConfiguration, pk=id_conf) +# ip=conf.device.ip_address +# port=conf.device.port_address + +# return render(request, 'cgs_conf_export.html', kwargs) \ No newline at end of file