diff --git a/apps/main/templates/operation.html b/apps/main/templates/operation.html index ecaf06c..92b6ba7 100644 --- a/apps/main/templates/operation.html +++ b/apps/main/templates/operation.html @@ -54,7 +54,7 @@ - + @@ -112,6 +112,11 @@ //alert($(this).data('url')); document.location = $(this).data('url'); }); + + //--------For REFRESH Button------- + $("#accordion").on("click", "button[name=bt_refresh]", function(){ + document.location = $(this).data('url'); + }); $(".clickable-row").click(function() { document.location = $(this).data("href"); diff --git a/apps/main/urls.py b/apps/main/urls.py index 971bb49..527695a 100644 --- a/apps/main/urls.py +++ b/apps/main/urls.py @@ -46,5 +46,6 @@ urlpatterns = ( url(r'^operation/search/(?P-?\d+)/$', 'apps.main.views.operation_search', name='url_operation_search'), url(r'^operation/(?P-?\d+)/radar/(?P-?\d+)/play/$', 'apps.main.views.radar_play', name='url_radar_play'), url(r'^operation/(?P-?\d+)/radar/(?P-?\d+)/stop/$', 'apps.main.views.radar_stop', name='url_radar_stop'), + url(r'^operation/(?P-?\d+)/radar/(?P-?\d+)/refresh/$', 'apps.main.views.radar_refresh', name='url_radar_refresh'), ) diff --git a/apps/main/views.py b/apps/main/views.py index 2771198..e6144a9 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -2,6 +2,7 @@ from django.shortcuts import render, redirect, get_object_or_404, HttpResponse from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse from django.contrib import messages +from datetime import datetime from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm from .forms import OperationSearchForm @@ -73,34 +74,6 @@ def location(request, id_loc): return render(request, 'location.html', kwargs) -#def location_play(request, id_camp, id_loc): - -# campaign = get_object_or_404(Campaign, pk=id_camp) -# print campaign -# location = get_object_or_404(Location, pk=id_loc) -# experiments = Experiment.objects.filter(location__pk=location.id).filter(campaign__pk=campaign.id) -# locations = Location.objects.filter(pk=id_loc) - -# if request.method=='GET': -# form = OperationForm(initial={'campaign': campaign.id}) - -# kwargs = {} - #---Campaign -# kwargs['campaign'] = campaign -# kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description'] - #---Experiment -# keys = ['id', 'name', 'start_time', 'end_time'] -# kwargs['experiment_keys'] = keys[1:] -# kwargs['experiments'] = experiments - #---Radar -# kwargs['location'] = location - #---Else -# kwargs['title'] = 'Campaign' -# kwargs['suptitle'] = campaign.name -# kwargs['form'] = form -# kwargs['button'] = 'Search' - -# return render(request, 'operation_play.html', kwargs) def location_new(request): @@ -868,8 +841,8 @@ def operation(request, id_camp=None): return redirect('url_operation', id_camp=campaign.id) #locations = Location.objects.filter(experiment__campaign__pk = campaign.id).distinct() experiments = Experiment.objects.filter(campaign__pk=campaign.id) - for exs in experiments: - exs.get_status() + #for exs in experiments: + # exs.get_status() locations= Location.objects.filter(experiment=experiments).distinct() #experiments = [Experiment.objects.filter(location__pk=location.id).filter(campaign__pk=campaign.id) for location in locations] kwargs = {} @@ -915,8 +888,8 @@ def operation_search(request, id_camp=None): #locations = Location.objects.filter(experiment__campaign__pk = campaign.id).distinct() experiments = Experiment.objects.filter(campaign__pk=campaign.id) - for exs in experiments: - exs.get_status() + #for exs in experiments: + # exs.get_status() locations= Location.objects.filter(experiment=experiments).distinct() form = OperationSearchForm(initial={'campaign': campaign.id}) @@ -942,6 +915,17 @@ def operation_search(request, id_camp=None): def radar_play(request, id_camp, id_radar): + campaign = get_object_or_404(Campaign, pk = id_camp) + radar = get_object_or_404(Location, pk = id_radar) + experiments = Experiment.objects.filter(campaign=campaign).filter(location=radar) + current_time = datetime.today() + #exp = RunningExperiment( + # radar = purchase_request.user_id, + # running_experiment = purchase_request, + # status = , + # ) + #new_pos.append(exp) + #exp.save() route = request.META['HTTP_REFERER'] route = str(route) @@ -950,6 +934,7 @@ def radar_play(request, id_camp, id_radar): else: return HttpResponseRedirect(reverse('url_operation', args=[id_camp])) + def radar_stop(request, id_camp, id_radar): route = request.META['HTTP_REFERER'] @@ -959,3 +944,19 @@ def radar_stop(request, id_camp, id_radar): else: return HttpResponseRedirect(reverse('url_operation', args=[id_camp])) + +def radar_refresh(request, id_camp, id_radar): + + campaign = get_object_or_404(Campaign, pk = id_camp) + radar = get_object_or_404(Location, pk = id_radar) + experiments = Experiment.objects.filter(campaign=campaign).filter(location=radar) + for exs in experiments: + exs.get_status() + + route = request.META['HTTP_REFERER'] + route = str(route) + if 'search' in route: + return HttpResponseRedirect(reverse('url_operation_search', args=[id_camp])) + else: + return HttpResponseRedirect(reverse('url_operation', args=[id_camp])) +