Merge branch 'release/0.3.49' into main

edc_export/archive_exporter.py

@@ -3,7 +3,7 @@
 from tempfile import mkdtemp
 from typing import TYPE_CHECKING, Type
 
-from edc_pdutils import CsvModelExporter
+from edc_pdutils.df_exporters import CsvModelExporter
 from edc_sites.site import sites
 from edc_utils import get_utcnow
 

edc_export/model_exporter/model_exporter.py

@@ -4,7 +4,7 @@
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ValidationError
-from edc_pdutils import ValueGetter
+from edc_pdutils.model_to_dataframe import ValueGetter
 from edc_utils import get_utcnow
 
 from ..utils import get_export_folder

edc_export/tests/tests/test_model_exporter.py

@@ -3,7 +3,8 @@
 
 from django.test import TestCase, override_settings
 from edc_facility.import_holidays import import_holidays
-from edc_pdutils import CsvModelExporter, ModelToDataframe
+from edc_pdutils.df_exporters import CsvModelExporter
+from edc_pdutils.model_to_dataframe import ModelToDataframe
 from edc_utils import get_utcnow
 from edc_visit_schedule.site_visit_schedules import site_visit_schedules
 

export_app/models.py

@@ -3,6 +3,7 @@
 from django.db import models
 from django.db.models.deletion import PROTECT
 from django_crypto_fields.fields import EncryptedCharField
+from edc_consent.managers import ConsentObjectsByCdefManager, CurrentSiteByCdefManager
 from edc_constants.constants import YES
 from edc_crf.model_mixins import CrfWithActionModelMixin
 from edc_identifier.managers import SubjectIdentifierManager
@@ -65,6 +66,9 @@ class SubjectConsent(
 
 
 class SubjectConsentV1(SubjectConsent):
+    on_site = CurrentSiteByCdefManager()
+    objects = ConsentObjectsByCdefManager()
+
     class Meta:
         proxy = True