-
Approved to test:
- {{ lab.approved_to_test|yesno:"Yes,No" }}
+
+
+
+
Institution
+
{{ lab.institution }}
+
+
+
Principal investigator
+
{{ lab.principal_investigator_name }}
+
+
+
Contact email
+
{{ lab.contact_email }}
+
+
+
Contact phone
+
{{ lab.contact_phone }}
+
+
+
+
+
Lab description
+
{{ lab.description|squash_spaces|linebreaks }}
+
+
+
IRB contact info
+
{{ lab.irb_contact_info }}
+
+
+ Approved to test:
+ {{ lab.approved_to_test|yesno:"Yes,No" }}
+
+ {% if in_this_lab %}
+
+
+
CHS License and Usage
+
The {{ lab.name }} is using Children Helping Science under a free license (through 2026-12-31).
+
Response sessions collected through the CHS platform:
+
+ Response sessions collected through the CHS platform by study type and time range.
+
+
+ |
+ Internal |
+ External |
+ Total |
+
+
+
+
+ | Last 12 months |
+ {{ lab_stats.internal_last_year }} |
+ {{ lab_stats.external_last_year }} |
+ {{ lab_stats.total_last_year }} |
+
+
+ |
+ {% if lab.created_at %}
+ Since {{ lab.created_at|date:"N j, Y" }}
+ {% else %}
+ All time
+ {% endif %} |
+ {{ lab_stats.internal_all_time }} |
+ {{ lab_stats.external_all_time }} |
+ {{ lab_stats.total_all_time }} |
+
+
+
+
Note: Session counts reflect the number of “tallied” sessions across all of your studies, including only non-preview responses from eligible children. For internal studies only, tallied sessions are also limited to those which are marked complete and have a consent status of approved or pending. See documentation for additional detail on session tallies and how to submit individual session updates.
+
+
+ {% endif %}
{% endblock content %}
diff --git a/studies/tests.py b/studies/tests.py
index 318891e1c..387c6f51c 100644
--- a/studies/tests.py
+++ b/studies/tests.py
@@ -37,6 +37,7 @@
from studies.permissions import StudyPermission
from studies.tasks import (
MessageTarget,
+ _validated,
acquire_potential_announcement_email_targets,
cleanup_incomplete_video_uploads,
complete_multipart_upload,
@@ -662,6 +663,22 @@ def test_potential_message_targets_external(self):
# Check that the message target no longer has this child for this study
self.assertNotIn(message_target, potential_message_targets())
+ def test_validated_skips_none_user(self):
+ result = list(_validated([(None, [])]))
+ self.assertEqual(result, [])
+
+ def test_validated_skips_user_with_empty_username(self):
+ mock_user = MagicMock()
+ mock_user.username = ""
+ result = list(_validated([(mock_user, [])]))
+ self.assertEqual(result, [])
+
+ def test_validated_skips_user_with_non_email_username(self):
+ mock_user = MagicMock()
+ mock_user.username = "debuguser"
+ result = list(_validated([(mock_user, [])]))
+ self.assertEqual(result, [])
+
class TestSendMail(TestCase):
def setUp(self):
@@ -818,6 +835,55 @@ def test_email_headers_returns_none_if_username_missing(self):
self.assertIsNone(headers)
+class TestSendAsEmail(TestCase):
+ def setUp(self):
+ self.fake_lab = G(Lab, contact_email="lab@example.com")
+ self.study = G(
+ Study,
+ lab=self.fake_lab,
+ image=SimpleUploadedFile(
+ "fake_image.png", b"fake-stuff", content_type="image/png"
+ ),
+ study_type=StudyType.get_ember_frame_player(),
+ )
+ self.message = G(
+ Message, related_study=self.study, subject="Test Subject", body="Test body"
+ )
+
+ @patch("accounts.models.send_mail")
+ def test_send_as_email_skips_recipient_with_non_email_username(
+ self, mock_send_mail
+ ):
+ invalid_user = G(User, username="notanemail")
+ self.message.recipients.add(invalid_user)
+
+ self.message.send_as_email()
+
+ mock_send_mail.delay.assert_not_called()
+
+ @patch("accounts.models.send_mail")
+ def test_send_as_email_skips_recipient_with_empty_username(self, mock_send_mail):
+ invalid_user = User(username="")
+ invalid_user.save()
+ self.message.recipients.add(invalid_user)
+
+ self.message.send_as_email()
+
+ mock_send_mail.delay.assert_not_called()
+
+ @patch("accounts.models.send_mail")
+ def test_send_as_email_sends_to_valid_recipients_only(self, mock_send_mail):
+ valid_user = G(User, username="valid@example.com")
+ invalid_user = G(User, username="notanemail")
+ self.message.recipients.add(valid_user, invalid_user)
+
+ self.message.send_as_email()
+
+ mock_send_mail.delay.assert_called_once()
+ call_args = mock_send_mail.delay.call_args
+ self.assertEqual(call_args[0][2], "valid@example.com")
+
+
class StudyTypeModelTestCase(TestCase):
def test_default_pk(self):
study_type = StudyType.objects.get(name=StudyTypeEnum.ember_frame_player.value)
@@ -2846,3 +2912,177 @@ def test_metadata_change_rejected(self):
self.study.save()
self.study.refresh_from_db()
self.assertEqual(self.study.state, "rejected")
+
+
+class LabCreatedAtTestCase(TestCase):
+ """Tests for Lab.created_at auto-population on save."""
+
+ def _make_lab(self, name, email):
+ return Lab.objects.create(name=name, institution="Test", contact_email=email)
+
+ def test_created_at_set_on_new_lab(self):
+ lab = self._make_lab("New Lab", "new@lab.com")
+ lab.refresh_from_db()
+ self.assertIsNotNone(lab.created_at)
+
+ def test_created_at_not_overwritten_on_resave(self):
+ lab = self._make_lab("Resave Lab", "resave@lab.com")
+ original_created_at = lab.created_at
+ lab.institution = "Changed"
+ lab.save()
+ lab.refresh_from_db()
+ self.assertEqual(lab.created_at, original_created_at)
+
+ def test_null_created_at_stays_null_on_resave(self):
+ """Labs with null created_at (simulating pre-migration rows) keep null after a subsequent save."""
+ lab = self._make_lab("Null Lab", "null@lab.com")
+ Lab.objects.filter(pk=lab.pk).update(created_at=None)
+ lab.refresh_from_db()
+ self.assertIsNone(lab.created_at)
+ lab.institution = "Updated"
+ lab.save()
+ lab.refresh_from_db()
+ self.assertIsNone(lab.created_at)
+
+
+class LabGetResponseStatsTestCase(TestCase):
+ """Tests for Lab.get_response_stats() using the effective-is-tallied logic."""
+
+ def setUp(self):
+ self.lab = Lab.objects.create(
+ name="Stats Lab", institution="Test", contact_email="stats@lab.com"
+ )
+ self.other_lab = Lab.objects.create(
+ name="Other Lab", institution="Test", contact_email="other@lab.com"
+ )
+ self.internal_study = Study.objects.create(
+ name="Internal Study",
+ lab=self.lab,
+ study_type=StudyType.get_ember_frame_player(),
+ )
+ self.external_study = Study.objects.create(
+ name="External Study",
+ lab=self.lab,
+ study_type=StudyType.get_external(),
+ )
+ self.other_study = Study.objects.create(
+ name="Other Lab Study",
+ lab=self.other_lab,
+ study_type=StudyType.get_ember_frame_player(),
+ )
+ self.user = User.objects.create(is_active=True)
+ self.child = Child.objects.create(
+ user=self.user, birthday=date.today() - timedelta(days=365)
+ )
+
+ def _make_response(self, study, tallied=True, override=None):
+ """Create a response whose is_tallied matches `tallied`, optionally with a researcher override."""
+ eligibility = (
+ [ResponseEligibility.ELIGIBLE]
+ if tallied
+ else [ResponseEligibility.INELIGIBLE_OLD]
+ )
+ r = Response.objects.create(
+ study=study,
+ child=self.child,
+ study_type=study.study_type,
+ completed=True,
+ completed_consent_frame=True,
+ is_preview=False,
+ )
+ # Second save sets eligibility (first save auto-computed it from child/study age range)
+ r.eligibility = eligibility
+ r.save()
+ r.refresh_from_db() # ensure is_tallied reflects the signal-computed DB value
+ if override is not None:
+ r.is_tallied_researcher_override = override
+ r.save()
+ return r
+
+ def test_empty_lab_returns_zeros(self):
+ stats = self.lab.get_response_stats()
+ for key in (
+ "internal_all_time",
+ "external_all_time",
+ "total_all_time",
+ "internal_last_year",
+ "external_last_year",
+ "total_last_year",
+ ):
+ self.assertEqual(stats[key], 0, f"Expected 0 for {key}")
+
+ def test_counts_tallied_internal_responses(self):
+ self._make_response(self.internal_study, tallied=True)
+ self._make_response(self.internal_study, tallied=True)
+ self._make_response(
+ self.internal_study, tallied=False
+ ) # untallied, should not count
+ stats = self.lab.get_response_stats()
+ self.assertEqual(stats["internal_all_time"], 2)
+ self.assertEqual(stats["external_all_time"], 0)
+ self.assertEqual(stats["total_all_time"], 2)
+
+ def test_counts_tallied_external_responses(self):
+ self._make_response(self.external_study, tallied=True)
+ self._make_response(
+ self.external_study, tallied=False
+ ) # untallied, should not count
+ stats = self.lab.get_response_stats()
+ self.assertEqual(stats["internal_all_time"], 0)
+ self.assertEqual(stats["external_all_time"], 1)
+ self.assertEqual(stats["total_all_time"], 1)
+
+ def test_mixed_study_types_breakdown(self):
+ self._make_response(self.internal_study, tallied=True)
+ self._make_response(self.internal_study, tallied=True)
+ self._make_response(self.external_study, tallied=True)
+ stats = self.lab.get_response_stats()
+ self.assertEqual(stats["internal_all_time"], 2)
+ self.assertEqual(stats["external_all_time"], 1)
+ self.assertEqual(stats["total_all_time"], 3)
+
+ def test_researcher_override_true_counts_untallied_response(self):
+ """Override=True on an untallied response makes it effectively tallied."""
+ r = self._make_response(self.internal_study, tallied=False)
+ self.assertFalse(r.is_tallied)
+ r.is_tallied_researcher_override = True
+ r.save()
+ stats = self.lab.get_response_stats()
+ self.assertEqual(stats["internal_all_time"], 1)
+
+ def test_researcher_override_false_excludes_tallied_response(self):
+ """Override=False on a tallied response makes it effectively untallied."""
+ r = self._make_response(self.internal_study, tallied=True)
+ self.assertTrue(r.is_tallied)
+ r.is_tallied_researcher_override = False
+ r.save()
+ stats = self.lab.get_response_stats()
+ self.assertEqual(stats["internal_all_time"], 0)
+
+ def test_last_year_excludes_responses_older_than_365_days(self):
+ self._make_response(self.internal_study, tallied=True)
+ old = self._make_response(self.internal_study, tallied=True)
+ two_years_ago = datetime.now(timezone.utc) - timedelta(days=730)
+ Response.objects.filter(pk=old.pk).update(date_created=two_years_ago)
+
+ stats = self.lab.get_response_stats()
+ self.assertEqual(stats["internal_all_time"], 2)
+ self.assertEqual(stats["internal_last_year"], 1)
+
+ def test_last_year_totals_sum_correctly(self):
+ self._make_response(self.internal_study, tallied=True)
+ self._make_response(self.external_study, tallied=True)
+ old_ext = self._make_response(self.external_study, tallied=True)
+ two_years_ago = datetime.now(timezone.utc) - timedelta(days=730)
+ Response.objects.filter(pk=old_ext.pk).update(date_created=two_years_ago)
+
+ stats = self.lab.get_response_stats()
+ self.assertEqual(stats["total_all_time"], 3)
+ self.assertEqual(stats["total_last_year"], 2)
+
+ def test_does_not_count_other_lab_responses(self):
+ self._make_response(self.other_study, tallied=True)
+ self._make_response(self.other_study, tallied=True)
+ stats = self.lab.get_response_stats()
+ self.assertEqual(stats["total_all_time"], 0)
+ self.assertEqual(stats["total_last_year"], 0)
diff --git a/uv.lock b/uv.lock
index dc2bdc8d4..4f845e9d1 100644
--- a/uv.lock
+++ b/uv.lock
@@ -325,16 +325,16 @@ wheels = [
[[package]]
name = "django"
-version = "5.2.13"
+version = "5.2.14"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "asgiref" },
{ name = "sqlparse" },
{ name = "tzdata", marker = "sys_platform == 'win32'" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/1f/c5/c69e338eb2959f641045802e5ea87ca4bf5ac90c5fd08953ca10742fad51/django-5.2.13.tar.gz", hash = "sha256:a31589db5188d074c63f0945c3888fad104627dfcc236fb2b97f71f89da33bc4", size = 10890368, upload-time = "2026-04-07T14:02:15.072Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/65/95/95f7faa0950867afaa0bef2460c6263afd6a2c78cc9434046ed28160b015/django-5.2.14.tar.gz", hash = "sha256:58a63ba841662e5c686b57ba1fec52ddd68c0b93bd96ac3029d55728f00bf8a2", size = 10895118, upload-time = "2026-05-05T13:57:31.104Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/59/b1/51ab36b2eefcf8cdb9338c7188668a157e29e30306bfc98a379704c9e10d/django-5.2.13-py3-none-any.whl", hash = "sha256:5788fce61da23788a8ce6f02583765ab060d396720924789f97fa42119d37f7a", size = 8310982, upload-time = "2026-04-07T14:02:08.883Z" },
+ { url = "https://files.pythonhosted.org/packages/14/44/f172870cf87aa25afef48fb72adba89ee8b77fcab6f3b23d240b923f1528/django-5.2.14-py3-none-any.whl", hash = "sha256:6f712143bd3064310d1f50fac859c3e9a274bdcfc9595339853be7779297fc76", size = 8311320, upload-time = "2026-05-05T13:57:25.795Z" },
]
[[package]]
@@ -773,11 +773,11 @@ wheels = [
[[package]]
name = "idna"
-version = "3.10"
+version = "3.15"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", size = 190490, upload-time = "2024-09-15T18:07:39.745Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/82/77/7b3966d0b9d1d31a36ddf1746926a11dface89a83409bf1483f0237aa758/idna-3.15.tar.gz", hash = "sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc", size = 199245, upload-time = "2026-05-12T22:45:57.011Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", size = 70442, upload-time = "2024-09-15T18:07:37.964Z" },
+ { url = "https://files.pythonhosted.org/packages/d2/23/408243171aa9aaba178d3e2559159c24c1171a641aa83b67bdd3394ead8e/idna-3.15-py3-none-any.whl", hash = "sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8", size = 72340, upload-time = "2026-05-12T22:45:55.733Z" },
]
[[package]]
@@ -900,7 +900,7 @@ dev = [
requires-dist = [
{ name = "boto3", specifier = "==1.40.52" },
{ name = "ciso8601", specifier = "==2.3.2" },
- { name = "django", specifier = "==5.2.13" },
+ { name = "django", specifier = "==5.2.14" },
{ name = "django-ace-overlay", git = "https://github.com/lookit/django-ace-overlay.git?rev=master" },
{ name = "django-bitfield", specifier = "==2.2.0" },
{ name = "django-bootstrap-icons", specifier = "==0.9.0" },
@@ -1517,11 +1517,11 @@ wheels = [
[[package]]
name = "urllib3"
-version = "2.6.3"
+version = "2.7.0"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/c7/24/5f1b3bdffd70275f6661c76461e25f024d5a38a46f04aaca912426a2b1d3/urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed", size = 435556, upload-time = "2026-01-07T16:24:43.925Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz", hash = "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c", size = 433602, upload-time = "2026-05-07T16:13:18.596Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/39/08/aaaad47bc4e9dc8c725e68f9d04865dbcb2052843ff09c97b08904852d84/urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4", size = 131584, upload-time = "2026-01-07T16:24:42.685Z" },
+ { url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" },
]
[[package]]
diff --git a/web/templates/web/jspsych-study-detail.html b/web/templates/web/jspsych-study-detail.html
index 707779ba4..59580efeb 100644
--- a/web/templates/web/jspsych-study-detail.html
+++ b/web/templates/web/jspsych-study-detail.html
@@ -82,6 +82,9 @@
+
diff --git a/web/templatetags/web_extras.py b/web/templatetags/web_extras.py
index f4a10c13e..e2417e652 100644
--- a/web/templatetags/web_extras.py
+++ b/web/templatetags/web_extras.py
@@ -1,3 +1,4 @@
+import re
import textwrap
from typing import Text
@@ -356,3 +357,13 @@ def response_page_transform(request, study_pk, page_number):
else:
updated[key] = str(page_number)
return updated.urlencode()
+
+
+@register.filter(name="squash_spaces")
+def squash_spaces(value):
+ """Collapses runs of spaces/tabs to a single space, preserving newlines.
+ Also normalizes literal backslash-r-backslash-n escape sequences to actual newlines."""
+ if isinstance(value, str):
+ value = value.replace("\\r\\n", "\n").replace("\\r", "\n").replace("\\n", "\n")
+ return re.sub(r"[^\S\r\n]+", " ", value)
+ return value