2014-08-27 10:42:50 -06:00
|
|
|
{% extends "base.html" %}
|
2014-10-27 09:47:32 -06:00
|
|
|
{% load tags %}
|
2014-08-27 10:42:50 -06:00
|
|
|
|
2015-07-22 05:20:45 -06:00
|
|
|
{% block title %} - Observations{% endblock %}
|
2014-09-18 07:34:39 -06:00
|
|
|
|
2014-08-27 10:42:50 -06:00
|
|
|
{% block content %}
|
2015-04-07 10:01:59 -06:00
|
|
|
<h1>
|
|
|
|
Observations
|
|
|
|
{% if user.is_authenticated == 1 %}
|
|
|
|
<a class="btn btn-primary pull-right" href="{% url 'base:observation_new' %}">New Observation</a>
|
|
|
|
{% endif %}
|
|
|
|
</h1>
|
2014-09-18 07:34:39 -06:00
|
|
|
|
2015-04-07 10:01:59 -06:00
|
|
|
<div class="row">
|
|
|
|
<div class="col-md-12">
|
|
|
|
<table class="table table-hover">
|
|
|
|
<thead>
|
|
|
|
<th>ID</th>
|
|
|
|
<th>Satellite</th>
|
|
|
|
<th>Frequency</th>
|
|
|
|
<th>Encoding</th>
|
|
|
|
<th>Timeframe</th>
|
|
|
|
<th>Observer</th>
|
|
|
|
</thead>
|
|
|
|
<tbody>
|
|
|
|
{% for observation in observations.all %}
|
|
|
|
<tr>
|
|
|
|
<td>
|
|
|
|
<a href="{% url 'base:observation_view' id=observation.id %}">
|
|
|
|
<span class="label
|
Initial data vetting/verification system
Model change (with migration 0006) adds 3 fields to Data:
vetted_status (charfield with options for data status, default "unknown")
vetted_user (who vetted the data)
vetted_datetime (when it was vetted)
In addition, various boolean functions are added for the Data model
to check statuses. More functions are added to the Observation model
to check status of verification within an observation as well, assuming
multiple data entries in an Observation. With these, I also changed
"has_data" to "has_submitted_data" to be more specific alongside the
others.
For UX, we add a green check sign or red removal sign to the data
header in Observation view (along with green/red datetime in the footer)
if a data is verified good or bad, respectively. If there is an unknown
status, the data header is given a thumbs-up and thumbs-down button to
verify the data good or bad. These icons are only offered to is_staff,
the observation requestor, and any station owner in the observation.
These buttons trigger new URLs/functions in view:
data_verify(id)
data_mark_bad(id)
Returning the user back to the originating Observation page.
In the observation lists I changed the coloring of the ID button to be:
Future: light blue (same)
No uploaded data and/or all vetted bad data: red
Some or all unvetted data with no verified good data: orange
Some or all verified good data: green
These changes are reflected in the observations.html, home.html, and
user_detail.html templates.
solves satnogs/satnogs-network#171
2016-03-25 13:52:45 -06:00
|
|
|
{% if observation.has_verified_data %}
|
|
|
|
label-success" title="There is known good data in this observation"
|
2016-02-05 14:20:00 -07:00
|
|
|
{% elif observation.is_future %}
|
Initial data vetting/verification system
Model change (with migration 0006) adds 3 fields to Data:
vetted_status (charfield with options for data status, default "unknown")
vetted_user (who vetted the data)
vetted_datetime (when it was vetted)
In addition, various boolean functions are added for the Data model
to check statuses. More functions are added to the Observation model
to check status of verification within an observation as well, assuming
multiple data entries in an Observation. With these, I also changed
"has_data" to "has_submitted_data" to be more specific alongside the
others.
For UX, we add a green check sign or red removal sign to the data
header in Observation view (along with green/red datetime in the footer)
if a data is verified good or bad, respectively. If there is an unknown
status, the data header is given a thumbs-up and thumbs-down button to
verify the data good or bad. These icons are only offered to is_staff,
the observation requestor, and any station owner in the observation.
These buttons trigger new URLs/functions in view:
data_verify(id)
data_mark_bad(id)
Returning the user back to the originating Observation page.
In the observation lists I changed the coloring of the ID button to be:
Future: light blue (same)
No uploaded data and/or all vetted bad data: red
Some or all unvetted data with no verified good data: orange
Some or all verified good data: green
These changes are reflected in the observations.html, home.html, and
user_detail.html templates.
solves satnogs/satnogs-network#171
2016-03-25 13:52:45 -06:00
|
|
|
label-info" title="This observation is in the future"
|
|
|
|
{% elif observation.has_unvetted_data %}
|
|
|
|
label-warning" title="There is data that needs vetting in this observation"
|
2015-07-07 08:03:57 -06:00
|
|
|
{% else %}
|
Initial data vetting/verification system
Model change (with migration 0006) adds 3 fields to Data:
vetted_status (charfield with options for data status, default "unknown")
vetted_user (who vetted the data)
vetted_datetime (when it was vetted)
In addition, various boolean functions are added for the Data model
to check statuses. More functions are added to the Observation model
to check status of verification within an observation as well, assuming
multiple data entries in an Observation. With these, I also changed
"has_data" to "has_submitted_data" to be more specific alongside the
others.
For UX, we add a green check sign or red removal sign to the data
header in Observation view (along with green/red datetime in the footer)
if a data is verified good or bad, respectively. If there is an unknown
status, the data header is given a thumbs-up and thumbs-down button to
verify the data good or bad. These icons are only offered to is_staff,
the observation requestor, and any station owner in the observation.
These buttons trigger new URLs/functions in view:
data_verify(id)
data_mark_bad(id)
Returning the user back to the originating Observation page.
In the observation lists I changed the coloring of the ID button to be:
Future: light blue (same)
No uploaded data and/or all vetted bad data: red
Some or all unvetted data with no verified good data: orange
Some or all verified good data: green
These changes are reflected in the observations.html, home.html, and
user_detail.html templates.
solves satnogs/satnogs-network#171
2016-03-25 13:52:45 -06:00
|
|
|
label-danger" title="No good data in this observation"
|
|
|
|
{% endif %}>
|
2015-04-07 10:01:59 -06:00
|
|
|
{{ observation.id }}
|
|
|
|
</span>
|
|
|
|
</a>
|
|
|
|
</td>
|
|
|
|
<td>{{ observation.satellite.name }}</td>
|
2015-08-14 07:55:43 -06:00
|
|
|
<td>{{ observation.transmitter.downlink_low|frq }}</td>
|
|
|
|
<td>{{ observation.transmitter.mode|default:"-" }}</td>
|
2015-04-07 10:01:59 -06:00
|
|
|
<td>{{ observation.start|date:"Y-m-d H:i:s" }}</br>{{ observation.end|date:"Y-m-d H:i:s" }}</td>
|
|
|
|
<td>
|
|
|
|
<a href="{% url 'users:view_user' username=observation.author.username %}">
|
2015-04-16 15:45:11 -06:00
|
|
|
{{ observation.author.displayname }}
|
2015-04-07 10:01:59 -06:00
|
|
|
</a>
|
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
{% endfor %}
|
|
|
|
</tbody>
|
|
|
|
</table>
|
|
|
|
</div>
|
2014-09-18 07:34:39 -06:00
|
|
|
</div>
|
2015-04-07 10:01:59 -06:00
|
|
|
{% endblock content %}
|