Skip to content

Commit

Permalink
Adding screen capture table with thumbnail previews, updating documen…
Browse files Browse the repository at this point in the history
…tation, (#553)

This PR:

- Adds a script to copy screen capture images from internal servers to the public-facing  ivilab server
- Updates the `create_datasette_with_plugins_image.sh` script to add a couple of Datasette plugins that are useful for previewing screen capture images in the web GUI.
- Updates `docker-compose.prod.yml` to point to the new location of `tomcat.db`
- Removes `schemacrawler.config.properties`
- Changes `container` to `container-fluid` in `base.html`
- Updates documentation in `index.html` and `derived-data-products.html`
  • Loading branch information
adarshp authored Nov 24, 2023
1 parent 10cd166 commit 4a76027
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 231 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Script to copy screenshots to the ivilab webserver. This is meant to be run
# on an IVILab machine on which /data is mounted.

time rsync \
-adrPm \ # archive mode, show progress, prune empty directories
--no-inc-recursive \
--copy-links \ # Copy files and not just symlinks
--info=progress2 \
--include="*/" \
--include="*/*/Screenshots/*.png" \
--include="*/*/screenshots/*.png" \ # Include lowercased variant
--exclude="*" \
/data/tomcat/raw/LangLab/experiments/study_3_pilot/group ivilab:/var/www/data/tomcat/
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ docker pull datasetteproject/datasette:0.64.3

docker run datasetteproject/datasette \
pip install \
datasette-render-markdown \
datasette-pretty-json \
datasette-render-markdown
datasette-copyable \
datasette-render-image-tags

docker commit $(docker ps -lq) datasette-with-plugins
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
ports:
- "8001:8001"
volumes:
- /work/ivilab/public_html/data/tomcat:/mnt
- /tomcat/data:/mnt
- .:/repo

entrypoint: |
Expand Down
216 changes: 0 additions & 216 deletions human_experiments/datasette_interface/schemacrawler.config.properties

This file was deleted.

2 changes: 1 addition & 1 deletion human_experiments/datasette_interface/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
{% endif %}
{% endblock %}

<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col">

Expand Down
12 changes: 5 additions & 7 deletions human_experiments/datasette_interface/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,18 @@ <h1>{{ metadata.title or "Datasette" }}{% if private %} 🔒{% endif %}</h1>
The dataset currently is served via a [single SQLite database](/tomcat),
but we may add additional ones in the future.

Currently, there are tables for the participant information, group session,
raw fNIRS data, the testbed messages, and the baseline tasks. More
tables (EEG, EKG, GSR, eye tracking, vocalic features, demographic data,
questionnaires) will be added in the near future.

For users who are not familiar with SQL, we will provide some sample SQL
queries to demonstrate how to use this database and the associated Datasette
interface.

For more advanced users, feel free to try different queries, use the
programmatic APIs provided by Datasette, or simply [download the whole SQLite
database](https://tomcat.ivilab.org/tomcat.db).
database](https://tomcat.ivilab.org/tomcat.db). Note that queries that take
too long to execute (i.e., > 10 seconds) will be aborted, in order to keep the
site running smoothly. If you would like to perform such complex queries, we
recommend downloading the database locally to perform them.

The database schema diagram is available here: [Database
The entity relationship diagram describing the database schema diagram is available here: [ERD
diagram](/assets/db_diagram.png).

Sign up for our [mailing list](/mailing-list) to get updates on the dataset!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,22 @@
Documentation for the derived data products is in sections 4 and 5 of the [data
products document](http://ivilab.cs.arizona.edu/data/tomcat/data_products.pdf).


- [Filtered synchronized data (1.1
TB)](https://ivilab.cs.arizona.edu/ivilab/data/tomcat/derived/release_2023_07_17_19.tar.gz).
Uploaded 2023-07-19. See [here](/updates/2023-07-19) for details.
- [Filtered synchronized data (generated 2023-08-28) (836
GB)](https://ivilab.cs.arizona.edu/ivilab/data/tomcat/derived/release_2023_08_28_17.tar.gz)

## Older versions

We always recommend using the latest version of the derived data products.
We always recommend using the latest version of the derived data products, as
older versions may have issues that are fixed in the newest versions, and the
documentation is only accurate for the newest version.

However, we will continue to provide the older versions for as long as
we feasibly can.

- [Filtered synchronized data (1.1
TB)](https://ivilab.cs.arizona.edu/ivilab/data/tomcat/derived/release_2023_07_17_19.tar.gz).
Uploaded 2023-07-19. See [here](/updates/2023-07-19) for details.

- [Filtered synchronized data (168
GB)](https://ivilab.cs.arizona.edu/ivilab/data/tomcat/derived/filtered_synchronized_data.tar.gz)
Uploaded 2023-06-14.
Expand Down

0 comments on commit 4a76027

Please sign in to comment.