1
0
Fork 0

Create permalink to hightlight observation data blocks

merge-requests/248/head
Nikos Roussos 2016-04-25 17:53:18 +03:00
parent e12313d006
commit 804263b2c5
5 changed files with 2148 additions and 1 deletions

View File

@ -19,6 +19,8 @@ base_urlpatterns = ([
views.prediction_windows, name='prediction_windows'),
url(r'^data_verify/(?P<id>[0-9]+)/$', views.data_verify, name='data_verify'),
url(r'^data_mark_bad/(?P<id>[0-9]+)/$', views.data_mark_bad, name='data_mark_bad'),
url(r'^observations/data/(?P<id>[0-9]+)/$', views.observation_data_view,
name='observation_data_view'),
# Stations
url(r'^stations/$', views.stations_list, name='stations_list'),

View File

@ -525,3 +525,7 @@ def satellite_view(request, id):
return JsonResponse(data, safe=False)
def observation_data_view(request, id):
observation = get_object_or_404(Observation, data__id=id)
return redirect(reverse('base:observation_view', kwargs={'id': observation.id}) + '#{0}'.format(id))

File diff suppressed because it is too large Load Diff

View File

@ -81,6 +81,12 @@ $(document).ready(function() {
});
});
// Hightlight Data block
var uri = URI(location.href);
var data_id = uri.hash();
$(data_id).addClass('panel-info');
// Delete confirmation
var message = "Do you really want to delete this Observation?";
var actions = $('#obs-delete');

View File

@ -102,7 +102,7 @@
</div>
{% for data in data %}
<div class="panel panel-default observation-data"
<div class="panel panel-default observation-data" id="{{ data.id }}"
data-start="{{ data.start|date:"U" }}"
data-end="{{ data.end|date:"U" }}"
data-groundstation="{{ data.ground_station }}">
@ -206,6 +206,7 @@
<script src="{% static 'js/lib/d3-timeline.js' %}"></script>
<script src="{% static 'js/lib/wavesurfer.min.js' %}"></script>
<script src="{% static 'js/lib/moment.min.js' %}"></script>
<script src="{% static 'js/lib/URI.js' %}"></script>
<script src="{% static 'js/utc.js' %}"></script>
<script src="{% static 'js/observation_view.js' %}"></script>
<script src="{% static 'js/satellite.js' %}"></script>