Merge branch 'development'

docker-compose.yml

@@ -17,6 +17,7 @@ services:
       - ./ref-test/app/editor/static:/usr/share/nginx/html/editor/static:ro
       - ./ref-test/app/quiz/static:/usr/share/nginx/html/quiz/static:ro
       - ./ref-test/app/view/static:/usr/share/nginx/html/view/static:ro
+      - ./ref-test/app/analysis/static:/usr/share/nginx/html/analysis/static:ro
     ports:
       - 80:80
       - 443:443

nginx/conf.d/ref-test-app.conf

@@ -45,6 +45,11 @@ server {
         alias /usr/share/nginx/html/view/static/;
     }
 
+    location ^~ /admin/analysis/static/  {
+        include  /etc/nginx/mime.types;
+        alias /usr/share/nginx/html/analysis/static/;
+    }
+
     # Proxy to the main app for all other requests
     location / {
         include /etc/nginx/conf.d/proxy_headers.conf;

ref-test/app/admin/templates/admin/results.html

@@ -54,7 +54,7 @@
                         </td>
                         <td>
                             {% if entry.end_time %}
-                                {{ entry.end_time.strftime('%d %b %Y') }}
+                                {{ entry.end_time.strftime('%Y-%m-%d %H:%M') }}
                             {% endif %}
                         </td>
                         <td>

ref-test/app/admin/templates/admin/settings/questions.html

@@ -43,7 +43,7 @@
                             {{ element.get_name() }}
                         </td>
                         <td>
-                            {{ element.date.strftime('%d %b %Y %H:%M') }}
+                            {{ element.date.strftime('%Y-%m-%d %H:%M') }}
                         </td>
                         <td>
                             {{ element.creator.get_username() }}

ref-test/app/admin/templates/admin/tests.html

@@ -33,13 +33,13 @@
                 {% for test in tests %}
                     <tr class="table-row">
                         <td>
-                            {{ test.start_date.strftime('%d %b %y %H:%M') }}
+                            {{ test.start_date.strftime('%Y-%m-%d %H:%M') }}
                         </td>
                         <td>
                             {{ test.get_code() }}
                         </td>
                         <td>
-                            {{ test.end_date.strftime('%d %b %Y %H:%M') }}
+                            {{ test.end_date.strftime('%Y-%m-%d %H:%M') }}
                         </td>
                         <td>
                             {% if test.time_limit == None -%}

ref-test/app/analysis/templates/analysis/analysis.html

@@ -55,7 +55,11 @@
         <div class="input-group mb-3">
             <span class="input-group-text">Standard Deviation</span>
             <span class="form-control">
-                {{ analysis.scores.stdev|round(2) }}
+                {% if analysis.scores.stdev %}
+                    {{ analysis.scores.stdev|round(2) }}
+                {% else %}
+                    {{ None }}
+                {% endif %}
             </span>
         </div>
         <div class="input-group mb-3">

ref-test/app/quiz/views.py

@@ -59,11 +59,11 @@ def _start():
             except Exception as exception:
                 write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
                 return abort(500)
+            if not test:  return jsonify({'error': 'The exam code you entered is invalid.'}), 400
             entry.test = test
             entry.dataset = test.dataset
             entry.user_code = request.form.get('user_code')
             entry.user_code = None if entry.user_code == '' else entry.user_code.lower()
-            if not test:  return jsonify({'error': 'The exam code you entered is invalid.'}), 400
             if entry.user_code and entry.user_code not in test.adjustments: return jsonify({'error': f'The user code you entered is not valid.'}), 400
             if test.end_date < datetime.now(): return jsonify({'error': f'The exam code you entered expired on {test["expiry_date"].strftime("%d %b %Y %H:%M")}.'}), 400
             if test.start_date > datetime.now(): return jsonify({'error': f'The exam has not yet opened. Your exam code will be valid from {test["start_date"].strftime("%d %b %Y %H:%M")}.'}), 400