meta-edc 0.3.6__py3-none-any.whl → 0.3.15__py3-none-any.whl

meta_auth/auth_objects.py

@@ -1,13 +1,20 @@
+from django.conf import settings
 from edc_auth.get_app_codenames import get_app_codenames
 
 clinic_codenames = get_app_codenames(
     "meta_prn", "meta_subject", "meta_consent", list_app="meta_lists"
 )
 
+add_perms = []
+if not settings.LIVE_SYSTEM:
+    add_perms = [
+        "meta_screening.add_screeningpartone",
+        "meta_screening.add_screeningpartthree",
+        "meta_screening.add_screeningparttwo",
+    ]
+
 screening_codenames = [
-    "meta_screening.add_screeningpartone",
-    "meta_screening.add_screeningpartthree",
-    "meta_screening.add_screeningparttwo",
+    *add_perms,
     "meta_screening.add_subjectrefusal",
     "meta_screening.change_screeningpartone",
     "meta_screening.change_screeningpartthree",

meta_consent/baker_recipes.py

@@ -5,13 +5,11 @@ from edc_utils import get_utcnow
 from faker import Faker
 from model_bakery.recipe import Recipe, seq
 
-from .models import SubjectConsent, SubjectReconsent
+from .models import SubjectConsent, SubjectConsentV1, SubjectReconsent
 
 fake = Faker()
 
-
-subjectconsent = Recipe(
-    SubjectConsent,
+opts = dict(
     assessment_score=YES,
     confirm_identity=seq("12315678"),
     consent_copy=YES,
@@ -35,6 +33,8 @@ subjectconsent = Recipe(
     user_created="erikvw",
     user_modified="erikvw",
 )
+subjectconsent = Recipe(SubjectConsent, **opts)
+subjectconsentv1 = Recipe(SubjectConsentV1, **opts)
 
 subjectreconsent = Recipe(
     SubjectReconsent,

meta_consent/consents.py

@@ -4,7 +4,7 @@ from edc_constants.constants import FEMALE, MALE
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
 
 consent_v1 = ConsentDefinition(
-    model="meta_consent.subjectconsentv1",
+    "meta_consent.subjectconsentv1",
     version="1",
     start=ResearchProtocolConfig().study_open_datetime,
     end=ResearchProtocolConfig().study_close_datetime,

meta_consent/migrations/0025_alter_historicalsubjectconsent_first_name_and_more.py

@@ -0,0 +1,151 @@
+# Generated by Django 4.2.11 on 2024-03-27 19:41
+
+import django.core.validators
+from django.db import migrations
+import django_crypto_fields.fields.encrypted_char_field
+import edc_consent.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_consent", "0024_historicalsubjectconsentv1"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubjectconsent",
+            name="first_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Use UPPERCASE letters only. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Ensure name consist of letters only in upper case",
+                        regex="^([A-Z]+$|[A-Z]+\\ [A-Z]+)$",
+                    )
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsent",
+            name="guardian_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Required only if participant is a minor.<BR>Format is 'LASTNAME, FIRSTNAME'. All uppercase separated by a comma. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[edc_consent.validators.FullNameValidator()],
+                verbose_name="Guardian's last and first name",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsent",
+            name="last_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Use UPPERCASE letters only. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Ensure name consist of letters only in upper case",
+                        regex="^([A-Z]+$|[A-Z]+\\ [A-Z]+)$",
+                    )
+                ],
+                verbose_name="Surname",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsentv1",
+            name="first_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Use UPPERCASE letters only. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Ensure name consist of letters only in upper case",
+                        regex="^([A-Z]+$|[A-Z]+\\ [A-Z]+)$",
+                    )
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsentv1",
+            name="guardian_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Required only if participant is a minor.<BR>Format is 'LASTNAME, FIRSTNAME'. All uppercase separated by a comma. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[edc_consent.validators.FullNameValidator()],
+                verbose_name="Guardian's last and first name",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalsubjectconsentv1",
+            name="last_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Use UPPERCASE letters only. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Ensure name consist of letters only in upper case",
+                        regex="^([A-Z]+$|[A-Z]+\\ [A-Z]+)$",
+                    )
+                ],
+                verbose_name="Surname",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectconsent",
+            name="first_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Use UPPERCASE letters only. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Ensure name consist of letters only in upper case",
+                        regex="^([A-Z]+$|[A-Z]+\\ [A-Z]+)$",
+                    )
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectconsent",
+            name="guardian_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Required only if participant is a minor.<BR>Format is 'LASTNAME, FIRSTNAME'. All uppercase separated by a comma. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[edc_consent.validators.FullNameValidator()],
+                verbose_name="Guardian's last and first name",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subjectconsent",
+            name="last_name",
+            field=django_crypto_fields.fields.encrypted_char_field.EncryptedCharField(
+                blank=True,
+                help_text="Use UPPERCASE letters only. (Encryption: RSA local)",
+                max_length=71,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Ensure name consist of letters only in upper case",
+                        regex="^([A-Z]+$|[A-Z]+\\ [A-Z]+)$",
+                    )
+                ],
+                verbose_name="Surname",
+            ),
+        ),
+    ]

meta_consent/models/signals.py

@@ -14,12 +14,13 @@ from meta_subject.models import SubjectVisit
 
 from ..action_items import ReconsentAction
 from .subject_consent import SubjectConsent
+from .subject_consent_v1 import SubjectConsentV1
 
 
 @receiver(
     post_save,
     weak=False,
-    sender=SubjectConsent,
+    sender=SubjectConsentV1,
     dispatch_uid="subject_consent_on_post_save",
 )
 def subject_consent_on_post_save(sender, instance, raw, created, **kwargs):
@@ -85,23 +86,25 @@ def subject_consent_on_post_save(sender, instance, raw, created, **kwargs):
 @receiver(
     post_delete,
     weak=False,
-    sender=SubjectConsent,
     dispatch_uid="subject_consent_on_post_delete",
 )
 def subject_consent_on_post_delete(sender, instance, using, **kwargs):
     """Updates/Resets subject screening."""
     # don't allow if subject visits exist. This should be caught
     # in the ModelAdmin delete view
-    if SubjectVisit.objects.filter(subject_identifier=instance.subject_identifier).exists():
-        raise ValidationError("Unable to delete consent. Visit data exists.")
+    if sender in [SubjectConsent, SubjectConsentV1]:
+        if SubjectVisit.objects.filter(
+            subject_identifier=instance.subject_identifier
+        ).exists():
+            raise ValidationError("Unable to delete consent. Visit data exists.")
 
-    _, schedule = site_visit_schedules.get_by_onschedule_model("meta_prn.onschedule")
-    schedule.take_off_schedule(instance.subject_identifier, instance.consent_datetime)
+        _, schedule = site_visit_schedules.get_by_onschedule_model("meta_prn.onschedule")
+        schedule.take_off_schedule(instance.subject_identifier, instance.consent_datetime)
 
-    # update subject screening
-    subject_screening = SubjectScreening.objects.get(
-        screening_identifier=instance.screening_identifier
-    )
-    subject_screening.consented = False
-    subject_screening.subject_identifier = subject_screening.subject_screening_as_pk
-    subject_screening.save()
+        # update subject screening
+        subject_screening = SubjectScreening.objects.get(
+            screening_identifier=instance.screening_identifier
+        )
+        subject_screening.consented = False
+        subject_screening.subject_identifier = subject_screening.subject_screening_as_pk
+        subject_screening.save()

meta_consent/models/subject_consent_v1.py

@@ -1,15 +1,13 @@
 from edc_consent.managers import ConsentObjectsByCdefManager, CurrentSiteByCdefManager
 from edc_model.models import HistoricalRecords
 
-from meta_consent.models import SubjectConsent
+from .subject_consent import SubjectConsent
 
 
 class SubjectConsentV1(SubjectConsent):
 
     objects = ConsentObjectsByCdefManager()
-
     on_site = CurrentSiteByCdefManager()
-
     history = HistoricalRecords()
 
     class Meta:

meta_consent/tests/tests/test_form_validators.py

@@ -7,7 +7,7 @@ from edc_consent.constants import HOSPITAL_NUMBER
 from edc_constants.constants import FEMALE
 from edc_utils.date import get_utcnow
 
-from meta_consent.forms import SubjectConsentFormValidator
+from meta_consent.form_validators import SubjectConsentFormValidator
 from meta_screening.tests.meta_test_case_mixin import MetaTestCaseMixin
 
 

meta_dashboard/templates/meta_dashboard/bootstrap3/screening/listboard.html

@@ -3,12 +3,12 @@
 {% load edc_dashboard_extras edc_subject_dashboard_extras meta_dashboard_extras %}
 
 {% block listboard_panel %}
-
+    {# screening is now disabled for live systems #}
     <a id="subjectscreening_add"
         title="{% if perms.meta_screening.add_screeningpartone %}add screening{% else %}check your permissions{% endif %}"
         class="btn btn-sm btn-default" role="button"
-        {% if not perms.meta_screening.add_screeningpartone %}disabled{% endif %}
-        href="{% if perms.meta_screening.add_screeningpartone %}{{ subject_screening_add_url }}?next={{ screening_listboard_url }}{% endif %}">
+        {% if not perms.meta_screening.add_screeningpartone or not LIVE_SYSTEM %}disabled href="#"{% else %}
+        href="{% if perms.meta_screening.add_screeningpartone %}{{ subject_screening_add_url }}?next={{ screening_listboard_url }}{% endif %}"{% endif %}>
             <i class="fas fa-plus fa-sm"></i> Add Subject Screening {% if meta_version == 3 %}(META3){% endif %}
     </a>
 
@@ -51,7 +51,7 @@
 
 
 {% block listboard_table_columns %}
-    <td>{{ result.human_readable_identifier }} </td>
+    <td>{{ result.human_readable_identifier }}</td>
     <td nowrap>
         {% if result.repeat_glucose_performed == 'PENDING' %}
             {% if result.repeat_due_in_days < 3 %}

meta_dashboard/templates/meta_dashboard/bootstrap3/subject/listboard.html

@@ -26,8 +26,7 @@
 {% endblock listboard_table_button_column %}
 
 {% block listboard_table_columns %}
-    <td>{{ result.subject_identifier }}
-    </td>
+    <td>{{ result.subject_identifier }}</td>
     <td>
        {% if result.gender == MALE %}
            <i class="fas fa-male fa-lg"></i>

meta_edc/settings/debug.py

@@ -8,22 +8,22 @@ print(f"Settings file {__file__}")
 
 # TZ Sites:
 # SITE_ID = SiteID(default=20)  # Amana
-# SITE_ID = SiteID(default=10)  # Hindu Mandal
+SITE_ID = SiteID(default=10)  # Hindu Mandal
 # SITE_ID = SiteID(default=40)  # Mwananyamala
 # SITE_ID = SiteID(default=50)  # Mbagala
 # SITE_ID = SiteID(default=60)  # Mnazi-Moja
-SITE_ID = SiteID(default=30)  # Temeke
-
+# SITE_ID = SiteID(default=30)  # Temeke
+INDEX_PAGE = "http://localhost:8000"
 EDC_SITES_UAT_DOMAIN = False
 DEBUG = True
 ALLOWED_HOSTS = [
     "localhost",
-    "mnazi-moja.tz.meta3.clinicedc.org",
-    "mbagala.tz.meta3.clinicedc.org",
-    "mwananyamala.tz.meta3.clinicedc.org",
-    "hindu-mandal.tz.meta3.clinicedc.org",
-    "temeke.tz.meta3.clinicedc.org",
-    "amana.tz.meta3.clinicedc.org",
+    "mnazi-moja.tz.meta4.clinicedc.org",
+    "mbagala.tz.meta4.clinicedc.org",
+    "mwananyamala.tz.meta4.clinicedc.org",
+    "hindu-mandal.tz.meta4.clinicedc.org",
+    "temeke.tz.meta4.clinicedc.org",
+    "amana.tz.meta4.clinicedc.org",
 ]
 
 SECURE_SSL_REDIRECT = False

meta_edc/settings/defaults.py

@@ -16,7 +16,6 @@ env = environ.Env(
     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),
@@ -31,13 +30,9 @@ 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",
 )
 
-DEBUG = env("DJANGO_DEBUG")
-
-if LOGGING_ENABLED := env("DJANGO_LOGGING_ENABLED"):
-    from .logging import *  # noqa
-
 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)
 
@@ -52,8 +47,15 @@ else:
         )
     env.read_env(os.path.join(ENV_DIR, ".env"))
 
+
+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")
@@ -66,8 +68,9 @@ ETC_DIR = env.str("DJANGO_ETC_FOLDER")
 
 TEST_DIR = os.path.join(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
 
@@ -86,8 +89,8 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "django.contrib.sites",
+    "multisite.apps.AppConfig",
     "defender",
-    "multisite",
     "fontawesomefree",
     "django_crypto_fields.apps.AppConfig",
     "django_revision.apps.AppConfig",
@@ -99,6 +102,7 @@ INSTALLED_APPS = [
     "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",
@@ -146,7 +150,6 @@ INSTALLED_APPS = [
     "edc_timepoint.apps.AppConfig",
     "edc_unblinding.apps.AppConfig",
     "edc_form_describer.apps.AppConfig",
-    "edc_adherence.apps.AppConfig",
     "edc_dx.apps.AppConfig",
     "meta_consent.apps.AppConfig",
     "meta_data_manager.apps.AppConfig",
@@ -173,6 +176,7 @@ 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",
@@ -238,12 +242,11 @@ 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"
@@ -292,13 +295,11 @@ USE_TZ = True
 
 LANG_INFO = dict(django.conf.locale.LANG_INFO, **EXTRA_LANG_INFO)
 django.conf.locale.LANG_INFO = LANG_INFO
-LANGUAGE_CODE = "en"
+
+LANGUAGE_CODE = "en-gb"
 LANGUAGE_LIST = ["sw", "en-gb", "en", "mas"]
 LANGUAGES = [(code, LANG_INFO[code]["name"]) for code in LANGUAGE_LIST]
 
-
-# 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"),)
 TIME_ZONE = env.str("DJANGO_TIME_ZONE")
 DATE_INPUT_FORMATS = ["%Y-%m-%d", "%d/%m/%Y"]
 DATETIME_INPUT_FORMATS = [
@@ -355,8 +356,9 @@ 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_BLOOD_RESULTS_MODEL_APP_LABEL = "meta_subject"
+EDC_DASHBOARD_APP_LABEL = "meta_dashboard"
 EDC_NAVBAR_DEFAULT = env("EDC_NAVBAR_DEFAULT")
 
 # dashboards
@@ -406,8 +408,10 @@ EDC_RANDOMIZATION_SKIP_VERIFY_CHECKS = True
 EDC_SITES_MODULE_NAME = env.str("EDC_SITES_MODULE_NAME")
 
 # 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
@@ -469,6 +473,9 @@ DATA_DICTIONARY_APP_LABELS = [
     "edc_offstudy",
 ]
 
+# edc_form_runners
+EDC_FORM_RUNNERS_ENABLED = False
+
 # edc_protocol
 EDC_PROTOCOL = env.str("EDC_PROTOCOL")
 EDC_PROTOCOL_INSTITUTION_NAME = env.str("EDC_PROTOCOL_INSTITUTION_NAME")

meta_edc/settings/live.py

@@ -4,16 +4,8 @@ from .defaults import *  # noqa
 
 print(f"Settings file {__file__}")
 
-
 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"

meta_edc/settings/uat.py

@@ -1,24 +1,11 @@
-from importlib.metadata import version
-
 from multisite import SiteID
 
 from .defaults import *  # noqa
 
 print(f"Settings file {__file__}")
-print(f"Version: {version('meta_edc')}")
 
 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/home.html

@@ -4,7 +4,7 @@
 {% block main %}
 
 <style>
-
+a { cursor: pointer; }
 .bg-1 {
     background-color: #428bca; /* dark blue */
     color: #ffffff;
@@ -21,8 +21,8 @@
 </style>
 
 {{ block.super }}
-
-
+<form id="switch_sites_form" method="post" action="{% url 'switch_sites_url' %}">{% csrf_token %}</form>
+<form id="logout_form" method="post" action="{% url 'edc_auth_admin:logout' %}">{% csrf_token %}</form>
 
 <div class="row">
 
@@ -62,8 +62,11 @@
       {% if perms.edc_export %}
         <a href="{% url 'edc_export:home_url' %}" class="list-group-item"><i class="fas fa-file-export fa-lg fa-fw"></i>&nbsp;&nbsp;&nbsp;Export data</a>
       {% endif %}
-        <a href="/switch_sites/" class="list-group-item"><i class="fas fa-arrows-alt fa-lg fa-fw"></i>&nbsp;&nbsp;&nbsp;Switch sites</a>
-        <a href="{% url 'edc_auth_admin:logout' %}" class="list-group-item"><i class="fas fa-sign-out-alt fa-lg fa-fw"></i>&nbsp;&nbsp;&nbsp;Log out</a>
+      {% if perms.edc_auth.change_userprofile %}
+        <a href="{% url 'edc_auth:home_url' %}" class="list-group-item"><i class="fas fa-users fa-lg fa-fw"></i>&nbsp;&nbsp;&nbsp;Account Management</a>
+      {% endif %}
+        <a onclick="document.getElementById('switch_sites_form').submit();" class="list-group-item" title="{% url 'switch_sites_url' %}"><i class="fas fa-arrows-alt fa-lg fa-fw"></i>&nbsp;&nbsp;&nbsp;Switch sites</a>
+        <a onclick="document.getElementById('logout_form').submit();" class="list-group-item" title="{% url 'edc_auth_admin:logout' %}"><i class="fas fa-sign-out-alt fa-lg fa-fw"></i>&nbsp;&nbsp;&nbsp;Log out</a>
       </div>
     </div>
   </div>