meta-edc 0.2.24__py3-none-any.whl → 1.4.0__py3-none-any.whl

meta_edc/settings/defaults.py

@@ -1,25 +1,24 @@
 import os
 import sys
+from importlib.metadata import version
 from pathlib import Path
+from urllib.parse import quote, urljoin
 
+import django
 import environ
-from edc_appointment.constants import SCHEDULED_APPT, UNSCHEDULED_APPT
-from edc_constants.constants import COMPLETE
+from clinicedc_constants import COMPLETE
+from edc_constants.internationalization import EXTRA_LANG_INFO
 from edc_protocol_incident.constants import PROTOCOL_INCIDENT
 from edc_utils import get_datetime_from_env
 
-BASE_DIR = str(Path(os.path.dirname(os.path.abspath(__file__))).parent.parent)
-ENV_DIR = str(Path(os.path.dirname(os.path.abspath(__file__))).parent.parent)
 env = environ.Env(
     AWS_ENABLED=(bool, False),
     CDN_ENABLED=(bool, False),
     CELERY_ENABLED=(bool, False),
     DATABASE_SQLITE_ENABLED=(bool, False),
     DJANGO_AUTO_CREATE_KEYS=(bool, False),
-    DJANGO_CRYPTO_FIELDS_TEMP_PATH=(bool, False),
     DJANGO_CSRF_COOKIE_SECURE=(bool, True),
     DJANGO_DEBUG=(bool, False),
-    DJANGO_EDC_BOOTSTRAP=(int, 3),
     DJANGO_EMAIL_ENABLED=(bool, False),
     DJANGO_EMAIL_USE_TLS=(bool, True),
     DJANGO_LIVE_SYSTEM=(bool, False),
@@ -31,35 +30,69 @@ env = environ.Env(
     EDC_RANDOMIZATION_REGISTER_DEFAULT_RANDOMIZER=(bool, True),
     EDC_LABEL_BROWSER_PRINT_PAGE_AUTO_BACK=(bool, True),
     TWILIO_ENABLED=(bool, False),
+    EDC_SITES_DOMAIN_SUFFIX="meta4.clinicedc.org",
 )
+if os.getenv("DJANGO_BASE_DIR"):
+    # for deployed systems where meta-edc is pip installed.
+    # same dir as manage.py
+    BASE_DIR = Path(os.getenv("DJANGO_BASE_DIR"))
+else:
+    # when running from a repo
+    BASE_DIR = Path(__file__).resolve().parent.parent.parent.parent
+
+if os.getenv("DJANGO_ENV_DIR"):
+    ENV_DIR = Path(os.getenv("DJANGO_ENV_DIR"))
+else:
+    ENV_DIR = Path(__file__).resolve().parent.parent.parent.parent
 
 # copy your .env file from .envs/ to BASE_DIR
 if "test" in sys.argv:
-    env.read_env(os.path.join(ENV_DIR, ".env-tests"))
-    print(f"Reading env from {os.path.join(BASE_DIR, '.env-tests')}")
+    env.read_env(ENV_DIR / ".env-tests")
+    print(f"Reading env from {(BASE_DIR / '.env-tests')}")  # noqa
 else:
-    if not os.path.exists(os.path.join(ENV_DIR, ".env")):
-        raise FileExistsError(
-            f"Environment file does not exist. Got `{os.path.join(ENV_DIR, '.env')}`"
-        )
-    env.read_env(os.path.join(ENV_DIR, ".env"))
+    if not (ENV_DIR / ".env").exists():
+        raise FileExistsError(f"Environment file does not exist. Got `{(ENV_DIR / '.env')}`")
+    env.read_env(ENV_DIR / ".env")
+
+# django_revision
+GIT_DIR = Path(env.str("EDC_REVISION_GIT_DIR", default=BASE_DIR))
+
+# django_crypto_fields
+KEY_PATH = env.str("DJANGO_KEY_FOLDER")
+AUTO_CREATE_KEYS = env("DJANGO_AUTO_CREATE_KEYS")
+
+EXPORT_FOLDER = env.str("DJANGO_EXPORT_FOLDER") or Path("~/").expanduser()
+
+
+LOGGING_ENABLED = env("DJANGO_LOGGING_ENABLED")
+if LOGGING_ENABLED:
+    from .logging import *  # noqa
 
 META_PHASE = 3
 
+EDC_SITES_DOMAIN_SUFFIX = env.str("EDC_SITES_DOMAIN_SUFFIX")  # "meta4.clinicedc.org"
+
 DEBUG = env("DJANGO_DEBUG")
 
 SECRET_KEY = env.str("DJANGO_SECRET_KEY")
 
 APP_NAME = env.str("DJANGO_APP_NAME")
 
+DJANGO_REVISION_IGNORE_WORKING_DIR = env.str("DJANGO_REVISION_IGNORE_WORKING_DIR")
+if DJANGO_REVISION_IGNORE_WORKING_DIR:
+    # get the version from the package and not a git tag
+    # this overrides django_revision
+    REVISION = version(APP_NAME)
+
 LIVE_SYSTEM = env.str("DJANGO_LIVE_SYSTEM")
 
 ETC_DIR = env.str("DJANGO_ETC_FOLDER")
 
-TEST_DIR = os.path.join(BASE_DIR, APP_NAME, "tests")
+TEST_DIR = BASE_DIR / APP_NAME / "tests"
 
-# INTERNAL_IPS = ["127.0.0.1"]
-ALLOWED_HOSTS = ["*"]  # env.list('DJANGO_ALLOWED_HOSTS')
+ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS")
+
+META3_DOMAIN_SUFFIX = "meta4.clinicedc.org"
 
 ENFORCE_RELATED_ACTION_ITEM_EXISTS = False
 
@@ -68,7 +101,6 @@ DEFAULT_APPOINTMENT_TYPE = "hospital"
 LOGIN_URL = "/accounts/login/"
 LOGOUT_REDIRECT_URL = "/accounts/login/"
 
-SENTRY_ENABLED = env("SENTRY_ENABLED")
 DEFENDER_ENABLED = env("DEFENDER_ENABLED")
 
 INSTALLED_APPS = [
@@ -79,21 +111,31 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "django.contrib.sites",
+    "multisite.apps.AppConfig",
     "defender",
-    "multisite",
+    "sequences.apps.SequencesConfig",
+    # "django_celery_beat",
+    # "django_celery_results",
+    "django_db_views",
     "fontawesomefree",
+    "rangefilter",
     "django_crypto_fields.apps.AppConfig",
     "django_revision.apps.AppConfig",
-    "django_extensions",
+    # "django_extensions",
     "logentry_admin",
     "simple_history",
     "storages",
+    "django_pylabels.apps.AppConfig",
+    "edc_pylabels.apps.AppConfig",
+    "edc_sites.apps.AppConfig",
     "edc_action_item.apps.AppConfig",
     "edc_appointment.apps.AppConfig",
     "edc_auth.apps.AppConfig",
+    "edc_adherence.apps.AppConfig",
     "edc_adverse_event.apps.AppConfig",
     "edc_consent.apps.AppConfig",
     "edc_crf.apps.AppConfig",
+    "edc_he.apps.AppConfig",
     "edc_reportable.apps.AppConfig",
     "edc_lab.apps.AppConfig",
     "edc_visit_schedule.apps.AppConfig",
@@ -105,6 +147,7 @@ INSTALLED_APPS = [
     "edc_export.apps.AppConfig",
     "edc_facility.apps.AppConfig",
     "edc_fieldsets.apps.AppConfig",
+    "edc_form_runners.apps.AppConfig",
     "edc_form_validators.apps.AppConfig",
     "edc_lab_dashboard.apps.AppConfig",
     "edc_label.apps.AppConfig",
@@ -125,29 +168,26 @@ INSTALLED_APPS = [
     "edc_protocol.apps.AppConfig",
     "edc_protocol_incident.apps.AppConfig",
     "edc_prn.apps.AppConfig",
+    "edc_qareports.apps.AppConfig",
     "edc_qol.apps.AppConfig",
     "edc_randomization.apps.AppConfig",
-    "edc_reference.apps.AppConfig",
     "edc_refusal.apps.AppConfig",
     "edc_registration.apps.AppConfig",
     "edc_pdf_reports.apps.AppConfig",
     "edc_review_dashboard.apps.AppConfig",
     "edc_screening.apps.AppConfig",
-    "edc_sites.apps.AppConfig",
     "edc_subject_dashboard.apps.AppConfig",
     "edc_timepoint.apps.AppConfig",
     "edc_unblinding.apps.AppConfig",
     "edc_form_describer.apps.AppConfig",
-    "edc_adherence.apps.AppConfig",
     "edc_dx.apps.AppConfig",
-    "canned_views.apps.AppConfig",
     "meta_consent.apps.AppConfig",
     "meta_data_manager.apps.AppConfig",
     "meta_lists.apps.AppConfig",
     "meta_dashboard.apps.AppConfig",
     "meta_labs.apps.AppConfig",
-    "meta_reference.apps.AppConfig",
     "meta_subject.apps.AppConfig",
+    "meta_reports.apps.AppConfig",
     "meta_visit_schedule.apps.AppConfig",
     "meta_ae.apps.AppConfig",
     "meta_auth.apps.AppConfig",
@@ -157,7 +197,9 @@ INSTALLED_APPS = [
     "meta_pharmacy.apps.AppConfig",
     "meta_screening.apps.AppConfig",
     "meta_sites.apps.AppConfig",
+    "meta_spfq.apps.AppConfig",
     "meta_edc.apps.AppConfig",
+    "edc_appconfig.apps.AppConfig",
 ]
 
 if not DEFENDER_ENABLED:
@@ -166,11 +208,13 @@ if not DEFENDER_ENABLED:
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
     "django.middleware.common.CommonMiddleware",
     "multisite.middleware.DynamicSiteMiddleware",
     "django.contrib.sites.middleware.CurrentSiteMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.auth.middleware.LoginRequiredMiddleware",
     "defender.middleware.FailedLoginMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
@@ -181,13 +225,13 @@ if not DEFENDER_ENABLED:
 
 MIDDLEWARE.extend(
     [
+        "edc_protocol.middleware.ResearchProtocolConfigMiddleware",
         "edc_dashboard.middleware.DashboardMiddleware",
         "edc_subject_dashboard.middleware.DashboardMiddleware",
         "edc_lab_dashboard.middleware.DashboardMiddleware",
         "edc_adverse_event.middleware.DashboardMiddleware",
         "edc_listboard.middleware.DashboardMiddleware",
         "edc_review_dashboard.middleware.DashboardMiddleware",
-        # 'simple_history.middleware.HistoryRequestMiddleware'
     ]
 )
 
@@ -217,7 +261,7 @@ if env("DATABASE_SQLITE_ENABLED"):
     DATABASES = {
         "default": {
             "ENGINE": "django.db.backends.sqlite3",
-            "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+            "NAME": BASE_DIR / "db.sqlite3",
         }
     }
 
@@ -231,19 +275,17 @@ if env.str("DJANGO_CACHE") == "redis":
         "default": {
             "BACKEND": "django_redis.cache.RedisCache",
             "LOCATION": "redis://127.0.0.1:6379/1",
-            # "LOCATION": "unix://[:{DJANGO_REDIS_PASSWORD}]@/path/to/socket.sock?db=0",
             "OPTIONS": {
                 "CLIENT_CLASS": "django_redis.client.DefaultClient",
                 "PASSWORD": env.str("DJANGO_REDIS_PASSWORD"),
             },
-            "KEY_PREFIX": f"{APP_NAME}",
+            "KEY_PREFIX": env.str("DJANGO_REDIS_KEY_PREFIX", default=APP_NAME),
         }
     }
     SESSION_ENGINE = "django.contrib.sessions.backends.cache"
     SESSION_CACHE_ALIAS = "default"
     DJANGO_REDIS_IGNORE_EXCEPTIONS = True
     DJANGO_REDIS_LOG_IGNORED_EXCEPTIONS = True
-
 elif env.str("DJANGO_CACHE") == "memcached":
     CACHES = {
         "default": {
@@ -279,11 +321,23 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
 
-USE_I18N = False  # disable trans
-USE_L10N = False  # set to False so DATE formats below are used
+USE_I18N = True  # disable trans
+USE_L10N = True  # set to False so DATE formats below are used
 USE_TZ = True
-LANGUAGE_CODE = env.str("DJANGO_LANGUAGE_CODE")  # ignored if USE_L10N = False
-LANGUAGES = [x.split(":") for x in env.list("DJANGO_LANGUAGES")] or (("en", "English"),)
+
+
+LANG_INFO = dict(django.conf.locale.LANG_INFO, **EXTRA_LANG_INFO)
+django.conf.locale.LANG_INFO = LANG_INFO
+
+LANGUAGE_CODE = "en-gb"
+LANGUAGE_LIST = ["sw", "en-gb", "en", "mas"]
+LANGUAGES = [(code, LANG_INFO[code]["name"]) for code in LANGUAGE_LIST]
+
+# LOCALE_PATHS = [
+#     base_dir / "locale",
+#     base_dir.parent / "edc-pharmacy" / "edc_pharmacy" / "locale",
+# ]
+
 TIME_ZONE = env.str("DJANGO_TIME_ZONE")
 DATE_INPUT_FORMATS = ["%Y-%m-%d", "%d/%m/%Y"]
 DATETIME_INPUT_FORMATS = [
@@ -308,10 +362,7 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 EXPORT_FILENAME_TIMESTAMP_FORMAT = "%Y%m%d"
 
 # django_revision
-with open(os.path.join(os.path.dirname(os.path.join(BASE_DIR, APP_NAME)), "VERSION")) as f:
-    REVISION = f.read().strip()
-
-# EDC_AUTH_SKIP_AUTH_UPDATER = True
+REVISION = version(APP_NAME)
 
 # enforce https if DEBUG=False!
 # Note: will cause "CSRF verification failed. Request aborted"
@@ -321,7 +372,6 @@ if not DEBUG:
     CSRF_COOKIE_SECURE = env.str("DJANGO_CSRF_COOKIE_SECURE")
     SECURE_PROXY_SSL_HEADER = env.tuple("DJANGO_SECURE_PROXY_SSL_HEADER")
     SESSION_COOKIE_SECURE = env.str("DJANGO_SESSION_COOKIE_SECURE")
-
     # other security defaults
     SECURE_SSL_REDIRECT = True
     SECURE_HSTS_SECONDS = 31_536_000
@@ -330,8 +380,8 @@ if not DEBUG:
     SECURE_BROWSER_XSS_FILTER = True
 
 # edc_lab and label
-LABEL_TEMPLATE_FOLDER = env.str("DJANGO_LABEL_TEMPLATE_FOLDER") or os.path.join(
-    BASE_DIR, "label_templates", "2.25x1.25in"
+LABEL_TEMPLATE_FOLDER = env.str("DJANGO_LABEL_TEMPLATE_FOLDER") or (
+    BASE_DIR / "label_templates" / "2.25x1.25in"
 )
 CUPS_SERVERS = env.dict("DJANGO_CUPS_SERVERS")
 
@@ -343,13 +393,13 @@ SUBJECT_REQUISITION_MODEL = env.str("EDC_SUBJECT_REQUISITION_MODEL")
 SUBJECT_VISIT_MODEL = env.str("EDC_SUBJECT_VISIT_MODEL")
 SUBJECT_VISIT_MISSED_MODEL = env.str("EDC_SUBJECT_VISIT_MISSED_MODEL")
 SUBJECT_VISIT_MISSED_REASONS_MODEL = env.str("EDC_SUBJECT_VISIT_MISSED_REASONS_MODEL")
+SUBJECT_REFUSAL_MODEL = env.str("EDC_SUBJECT_REFUSAL_MODEL")
 
 EDC_BLOOD_RESULTS_MODEL_APP_LABEL = "meta_subject"
-
+EDC_DASHBOARD_APP_LABEL = "meta_dashboard"
 EDC_NAVBAR_DEFAULT = env("EDC_NAVBAR_DEFAULT")
 
 # dashboards
-EDC_BOOTSTRAP = env("DJANGO_EDC_BOOTSTRAP")
 DASHBOARD_URL_NAMES = env.dict("DJANGO_DASHBOARD_URL_NAMES")
 DASHBOARD_BASE_TEMPLATES = env.dict("DJANGO_DASHBOARD_BASE_TEMPLATES")
 LAB_DASHBOARD_BASE_TEMPLATES = env.dict("DJANGO_LAB_DASHBOARD_BASE_TEMPLATES")
@@ -361,6 +411,9 @@ EDC_DX_LABELS = dict(hiv="HIV", dm="Diabetes", htn="Hypertension", chol="High Ch
 # edc-egfr
 EDC_EGFR_DROP_NOTIFICATION_MODEL = "meta_subject.egfrdropnotification"
 
+# edc-export
+EDC_EXPORT_EXPORT_PII_USERS = env.list("EDC_EXPORT_EXPORT_PII_USERS")
+
 # edc_facility
 HOLIDAY_FILE = env.str("DJANGO_HOLIDAY_FILE")
 
@@ -369,11 +422,25 @@ EDC_LABEL_BROWSER_PRINT_PAGE_AUTO_BACK = env("EDC_LABEL_BROWSER_PRINT_PAGE_AUTO_
 
 # edc_model_admin
 EDC_MODEL_ADMIN_CSS_THEME = "edc_indigo"
+EDC_MODEL_ADMIN_SAVE_DELAY = 3000
+
 # edc-mnsi
 EDC_MNSI_MODEL = "meta_subject.mnsi"
 
 EDC_OFFSTUDY_OFFSTUDY_MODEL = "meta_prn.endofstudy"
 
+# edc-pharmacy
+EDC_PDF_REPORTS_WATERMARK_WORD = env.str("EDC_PDF_REPORTS_WATERMARK_WORD")
+EDC_PDF_REPORTS_WATERMARK_FONT = env.str("EDC_PDF_REPORTS_WATERMARK_FONT")
+EDC_PDF_REPORTS_WATERMARK_FONTSIZE = env.int("EDC_PDF_REPORTS_WATERMARK_FONTSIZE")
+EDC_PHARMACY_LABEL_WATERMARK_WORD = env.str("EDC_PHARMACY_LABEL_WATERMARK_WORD")
+if EDC_PDF_REPORTS_WATERMARK_FONT:
+    EDC_PDF_REPORTS_WATERMARK_FONT = (
+        EDC_PDF_REPORTS_WATERMARK_FONT,
+        EDC_PDF_REPORTS_WATERMARK_FONTSIZE,
+    )
+else:
+    EDC_PDF_REPORTS_WATERMARK_FONT = ()
 # edc-protocol-incident
 EDC_PROTOCOL_VIOLATION_TYPE = PROTOCOL_INCIDENT
 
@@ -391,16 +458,21 @@ EDC_RANDOMIZATION_SKIP_VERIFY_CHECKS = True
 # edc-sites
 EDC_SITES_MODULE_NAME = env.str("EDC_SITES_MODULE_NAME")
 
+# meta_pharmacy
+META_PHARMACY_RX_SUBSTITUTION_FILE = env.str("META_PHARMACY_RX_SUBSTITUTION_FILE")
+
 # django-multisite
-CACHE_MULTISITE_KEY_PREFIX = APP_NAME
+CACHE_MULTISITE_KEY_PREFIX = "meta4"
 SILENCED_SYSTEM_CHECKS = ["sites.E101"]
+MULTISITE_SYNC_ALIAS_MANUALLY = True
+MULTISITE_REGISTER_POST_MIGRATE_SYNC_ALIAS = False
 
 # django-defender
 # see if env.str("DJANGO_CACHE") == "redis" above
 # and that redis server is running
 DEFENDER_REDIS_NAME = "default"
 DEFENDER_LOCK_OUT_BY_IP_AND_USERNAME = True
-DEFENDER_LOCKOUT_TEMPLATE = "edc_auth/bootstrap3/login.html"
+DEFENDER_LOCKOUT_TEMPLATE = "edc_auth/login.html"
 DEFENDER_LOGIN_FAILURE_LIMIT = 5
 
 # edc_crf
@@ -423,22 +495,12 @@ if TWILIO_ENABLED:
     TWILIO_AUTH_TOKEN = env.str("TWILIO_AUTH_TOKEN")
     TWILIO_SENDER = env.str("TWILIO_SENDER")
 
-# django_revision
-GIT_DIR = BASE_DIR
-
-# django_crypto_fields
-KEY_PATH = env.str("DJANGO_KEY_FOLDER")
-AUTO_CREATE_KEYS = env("DJANGO_AUTO_CREATE_KEYS")
-
-EXPORT_FOLDER = env.str("DJANGO_EXPORT_FOLDER") or os.path.expanduser("~/")
-
 # django_simple_history
 SIMPLE_HISTORY_ENFORCE_HISTORY_MODEL_PERMISSIONS = True
 
 FQDN = env.str("DJANGO_FQDN")  # ???
 INDEX_PAGE = env.str("DJANGO_INDEX_PAGE")
 INDEX_PAGE_LABEL = env.str("DJANGO_INDEX_PAGE_LABEL")
-DJANGO_LOG_FOLDER = env.str("DJANGO_LOG_FOLDER")
 
 # edc_adverse_event
 ADVERSE_EVENT_ADMIN_SITE = env.str("EDC_ADVERSE_EVENT_ADMIN_SITE")
@@ -456,6 +518,12 @@ DATA_DICTIONARY_APP_LABELS = [
     "edc_offstudy",
 ]
 
+# edc_form_runners
+EDC_FORM_RUNNERS_ENABLED = False
+
+# edc_pdf_reports
+EDC_PDF_REPORTS_DRAW_LOGO = False
+
 # edc_protocol
 EDC_PROTOCOL = env.str("EDC_PROTOCOL")
 EDC_PROTOCOL_INSTITUTION_NAME = env.str("EDC_PROTOCOL_INSTITUTION_NAME")
@@ -470,7 +538,7 @@ EDC_PROTOCOL_STUDY_CLOSE_DATETIME = get_datetime_from_env(
 )
 EDC_PROTOCOL_TITLE = env.str("EDC_PROTOCOL_TITLE")
 
-# static
+# static / AWS
 if env("AWS_ENABLED"):
     # see
     # https://www.digitalocean.com/community/tutorials/
@@ -485,58 +553,36 @@ if env("AWS_ENABLED"):
     AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "max-age=86400"}
     AWS_LOCATION = env.str("AWS_LOCATION")
     AWS_IS_GZIPPED = True
-    STATICFILES_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
-    STATIC_URL = f"{os.path.join(AWS_S3_CUSTOM_DOMAIN, AWS_LOCATION)}/"
+    STORAGES = {"staticfiles": {"BACKEND": "storages.backends.s3boto3.S3Boto3Storage"}}
+    STATIC_URL = urljoin(AWS_S3_CUSTOM_DOMAIN, AWS_LOCATION) + "/"
     STATIC_ROOT = ""
 elif DEBUG:
     STATIC_URL = env.str("DJANGO_STATIC_URL")
-    STATIC_ROOT = os.path.expanduser("~/source/edc_source/meta-edc/static/")
-
+    STATIC_ROOT = Path("~/source/edc_source/meta-edc/static/").expanduser()
 else:
     # run collectstatic, check nginx LOCATION
     STATIC_URL = env.str("DJANGO_STATIC_URL")
     STATIC_ROOT = env.str("DJANGO_STATIC_ROOT")
 
-if env("DJANGO_LOGGING_ENABLED"):
-    from .logging import LOGGING  # noqa
-
 # CELERY
-# see docs on setting up the broker
 CELERY_ENABLED = env("CELERY_ENABLED")
 if CELERY_ENABLED:
-    CELERY_BROKER_USER = env.str("CELERY_BROKER_USER")
-    CELERY_BROKER_PASSWORD = env.str("CELERY_BROKER_PASSWORD")
-    CELERY_BROKER_HOST = env.str("CELERY_BROKER_HOST")
-    CELERY_BROKER_PORT = env.str("CELERY_BROKER_PORT")
-    if DEBUG:
-        CELERY_BROKER_VHOST = f"{APP_NAME}_debug"
-    elif LIVE_SYSTEM:
-        CELERY_BROKER_VHOST = f"{APP_NAME}_production"
-    else:
-        CELERY_BROKER_VHOST = f"{APP_NAME}_uat"
+    CELERY_CACHE_BACKEND = "default"
+    if env.str("DJANGO_REDIS_PASSWORD"):
         CELERY_BROKER_URL = (
-            f"amqp://{CELERY_BROKER_USER}:{CELERY_BROKER_PASSWORD}@"
-            f"{CELERY_BROKER_HOST}:{CELERY_BROKER_PORT}/{CELERY_BROKER_VHOST}"
+            f"redis://:{quote(env.str('DJANGO_REDIS_PASSWORD'), safe='')}@127.0.0.1:6379/0"
         )
-        DJANGO_CELERY_RESULTS_TASK_ID_MAX_LENGTH = 191
-        CELERY_RESULT_BACKEND = "django-db"
-        #     CELERY_QUEUES = (
-        #         Queue('high', Exchange('high'), routing_key='high'),
-        #         Queue('normal', Exchange('normal'), routing_key='normal'),
-        #         Queue('low', Exchange('low'), routing_key='low'),
-        #     )
-        #     CELERY_DEFAULT_QUEUE = 'normal'
-        #     CELERY_DEFAULT_EXCHANGE = 'normal'
-        #     CELERY_DEFAULT_ROUTING_KEY = 'normal'
-        #     CELERY_ROUTES = {
-        #         'edc_data_manager.tasks.*': {'queue': 'normal'},
-        #     }
-
-EDC_APPOINTMENT_APPT_REASON_CHOICES = (
-    (SCHEDULED_APPT, "Scheduled visit (study)"),
-    (UNSCHEDULED_APPT, "Routine / Unscheduled (non-study)"),
-)
-
+        CELERY_RESULT_BACKEND = (
+            f"redis://:{quote(env.str('DJANGO_REDIS_PASSWORD'), safe='')}@127.0.0.1:6379/0"
+        )
+    else:
+        CELERY_BROKER_URL = "redis://127.0.0.1:6379/0"
+        CELERY_RESULT_BACKEND = "redis://localhost:6379/0"
+    # CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers.DatabaseScheduler"
+    CELERY_ACCEPT_CONTENT = ["json"]
+    CELERY_TASK_SERIALIZER = "json"
+    CELERY_RESULT_SERIALIZER = "json"
+    CELERY_TIMEZONE = "UTC"
 
 if "test" in sys.argv:
 
@@ -550,3 +596,8 @@ if "test" in sys.argv:
     MIGRATION_MODULES = DisableMigrations()
     PASSWORD_HASHERS = ("django.contrib.auth.hashers.MD5PasswordHasher",)
     DEFAULT_FILE_STORAGE = "inmemorystorage.InMemoryStorage"
+
+
+META_SPFQ_LIST_FILENAME = env.str("META_SPFQ_LIST_FILENAME")
+# edc_pdf_reports
+EDC_PDF_REPORTS_DRAW_LOGO = False

meta_edc/settings/live.py

@@ -1,19 +1,14 @@
+import sys
+
 from multisite import SiteID
 
 from .defaults import *  # noqa
 
-print(f"Settings file {__file__}")  # noqa
-
+sys.stdout.write(f"Settings file {__file__}\n")
 
 SITE_ID = SiteID(default=1)
 EDC_SITES_UAT_DOMAIN = False
-ALLOWED_HOSTS = [
-    "amana.tz.meta3.clinicedc.org",
-    "hindu-mandal.tz.meta3.clinicedc.org",
-    "mbagala.tz.meta3.clinicedc.org",
-    "mnazi-moja.tz.meta3.clinicedc.org",
-    "mwananyamala.tz.meta3.clinicedc.org",
-    "temeke.tz.meta3.clinicedc.org",
-]
 EDC_MODEL_ADMIN_CSS_THEME = "edc_indigo"
 LIVE_SYSTEM = True
+EDC_SITES_DOMAIN_SUFFIX = "meta4.clinicedc.org"
+AUTO_CREATE_KEYS = False

meta_edc/settings/logging.py

@@ -1,21 +1,28 @@
 # see http://www.simonkrueger.com/2015/05/27/logging-django-apps-to-syslog.html
-import os
+from pathlib import Path
 
 import environ
 
+__all__ = ["LOGGING", "LOGGING_FILE_LEVEL", "LOGGING_SYSLOG_LEVEL", "LOG_FOLDER"]
+
 env = environ.Env()
 env.read_env(".env")
 
-LOG_FOLDER = env.str("DJANGO_LOG_FOLDER")
+LOG_FOLDER = Path(env.str("DJANGO_LOG_FOLDER"))
 LOGGING_FILE_LEVEL = env.str("DJANGO_LOGGING_FILE_LEVEL")
 LOGGING_SYSLOG_LEVEL = env.str("DJANGO_LOGGING_SYSLOG_LEVEL")
 
+
 LOGGING = {
     "version": 1,
     "disable_existing_loggers": False,
     "filters": {
         "require_debug_false": {"()": "django.utils.log.RequireDebugFalse"},
         "require_debug_true": {"()": "django.utils.log.RequireDebugTrue"},
+        "ignore_specific_ip": {
+            "()": "edc_utils.logging_filters.IgnoreSpecificIPDisallowedHost",
+            "ip_to_ignore": "178.128.175.239",
+        },
     },
     "formatters": {
         "verbose": {
@@ -34,7 +41,7 @@ LOGGING = {
         "file": {
             "level": LOGGING_FILE_LEVEL,
             "class": "logging.FileHandler",
-            "filename": os.path.join(LOG_FOLDER, "edc.log"),
+            "filename": LOG_FOLDER / "edc.log",
             "formatter": "verbose",
         },
         "syslog": {

meta_edc/settings/minimal.py

@@ -1,21 +1,21 @@
 """
 A settings file with the bare minimum attributes.
 """
-import os
+
 from pathlib import Path
 
 import environ
 from multisite import SiteID
 
 APP_NAME = "meta_edc"
-BASE_DIR = str(Path(os.path.dirname(os.path.abspath(__file__))).parent.parent)
-ENV_DIR = str(Path(os.path.dirname(os.path.abspath(__file__))).parent.parent)
+BASE_DIR = Path(__file__).resolve().parent.parent
+ENV_DIR = Path(__file__).resolve().parent.parent
 
 env = environ.Env()
-env.read_env(os.path.join(ENV_DIR, ".env"))
+env.read_env(ENV_DIR / ".env")
 
 EDC_SITES_MODULE_NAME = env.str("EDC_SITES_MODULE_NAME")
 ETC_DIR = env.str("DJANGO_ETC_FOLDER")
-SECRET_KEY = "blahblahblah"  # nosec B105
+SECRET_KEY = "blahblahblah"  # noqa: S105
 ALLOWED_HOSTS = ["*"]
 SITE_ID = SiteID(default=1)  # 1 is not a site

meta_edc/settings/uat.py

@@ -1,22 +1,13 @@
+import sys
+
 from multisite import SiteID
 
 from .defaults import *  # noqa
 
-print(f"Settings file {__file__}")  # noqa
-
+sys.stdout.write(f"Settings file {__file__}\n")
 
 SITE_ID = SiteID(default=1)
 EDC_SITES_UAT_DOMAIN = True
-EDC_CONSENT_BYPASS_CONSENT_DATETIME_VALIDATION = True
-ALLOWED_HOSTS = [
-    "amana.uat.tz.meta3.clinicedc.org",
-    "hindu-mandal.uat.tz.meta3.clinicedc.org",
-    "mbagala.uat.tz.meta3.clinicedc.org",
-    "mnazi-moja.uat.tz.meta3.clinicedc.org",
-    "mwananyamala.uat.tz.meta3.clinicedc.org",
-    "temeke.uat.tz.meta3.clinicedc.org",
-]
-
-# edc_model_admin
 EDC_MODEL_ADMIN_CSS_THEME = "edc_purple"
 LIVE_SYSTEM = False
+EDC_CONSENT_BYPASS_CONSENT_DATETIME_VALIDATION = True

meta_edc/templates/meta_edc/{bootstrap3/base.html → base.html}

@@ -1,2 +1,2 @@
-{% extends 'edc_dashboard/bootstrap3/base.html' %}
+{% extends 'edc_dashboard/base.html' %}
 {% block footer %}{{ block.super }} {% comment %}META 2/3 base.html template{% endcomment %}{% endblock footer %}