otree 6.0.3__tar.gz → 6.0.5__tar.gz

{otree-6.0.3/otree.egg-info → otree-6.0.5}/PKG-INFO

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

{otree-6.0.3 → otree-6.0.5}/otree/__init__.py

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

{otree-6.0.3 → otree-6.0.5}/otree/static/otree/css/theme2.css

@@ -12,11 +12,14 @@
 /* Input fields should only take up to 400px width and not stretch over the
    whole screen */
 .input-group,
-input.form-control,
-select.form-control {
+input.form-control {
     max-width: 400px;
 }
 
+input[type="number"] {
+    max-width: 150px;
+}
+
 .input-group-narrow {
     /* Choosing a very small value that will always be filled with the input
      * type and input-group-addon. That way we don't allow a gap between the

{otree-6.0.3 → otree-6.0.5}/otree/templates/otree/Page.html

@@ -8,7 +8,12 @@ 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.3 → otree-6.0.5}/otree/templates/otree/SessionData.html

@@ -143,8 +143,8 @@
       <div class="toolbar-group">
         <small><div>Download:</div></small>
         <small><div>
-          <a href="{% url 'ExportWide' session.code %}?token={{ DATA_EXPORT_HASH }}">Regular CSV</a><br>
-          <a href="{% url 'ExportWide' session.code %}?token={{ DATA_EXPORT_HASH }}&excel=1">Excel CSV</a>
+          <a href="{% url 'ExportWideLogin' session.code %}">Regular CSV</a><br>
+          <a href="{% url 'ExportWideLogin' session.code %}?format=csv_bom">Excel CSV</a>
         </div></small>
       </div>
     </div>

{otree-6.0.3 → otree-6.0.5}/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.3 → otree-6.0.5}/otree/views/export.py

@@ -156,6 +156,18 @@ class ExportChatLogin(LoginProtectedExport):
         export.export_chat(buf, session_code=session_code)
 
 
+class ExportWideLogin(LoginProtectedExport):
+    '''used by 'SessionData' page'''
+
+    url_pattern = '/ExportWide'
+
+    def file_name_stem(self):
+        return 'all_apps_wide'
+
+    def write_to_buf(self, buf, session_code, query_params):
+        export.export_wide(buf, session_code=session_code)
+
+
 class ExportIndex(cbv.AdminView):
     url_pattern = '/ExportIndex'
 

{otree-6.0.3 → otree-6.0.5}/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.3 → otree-6.0.5/otree.egg-info}/PKG-INFO

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