From 46bd3d0b356766be8e4c9781b0d9774d75ea6b57 Mon Sep 17 00:00:00 2001
From: Edward Gomez <edward@gomez.me.uk>
Date: Tue, 22 Feb 2022 12:17:30 +0000
Subject: [PATCH] Fixing submission Problems

---
 Jenkinsfile                                              | 3 +--
 app/explorer/static/explorer/js/utils.js                 | 4 ++--
 app/explorer/templates/explorer/challenge-observe.html   | 2 +-
 app/explorer/templates/explorer/challenge-submitted.html | 2 +-
 app/explorer/views.py                                    | 3 ++-
 app/status/schedule.py                                   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9e11a73..91371d8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,2 @@
 // LCO Jenkins automated docker container build
-// dockerPipeline("docker.lco.global/serol")
-helmPipeline()
+dockerPipeline("docker.lco.global/serol")
diff --git a/app/explorer/static/explorer/js/utils.js b/app/explorer/static/explorer/js/utils.js
index b587a78..f373d47 100644
--- a/app/explorer/static/explorer/js/utils.js
+++ b/app/explorer/static/explorer/js/utils.js
@@ -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);
diff --git a/app/explorer/templates/explorer/challenge-observe.html b/app/explorer/templates/explorer/challenge-observe.html
index 456b192..bb9d47f 100644
--- a/app/explorer/templates/explorer/challenge-observe.html
+++ b/app/explorer/templates/explorer/challenge-observe.html
@@ -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){
diff --git a/app/explorer/templates/explorer/challenge-submitted.html b/app/explorer/templates/explorer/challenge-submitted.html
index 823cd1f..5d2d2ce 100644
--- a/app/explorer/templates/explorer/challenge-submitted.html
+++ b/app/explorer/templates/explorer/challenge-submitted.html
@@ -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;
diff --git a/app/explorer/views.py b/app/explorer/views.py
index 9340870..774ba3f 100644
--- a/app/explorer/views.py
+++ b/app/explorer/views.py
@@ -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}))
diff --git a/app/status/schedule.py b/app/status/schedule.py
index cd969da..61b2a21 100644
--- a/app/status/schedule.py
+++ b/app/status/schedule.py
@@ -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__)