Skip to content

Commit

Permalink
Merge branch 'release/0.3.45' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Jan 29, 2024
2 parents b28aac8 + 0096eac commit 37b1fb4
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 22 deletions.
6 changes: 0 additions & 6 deletions edc_offstudy/apps.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import sys

from django.apps import AppConfig as DjangoAppConfig


Expand All @@ -8,7 +6,3 @@ class AppConfig(DjangoAppConfig):
verbose_name = "Edc Offstudy"
has_exportable_data = True
include_in_administration_section = True

def ready(self):
sys.stdout.write("Loading {} ...\n".format(self.verbose_name))
sys.stdout.write(" Done loading {}.\n".format(self.verbose_name))
2 changes: 1 addition & 1 deletion edc_offstudy/auths.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from edc_auth.auth_objects import (
from edc_auth.constants import (
AUDITOR_ROLE,
CLINICIAN_ROLE,
CLINICIAN_SUPER_ROLE,
Expand Down
6 changes: 3 additions & 3 deletions edc_offstudy/tests/consents.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from edc_consent import site_consents
from edc_consent.consent_definition import ConsentDefinition
from edc_constants.constants import FEMALE, MALE
from edc_protocol import Protocol
from edc_protocol.research_protocol_config import ResearchProtocolConfig

consent_v1 = ConsentDefinition(
"edc_offstudy.subjectconsent",
version="1",
start=Protocol().study_open_datetime,
end=Protocol().study_close_datetime,
start=ResearchProtocolConfig().study_open_datetime,
end=ResearchProtocolConfig().study_close_datetime,
age_min=18,
age_is_adult=18,
age_max=64,
Expand Down
31 changes: 19 additions & 12 deletions runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
BASE_DIR=base_dir,
APP_NAME=app_name,
ETC_DIR=str(base_dir / app_name / "tests" / "etc"),
SILENCED_SYSTEM_CHECKS=[
"sites.E101",
"edc_navbar.E002",
"edc_navbar.E003",
"edc_consent.E001",
],
SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit",
SUBJECT_VISIT_MISSED_MODEL="edc_appointment.subjectvisitmissed",
EDC_PROTOCOL_STUDY_OPEN_DATETIME=get_utcnow() - relativedelta(years=5),
Expand All @@ -33,23 +39,24 @@
"django_crypto_fields.apps.AppConfig",
"edc_action_item.apps.AppConfig",
"edc_appointment.apps.AppConfig",
"edc_consent.apps.AppConfig",
"edc_crf.apps.AppConfig",
"edc_list_data.apps.AppConfig",
"edc_notification.apps.AppConfig",
"edc_randomization.apps.AppConfig",
"edc_auth.apps.AppConfig",
"edc_data_manager.apps.AppConfig",
"edc_device.apps.AppConfig",
"edc_timepoint.apps.AppConfig",
"edc_protocol.apps.AppConfig",
"edc_registration.apps.AppConfig",
"edc_visit_schedule.apps.AppConfig",
"edc_lab.apps.AppConfig",
"edc_facility.apps.AppConfig",
"edc_form_runners.apps.AppConfig",
"edc_identifier.apps.AppConfig",
"edc_lab.apps.AppConfig",
"edc_label.apps.AppConfig",
"edc_locator.apps.AppConfig",
"edc_metadata.apps.AppConfig",
"edc_notification.apps.AppConfig",
"edc_offstudy.apps.AppConfig",
"edc_registration.apps.AppConfig",
"edc_sites.apps.AppConfig",
"edc_timepoint.apps.AppConfig",
"edc_visit_schedule.apps.AppConfig",
"edc_visit_tracking.apps.AppConfig",
"edc_facility.apps.AppConfig",
"edc_offstudy.apps.AppConfig",
"edc_appconfig.apps.AppConfig",
],
add_dashboard_middleware=True,
).settings
Expand Down

0 comments on commit 37b1fb4

Please sign in to comment.