| @@ -0,0 +1,7 | |||||
|
|
1 | {% extends "dev_conf_edit.html" %} | |||
|
|
2 | {% load bootstrap3 %} | |||
|
|
3 | {% load static %} | |||
|
|
4 | {% load main_tags %} | |||
|
|
5 | ||||
|
|
6 | {% block extra-js%} | |||
|
|
7 | {% endblock %} No newline at end of file | |||
| @@ -10,6 +10,7 urlpatterns = ( | |||||
| 10 | #url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_cgs_conf'), |
|
10 | #url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_cgs_conf'), | |
| 11 | #url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_cgs_conf'), |
|
11 | #url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_cgs_conf'), | |
| 12 | url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_cgs_conf'), |
|
12 | url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_cgs_conf'), | |
|
|
13 | #url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.cgs.views.cgs_conf_export', name='url_export_cgs_conf'), | |||
| 13 | url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_cgs_conf'), |
|
14 | url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_cgs_conf'), | |
| 14 | ) |
|
15 | ) | |
| 15 |
|
16 | |||
| @@ -126,7 +126,9 def cgs_conf_read(request, id_conf): | |||||
| 126 | else: |
|
126 | else: | |
| 127 | messages.error(request, status) |
|
127 | messages.error(request, status) | |
| 128 | #Get Frequencies |
|
128 | #Get Frequencies | |
| 129 | frequencies = requests.get('http://10.10.10.175:8080/frequencies/') |
|
129 | route = "http://" + str(ip) + ":" + str(port) + "/frequencies/" | |
|
|
130 | #frequencies = requests.get('http://10.10.10.175:8080/frequencies/') | |||
|
|
131 | frequencies = requests.get(route) | |||
| 130 | frequencies = frequencies.json() |
|
132 | frequencies = frequencies.json() | |
| 131 | frequencies = frequencies.get("Frecuencias") |
|
133 | frequencies = frequencies.get("Frecuencias") | |
| 132 | f0 = frequencies.get("f0") |
|
134 | f0 = frequencies.get("f0") | |
| @@ -159,4 +161,12 def cgs_conf_read(request, id_conf): | |||||
| 159 | ###### SIDEBAR ###### |
|
161 | ###### SIDEBAR ###### | |
| 160 | kwargs.update(sidebar(conf)) |
|
162 | kwargs.update(sidebar(conf)) | |
| 161 |
|
163 | |||
| 162 | return render(request, 'cgs_conf_edit.html', kwargs) No newline at end of file |
|
164 | return render(request, 'cgs_conf_edit.html', kwargs) | |
|
|
165 | ||||
|
|
166 | #def cgs_conf_export(request, id_conf): | |||
|
|
167 | ||||
|
|
168 | # conf = get_object_or_404(CGSConfiguration, pk=id_conf) | |||
|
|
169 | # ip=conf.device.ip_address | |||
|
|
170 | # port=conf.device.port_address | |||
|
|
171 | ||||
|
|
172 | # return render(request, 'cgs_conf_export.html', kwargs) No newline at end of file | |||
General Comments 0
You need to be logged in to leave comments.
Login now