From 853d2d2bd93ab332c69338c7364f6ee790779c44 2015-12-31 19:02:57 From: Miguel Urco Date: 2015-12-31 19:02:57 Subject: [PATCH] siderbar_devices.html updated git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@31 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71 --- diff --git a/apps/cgs/urls.py b/apps/cgs/urls.py index d9dc075..e1f9a6e 100644 --- a/apps/cgs/urls.py +++ b/apps/cgs/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url urlpatterns = ( #url(r'^configuration/$', 'apps.cgs.views.configurate_frequencies', name='new_device'), - url(r'^(?P-?\d+)/$', 'apps.cgs.views.configurate_frequencies', name='new_device'), +# url(r'^(?P-?\d+)/$', 'apps.cgs.views.configurate_frequencies', name='new_device'), + url(r'^(?P-?\d+)/$', 'apps.main.views.dev_conf', name='url_cgs_conf'), + url(r'^(?P-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_cgs_conf'), ) diff --git a/apps/dds/views.py b/apps/dds/views.py index 6914fb2..c5472c6 100644 --- a/apps/dds/views.py +++ b/apps/dds/views.py @@ -2,16 +2,17 @@ from django.shortcuts import redirect, render +from apps.main.models import Experiment, Configuration from .models import DDSConfiguration from .forms import DDSConfigurationForm # Create your views here. def dds_conf(request, id_conf): - dev_conf = DDSConfiguration.objects.get(pk=id_conf) + conf = DDSConfiguration.objects.get(pk=id_conf) kwargs = {} - kwargs['dev_conf'] = dev_conf + kwargs['dev_conf'] = conf kwargs['dev_conf_keys'] = ['experiment', 'device', 'clock', 'multiplier', 'freq_reg', 'phase_reg', @@ -24,17 +25,30 @@ def dds_conf(request, id_conf): kwargs['button'] = 'Edit Configuration' + ###### SIDEBAR ###### + experiments = Experiment.objects.filter(campaign=conf.experiment.campaign) + configurations = Configuration.objects.filter(experiment=conf.experiment) + + exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time'] + conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address'] + + kwargs['experiment_keys'] = exp_keys[1:] + kwargs['experiments'] = experiments.values(*exp_keys) + + kwargs['configuration_keys'] = conf_keys[1:] + kwargs['configurations'] = configurations.values(*conf_keys) + return render(request, 'dds_conf.html', kwargs) def edit_dds_conf(request, id_conf): - dev_conf = DDSConfiguration.objects.get(pk=id_conf) + conf = DDSConfiguration.objects.get(pk=id_conf) if request.method=='GET': - form = DDSConfigurationForm(instance=dev_conf) + form = DDSConfigurationForm(instance=conf) if request.method=='POST': - form = DDSConfigurationForm(request.POST, instance=dev_conf) + form = DDSConfigurationForm(request.POST, instance=conf) if form.is_valid(): form.save() diff --git a/apps/jars/urls.py b/apps/jars/urls.py index 21ac7d0..8fad276 100644 --- a/apps/jars/urls.py +++ b/apps/jars/urls.py @@ -1,5 +1,7 @@ from django.conf.urls import url urlpatterns = ( - url(r'^(?P-?\d+)/$', 'apps.jars.views.jars_config', name='jars'), +# url(r'^(?P-?\d+)/$', 'apps.jars.views.jars_config', name='jars'), + url(r'^(?P-?\d+)/$', 'apps.main.views.dev_conf', name='url_jars_conf'), + url(r'^(?P-?\d+)/edit/$', 'apps.main.views.edit_dev_conf', name='url_edit_jars_conf'), ) diff --git a/apps/main/templates/sidebar_devices.html b/apps/main/templates/sidebar_devices.html index a045a53..f7949a9 100644 --- a/apps/main/templates/sidebar_devices.html +++ b/apps/main/templates/sidebar_devices.html @@ -1,22 +1,50 @@ -{% if experiment %} +{% if campaign %}

Campaign

- {{ experiment.campaign.name }} + {{ campaign.name }}
+ {% if experiments %} +
+
+

Experiments

+
+
+ {% for item in experiments %} + {{item.name}} + {% endfor %} +
+
+ {% endif %} +{% endif %} + +{% if experiment %}
-

Experiment

+

Campaign

- {{ experiment.name }} + {{ experiment.campaign.name }}
+ {% if experiments %} +
+
+

Experiments

+
+
+ {% for item in experiments %} + {{item.name}} + {% endfor %} +
+
+ {% endif %} + {% if configurations %}
@@ -29,6 +57,7 @@
{% endif %} + {% endif %} {% if dev_conf %} @@ -41,22 +70,31 @@ -
-
-

Experiment

-
-
- {{ dev_conf.experiment.name }} -
-
+ {% if experiments %} +
+
+

Experiments

+
+
+ {% for item in experiments %} + {{item.name}} + {% endfor %} +
+
+ {% endif %} + + {% if configurations %} +
+
+

Device Configurations

+
+
+ {% for item in configurations %} + {{item.device__name}} + {% endfor %} +
+
+ {% endif %} -
-
-

Device

-
-
- {{ dev_conf.device.name }} -
-
{% endif %} diff --git a/apps/main/views.py b/apps/main/views.py index 57f99cf..d9f486c 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -217,23 +217,23 @@ def experiments(request): def experiment(request, id_exp): experiment = Experiment.objects.get(pk=id_exp) -# campaign = Campaign.objects.get(pk = experiment.campaign.id) - configurations = Configuration.objects.filter(experiment=experiment) -# form = ExperimentForm(instance=experiment) + experiments = Experiment.objects.filter(campaign=experiment.campaign) + configurations = Configuration.objects.filter(experiment=experiment) kwargs = {} -# kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description'] -# kwargs['campaign'] = campaign + exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time'] + conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address'] + - kwargs['experiment_keys'] = ['campaign', 'name', 'start_time', 'end_time'] + kwargs['experiment_keys'] = exp_keys[1:] kwargs['experiment'] = experiment - keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address'] + kwargs['experiments'] = experiments.values(*exp_keys) - kwargs['configuration_keys'] = keys[1:] - kwargs['configurations'] = configurations.values(*keys) + kwargs['configuration_keys'] = conf_keys[1:] + kwargs['configurations'] = configurations.values(*conf_keys) kwargs['title'] = 'Experiment' kwargs['suptitle'] = 'Details' @@ -318,6 +318,19 @@ def dev_conf(request, id_conf): kwargs['button'] = 'Edit Configuration' + ###### SIDEBAR ###### + experiments = Experiment.objects.filter(campaign=conf.experiment.campaign) + configurations = Configuration.objects.filter(experiment=conf.experiment) + + exp_keys = ['id', 'campaign', 'name', 'start_time', 'end_time'] + conf_keys = ['id', 'device__name', 'device__device_type__name', 'device__ip_address'] + + kwargs['experiment_keys'] = exp_keys[1:] + kwargs['experiments'] = experiments.values(*exp_keys) + + kwargs['configuration_keys'] = conf_keys[1:] + kwargs['configurations'] = configurations.values(*conf_keys) + return render(request, 'dev_conf.html', kwargs) def add_dev_conf(request, id_exp=0):