radarsys Commit - r88:35eccea3581b · Jicamarca Repository

Task 487: Operation View gets status from database and radar_refresh button updates status...

Fiorella Quino -

r88:35eccea3581b

parent child

Context file:

r88:35eccea3581b

Collapse all files

apps/main/templates/operation.html +6 -1

                          <button type="button" name="bt_stop" class="btn btn-primary pull-right btn-xs" data-url="{% url 'url_radar_stop' campaign.id location.id %}" aria-label="Left Align" style="margin-left: 10px">
                              <span class="glyphicon glyphicon-stop" aria-hidden="true"></span>
                          </button>
-                         <button type="button" name="bt_refresh" class="btn btn-primary pull-right btn-xs" data-url="{% url 'url_radar_stop' campaign.id location.id %}" aria-label="Left Align" style="margin-left: 10px">
+                         <button type="button" name="bt_refresh" class="btn btn-primary pull-right btn-xs" data-url="{% url 'url_radar_refresh' campaign.id location.id %}" aria-label="Left Align" style="margin-left: 10px">
                              <span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>
                          </button>
              	      </h4>
                  	//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");

apps/main/urls.py +1 0

                  url(r'^operation/search/(?P<id_camp>-?\d+)/$', 'apps.main.views.operation_search', name='url_operation_search'),
                  url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/play/$', 'apps.main.views.radar_play', name='url_radar_play'),
                  url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/stop/$', 'apps.main.views.radar_stop', name='url_radar_stop'),
+                 url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/refresh/$', 'apps.main.views.radar_refresh', name='url_radar_refresh'),
              )

apps/main/views.py +33 -32

              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
                  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):
                          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 = {}
                  #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})
              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)
                  else:
                      return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
              def radar_stop(request, id_camp, id_radar):
                  route = request.META['HTTP_REFERER']
                  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]))

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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