meta-edc 1.5.2__py3-none-any.whl → 1.5.4__py3-none-any.whl

{meta_edc-1.5.2.dist-info → meta_edc-1.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-edc
-Version: 1.5.2
+Version: 1.5.4
 Summary: META Trial EDC (https://www.isrctn.com/ISRCTN76157257)
 Keywords: django,clinicedc,META EDC,EDC,clinical trials,META Trial,ISRCTN76157257
 Author: Erik van Widenfelt, Jonathan Willitts
@@ -89,8 +89,8 @@ Assuming you are logged into the account ``myaccount``:
     mkdir ~/edc && \
     cd ~/edc && \
     uv venv && \
-    uv pip install -U meta-edc==1.5.1 && \
-    wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.5.1/manage.py && \
+    uv pip install -U meta-edc==1.5.3 && \
+    wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.5.3/manage.py && \
     uv pip freeze | grep meta-edc
 
 Copy your ``.env`` file to ``~/.etc``.
@@ -140,7 +140,7 @@ From the above example:
 
     cd ~/edc && \
     uv venv --clear && \
-    uv pip install -U meta-edc==1.5.1 && \
+    uv pip install -U meta-edc==1.5.3 && \
     wget -O manage.py https://raw.githubusercontent.com/meta-trial/meta-edc/1.1.10/manage.py && \
     uv pip freeze | grep meta-edc && \
     python manage.py check

{meta_edc-1.5.2.dist-info → meta_edc-1.5.4.dist-info}/RECORD

@@ -796,7 +796,7 @@ meta_subject/forms/blood_results/blood_results_hba1c_form.py,sha256=2eugHsvMxwD0
 meta_subject/forms/blood_results/blood_results_ins_form.py,sha256=zKwobon8wRBrwpAMxonbXtR-Bg2wsJbcHraLjsqcAhY,722
 meta_subject/forms/blood_results/blood_results_lft_form.py,sha256=WKCGZXTk9ndlASymnKKIAo0rBtE9uoE_gzKsx19p-LQ,714
 meta_subject/forms/blood_results/blood_results_lipids_form.py,sha256=YcqETGjN1LH_kKTGVD0a-gW4z6X3PmM8z1xQmI0-Yfg,735
-meta_subject/forms/blood_results/blood_results_rft_form.py,sha256=FOBxOmSurSctidPkAvOS1XZ6-xQ5VQaubdc-pG3H6Es,3474
+meta_subject/forms/blood_results/blood_results_rft_form.py,sha256=HHDHbI_imJllaB1rKuVRjNxjqYjgYkYDbtWOA1I5lPw,2777
 meta_subject/forms/complications_glycemia_form.py,sha256=yTm3qRDJ1wPuukmpf0s0lg-oXi8fZ5Y7D7T9V-CsOXk,375
 meta_subject/forms/concomitant_medication_form.py,sha256=eznM4YOSV0eSsc-qaQgkga76T76Oz6i8svyBaleW-gQ,375
 meta_subject/forms/delivery_form.py,sha256=L4WZqWbo9gz_BzxSdckh3e0v6DojOSoygD2xEcT4P78,484
@@ -841,8 +841,8 @@ meta_subject/management/commands/create_missing_refills.py,sha256=PlL0ZQwPuIMA_Y
 meta_subject/management/commands/create_missing_rx.py,sha256=KhQGCP6NCuiniMTXGFW33z0-dpZsTEPPCxpDOOenm7M,1484
 meta_subject/management/commands/missed.py,sha256=-6u4ECdvB0bSasO0ZZE4Cj9WSPUPe-anf2JpXiMqjrI,8148
 meta_subject/metadata_rules/__init__.py,sha256=oCYvXgdEXNDdg3uxsseQbgv877E1u7RAtHPM-hpKB1s,93
-meta_subject/metadata_rules/metadata_rules.py,sha256=CeZKXkr_sFsMlZK3CoU8buF51hqSH5hyxTWS92ZfBGk,4323
-meta_subject/metadata_rules/predicates.py,sha256=PVO6bSvQloW13Vtnc5ihEOhdUR2b4gEfvO95zszbSVI,10035
+meta_subject/metadata_rules/metadata_rules.py,sha256=pKE13pdTywxwZ8JXAgwKPXrSIJrOYV_d-bfv6j06qMU,4673
+meta_subject/metadata_rules/predicates.py,sha256=D_2uzeAGiF6YOTi2kktqN939pOuYKJFBMSvM2s6UoMo,10195
 meta_subject/migrations/0001_initial.py,sha256=U6ULFoW9DxoI0Ts98ulh76Ngj62z_04okiVqm9sa8RA,407349
 meta_subject/migrations/0002_auto_20191021_0353.py,sha256=2fyDZciaIc06BA-9abijvb-tW2_pi0hJa7BJrhqLlH8,29224
 meta_subject/migrations/0003_auto_20191021_0534.py,sha256=Ye9au73hXxbvd1tBmrafin20NPWUZfhxj50x4S-tYqk,4024
@@ -1158,7 +1158,7 @@ meta_visit_schedule/visit_schedules/phase_three/schedule.py,sha256=LU1HRaV6o1UeK
 meta_visit_schedule/visit_schedules/phase_three/schedule_dm_referral.py,sha256=q12p5wXc2D7lSiJVBnoSQw8Q3vL6uDx1t3PuDJO-Z-U,1735
 meta_visit_schedule/visit_schedules/phase_three/schedule_pregnancy.py,sha256=bEpbpCX3vfZmnsqudr0z8PU5kiaX4ws1sO5Im98Mo28,1106
 meta_visit_schedule/visit_schedules/phase_three/visit_schedule.py,sha256=ak4qazeKlpIlvpqrK9hDDO0fwWuWyvb4Ec-JU31IJxc,654
-meta_edc-1.5.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-1.5.2.dist-info/WHEEL,sha256=ZHijuPszqKbNczrBXkSuoxdxocbxgFghqnequ9ZQlVk,79
-meta_edc-1.5.2.dist-info/METADATA,sha256=obgIfLrCBL7boOhiRrCm9fAFpOVHsWanM3Z7GzmVSkg,5162
-meta_edc-1.5.2.dist-info/RECORD,,
+meta_edc-1.5.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.5.4.dist-info/WHEEL,sha256=ZHijuPszqKbNczrBXkSuoxdxocbxgFghqnequ9ZQlVk,79
+meta_edc-1.5.4.dist-info/METADATA,sha256=Yy_GfVEQPUXQrQnYSt2Cm1-8_E4ah4HmxmS279I477A,5162
+meta_edc-1.5.4.dist-info/RECORD,,

meta_subject/forms/blood_results/blood_results_rft_form.py

@@ -11,9 +11,7 @@ from edc_utils import age
 from edc_visit_schedule.utils import is_baseline
 from edc_vitals.form_validators import BmiFormValidatorMixin
 
-from meta_visit_schedule.constants import DAY1
-
-from ...models import BloodResultsRft, FollowupVitals, PhysicalExam, SubjectVisit
+from ...models import BloodResultsRft, FollowupVitals, PhysicalExam
 
 
 class BloodResultsRftFormValidator(
@@ -30,28 +28,13 @@ class BloodResultsRftFormValidator(
         if self.cleaned_data.get("creatinine_value") and self.cleaned_data.get(
             "creatinine_units"
         ):
-            if is_baseline(self.related_visit):
-                baseline_egfr_value = None
-            else:
-                baseline_visit = SubjectVisit.objects.get(
-                    subject_identifier=self.related_visit.subject_identifier,
-                    visit_code=DAY1,
-                    visit_code_sequence=0,
-                )
-                baseline_egfr_value = BloodResultsRft.objects.get(
-                    subject_visit=baseline_visit
-                ).egfr_value
             rs = RegisteredSubject.objects.get(
                 subject_identifier=self.related_visit.subject_identifier
             )
             age_in_years = age(rs.dob, self.report_datetime).years
 
             self.validate_egfr(
-                gender=rs.gender,
-                age_in_years=age_in_years,
-                ethnicity=rs.ethnicity,
-                weight_in_kgs=self.get_weight_in_kgs(),
-                baseline_egfr_value=baseline_egfr_value,
+                gender=rs.gender, age_in_years=age_in_years, ethnicity=rs.ethnicity
             )
 
     def get_weight_in_kgs(self) -> float | None:

meta_subject/metadata_rules/metadata_rules.py

@@ -174,3 +174,17 @@ class NextAppointmentRuleGroup(CrfRuleGroup):
     class Meta:
         app_label = "meta_subject"
         source_model = "meta_subject.subjectvisit"
+
+
+@register()
+class HivExitReviewRuleGroup(CrfRuleGroup):
+    hiv_exit_review = CrfRule(
+        predicate=pc.hiv_exit_review_required,
+        consequence=REQUIRED,
+        alternative=NOT_REQUIRED,
+        target_models=["hivexitreview"],
+    )
+
+    class Meta:
+        app_label = "meta_subject"
+        source_model = "meta_subject.subjectvisit"

meta_subject/metadata_rules/predicates.py

@@ -282,3 +282,6 @@ class Predicates(PersistantSingletonMixin):
             if obj.offschedule_today == YES:
                 return True
         return False
+
+    def hiv_exit_review_required(self, visit, **kwargs) -> bool:  # noqa: ARG002
+        return self.offschedule_today(visit) or visit.visit_code in [MONTH48]