meta-edc 1.1.8__py3-none-any.whl → 1.1.12__py3-none-any.whl

meta_screening/forms/field_lists.py

@@ -1,6 +1,5 @@
-from typing import Tuple
 
-part_one_fields: Tuple[str, ...] = (
+part_one_fields: tuple[str, ...] = (
     "report_datetime",
     "screening_consent",
     "meta_phase_two",
@@ -22,7 +21,7 @@ part_one_fields: Tuple[str, ...] = (
 )
 
 
-part_two_fields: Tuple[str, ...] = (
+part_two_fields: tuple[str, ...] = (
     "part_two_report_datetime",
     "congestive_heart_failure",
     "liver_disease",
@@ -42,7 +41,7 @@ part_two_fields: Tuple[str, ...] = (
 )
 
 
-part_three_vitals_fields: Tuple[str, ...] = (
+part_three_vitals_fields: tuple[str, ...] = (
     "height",
     "weight",
     "sys_blood_pressure_one",
@@ -53,7 +52,7 @@ part_three_vitals_fields: Tuple[str, ...] = (
 )
 
 
-part_three_fbg_fields: Tuple[str, ...] = (
+part_three_fbg_fields: tuple[str, ...] = (
     "fasting",
     "fasting_duration_str",
     "fbg_datetime",
@@ -62,39 +61,39 @@ part_three_fbg_fields: Tuple[str, ...] = (
 )
 
 
-part_three_repeat_fbg_fields: Tuple[str, ...] = (
+part_three_repeat_fbg_fields: tuple[str, ...] = (
     "fbg2_datetime",
     "fbg2_value",
     "fbg2_units",
 )
 
-part_three_ogtt_fields: Tuple[str, ...] = (
+part_three_ogtt_fields: tuple[str, ...] = (
     "ogtt_base_datetime",
     "ogtt_datetime",
     "ogtt_value",
     "ogtt_units",
 )
 
-part_three_repeat_ogtt_fields: Tuple[str, ...] = (
+part_three_repeat_ogtt_fields: tuple[str, ...] = (
     "ogtt2_base_datetime",
     "ogtt2_datetime",
     "ogtt2_value",
     "ogtt2_units",
 )
 
-part_three_glucose_fields: Tuple[str, ...] = (
+part_three_glucose_fields: tuple[str, ...] = (
     *part_three_fbg_fields,
     *part_three_ogtt_fields,
     *("repeat_glucose_opinion", "repeat_appt_datetime", "contact_number"),
 )
 
-part_three_pregnancy_fields: Tuple[str, ...] = (
+part_three_pregnancy_fields: tuple[str, ...] = (
     "urine_bhcg_performed",
     "urine_bhcg_value",
     "urine_bhcg_date",
 )
 
-part_three_other_fields: Tuple[str, ...] = (
+part_three_other_fields: tuple[str, ...] = (
     "creatinine_performed",
     "creatinine_value",
     "creatinine_units",
@@ -103,25 +102,25 @@ part_three_other_fields: Tuple[str, ...] = (
     "hba1c_value",
 )
 
-part_three_creatinine_fields: Tuple[str, ...] = (
+part_three_creatinine_fields: tuple[str, ...] = (
     "creatinine_performed",
     "creatinine_value",
     "creatinine_units",
 )
 
-part_three_hba1c_fields: Tuple[str, ...] = (
+part_three_hba1c_fields: tuple[str, ...] = (
     "hba1c_performed",
     "hba1c_datetime",
     "hba1c_value",
 )
 
-part_three_comment_fields: Tuple[str, ...] = (
+part_three_comment_fields: tuple[str, ...] = (
     "unsuitable_for_study",
     "reasons_unsuitable",
     "unsuitable_agreed",
 )
 
-calculated_fields: Tuple[str, ...] = (
+calculated_fields: tuple[str, ...] = (
     "sys_blood_pressure_avg",
     "dia_blood_pressure_avg",
     "calculated_bmi_value",
@@ -138,7 +137,7 @@ calculated_fields: Tuple[str, ...] = (
 )
 
 
-part_three_labs: Tuple[str, ...] = (
+part_three_labs: tuple[str, ...] = (
     "haemoglobin_value",
     "wbc_value",
     "ast_value",
@@ -149,7 +148,7 @@ part_three_labs: Tuple[str, ...] = (
 )
 
 
-part_three_fields: Tuple[str, ...] = (
+part_three_fields: tuple[str, ...] = (
     "part_three_report_datetime",
     *part_three_vitals_fields,
     *part_three_pregnancy_fields,

meta_screening/forms/screening_part_one_form.py

@@ -17,9 +17,9 @@ class ScreeningPartOneForm(
         model = ScreeningPartOne
         fields = part_one_fields
 
-        labels = {
+        labels = {  # noqa: RUF012
             "site": "Which study site is this?",
         }
-        help_texts = {
+        help_texts = {  # noqa: RUF012
             "site": "This question is asked to confirm you are logged in to the correct site.",
         }

meta_screening/forms/screening_part_three_form.py

@@ -18,9 +18,11 @@ class ScreeningPartThreeForm(AlreadyConsentedFormMixin, FormValidatorMixin, form
     def clean(self):
         cleaned_data = super().clean()
 
-        if cleaned_data.get("creatinine_value"):
-            if float(cleaned_data.get("creatinine_value")) > GLUCOSE_HIGH_READING:
-                raise forms.ValidationError({"creatinine_value": "Value is absurd."})
+        if (
+            cleaned_data.get("creatinine_value")
+            and float(cleaned_data.get("creatinine_value")) > GLUCOSE_HIGH_READING
+        ):
+            raise forms.ValidationError({"creatinine_value": "Value is absurd."})
         return cleaned_data
 
     class Meta:

meta_screening/forms/screening_part_two_form.py

@@ -12,11 +12,7 @@ class ScreeningPartTwoForm(AlreadyConsentedFormMixin, FormValidatorMixin, forms.
 
     AUTO_NUMBER_START = 17
 
-    def clean(self):
-        cleaned_data = super().clean()
-        return cleaned_data
-
     class Meta:
         model = ScreeningPartTwo
         fields = part_two_fields
-        help_texts = {"contact_number": "(Encryption: RSA local)"}
+        help_texts = {"contact_number": "(Encryption: RSA local)"}  # noqa: RUF012

meta_screening/forms/subject_refusal_form.py

@@ -12,10 +12,6 @@ class SubjectRefusalForm(
 ):
     form_validator_cls = SubjectRefusalFormValidator
 
-    def clean(self):
-        cleaned_data = super().clean()
-        return cleaned_data
-
     class Meta:
         model = SubjectRefusal
         fields = "__all__"

meta_screening/forms/subject_screening_form.py

@@ -12,10 +12,6 @@ class SubjectScreeningForm(
 ):
     form_validator_cls = SubjectScreeningFormValidator
 
-    def clean(self):
-        cleaned_data = super().clean()
-        return cleaned_data
-
     class Meta:
         model = SubjectScreening
         fields = "__all__"

meta_screening/migrations/0001_initial.py

@@ -8,7 +8,7 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_crypto_fields.fields.encrypted_char_field
 import django_revision.revision_field
 import edc_sites.models
@@ -45,14 +45,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -839,14 +839,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -1028,14 +1028,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -1852,14 +1852,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -2676,14 +2676,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -3500,14 +3500,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -4324,14 +4324,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

meta_screening/migrations/0010_auto_20191106_0828.py

@@ -8,7 +8,7 @@ import django.db.models.deletion
 import django_audit_fields.fields.hostname_modification_field
 import django_audit_fields.fields.userfield
 import django_audit_fields.fields.uuid_auto_field
-import django_audit_fields.models.audit_model_mixin
+import django.utils.timezone
 import django_revision.revision_field
 import edc_model_fields.fields.other_charfield
 import edc_sites.models
@@ -614,14 +614,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
@@ -769,14 +769,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (