From 24766010efa58778f15324974bd61d9822b04bed Mon Sep 17 00:00:00 2001 From: erikvw Date: Mon, 10 Jul 2023 13:26:42 -0500 Subject: [PATCH] move initials from base to peronalfieldsmixin --- .../field_mixins/personal_fields_mixin.py | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/edc_consent/field_mixins/personal_fields_mixin.py b/edc_consent/field_mixins/personal_fields_mixin.py index ac5af7a..5d9a226 100644 --- a/edc_consent/field_mixins/personal_fields_mixin.py +++ b/edc_consent/field_mixins/personal_fields_mixin.py @@ -15,17 +15,6 @@ class BaseFieldsMixin(models.Model): - initials = EncryptedCharField( - validators=[ - RegexValidator( - regex=r"^[A-Z]{2,3}$", - message="Ensure initials consist of letters only in upper case, no spaces.", - ) - ], - null=True, - blank=False, - ) - dob = models.DateField(verbose_name="Date of birth", null=True, blank=False) is_dob_estimated = IsDateEstimatedField( @@ -91,5 +80,16 @@ class PersonalFieldsMixin(CryptoMixin, BaseFieldsMixin, models.Model): help_text="Use UPPERCASE letters only.", ) + initials = EncryptedCharField( + validators=[ + RegexValidator( + regex=r"^[A-Z]{2,3}$", + message="Ensure initials consist of letters only in upper case, no spaces.", + ) + ], + null=True, + blank=False, + ) + class Meta: abstract = True