Skip to content

Commit

Permalink
Merge pull request #52 from ctreffe/release-v0.8
Browse files Browse the repository at this point in the history 
Release v0.8.5
  • Loading branch information
@jobrachem
jobrachem authored Apr 20, 2021
2 parents 44bd043 + 68df355 commit 606a4b5
Show file tree
Hide file tree
Showing 8 changed files with 193 additions and 299 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Mortimer v0.8.5 (Released 2021-04-20)

### Changed v0.8.5

- Changed some internal functions in alfredo.py for compatibility with
alfred3 v2.0.0

## Mortimer v0.8.4 (Released 2021-04-15)

### Added v0.8.4
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
},
package_dir={"": "src"},
install_requires=[
"alfred3>=1.1.4",
"cryptography>=2.9",
"alfred3>=2.0.0",
"cryptography>=3.4",
"email_validator>=1.1",
"flask>=1.1.2",
"flask_bcrypt>=0.7.1",
Expand Down
2 changes: 1 addition & 1 deletion src/mortimer/_version.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# 2) we can import it in setup.py for the same reason
# 3) we can import it into your module module

__version__ = "0.8.4"
__version__ = "0.8.5"
119 changes: 76 additions & 43 deletions src/mortimer/templates/export.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ <h4>Select Experiment Version</h4>
<div class="col col-md-4 my-auto">
<h4>Main experiment data</h4>
<small class="text-muted">
Contains the values that are saved by input elements in an experiment and the additional data dictionary.
Contains the values that are saved by input elements in an experiment and the additional data
dictionary.
</small>
</div>
<div class="col my-auto">

<button type="submit" name="submit" value="main.comma" class="btn btn-primary">csv ( , )</button>
<button type="submit" name="submit" value="main.semicolon" class="btn btn-primary">csv ( ; )</button>
<button type="submit" name="submit" value="main.semicolon" class="btn btn-primary">csv ( ;
)</button>

</div>
</div>
Expand All @@ -60,75 +62,106 @@ <h4>Codebook</h4>
</div>
<div class="col my-auto">

<button type="submit" name="submit" value="codebook.comma" class="btn btn-primary">csv ( , )</button>
<button type="submit" name="submit" value="codebook.semicolon" class="btn btn-primary">csv ( ; )</button>
<button type="submit" name="submit" value="codebook.comma" class="btn btn-primary">csv ( ,
)</button>
<button type="submit" name="submit" value="codebook.semicolon" class="btn btn-primary">csv ( ;
)</button>

</div>
</div>
</div>
</div>

<div class="card mb-3">
<div class="card-body">
<div class="row">
<div class="col col-md-4 my-auto">
<h4>Move history</h4>
<small class="text-muted">
Information on participant's movements in the experiment. Each row contains information
about one move, i.e. there can be lots of rows for a single participant.
</small>
</div>
<div class="col my-auto">
<div class="card-body">
<div class="row">
<div class="col col-md-4 my-auto">
<h4>Move history</h4>
<small class="text-muted">
Information on participant's movements in the experiment. Each row contains information
about one move, i.e. there can be lots of rows for a single participant.
</small>
</div>
<div class="col my-auto">

<button type="submit" name="submit" value="moves.comma" class="btn btn-primary">csv ( , )</button>
<button type="submit" name="submit" value="moves.semicolon" class="btn btn-primary">csv ( ; )</button>
<button type="submit" name="submit" value="moves.comma" class="btn btn-primary">csv ( , )</button>
<button type="submit" name="submit" value="moves.semicolon" class="btn btn-primary">csv ( ;
)</button>

</div>
</div>
</div>
</div>
</div>


<div class="card mb-3">
<div class="card-body">
<div class="row">
<div class="col col-md-4 my-auto">
<h4>Full experiment data</h4>
<small class="text-muted">
Main experiment data, element information (codebook) and values, and the movement history in JSON
format. <i>Unlinked data is not included here.</i>
</small>
</div>
<div class="col my-auto">
<div class="card-body">
<div class="row">
<div class="col col-md-4 my-auto">
<h4>Full experiment data</h4>
<small class="text-muted">
Main experiment data, element information (codebook) and values, and the movement history in
JSON
format. <i>Unlinked data is not included here.</i>
</small>
</div>
<div class="col my-auto">

<button type="submit" name="submit" value="full.json" class="btn btn-primary">json</button>
<button type="submit" name="submit" value="full.json" class="btn btn-primary">json</button>

</div>
</div>
</div>
</div>
</div>


<div class="card mb-3">
<div class="card-body">
<div class="row">
<div class="col col-md-4 my-auto">
<h4>Unlinked experiment data</h4>
<small class="text-muted">
Shuffled unlinked data: Values that are saved on <code>UnlinkedDataPage</code>s. Contains no data that allows linking with specific experiment sessions.
</small>
<div class="card mb-3">
<div class="card-body">
<div class="row">
<div class="col col-md-4 my-auto">
<h4>Unlinked experiment data</h4>
<small class="text-muted">
Shuffled unlinked data: Values that are saved on <code>UnlinkedDataPage</code>s. Contains no
data that allows linking with specific experiment sessions.
</small>
</div>
<div class="col my-auto">

<button type="submit" name="submit" value="unlinked.comma" class="btn btn-primary">csv ( ,
)</button>
<button type="submit" name="submit" value="unlinked.semicolon" class="btn btn-primary">csv ( ;
)</button>
<button type="submit" name="submit" value="unlinked.json" class="btn btn-primary">json</button>

</div>
</div>
<div class="col my-auto">
</div>
</div>

<button type="submit" name="submit" value="unlinked.comma" class="btn btn-primary">csv ( , )</button>
<button type="submit" name="submit" value="unlinked.semicolon" class="btn btn-primary">csv ( ; )</button>
<button type="submit" name="submit" value="unlinked.json" class="btn btn-primary">json</button>
<div class="card mb-3">
<div class="card-body">
<div class="row">
<div class="col col-md-4 my-auto">
<h4>Plugin data</h4>
<small class="text-muted">
Data provided by plugins.
</small>
</div>
<div class="col my-auto">

<select class="custom-select mb-2" id="plugin_export_select" name="plugin_export_select">
{% for title, data_type in plugin_queries %}
<option value="{{ data_type }}">{{ title }}</option>
{% endfor %}
</select>

<button type="submit" name="submit" value="plugin.json" class="btn btn-primary">json</button>

</div>
</div>
</div>
</div>
</div>

</form>

{% endblock content %}
{% endblock content %}
Loading

0 comments on commit 606a4b5

Please sign in to comment.