Skip to content

Commit

Permalink
Fixing submission Problems
Browse files Browse the repository at this point in the history
  • Loading branch information
zemogle committed Feb 22, 2022
1 parent 8abe326 commit 46bd3d0
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
3 changes: 1 addition & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
// LCO Jenkins automated docker container build
// dockerPipeline("docker.lco.global/serol")
helmPipeline()
dockerPipeline("docker.lco.global/serol")
4 changes: 2 additions & 2 deletions app/explorer/static/explorer/js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ function aggregate_status(rdata, progressid, token){
}
});

if (completed.length > 0){
update_status(progressid, completed[0]);
if (complete.length > 0){
update_status(progressid, complete[0]);
} else if (pending.length > 0){
pending.forEach((req) => {
status_userrequest(req, token);
Expand Down
2 changes: 1 addition & 1 deletion app/explorer/templates/explorer/challenge-observe.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
var challenge_id = '{{object.id}}'
var redirect_url = "{% url 'challenge' object.id %}";
var image_file = image_files[category];
var whatsupurl = "https://whatsup.lco.global/range/?aperture=0m4&format=jsonp";
var whatsupurl = "https://whatsup.lco.global/range/?aperture=0m4&format=jsonp&full=best";
var target_type;

function add_targets(i, data){
Expand Down
2 changes: 1 addition & 1 deletion app/explorer/templates/explorer/challenge-submitted.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ <h3>{% trans "Fun Fact" %}</h3>
{% endblock %}

{% block script-content %}
<script src="{% static "explorer/js/utils.js" %}?q=0.12" type="text/javascript" ></script>
<script src="{% static "explorer/js/utils.js" %}?q=0.13" type="text/javascript" ></script>
<script>
var requestgroup = {{progress.requestgroup|safe}};
var resp;
Expand Down
3 changes: 2 additions & 1 deletion app/explorer/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ def get(self, request, *args, **kwargs):
chal_id = Challenge.objects.get(number=latest.challenge.number + 1, mission=kwargs['mission_num']).id
return HttpResponseRedirect(reverse('challenge', kwargs={'pk':chal_id}))
except ObjectDoesNotExist:
if kwargs['mission_num'] in ['1', '2', '3']:
print(kwargs['mission_num'])
if str(kwargs['mission_num']) in ['1', '2', '3']:
logger.debug('User accessing Mission {} for 1st time'.format(kwargs['mission_num']))
chal = Challenge.objects.get(number=1,mission__id=kwargs['mission_num'])
return HttpResponseRedirect(reverse('challenge', kwargs={'pk':chal.id}))
Expand Down
2 changes: 1 addition & 1 deletion app/status/schedule.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from explorer.models import Body
from .request_formats import request_format, request_format_moon, format_moving_object, \
SITES, best_observing_time, moon_coords
SITES, best_observing_time, moon_coords, format_sidereal_object

logger = logging.getLogger(__name__)

Expand Down

0 comments on commit 46bd3d0

Please sign in to comment.