spacecruft
/
satnogs-network
1
0
Fork 0
Code Releases Activity

Constrain calculation time and hide results by default.

merge-requests/64/head
Pierros Papadeas 2014-10-26 22:44:22 +00:00
parent 60c7ba424d
commit 577e349e2a
3 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SatNOGS/static/css/project.css
View File

@ -118,4 +118,8 @@
.notice {
text-align: center;
color: #888;
}
.calculation-result {
display: none;
}

8
SatNOGS/static/js/observation_new.js
View File

@ -1,6 +1,11 @@
$(function () {
$('#datetimepicker-start').datetimepicker();
$('#datetimepicker-start').data("DateTimePicker").setMinDate(moment().add(1,'h'));
$('#datetimepicker-end').datetimepicker();
$("#datetimepicker-start").on("dp.change",function (e) {
$('#datetimepicker-end').data("DateTimePicker").setMinDate(e.date);
$('#datetimepicker-end').data("DateTimePicker").setMaxDate(moment(e.date).add(24, 'h'));
});
$('#satellite-selection').change( function() {
var norad = $(this).find(':selected').data("norad");
@ -16,6 +21,7 @@ $(function () {
$( document ).ready( function(){
$('#calculate-observation').click( function(){
$('.calculation-result').show();
var satellite = $('#satellite-selection').val();
var start_time = $('#datetimepicker-start input').val();
var end_time = $('#datetimepicker-end input').val();
@ -27,7 +33,7 @@ $( document ).ready( function(){
$.each(data, function( i,k ){
label = k.id + " - " + k.name;
var times = [];
console.log(k);
//console.log(k);
$.each(k.window, function( m,n ){
var starting_time = moment(n.start).valueOf();
var ending_time = moment(n.end).valueOf();

116
SatNOGS/templates/base/observation_new.html
View File

@ -16,66 +16,65 @@
</div>
</div>
<form class="form-horizontal" role="form">
<div class="row">
<form class="form-horizontal" role="form">
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">Satellite</label>
<div class="col-sm-9">
<select id="satellite-selection" class="form-control" name="satellite">
<option value="" disabled selected>Select a satellite</option>
{% for satellite in satellites %}
<option data-norad="{{ satellite.norad_cat_id }}" value="{{ satellite.norad_cat_id }}">
{{ satellite.norad_cat_id }} - {{ satellite.name }}
</option>
{% endfor %}
</select>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">Satellite</label>
<div class="col-sm-9">
<select id="satellite-selection" class="form-control" name="satellite">
<option value="" disabled selected>Select a satellite</option>
{% for satellite in satellites %}
<option data-norad="{{ satellite.norad_cat_id }}" value="{{ satellite.norad_cat_id }}">
{{ satellite.norad_cat_id }} - {{ satellite.name }}
</option>
{% endfor %}
</select>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Transponder</label>
<div class="col-sm-9">
<select id="transponder-selection" class="form-control" disabled name="transponder" >
<option id="no-transponder" value="" disabled selected>No transponder available</option>
{% for transponder in transponders %}
<option data-satellite="{{ transponder.satellite.norad_cat_id }}"
value="{{ transponder.satellite.norad_cat_id }}">
{{ transponder.description }} - {{ transponder.downlink_low}} - {{ transponder.mode }}
</option>
{% endfor %}
</select>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Transponder</label>
<div class="col-sm-9">
<select id="transponder-selection" class="form-control" disabled name="transponder" >
<option id="no-transponder" value="" disabled selected>No transponder available</option>
{% for transponder in transponders %}
<option data-satellite="{{ transponder.satellite.norad_cat_id }}"
value="{{ transponder.satellite.norad_cat_id }}">
{{ transponder.description }} - {{ transponder.downlink_low}} - {{ transponder.mode }}
</option>
{% endfor %}
</select>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">Start Time</label>
<div class="col-sm-9">
<div class='input-group date' id='datetimepicker-start'>
<input type="text"
class="form-control"
name="start-time"
data-date-format="YYYY-MM-DD HH:mm" />
<span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-sm-3 control-label">Start Time</label>
<div class="col-sm-9">
<div class='input-group date' id='datetimepicker-start'>
<input type="text"
class="form-control"
name="start-time"
data-date-format="YYYY-MM-DD HH:mm" />
<span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">End Time</label>
<div class="col-sm-9">
<div class='input-group date' id='datetimepicker-end'>
<input type="text"
class="form-control"
name="end-time"
data-date-format="YYYY-MM-DD HH:mm" />
<span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">End Time</label>
<div class="col-sm-9">
<div class='input-group date' id='datetimepicker-end'>
<input type="text"
class="form-control"
name="end-time"
data-date-format="YYYY-MM-DD HH:mm" />
<span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="row">
@ -86,9 +85,9 @@
</div>
</div>
<div class="row">
<div class="row calculation-result">
<div class="col-md-12">
<h3>Suggested Timeline</h3>
<h3>Calculated Timeline</h3>
<div id="timeline"></div>
<div id="hoverRes">
<div class="coloredDiv"></div>
@ -98,6 +97,15 @@
</div>
</div>
<div class="row calculation-result">
<div class="col-md-12">
<button type="button" id="calculate-observation" class="btn btn-success pull-right">
Schedule Observation
</button>
</div>
</div>
</form>
{% endblock content %}
{% block javascript %}