From 5b56528c3c94f9469442e6d972ad4c8b2f1abe71 Mon Sep 17 00:00:00 2001 From: erikvw Date: Wed, 17 Jan 2024 21:36:02 -0600 Subject: [PATCH] fix visit schedule definition --- adverse_event_app/consents.py | 4 +-- adverse_event_app/visit_schedules.py | 8 +++-- .../death_report_model_wrapper.py | 32 +++++++++---------- .../ae_initial_admin_mixin.py | 3 -- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/adverse_event_app/consents.py b/adverse_event_app/consents.py index 370b7fa..d0947af 100644 --- a/adverse_event_app/consents.py +++ b/adverse_event_app/consents.py @@ -5,7 +5,7 @@ from edc_constants.constants import FEMALE, MALE from edc_utils import get_utcnow -v1 = ConsentDefinition( +consent_v1 = ConsentDefinition( "adverse_event_app.subjectconsent", version="1", start=getattr( @@ -26,4 +26,4 @@ gender=[MALE, FEMALE], ) -site_consents.register(v1) +site_consents.register(consent_v1) diff --git a/adverse_event_app/visit_schedules.py b/adverse_event_app/visit_schedules.py index 6849ef8..c090e4e 100644 --- a/adverse_event_app/visit_schedules.py +++ b/adverse_event_app/visit_schedules.py @@ -1,9 +1,11 @@ from dateutil.relativedelta import relativedelta from edc_visit_schedule.schedule import Schedule -from edc_visit_schedule.visit import Crf, FormsCollection, Visit +from edc_visit_schedule.visit import Crf, CrfCollection, Visit from edc_visit_schedule.visit_schedule import VisitSchedule -crfs = FormsCollection(Crf(show_order=1, model="adverse_event_app.crfone", required=True)) +from adverse_event_app.consents import consent_v1 + +crfs = CrfCollection(Crf(show_order=1, model="adverse_event_app.crfone", required=True)) visit = Visit( code="1000", @@ -25,7 +27,7 @@ onschedule_model="adverse_event_app.onschedule", offschedule_model="adverse_event_app.StudyTerminationConclusion", appointment_model="edc_appointment.appointment", - consent_model="adverse_event_app.subjectconsent", + consent_definitions=[consent_v1], ) visit_schedule = VisitSchedule( diff --git a/edc_adverse_event/model_wrappers/death_report_model_wrapper.py b/edc_adverse_event/model_wrappers/death_report_model_wrapper.py index a3e0adb..3ab2fb6 100644 --- a/edc_adverse_event/model_wrappers/death_report_model_wrapper.py +++ b/edc_adverse_event/model_wrappers/death_report_model_wrapper.py @@ -120,15 +120,15 @@ def death_report_tmg_second(self) -> DeathReportModelMixin: def get_death_report_tmg_model_wrapper(self, action_item): if not self.death_report_tmg: - model_wrapper = self.death_report_tmg_model_wrapper_cls( - model_obj=self.death_report_tmg_model_cls( - death_report=self.object, - subject_identifier=self.object.subject_identifier, - action_identifier=action_item.action_identifier, - parent_action_item=action_item.parent_action_item, - related_action_item=action_item.related_action_item, - ) + # unpersisted model_obj + model_obj = self.death_report_tmg_model_cls( + death_report=self.object, + subject_identifier=self.object.subject_identifier, + action_identifier=action_item.action_identifier, + parent_action_item=action_item.parent_action_item, + related_action_item=action_item.related_action_item, ) + model_wrapper = self.death_report_tmg_model_wrapper_cls(model_obj=model_obj) else: model_wrapper = self.death_report_tmg_model_wrapper_cls( model_obj=self.death_report_tmg @@ -137,15 +137,15 @@ def get_death_report_tmg_model_wrapper(self, action_item): def get_death_report_tmg_second_model_wrapper(self, action_item): if not self.death_report_tmg_second: - model_wrapper = self.death_report_tmg_second_model_wrapper_cls( - model_obj=self.death_report_tmg_model_cls( - death_report=self.object, - subject_identifier=self.object.subject_identifier, - action_identifier=action_item.action_identifier, - parent_action_item=action_item.parent_action_item, - related_action_item=action_item.related_action_item, - ) + # unpersisted model_obj + model_obj = self.death_report_tmg_model_cls( + death_report=self.object, + subject_identifier=self.object.subject_identifier, + action_identifier=action_item.action_identifier, + parent_action_item=action_item.parent_action_item, + related_action_item=action_item.related_action_item, ) + model_wrapper = self.death_report_tmg_second_model_wrapper_cls(model_obj=model_obj) else: model_wrapper = self.death_report_tmg_second_model_wrapper_cls( model_obj=self.death_report_tmg_second diff --git a/edc_adverse_event/modeladmin_mixins/ae_initial_admin_mixin.py b/edc_adverse_event/modeladmin_mixins/ae_initial_admin_mixin.py index 46c65eb..17e6e05 100644 --- a/edc_adverse_event/modeladmin_mixins/ae_initial_admin_mixin.py +++ b/edc_adverse_event/modeladmin_mixins/ae_initial_admin_mixin.py @@ -81,9 +81,6 @@ class AeInitialModelAdminMixin( ): form = AeInitialForm - change_list_template = "edc_adverse_event/admin/change_list.html" - change_form_template = "edc_adverse_event/admin/change_form.html" - ordering = ("-ae_awareness_date",) actions = [print_to_pdf_action]