otree 6.0.4__tar.gz → 6.0.6__tar.gz

{otree-6.0.4/otree.egg-info → otree-6.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otree
-Version: 6.0.4
+Version: 6.0.6
 Summary: Framework for multiplayer strategy games and complex surveys.
 Home-page: http://otree.org/
 Author: chris@otree.org

{otree-6.0.4 → otree-6.0.6}/otree/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '6.0.4'
+__version__ = '6.0.6'
 # don't import anything else here because setup.py imports this.

{otree-6.0.4 → otree-6.0.6}/otree/static/otree/js/common_user_facing.js

@@ -6,15 +6,17 @@ function makeReconnectingWebSocket(path) {
 }
 
 document.addEventListener('DOMContentLoaded', function () {
+    let tabDebugMetaEle = document.querySelector('meta[name="tab-title-debug-info"]');
     let bodyTitle = document.getElementById('_otree-title');
     let bodyTitleText = bodyTitle ? bodyTitle.textContent : '';
-    let tabTitle = document.querySelector('title');
-    if (bodyTitleText && !tabTitle.textContent) {
+    let tabTitle = document.querySelector('title');    
+
+    if (tabDebugMetaEle) {
+        tabTitle.textContent += `${tabDebugMetaEle.content} ${bodyTitleText} [debug]`;
+    } else if (!tabTitle.textContent.trim()) {
         tabTitle.textContent = bodyTitleText;
-    } else if (bodyTitleText && isDebug) {
-        tabTitle.textContent += ` ${bodyTitleText} [debug]`;
     }
-
+ 
     // block the user from spamming the next button which can make congestion
     // problems worse.
     // i can't use addEventListener on the button itself

{otree-6.0.4 → otree-6.0.6}/otree/templates/otree/Base_UserFacing.html

@@ -15,6 +15,7 @@
         {% endcomment %}
         <script src="{% static 'otree/js/jquery-3.2.1.min.js' %}"></script>
     {% endblock %}
+    {% block tab_title_data %}{% endblock %}
     {# these blocks are for public API #}
     {% block global_styles %}{% endblock %}
     {% block app_styles %}{% endblock %}

{otree-6.0.4 → otree-6.0.6}/otree/templates/otree/Page.html

@@ -1,14 +1,19 @@
 {% extends "otree/Base_UserFacing.html" %}
 
-{% block head_title %}[{{ session.code|truncate_(4) }}/P{{ participant.id_in_session}}]{% endblock %}
-
+{% block head_title %}{% endblock %}
+{% block tab_title_data %}{% include 'otree/includes/debug_info_tab_title.html' %}{% endblock %}
 {% comment %}
 NOTE:
 we should keep this page as simple as possible so that 'view source' is friendly
 i removed many linebreaks to make output HTML cleaner
 {% endcomment %}
 {% block body_main %}
-    
+    {% if is_defined('view.is_debug') and view.is_debug %}
+    <script>
+    window.addEventListener('error', function() { window._hasJsErrors = true; });
+    window.addEventListener('unhandledrejection', function() { window._hasJsErrors = true; });
+    </script>
+    {% endif %}
     {% if is_defined('js_vars') and js_vars %}<script>var js_vars = {{ js_vars }};</script>{% endif %}
     {% if use_standard_layout %}
     <div class="otree-body container">

{otree-6.0.4 → otree-6.0.6}/otree/templates/otree/WaitPage.html

@@ -73,7 +73,7 @@
         }
     </style>
 {% endblock %}
-
+{% block tab_title_data %}{% include 'otree/includes/debug_info_tab_title.html' %}{% endblock %}
 {% block body_main %}{% if is_defined('js_vars') and js_vars %}<script>var js_vars = {{ js_vars }};</script>{% endif %}
 <div class="otree-wait-page container">
     <div class="card">

{otree-6.0.4 → otree-6.0.6}/otree/templates/otree/includes/debug_info.html

@@ -7,6 +7,12 @@
 <div class="container">
 <div class="card debug-info"> {# .debug-info so it's visible in inspector #}
     <h5 class="card-header">Debug info</h5>
+    <p id="_js-errors-alert" class="text-danger m-3" style="display:none;">
+        JavaScript errors occurred. Check your browser console.
+    </p>
+    <script>
+    if (window._hasJsErrors) document.getElementById('_js-errors-alert').style.display = 'block';
+    </script>
 
     {% include 'otree/includes/hidden_form_errors.html' %}
 

otree-6.0.6/otree/templates/otree/includes/debug_info_tab_title.html

@@ -0,0 +1,3 @@
+{% if is_defined('view.is_debug') and view.is_debug %}
+<meta name="tab-title-debug-info" content="{{ session.code|truncate_(4) }}/P{{ participant.id_in_session}}">
+{% endif %}

{otree-6.0.4 → otree-6.0.6}/otree/views/rest.py

@@ -188,6 +188,11 @@ class RESTGetSessionInfo(BaseRESTView):
                 payoff_in_real_world_currency=pp.payoff.to_real_world_currency(session),
                 status=pp.status,
             )
+
+            # for otree HR
+            if 'finished' in settings.PARTICIPANT_FIELDS:
+                pdata['finished'] = pp.vars.get('finished', False)
+
             # shouldn't raise an error if the field is not found,
             # e.g. because oTree Hub may check if some things are defined to provide
             # extra functionality.

{otree-6.0.4 → otree-6.0.6/otree.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otree
-Version: 6.0.4
+Version: 6.0.6
 Summary: Framework for multiplayer strategy games and complex surveys.
 Home-page: http://otree.org/
 Author: chris@otree.org

{otree-6.0.4 → otree-6.0.6}/otree.egg-info/SOURCES.txt

@@ -231,6 +231,7 @@ otree/templates/otree/includes/SessionInfo.html
 otree/templates/otree/includes/TimeLimit.html
 otree/templates/otree/includes/TimeLimit.js.html
 otree/templates/otree/includes/debug_info.html
+otree/templates/otree/includes/debug_info_tab_title.html
 otree/templates/otree/includes/hidden_form_errors.html
 otree/templates/otree/includes/messages.html
 otree/templates/otree/includes/mturk_payment_table.html