Merge branch 'development' of https://github.com/FAI-CIVL/FAI-Airscore …

…into development
FAI-CIVL · Jul 24, 2024 · 697f7ab · 697f7ab
2 parents f024100 + d051ddb
commit 697f7ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/airscore/core/frontendUtils.py b/airscore/core/frontendUtils.py
@@ -1327,8 +1327,10 @@ def get_comp_info(compid: int, task_ids=None):
 
     with db_session() as db:
         non_scored_tasks = (
-            db.query(t.task_id.label('id'),
-                     t.task_name, t.date, t.task_type, t.opt_dist, t.training, t.comment, t.cancelled)
+            db.query(
+                t.task_id.label('id'),
+                t.task_name, t.date, t.task_type, t.opt_dist,
+                t.training, t.comment, t.stopped_time, t.cancelled)
             .filter_by(comp_id=compid)
             .order_by(t.date.desc())
             .all()

diff --git a/airscore/public/views.py b/airscore/public/views.py
@@ -392,7 +392,8 @@ def competition(compid: int):
                     '''tracks download status'''
                     task['tracks_status'] = frontendUtils.task_has_valid_results(task['id'])
             if task['cancelled']:
-                task['status'] = "CANCELLED"
+                # it could be cancelled or stopped but not valid
+                task['status'] = "CANCELLED" if not task['stopped_time'] else "STOPPED / NOT VALID"
 
             all_tasks.append(task)
     all_tasks.sort(key=lambda k: k['date'], reverse=True)

diff --git a/airscore/templates/public/comp.html b/airscore/templates/public/comp.html
@@ -50,7 +50,7 @@ <h1> No task has been set yet</h1>
       <div class='col'>
         <h3 id='task_hd'>{{ task.task_name }}</h3>
         <h5>{{ task.date }} {% if task.training %}<span class = 'text-info'>(TRAINING DAY)</span>{% endif %}</h5>
-        {% if task.status == 'CANCELLED' %}
+        {% if task.status in ['CANCELLED', 'STOPPED / NOT VALID'] %}
         {%  set class = 'text-danger' %}
         {% elif task.status is in ['Not yet scored', 'Task not set'] %}
         {%  set class = 'text-warning' %}
@@ -94,7 +94,7 @@ <h6>{{ task.comment }}</h6>
           <a href="{{ url_for('public.tracks', taskid=task.id) }}" class='btn btn-primary'>Tracks Status</a>
         </p>
         {%  endif %}
-        {% elif task.status is not in ["Task not set", "CANCELLED"] %}
+        {% elif task.status is not in ['Task not set', 'CANCELLED', 'STOPPED / NOT VALID'] %}
         <p>
           <a href="{{ url_for('public.download_file', filetype='igc_zip', filename=task.id) }}">IGC Zip File</a>
         </p>