clinicedc 2.0.1__py3-none-any.whl → 2.0.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of clinicedc might be problematic. Click here for more details.
- {clinicedc-2.0.1.dist-info → clinicedc-2.0.2.dist-info}/METADATA +15 -22
- {clinicedc-2.0.1.dist-info → clinicedc-2.0.2.dist-info}/RECORD +854 -787
- {clinicedc-2.0.1.dist-info → clinicedc-2.0.2.dist-info}/WHEEL +1 -1
- edc_action_item/action.py +10 -30
- edc_action_item/action_with_notification.py +1 -2
- edc_action_item/admin/action_item_admin.py +2 -6
- edc_action_item/admin_site.py +1 -3
- edc_action_item/auths.py +1 -3
- edc_action_item/create_or_update_action_type.py +1 -3
- edc_action_item/data_fixers.py +6 -20
- edc_action_item/forms/action_item_form.py +1 -3
- edc_action_item/management/commands/inspect_action_items.py +3 -9
- edc_action_item/migrations/0001_initial.py +4 -5
- edc_action_item/migrations/0003_auto_20180116_1528.py +2 -1
- edc_action_item/migrations/0006_auto_20180707_1659.py +3 -4
- edc_action_item/migrations/0007_auto_20180707_1715.py +1 -3
- edc_action_item/migrations/0008_auto_20180809_0303.py +2 -1
- edc_action_item/migrations/0014_auto_20181121_1738.py +2 -6
- edc_action_item/migrations/0015_auto_20190114_0250.py +4 -3
- edc_action_item/migrations/0021_auto_20190628_2113.py +1 -3
- edc_action_item/migrations/0022_auto_20190628_2136.py +2 -6
- edc_action_item/migrations/0030_edcpermissions.py +1 -1
- edc_action_item/migrations/0033_alter_actionitem_managers.py +1 -0
- edc_action_item/migrations/0034_alter_actionitem_device_created_and_more.py +13 -37
- edc_action_item/models/action_item.py +2 -6
- edc_action_item/models/action_model_mixin.py +5 -16
- edc_action_item/models/action_type.py +1 -3
- edc_action_item/models/reference.py +1 -2
- edc_action_item/models/signals.py +3 -9
- edc_action_item/site_action_items.py +5 -15
- edc_action_item/templatetags/action_item_extras.py +1 -3
- edc_action_item/view_utils/action_item_button.py +1 -3
- edc_action_item/view_utils/action_item_popover_list_item.py +1 -2
- edc_adherence/migrations/0002_nonadherencereasons_plural_name.py +1 -3
- edc_adherence/model_admin_mixin.py +1 -3
- edc_adverse_event/action_items/ae_followup_action.py +2 -6
- edc_adverse_event/action_items/ae_initial_action.py +3 -7
- edc_adverse_event/auth_objects.py +2 -6
- edc_adverse_event/constants.py +1 -3
- edc_adverse_event/form_validator_mixins/death_report_form_validator.py +1 -3
- edc_adverse_event/form_validator_mixins/requires_death_report_form_validator_mixin.py +2 -7
- edc_adverse_event/form_validators/hospitalization.py +1 -3
- edc_adverse_event/migrations/0003_auto_20191026_2231.py +3 -9
- edc_adverse_event/migrations/0008_auto_20220825_0451.py +1 -1
- edc_adverse_event/migrations/0009_auto_20220907_0157.py +1 -1
- edc_adverse_event/migrations/0010_auto_20220913_2139.py +4 -12
- edc_adverse_event/migrations/0013_alter_aeactionclassification_device_created_and_more.py +11 -31
- edc_adverse_event/model_mixins/ae_followup/ae_followup_fields_model_mixin.py +1 -3
- edc_adverse_event/model_mixins/ae_followup/ae_followup_model_mixin.py +1 -5
- edc_adverse_event/model_mixins/ae_initial/ae_initial_ae_model_mixin.py +1 -3
- edc_adverse_event/model_mixins/ae_initial/ae_initial_fields_model_mixin.py +1 -3
- edc_adverse_event/model_mixins/ae_initial/ae_initial_susar_model_mixin.py +1 -2
- edc_adverse_event/model_mixins/ae_special_interest/aesi_model_mixin.py +1 -5
- edc_adverse_event/model_mixins/ae_susar/ae_susar_model_mixin.py +1 -5
- edc_adverse_event/model_mixins/ae_tmg/ae_tmg_fields_model_mixin.py +2 -6
- edc_adverse_event/model_mixins/ae_tmg/ae_tmg_model_mixin.py +1 -5
- edc_adverse_event/model_mixins/death_report/death_report_extra_fields_model_mixin.py +1 -2
- edc_adverse_event/model_mixins/death_report/death_report_model_mixin.py +2 -5
- edc_adverse_event/model_mixins/death_report/death_report_tmg_model_mixin.py +2 -7
- edc_adverse_event/model_mixins/death_report/simple_death_report_model_mixin.py +1 -3
- edc_adverse_event/modeladmin_mixins/ae_tmg_admin_mixin.py +1 -3
- edc_adverse_event/modeladmin_mixins/death_report_admin_mixin.py +6 -10
- edc_adverse_event/modelform_mixins/ae_tmg_modelform_mixin.py +1 -3
- edc_adverse_event/models/signals.py +3 -9
- edc_adverse_event/pdf_reports/ae_pdf_report.py +6 -18
- edc_adverse_event/pdf_reports/death_pdf_report.py +3 -9
- edc_adverse_event/templatetags/edc_adverse_event_extras.py +5 -15
- edc_adverse_event/utils.py +2 -6
- edc_adverse_event/view_mixins/ae/ae_listboard_view_mixin.py +1 -3
- edc_adverse_event/view_mixins/ae/death_report_listboard_view_mixin.py +1 -3
- edc_adverse_event/view_mixins/tmg/tmg_ae_listboard_view_mixin.py +2 -6
- edc_adverse_event/view_utils/tmg_button.py +2 -6
- edc_adverse_event/views/home_view.py +1 -3
- edc_adverse_event/views/tmg/death_listboard_view.py +1 -3
- edc_adverse_event/views/tmg/home_view.py +2 -6
- edc_adverse_event/views/tmg/summary_listboard_view.py +1 -3
- edc_appointment/admin/appointment_admin.py +1 -3
- edc_appointment/admin/list_filters.py +1 -3
- edc_appointment/admin_site.py +1 -3
- edc_appointment/analytics/dataframes/get_appointment_df.py +2 -6
- edc_appointment/appointment_reason_updater.py +2 -5
- edc_appointment/appointment_status_updater.py +1 -4
- edc_appointment/constants.py +1 -3
- edc_appointment/creators/appointment_creator.py +4 -10
- edc_appointment/creators/unscheduled_appointment_creator.py +3 -7
- edc_appointment/creators/utils.py +4 -0
- edc_appointment/form_validator_mixins/next_appointment_crf_form_validator_mixin.py +3 -10
- edc_appointment/form_validator_mixins/window_period_form_validator_mixin.py +3 -9
- edc_appointment/form_validators/appointment_form_validator.py +11 -37
- edc_appointment/form_validators/next_appointment_crf_form_validator.py +1 -3
- edc_appointment/form_validators/utils.py +1 -3
- edc_appointment/managers.py +2 -6
- edc_appointment/migrations/0002_auto_20161126_1156.py +5 -8
- edc_appointment/migrations/0003_auto_20161127_2226.py +7 -16
- edc_appointment/migrations/0006_auto_20170106_2118.py +2 -1
- edc_appointment/migrations/0008_auto_20171115_1601.py +3 -4
- edc_appointment/migrations/0014_auto_20180116_1411.py +2 -1
- edc_appointment/migrations/0024_auto_20200911_0425.py +1 -1
- edc_appointment/migrations/0034_appointmenttype_alter_appointment_appt_type_and_more.py +2 -4
- edc_appointment/migrations/0036_auto_20230124_1822.py +2 -6
- edc_appointment/migrations/0040_appointment_appt_type_other_and_more.py +1 -0
- edc_appointment/migrations/0042_alter_appointment_device_created_and_more.py +5 -13
- edc_appointment/migrations/0046_infosources.py +1 -3
- edc_appointment/migrations/0047_alter_appointment_options_and_more.py +1 -3
- edc_appointment/model_mixins/appointment_methods_model_mixin.py +1 -5
- edc_appointment/model_mixins/appointment_model_mixin.py +2 -8
- edc_appointment/model_mixins/next_appointment_crf_model_mixin.py +1 -3
- edc_appointment/modeladmin_mixins/next_appointment_crf_modeladmin_mixin.py +1 -3
- edc_appointment/modelform_mixins/next_appointment_crf_modelform_mixins.py +1 -5
- edc_appointment/models/signals.py +5 -17
- edc_appointment/utils.py +11 -33
- edc_appointment/view_mixins/appointment_view_mixin.py +2 -6
- edc_auth/admin/list_filters.py +2 -6
- edc_auth/admin/role_admin.py +1 -3
- edc_auth/admin/user_admin.py +4 -12
- edc_auth/admin/user_profile_admin.py +2 -5
- edc_auth/auth_updater/auth_updater.py +1 -3
- edc_auth/auth_updater/group_updater.py +3 -9
- edc_auth/forms.py +1 -3
- edc_auth/get_app_codenames.py +1 -3
- edc_auth/import_users.py +3 -9
- edc_auth/management/commands/export_users.py +1 -3
- edc_auth/management/commands/reset_password.py +1 -3
- edc_auth/migrations/0001_squashed_0033_alter_userprofile_is_multisite_viewer.py +4 -12
- edc_auth/migrations/0015_auto_20191026_2149.py +1 -3
- edc_auth/migrations/0016_auto_20191026_2153.py +1 -3
- edc_auth/migrations/0025_permissions.py +1 -1
- edc_auth/migrations/0029_alter_edcpermissions_device_created_and_more.py +5 -13
- edc_auth/models/__init__.py +1 -3
- edc_auth/models/signals.py +2 -6
- edc_auth/models/user_profile.py +1 -3
- edc_auth/password_setter.py +1 -3
- edc_auth/system_checks.py +1 -5
- edc_auth/urls_for_accounts.py +1 -3
- edc_auth/utils.py +3 -9
- edc_consent/actions.py +3 -9
- edc_consent/consent_definition.py +2 -6
- edc_consent/consent_definition_extension.py +4 -12
- edc_consent/field_mixins/citizen_fields_mixin.py +2 -4
- edc_consent/field_mixins/identity_fields_mixin.py +1 -2
- edc_consent/field_mixins/personal_fields_mixin.py +8 -3
- edc_consent/field_mixins/site_fields_mixin.py +1 -2
- edc_consent/form_validators/subject_consent_form_validator.py +2 -7
- edc_consent/migrations/0001_initial.py +1 -1
- edc_consent/migrations/0002_alter_edcpermissions_device_created_and_more.py +3 -7
- edc_consent/model_mixins/consent_extension_model_mixin.py +1 -3
- edc_consent/model_mixins/consent_model_mixin.py +3 -9
- edc_consent/modeladmin_mixins/consent_model_admin_mixin.py +7 -17
- edc_consent/modelform_mixins/consent_modelform_mixin/consent_modelform_validation_mixin.py +3 -8
- edc_consent/modelform_mixins/requires_consent_modelform_mixin.py +1 -3
- edc_consent/models/signals.py +2 -6
- edc_consent/site_consents.py +5 -17
- edc_consent/system_checks.py +3 -9
- edc_consent/validators.py +1 -2
- edc_consent/view_mixins/consent_view_mixins.py +3 -5
- edc_crf/crf_form_validator.py +2 -6
- edc_crf/crf_form_validator_mixins.py +2 -6
- edc_crf/migrations/0004_alter_crfstatus_device_created_and_more.py +3 -7
- edc_crf/utils.py +1 -3
- edc_dashboard/management/commands/update_search_slugs.py +1 -3
- edc_dashboard/migrations/0001_initial.py +1 -1
- edc_dashboard/migrations/0003_alter_edcpermissions_device_created_and_more.py +3 -7
- edc_dashboard/templatetags/edc_dashboard_extras.py +2 -6
- edc_dashboard/view_mixins/administration_view_mixin.py +1 -3
- edc_dashboard/view_mixins/edc_view_mixin.py +1 -3
- edc_dashboard/views/administration_view.py +1 -3
- edc_data_manager/action_items.py +1 -3
- edc_data_manager/admin/actions.py +3 -9
- edc_data_manager/admin/data_query_admin.py +4 -12
- edc_data_manager/admin/query_rule_admin.py +4 -13
- edc_data_manager/auths.py +1 -3
- edc_data_manager/forms/data_query.py +2 -6
- edc_data_manager/forms/query_rule.py +1 -3
- edc_data_manager/get_longitudinal_value.py +2 -5
- edc_data_manager/handlers/handlers.py +2 -6
- edc_data_manager/migrations/0001_initial.py +4 -3
- edc_data_manager/migrations/0003_auto_20190806_1749.py +2 -6
- edc_data_manager/migrations/0004_auto_20190806_1750.py +1 -3
- edc_data_manager/migrations/0025_edcpermissions.py +1 -1
- edc_data_manager/migrations/0027_alter_dataquery_dm_user.py +1 -1
- edc_data_manager/migrations/0028_alter_dataquery_options_alter_queryrule_options_and_more.py +2 -1
- edc_data_manager/migrations/0029_alter_dataquery_managers.py +2 -1
- edc_data_manager/migrations/0030_alter_datadictionary_device_created_and_more.py +15 -43
- edc_data_manager/models/model_mixins.py +1 -3
- edc_data_manager/populate_data_dictionary.py +1 -2
- edc_data_manager/post_migrate_signals.py +1 -3
- edc_data_manager/site_data_manager.py +1 -3
- edc_document_status/model_mixins.py +1 -3
- edc_egfr/__init__.py +1 -0
- edc_egfr/admin/__init__.py +1 -0
- edc_egfr/admin/egfr_drop_notification_admin_mixin.py +73 -0
- edc_egfr/apps.py +5 -0
- edc_egfr/calculators/__init__.py +4 -0
- edc_egfr/calculators/base_egrfr.py +56 -0
- edc_egfr/calculators/egfr_ckd_epi.py +68 -0
- edc_egfr/calculators/egfr_cockcroft_gault.py +63 -0
- edc_egfr/calculators/percent_change.py +7 -0
- edc_egfr/constants.py +1 -0
- edc_egfr/egfr.py +237 -0
- edc_egfr/form_validator_mixins/__init__.py +4 -0
- edc_egfr/form_validator_mixins/egfr_form_validator_mixins.py +55 -0
- edc_egfr/get_drop_notification_model.py +10 -0
- edc_egfr/get_egfr_for_subject.py +31 -0
- edc_egfr/model_mixins/__init__.py +2 -0
- edc_egfr/model_mixins/egfr_drop_notification_model_mixin.py +63 -0
- edc_egfr/model_mixins/egfr_model_mixin.py +120 -0
- edc_export/archive_exporter.py +2 -6
- edc_export/exportables.py +2 -6
- edc_export/files_emailer.py +1 -3
- edc_export/management/commands/import_receipts.py +1 -3
- edc_export/managers.py +3 -9
- edc_export/migrations/0001_initial.py +15 -36
- edc_export/migrations/0005_exportdata_importdata.py +1 -3
- edc_export/migrations/0006_auto_20200512_0208.py +2 -6
- edc_export/migrations/0010_auto_20210910_1636.py +2 -6
- edc_export/migrations/0013_edcpermissions.py +1 -1
- edc_export/migrations/0015_alter_datarequest_managers_and_more.py +2 -1
- edc_export/migrations/0016_alter_datarequest_device_created_and_more.py +27 -79
- edc_export/migrations/0017_alter_datarequest_options_and_more.py +2 -6
- edc_export/migrations/0020_remove_datarequesthistory_edc_export__exporte_ba8050_idx_and_more.py +2 -6
- edc_export/model_exporter/model_exporter.py +4 -15
- edc_export/model_exporter/object_history_helpers.py +1 -3
- edc_export/model_exporter/value_getter.py +5 -14
- edc_export/models/signals.py +1 -3
- edc_export/models/upload_export_receipt_file.py +1 -3
- edc_export/utils.py +1 -4
- edc_export/views/export_selected_models_view.py +6 -17
- edc_facility/default_definitions.py +1 -3
- edc_facility/facility.py +4 -14
- edc_facility/import_holidays.py +1 -3
- edc_facility/migrations/0005_healthfacility_healthfacilitytypes_and_more.py +4 -6
- edc_facility/migrations/0006_alter_healthfacility_health_facility_type.py +1 -1
- edc_facility/migrations/0008_alter_healthfacility_device_created_and_more.py +5 -13
- edc_facility/models/holiday.py +1 -3
- edc_facility/utils.py +1 -3
- edc_fieldsets/fieldsets_modeladmin_mixin.py +1 -3
- edc_form_describer/form_describer.py +3 -9
- edc_form_describer/make_forms_reference.py +1 -3
- edc_form_describer/management/commands/make_forms_reference.py +1 -3
- edc_form_runners/admin/issue_admin.py +2 -6
- edc_form_runners/form_runner.py +4 -13
- edc_form_runners/form_runner_by_scr_id.py +1 -3
- edc_form_runners/get_form_runner.py +1 -3
- edc_form_runners/get_form_runner_by_src_id.py +3 -3
- edc_form_runners/management/commands/run_form_runners.py +1 -3
- edc_form_runners/migrations/0001_initial.py +2 -4
- edc_form_runners/run_form_runners.py +1 -3
- edc_form_runners/utils.py +1 -3
- edc_form_validators/applicable_field_validator.py +6 -17
- edc_form_validators/base_form_validator.py +1 -3
- edc_form_validators/date_range_validator.py +4 -12
- edc_form_validators/date_validator.py +3 -9
- edc_form_validators/many_to_many_field_validator.py +1 -3
- edc_form_validators/other_specify_field_validator.py +3 -7
- edc_form_validators/range_field_validator.py +1 -3
- edc_form_validators/required_field_validator.py +5 -18
- edc_glucose/__init__.py +0 -0
- edc_glucose/apps.py +6 -0
- edc_glucose/constants.py +3 -0
- edc_glucose/fieldsets.py +14 -0
- edc_glucose/form_validators/__init__.py +6 -0
- edc_glucose/form_validators/fasting_form_validator.py +12 -0
- edc_glucose/form_validators/fbg_form_validator_mixin.py +32 -0
- edc_glucose/form_validators/fbg_ogtt_form_validator_mixin.py +47 -0
- edc_glucose/form_validators/glucose_form_validator.py +44 -0
- edc_glucose/form_validators/glucose_form_validator_mixin.py +53 -0
- edc_glucose/form_validators/ogtt_form_validator_mixin.py +91 -0
- edc_glucose/list_filters.py +42 -0
- edc_glucose/migrations/__init__.py +0 -0
- edc_glucose/model_mixin_factories/__init__.py +4 -0
- edc_glucose/model_mixin_factories/fasting_model_mixin_factory.py +63 -0
- edc_glucose/model_mixin_factories/fbg_model_mixin_factory.py +48 -0
- edc_glucose/model_mixin_factories/glucose_model_mixin_factory.py +49 -0
- edc_glucose/model_mixin_factories/ogtt_model_mixin_factory.py +71 -0
- edc_glucose/model_mixins/__init__.py +5 -0
- edc_glucose/model_mixins/fasting_model_mixin.py +15 -0
- edc_glucose/model_mixins/fbg_model_mixin.py +10 -0
- edc_glucose/model_mixins/glucose_model_mixin.py +17 -0
- edc_glucose/model_mixins/hba1c_model_mixin.py +42 -0
- edc_glucose/model_mixins/ogtt_model_mixin.py +10 -0
- edc_glucose/models.py +0 -0
- edc_glucose/utils.py +42 -0
- edc_identifier/admin_site.py +1 -3
- edc_identifier/identifier.py +1 -3
- edc_identifier/migrations/0001_initial.py +3 -4
- edc_identifier/migrations/0001_squashed_0018_auto_20180128_1054.py +3 -2
- edc_identifier/migrations/0005_alter_identifiermodel_managers.py +2 -1
- edc_identifier/migrations/0005_historicalidentifierhistory_historicalidentifiertracker_historicalsubjectidentifier.py +4 -5
- edc_identifier/migrations/0006_auto_20161127_2226.py +16 -43
- edc_identifier/migrations/0007_alter_identifiermodel_device_created_and_more.py +3 -7
- edc_identifier/migrations/0007_auto_20161204_2227.py +4 -7
- edc_identifier/migrations/0009_auto_20161221_2323.py +1 -0
- edc_identifier/migrations/0010_auto_20170112_0602.py +2 -1
- edc_identifier/migrations/0012_auto_20171116_1606.py +2 -1
- edc_identifier/migrations/0013_auto_20171230_1316.py +3 -9
- edc_identifier/research_identifier.py +3 -11
- edc_identifier/short_identifier.py +5 -9
- edc_identifier/utils.py +1 -3
- edc_lab/admin/modeladmin_mixins.py +2 -8
- edc_lab/aliquot_types.py +1 -3
- edc_lab/form_validators/requisition_form_validator_mixin.py +1 -3
- edc_lab/forms/box_type_form.py +4 -6
- edc_lab/lab/aliquot_type.py +2 -6
- edc_lab/lab/manifest.py +2 -6
- edc_lab/lab/primary_aliquot.py +1 -3
- edc_lab/lab/requisition_panel.py +1 -3
- edc_lab/lab/requisition_panel_group.py +2 -6
- edc_lab/lab/specimen.py +1 -3
- edc_lab/labels/aliquot_label.py +4 -6
- edc_lab/labels/manifest_label.py +1 -3
- edc_lab/migrations/0001_initial.py +12 -29
- edc_lab/migrations/0002_auto_20170305_1939.py +4 -12
- edc_lab/migrations/0007_auto_20170321_1119.py +2 -6
- edc_lab/migrations/0008_auto_20170921_0719.py +2 -1
- edc_lab/migrations/0010_auto_20171127_1541.py +3 -2
- edc_lab/migrations/0012_auto_20180114_1438.py +2 -1
- edc_lab/migrations/0013_auto_20180117_1438.py +2 -1
- edc_lab/migrations/0022_auto_20211210_1839.py +1 -0
- edc_lab/migrations/0024_alter_manifestitem_managers.py +2 -1
- edc_lab/migrations/0027_alter_aliquot_managers_alter_box_managers_and_more.py +1 -1
- edc_lab/migrations/0028_alter_aliquot_device_created_and_more.py +43 -127
- edc_lab/model_mixins/aliquot/aliquot_label_mixin.py +1 -3
- edc_lab/model_mixins/aliquot/aliquot_model_mixin.py +4 -12
- edc_lab/model_mixins/requisition/requisition_identifier_mixin.py +1 -3
- edc_lab/model_mixins/shipping/manifest_model_mixin.py +1 -3
- edc_lab/models/box_item.py +1 -3
- edc_lab/models/box_type.py +1 -3
- edc_lab/models/manifest/manifest.py +3 -9
- edc_lab/models/manifest/manifest_item.py +1 -3
- edc_lab/models/order.py +1 -3
- edc_lab/models/signals.py +1 -3
- edc_lab/patterns.py +1 -3
- edc_lab/pdf_reports/manifest_pdf_report.py +9 -27
- edc_lab/post_migrate_signals.py +1 -3
- edc_lab/site_labs.py +4 -10
- edc_lab_dashboard/migrations/0001_initial.py +1 -1
- edc_lab_dashboard/migrations/0002_alter_edcpermissions_device_created_and_more.py +3 -7
- edc_lab_dashboard/view_mixins/box_view_mixin.py +1 -3
- edc_lab_dashboard/view_mixins/manifest_view_mixin.py +4 -12
- edc_lab_dashboard/views/action_views/receive_view.py +1 -3
- edc_lab_dashboard/views/action_views/verify_box_item_view.py +1 -3
- edc_lab_dashboard/views/listboard_filters/aliquot_listboard_view_filters.py +2 -6
- edc_lab_dashboard/views/listboard_filters/manifest_listboard_filters.py +1 -3
- edc_lab_dashboard/views/listboard_views/base_box_item_listboard_view.py +1 -3
- edc_lab_dashboard/views/listboard_views/manifest_listboard_view.py +1 -3
- edc_lab_dashboard/views/listboard_views/process_listboard_view.py +2 -6
- edc_lab_dashboard/views/listboard_views/receive_listboard_view.py +2 -6
- edc_lab_dashboard/views/listboard_views/requisition_listboard_view.py +2 -6
- edc_lab_results/action_items.py +1 -3
- edc_lab_results/form_validator_mixins/blood_results_fbg_form_validator_mixin.py +2 -4
- edc_lab_results/form_validator_mixins/blood_results_form_validator_mixin.py +1 -3
- edc_lab_results/get_summary.py +3 -5
- edc_lab_results/model_mixin_factories/__init__.py +10 -0
- edc_lab_results/{model_mixin_factory → model_mixin_factories}/field_attrs.py +8 -8
- edc_lab_results/{model_mixin_factory → model_mixin_factories}/reportable_result_model_mixin_factory.py +2 -0
- edc_lab_results/{model_mixin_factory → model_mixin_factories}/result_model_mixin_factory.py +2 -0
- edc_lab_results/model_mixins/blood_result_model_mixin.py +2 -5
- edc_lab_results/model_mixins/electrolytes_model_mixins.py +1 -1
- edc_lab_results/model_mixins/fbc_model_mixins.py +1 -1
- edc_lab_results/model_mixins/fbg_model_mixin.py +6 -3
- edc_lab_results/model_mixins/glucose_model_mixin.py +2 -2
- edc_lab_results/model_mixins/hba1c_model_mixin.py +2 -28
- edc_lab_results/model_mixins/insulin_model_mixin.py +4 -11
- edc_lab_results/model_mixins/lft_model_mixins.py +1 -1
- edc_lab_results/model_mixins/lipid_model_mixins.py +1 -1
- edc_lab_results/model_mixins/proteinuria_model_mixin.py +1 -1
- edc_lab_results/model_mixins/rft_model_mixins.py +1 -1
- edc_label/apps.py +1 -2
- edc_label/migrations/0001_initial.py +1 -1
- edc_label/migrations/0003_alter_zpllabeltemplates_device_created_and_more.py +3 -7
- edc_label/printer.py +2 -6
- edc_label/printers_mixin.py +1 -3
- edc_label/urls.py +1 -3
- edc_label/view_mixins.py +1 -3
- edc_label/views/print_label_view.py +1 -3
- edc_list_data/model_mixins.py +1 -3
- edc_list_data/preload_data.py +2 -6
- edc_list_data/site_list_data.py +1 -3
- edc_listboard/migrations/0001_initial.py +1 -1
- edc_listboard/migrations/0003_alter_listboard_device_created_and_more.py +3 -7
- edc_listboard/view_mixins/listboard_filter_view_mixin.py +5 -15
- edc_listboard/view_mixins/search_listboard_view_mixin.py +2 -6
- edc_listboard/views/listboard_view.py +2 -6
- edc_listboard/views/screen/screening_listboard_view.py +1 -3
- edc_listboard/views/subject/subject_listboard_view.py +1 -3
- edc_locator/forms/subject_locator_form_validator.py +4 -12
- edc_locator/migrations/0001_initial.py +3 -2
- edc_locator/migrations/0003_auto_20180103_1351.py +2 -1
- edc_locator/migrations/0004_auto_20180106_2148.py +2 -1
- edc_locator/migrations/0007_auto_20180117_1819.py +2 -1
- edc_locator/migrations/0011_auto_20181007_0053.py +1 -1
- edc_locator/migrations/0013_auto_20181007_0054.py +2 -3
- edc_locator/migrations/0014_auto_20181009_0545.py +1 -0
- edc_locator/migrations/0032_alter_subjectlocator_managers.py +1 -1
- edc_locator/migrations/0034_alter_historicalsubjectlocator_device_created_and_more.py +5 -13
- edc_locator/modeladmin_mixins.py +1 -3
- edc_locator/view_mixins/subject_locator_view_mixins.py +1 -3
- edc_ltfu/admin.py +1 -3
- edc_ltfu/forms/ltfu_form.py +1 -3
- edc_ltfu/forms/ltfu_form_validator_mixin.py +1 -2
- edc_ltfu/modelform_mixins.py +3 -8
- edc_metadata/admin/modeladmin_mixins.py +2 -8
- edc_metadata/management/commands/validate_entry_status.py +1 -3
- edc_metadata/metadata/metadata.py +12 -41
- edc_metadata/metadata/metadata_getter.py +2 -9
- edc_metadata/metadata/requisition_metadata_getter.py +1 -3
- edc_metadata/metadata_handler.py +3 -9
- edc_metadata/metadata_helper/metadata_helper_mixin.py +1 -3
- edc_metadata/metadata_mixins/source_model_metadata_mixin.py +3 -9
- edc_metadata/metadata_refresher.py +3 -9
- edc_metadata/metadata_rules/crf/crf_rule_group.py +2 -5
- edc_metadata/metadata_rules/persistant_singleton_mixin.py +3 -3
- edc_metadata/metadata_rules/requisition/requisition_rule_group.py +1 -2
- edc_metadata/metadata_rules/rule_evaluator.py +1 -3
- edc_metadata/metadata_rules/rule_group.py +2 -6
- edc_metadata/metadata_rules/rule_group_meta_options.py +1 -3
- edc_metadata/metadata_updater.py +1 -3
- edc_metadata/metadata_wrappers/metadata_wrapper.py +1 -3
- edc_metadata/migrations/0001_initial.py +2 -1
- edc_metadata/migrations/0002_auto_20161127_2226.py +6 -13
- edc_metadata/migrations/0005_auto_20170112_0602.py +2 -1
- edc_metadata/migrations/0007_auto_20170810_1032.py +2 -1
- edc_metadata/migrations/0009_auto_20180116_1528.py +2 -1
- edc_metadata/migrations/0014_auto_20190707_0002.py +1 -1
- edc_metadata/migrations/0015_auto_20190709_0009.py +3 -5
- edc_metadata/migrations/0021_alter_crfmetadata_managers_and_more.py +1 -1
- edc_metadata/migrations/0023_alter_crfmetadata_device_created_and_more.py +5 -13
- edc_metadata/model_mixins/creates/creates_metadata_model_mixin.py +1 -3
- edc_metadata/model_mixins/updates/updates_metadata_model_mixin.py +1 -3
- edc_metadata/models/crf_metadata_model_mixin.py +2 -6
- edc_metadata/next_form_getter.py +1 -3
- edc_metadata/requisition/requisition_metadata_handler.py +3 -2
- edc_metadata/requisition/requisition_metadata_updater.py +1 -3
- edc_metadata/update_metadata_on_schedule_change.py +7 -14
- edc_model/models/fields/initials_field.py +1 -3
- edc_model/models/signals.py +1 -3
- edc_model/system_checks.py +1 -3
- edc_model/validators/duration.py +1 -3
- edc_model_admin/admin_site.py +1 -3
- edc_model_admin/changelist_buttons/model_admin_changelist_button_mixin.py +4 -12
- edc_model_admin/changelist_buttons/model_admin_changelist_model_button_mixin.py +1 -3
- edc_model_admin/dashboard/model_admin_crf_dashboard_mixin.py +1 -3
- edc_model_admin/dashboard/model_admin_dashboard_mixin.py +1 -3
- edc_model_admin/mixins/base_model_admin_redirect_mixin.py +2 -6
- edc_model_admin/mixins/inlines/limited_admin_inline_mixin.py +1 -3
- edc_model_admin/mixins/model_admin_bypass_default_form_cls_mixin.py +4 -12
- edc_model_admin/mixins/model_admin_form_auto_number_mixin.py +2 -6
- edc_model_admin/mixins/model_admin_form_instructions_mixin.py +2 -6
- edc_model_admin/mixins/model_admin_next_url_redirect_mixin.py +3 -9
- edc_model_admin/mixins/model_admin_protect_pii_mixin.py +1 -3
- edc_model_admin/mixins/model_admin_redirect_all_to_changelist_mixin.py +2 -6
- edc_model_admin/mixins/model_admin_redirect_on_delete_mixin.py +1 -3
- edc_model_admin/templatetags/edc_admin_modify.py +3 -9
- edc_model_fields/fields/initials_field.py +1 -3
- edc_model_form/mixins/inline_model_form_mixin.py +5 -9
- edc_model_to_dataframe/model_to_dataframe.py +15 -46
- edc_navbar/get_default_navbar.py +1 -3
- edc_navbar/migrations/0004_auto_20220825_0451.py +1 -1
- edc_navbar/migrations/0006_alter_edcpermissions_device_created_and_more.py +3 -7
- edc_navbar/navbar.py +1 -3
- edc_navbar/navbar_item.py +1 -3
- edc_navbar/site_navbars.py +2 -6
- edc_navbar/templatetags/edc_navbar_extras.py +1 -3
- edc_notification/admin_site.py +1 -3
- edc_notification/mailing_list_manager.py +5 -15
- edc_notification/migrations/0001_initial.py +2 -1
- edc_notification/migrations/0008_alter_notification_device_created_and_more.py +3 -7
- edc_notification/modeladmin_mixins.py +1 -3
- edc_notification/models/notification.py +1 -3
- edc_notification/models/signals.py +3 -10
- edc_notification/notification/model_notification.py +3 -9
- edc_notification/notification/notification.py +4 -12
- edc_notification/site_notifications.py +5 -14
- edc_offstudy/migrations/0001_initial.py +2 -1
- edc_offstudy/migrations/0002_auto_20180921_0434.py +4 -3
- edc_offstudy/migrations/0008_auto_20191102_0033.py +2 -1
- edc_offstudy/migrations/0015_auto_20220925_0032.py +1 -1
- edc_offstudy/migrations/0016_auto_20220929_1742.py +1 -0
- edc_offstudy/migrations/0018_alter_subjectoffstudy_managers.py +2 -1
- edc_offstudy/migrations/0019_alter_historicalsubjectoffstudy_device_created_and_more.py +5 -13
- edc_offstudy/model_mixins/offstudy_model_mixin.py +3 -3
- edc_offstudy/modelform_mixins/crf/offstudy_crf_modelform_mixin.py +2 -6
- edc_offstudy/templatetags/edc_offstudy_extras.py +2 -6
- edc_offstudy/utils.py +1 -3
- edc_pdf_reports/admin/modeladmin_mixins.py +1 -3
- edc_pdf_reports/crf_pdf_report.py +3 -9
- edc_pdf_reports/flowables/textbox.py +1 -3
- edc_pdf_reports/report.py +6 -18
- edc_pdf_reports/utils.py +1 -3
- edc_pdf_reports/views/pdf_intermediate_view.py +1 -3
- edc_pdf_reports/views/print_pdf_report_view.py +2 -6
- edc_pdutils/actions.py +4 -12
- edc_pdutils/choices.py +1 -4
- edc_pdutils/database.py +1 -3
- edc_pdutils/df_exporters/csv_crf_inline_tables_exporter.py +4 -12
- edc_pdutils/df_exporters/csv_exporter.py +7 -22
- edc_pdutils/df_handlers/crf_df_handler.py +3 -9
- edc_pdutils/df_handlers/df_handler.py +1 -3
- edc_pdutils/df_handlers/registered_subject_df_handler.py +1 -3
- edc_pdutils/management/commands/export_models.py +2 -6
- edc_pdutils/migrations/0001_initial.py +6 -9
- edc_pdutils/site.py +2 -6
- edc_pdutils/site_values_mappings.py +3 -9
- edc_pdutils/tables/aliquot.py +2 -9
- edc_pdutils/tables/consent.py +2 -6
- edc_pdutils/tables/crf.py +4 -12
- edc_pdutils/tables/requisition.py +4 -12
- edc_pdutils/tables/visit.py +1 -3
- edc_pdutils/utils/convert_dates_from_model.py +3 -9
- edc_pdutils/utils/convert_numerics_from_model.py +1 -3
- edc_pdutils/utils/convert_timedelta_from_model.py +1 -3
- edc_pdutils/utils/missing_subject_identifiers.py +1 -3
- edc_pharmacy/admin/actions/confirm_stock.py +2 -6
- edc_pharmacy/admin/actions/delete_order_items.py +1 -3
- edc_pharmacy/admin/actions/delete_receive_items.py +1 -3
- edc_pharmacy/admin/actions/print_stock_report.py +1 -3
- edc_pharmacy/admin/list_filters.py +5 -17
- edc_pharmacy/admin/model_admin_mixin.py +1 -3
- edc_pharmacy/admin/prescription/rx_admin.py +2 -6
- edc_pharmacy/admin/prescription/rx_refill_admin.py +1 -3
- edc_pharmacy/admin/reports/stock_availability_admin.py +1 -5
- edc_pharmacy/admin/stock/allocation_admin.py +5 -15
- edc_pharmacy/admin/stock/allocation_proxy_admin.py +1 -3
- edc_pharmacy/admin/stock/confirmation_admin.py +1 -3
- edc_pharmacy/admin/stock/confirmation_at_site_admin.py +4 -12
- edc_pharmacy/admin/stock/confirmation_at_site_item_admin.py +5 -17
- edc_pharmacy/admin/stock/dispense_admin.py +3 -11
- edc_pharmacy/admin/stock/dispense_item_admin.py +4 -14
- edc_pharmacy/admin/stock/order_admin.py +1 -3
- edc_pharmacy/admin/stock/order_item_admin.py +5 -15
- edc_pharmacy/admin/stock/receive_admin.py +4 -12
- edc_pharmacy/admin/stock/receive_item_admin.py +4 -12
- edc_pharmacy/admin/stock/repack_request_admin.py +2 -6
- edc_pharmacy/admin/stock/stock_adjustment_admin.py +1 -3
- edc_pharmacy/admin/stock/stock_admin.py +8 -24
- edc_pharmacy/admin/stock/stock_proxy_admin.py +1 -5
- edc_pharmacy/admin/stock/stock_request_item_admin.py +5 -15
- edc_pharmacy/admin/stock/stock_transfer_admin.py +4 -12
- edc_pharmacy/admin/stock/stock_transfer_item_admin.py +6 -18
- edc_pharmacy/admin/stock/storage_bin_admin.py +3 -11
- edc_pharmacy/admin/stock/storage_bin_item_admin.py +4 -14
- edc_pharmacy/analytics/dataframes/get_next_scheduled_visit_for_subjects_df.py +3 -9
- edc_pharmacy/analytics/dataframes/in_stock_for_subjects_df.py +2 -6
- edc_pharmacy/analytics/dataframes/stock_for_subjects.py +1 -3
- edc_pharmacy/form_validators/crf/study_medication_form_validator.py +9 -27
- edc_pharmacy/forms/stock/container_form.py +2 -6
- edc_pharmacy/forms/stock/receive_item_form.py +2 -6
- edc_pharmacy/forms/stock/repack_request_form.py +4 -11
- edc_pharmacy/forms/stock/stock_request_form.py +5 -14
- edc_pharmacy/forms/stock/stock_request_item_form.py +1 -3
- edc_pharmacy/labels/draw_bulk_stock_label_code128.py +1 -3
- edc_pharmacy/labels/draw_bulk_stock_label_code39.py +3 -9
- edc_pharmacy/labels/draw_patient_stock_label_code128.py +1 -3
- edc_pharmacy/migrations/0001_initial.py +7 -15
- edc_pharmacy/migrations/0005_alter_rx_managers.py +2 -1
- edc_pharmacy/migrations/0015_auto_20220913_2139.py +9 -22
- edc_pharmacy/migrations/0016_auto_20220929_1742.py +2 -1
- edc_pharmacy/migrations/0018_alter_rxrefill_managers.py +1 -1
- edc_pharmacy/migrations/0020_alter_box_device_created_alter_box_device_modified_and_more.py +71 -211
- edc_pharmacy/migrations/0021_alter_box_options_alter_container_options_and_more.py +1 -1
- edc_pharmacy/migrations/0023_remove_rx_edc_pharmac_modifie_986021_idx_and_more.py +1 -3
- edc_pharmacy/migrations/0024_allocation_assignment_containerunits_dispense_and_more.py +40 -104
- edc_pharmacy/migrations/0031_historicalrepackrequest_task_id_and_more.py +2 -1
- edc_pharmacy/migrations/0033_container_display_name_and_more.py +1 -3
- edc_pharmacy/migrations/0035_container_max_per_subject_and_more.py +2 -6
- edc_pharmacy/migrations/0037_remove_historicalstock_confirmed_at_site_by_and_more.py +2 -6
- edc_pharmacy/migrations/0039_remove_dispense_registered_subject_and_more.py +7 -9
- edc_pharmacy/migrations/0043_stockproxy_alter_historicallot_lot_no_and_more.py +2 -1
- edc_pharmacy/migrations/0049_remove_stocktransferconfirmation_stock_and_more.py +5 -13
- edc_pharmacy/migrations/0050_remove_stocktransferconfirmation2_location_and_more.py +2 -6
- edc_pharmacy/migrations/0051_alter_historicalstocktransferconfirmationitem_options_and_more.py +2 -1
- edc_pharmacy/migrations/0053_alter_location_managers_alter_historicalstock_lot_and_more.py +7 -11
- edc_pharmacy/migrations/0057_scanduplicates.py +3 -4
- edc_pharmacy/migrations/0058_stockrequestproxy_alter_stockproxy_options.py +2 -1
- edc_pharmacy/migrations/0060_alter_container_max_per_subject_and_more.py +8 -14
- edc_pharmacy/migrations/0061_alter_historicalstocktransferconfirmation_options_and_more.py +1 -1
- edc_pharmacy/migrations/0062_auto_20250312_1433.py +2 -6
- edc_pharmacy/migrations/0063_alter_allocation_managers_remove_allocation_site_and_more.py +2 -1
- edc_pharmacy/migrations/0065_allocationproxy.py +2 -1
- edc_pharmacy/migrations/0068_stockout.py +2 -1
- edc_pharmacy/migrations/0076_historicalstockadjustment_stockadjustment.py +5 -8
- edc_pharmacy/migrations/0077_historicalstockadjustment_adjustment_datetime_and_more.py +2 -1
- edc_pharmacy/migrations/0078_alter_historicalstock_qty_and_more.py +2 -1
- edc_pharmacy/migrations/0081_historicalconfirmation_confirmation.py +8 -10
- edc_pharmacy/migrations/0084_confirmationatsiteitem_and_more.py +2 -2
- edc_pharmacy/model_mixins/study_medication_crf_model_mixin.py +3 -9
- edc_pharmacy/models/medication/dosage_guideline.py +1 -3
- edc_pharmacy/models/medication/formulation.py +1 -3
- edc_pharmacy/models/prescription/rx.py +1 -3
- edc_pharmacy/models/prescription/rx_refill.py +2 -6
- edc_pharmacy/models/signals.py +11 -21
- edc_pharmacy/models/stock/allocation.py +3 -9
- edc_pharmacy/models/stock/confirmation.py +1 -3
- edc_pharmacy/models/stock/confirmation_at_site_item.py +1 -3
- edc_pharmacy/models/stock/container.py +1 -3
- edc_pharmacy/models/stock/dispense.py +1 -3
- edc_pharmacy/models/stock/dispense_item.py +1 -3
- edc_pharmacy/models/stock/lot.py +1 -3
- edc_pharmacy/models/stock/order_item.py +2 -6
- edc_pharmacy/models/stock/product.py +2 -6
- edc_pharmacy/models/stock/receive_item.py +4 -12
- edc_pharmacy/models/stock/repack_request.py +1 -3
- edc_pharmacy/models/stock/stock.py +3 -8
- edc_pharmacy/models/stock/stock_request_item.py +4 -4
- edc_pharmacy/models/stock/stock_transfer_item.py +1 -3
- edc_pharmacy/models/stock/supplier.py +1 -3
- edc_pharmacy/models/storage/utils.py +1 -4
- edc_pharmacy/pdf_reports/manifest_pdf_report.py +3 -9
- edc_pharmacy/pdf_reports/stock_pdf_report.py +3 -9
- edc_pharmacy/refill/adjust_previous_end_datetime.py +2 -6
- edc_pharmacy/refill/create_next_refill.py +1 -3
- edc_pharmacy/refill/create_refill.py +1 -3
- edc_pharmacy/refill/refill_creator.py +2 -6
- edc_pharmacy/sample_usb_printing/network_printers.py +1 -3
- edc_pharmacy/settings.py +3 -9
- edc_pharmacy/urls.py +1 -3
- edc_pharmacy/utils/allocate_stock.py +1 -3
- edc_pharmacy/utils/confirm_stock_at_site.py +3 -5
- edc_pharmacy/utils/dispense.py +1 -4
- edc_pharmacy/utils/get_unit_qty_out.py +1 -3
- edc_pharmacy/utils/process_repack_request.py +1 -3
- edc_pharmacy/utils/process_repack_request_queryset.py +1 -3
- edc_pharmacy/utils/stock_request/bulk_create_stock_request_items.py +2 -6
- edc_pharmacy/utils/stock_request/get_instock_and_nostock_data.py +3 -8
- edc_pharmacy/utils/transfer_stock.py +1 -3
- edc_pharmacy/utils/update_previous_refill_end_datetime.py +1 -3
- edc_pharmacy/views/add_to_storage_bin_view.py +2 -6
- edc_pharmacy/views/allocate_to_subject_view.py +7 -21
- edc_pharmacy/views/confirm_stock_from_instance_view.py +2 -6
- edc_pharmacy/views/confirm_stock_from_queryset_view.py +2 -7
- edc_pharmacy/views/confirmation_at_site_view.py +10 -31
- edc_pharmacy/views/dispense_view.py +2 -6
- edc_pharmacy/views/move_to_storage_bin_view.py +2 -6
- edc_pharmacy/views/prepare_and_review_stock_request_view.py +3 -9
- edc_pharmacy/views/print_labels_view.py +1 -3
- edc_pharmacy/views/print_stock_transfer_manifest_view.py +1 -3
- edc_pharmacy/views/transfer_stock_view.py +1 -3
- edc_prn/modelform_mixins.py +1 -3
- edc_prn/prn.py +2 -6
- edc_prn/templatetags/edc_prn_extras.py +4 -8
- edc_protocol/research_protocol_config.py +2 -5
- edc_protocol_incident/admin/protocol_deviation_violation_admin.py +1 -3
- edc_protocol_incident/auth_objects.py +1 -3
- edc_protocol_incident/auths.py +1 -3
- edc_protocol_incident/form_validators/mixins.py +3 -9
- edc_protocol_incident/form_validators/protocol_deviation_violation_form_validator.py +6 -18
- edc_protocol_incident/form_validators/protocol_incident_form_validator.py +3 -8
- edc_protocol_incident/migrations/0001_initial.py +4 -3
- edc_protocol_incident/migrations/0001_squashed_0015_auto_20220927_0401.py +7 -12
- edc_protocol_incident/migrations/0005_protocolincident_historicalprotocolincident_and_more.py +4 -3
- edc_protocol_incident/migrations/0012_auto_20220913_2139.py +3 -9
- edc_protocol_incident/migrations/0020_alter_historicalprotocoldeviationviolation_device_created_and_more.py +9 -25
- edc_protocol_incident/model_mixins/protocol_deviation_violation_model_mixin.py +3 -7
- edc_protocol_incident/model_mixins/protocol_incident_model_mixin.py +1 -3
- edc_protocol_incident/urls.py +1 -3
- edc_pylabels/actions.py +2 -6
- edc_pylabels/admin/label_configuration_admin.py +4 -4
- edc_pylabels/drawing_callable_example.py +1 -3
- edc_pylabels/migrations/0001_initial.py +1 -3
- edc_pylabels/migrations/0002_alter_label_options_label_created_and_more.py +2 -6
- edc_pylabels/migrations/0005_labelconfiguration_delete_label_and_more.py +1 -3
- edc_pylabels/models/label_configuration.py +1 -3
- edc_qareports/migrations/0001_initial.py +3 -4
- edc_qareports/migrations/0005_edcpermissions.py +2 -4
- edc_qareports/migrations/0006_qareportlog.py +2 -1
- edc_qareports/migrations/0007_qareportlog_edc_qarepor_accesse_738ffe_idx.py +1 -3
- edc_qareports/migrations/0017_auto_20240816_0256.py +1 -0
- edc_qareports/model_mixins/note_model_mixin.py +1 -3
- edc_qareports/modeladmin_mixins/list_filters.py +8 -12
- edc_qareports/modeladmin_mixins/note_modeladmin_mixin.py +1 -3
- edc_qareports/modeladmin_mixins/on_study_missing_values_modeladmin_mixin.py +2 -6
- edc_qareports/modeladmin_mixins/qa_report_modeladmin_mixin.py +1 -3
- edc_qareports/sql_generator/crf_case.py +1 -5
- edc_qareports/sql_generator/sql_view_generator.py +1 -3
- edc_qareports/utils.py +2 -6
- edc_randomization/admin.py +1 -3
- edc_randomization/auths.py +2 -6
- edc_randomization/blinding.py +1 -3
- edc_randomization/migrations/0001_initial.py +3 -4
- edc_randomization/migrations/0009_edcpermissions.py +1 -1
- edc_randomization/migrations/0011_alter_edcpermissions_device_created_and_more.py +7 -19
- edc_randomization/model_mixins.py +2 -5
- edc_randomization/randomization_list_importer.py +3 -7
- edc_randomization/randomization_list_verifier.py +2 -7
- edc_randomization/randomizer.py +2 -6
- edc_randomization/site_randomizers.py +1 -3
- edc_randomization/system_checks.py +1 -3
- edc_randomization/utils.py +2 -6
- edc_refusal/admin.py +1 -3
- edc_refusal/forms.py +1 -2
- edc_refusal/migrations/0001_initial.py +2 -1
- edc_refusal/migrations/0002_historicalsubjectrefusal.py +6 -4
- edc_refusal/migrations/0004_refusalreasons_plural_name.py +1 -3
- edc_refusal/migrations/0005_alter_subjectrefusal_options_and_more.py +2 -1
- edc_refusal/migrations/0006_alter_subjectrefusal_managers.py +2 -1
- edc_refusal/migrations/0008_alter_historicalsubjectrefusal_device_created_and_more.py +5 -13
- edc_registration/admin_site.py +1 -3
- edc_registration/migrations/0001_initial.py +3 -4
- edc_registration/migrations/0002_auto_20161127_2226.py +4 -7
- edc_registration/migrations/0004_auto_20161221_0018.py +2 -1
- edc_registration/migrations/0005_auto_20170111_1809.py +2 -1
- edc_registration/migrations/0008_auto_20170810_1032.py +2 -1
- edc_registration/migrations/0012_auto_20180116_1528.py +2 -1
- edc_registration/migrations/0015_auto_20181006_2257.py +1 -1
- edc_registration/migrations/0016_historicalregisteredsubject.py +5 -6
- edc_registration/migrations/0026_historicalregisteredsubject_familiar_name_and_more.py +1 -1
- edc_registration/migrations/0028_alter_registeredsubject_managers.py +1 -1
- edc_registration/migrations/0029_alter_historicalregisteredsubject_device_created_and_more.py +5 -13
- edc_registration/modeladmin_mixins.py +1 -3
- edc_registration/models/registered_subject.py +4 -11
- edc_registration/utils.py +1 -3
- edc_reportable/admin_site.py +1 -3
- edc_reportable/data/normal_data/africa.py +4 -14
- edc_reportable/evaluator.py +2 -6
- edc_reportable/formula.py +2 -6
- edc_reportable/management/commands/export_reportables.py +1 -3
- edc_reportable/migrations/0001_initial.py +3 -9
- edc_reportable/migrations/0003_referencerangecollection_grade1_and_more.py +3 -9
- edc_reportable/migrations/0004_alter_referencerangecollection_grade3_and_more.py +4 -7
- edc_reportable/migrations/0006_alter_gradingdata_revision_and_more.py +8 -19
- edc_reportable/models/mw.py +1 -3
- edc_reportable/models/reference_model_mixins.py +1 -3
- edc_reportable/models/reference_range_collection.py +3 -9
- edc_reportable/post_migrate_signals.py +1 -3
- edc_reportable/reference_range_evaluator.py +4 -11
- edc_reportable/utils/convert_units.py +1 -3
- edc_reportable/utils/get_grade_for_value.py +3 -1
- edc_reportable/utils/get_reference_range_collection.py +2 -2
- edc_reportable/utils/load_data.py +1 -3
- edc_reportable/utils/update_grading_data.py +2 -6
- edc_review_dashboard/migrations/0001_initial.py +1 -1
- edc_review_dashboard/migrations/0003_alter_edcpermissions_device_created_and_more.py +3 -7
- edc_review_dashboard/views/subject_review_listboard_view.py +1 -3
- edc_screening/eligibility.py +1 -3
- edc_screening/fc.py +1 -3
- edc_screening/migrations/0001_initial.py +1 -1
- edc_screening/migrations/0002_alter_edcpermissions_device_created_and_more.py +3 -7
- edc_screening/model_mixins/eligibility_model_mixin.py +1 -3
- edc_screening/model_mixins/screening_fields_model_mixin.py +2 -0
- edc_screening/modelform_mixins.py +1 -3
- edc_search/search_slug.py +2 -6
- edc_search/updater.py +2 -5
- edc_sites/admin/site_model_admin_mixin.py +4 -12
- edc_sites/management/commands/sync_sites.py +1 -3
- edc_sites/migrations/0007_edcpermissions.py +2 -4
- edc_sites/single_site/get_languages.py +1 -3
- edc_sites/site.py +4 -11
- edc_sites/system_checks.py +1 -4
- edc_sites/utils/add_or_update_django_sites.py +1 -3
- edc_subject_dashboard/migrations/0001_initial.py +1 -1
- edc_subject_dashboard/migrations/0002_alter_edcpermissions_device_created_and_more.py +3 -7
- edc_subject_dashboard/requisition_labels.py +1 -3
- edc_subject_dashboard/requisition_report.py +5 -15
- edc_subject_dashboard/requisition_verifier.py +2 -7
- edc_subject_dashboard/templatetags/edc_subject_dashboard_extras.py +2 -6
- edc_subject_dashboard/view_mixins/subject_visit_view_mixin.py +1 -2
- edc_subject_dashboard/view_utils/crf_button.py +1 -3
- edc_subject_dashboard/view_utils/subject_consent_listboard_button.py +1 -3
- edc_subject_dashboard/view_utils/timepoint_status_button.py +1 -3
- edc_subject_dashboard/views/requisition_print_actions_view.py +4 -12
- edc_subject_dashboard/views/requisition_verify_actions_view.py +1 -3
- edc_subject_dashboard/views/subject_dashboard_view.py +1 -3
- edc_timepoint/apps.py +1 -3
- edc_timepoint/timepoint.py +1 -3
- edc_timepoint/timepoint_lookup.py +1 -3
- edc_transfer/form_validators.py +4 -6
- edc_transfer/model_mixins.py +1 -3
- edc_transfer/modelform_mixins.py +1 -3
- edc_unblinding/action_items.py +1 -3
- edc_unblinding/admin_site.py +1 -3
- edc_unblinding/migrations/0001_initial.py +6 -4
- edc_unblinding/migrations/0002_auto_20210908_2318.py +1 -1
- edc_unblinding/migrations/0009_alter_unblindingrequest_managers_and_more.py +2 -1
- edc_unblinding/migrations/0010_alter_historicalunblindingrequest_device_created_and_more.py +9 -25
- edc_unblinding/models/unblinding_request.py +1 -3
- edc_unblinding/models/unblinding_review.py +1 -3
- edc_utils/age.py +1 -3
- edc_utils/date.py +1 -3
- edc_utils/paths_for_urlpatterns.py +1 -3
- edc_utils/show_urls.py +1 -3
- edc_utils/text.py +1 -2
- edc_view_utils/model_button.py +5 -13
- edc_view_utils/query_button.py +1 -3
- edc_visit_schedule/admin/subject_schedule_history_admin.py +1 -3
- edc_visit_schedule/baseline.py +1 -3
- edc_visit_schedule/migrations/0001_initial.py +3 -4
- edc_visit_schedule/migrations/0003_historicalvisitschedule_visitschedule.py +1 -3
- edc_visit_schedule/migrations/0004_auto_20190629_1800.py +1 -3
- edc_visit_schedule/migrations/0011_alter_historicalvisitschedule_device_created_and_more.py +7 -19
- edc_visit_schedule/migrations/0012_alter_subjectschedulehistory_managers_and_more.py +2 -1
- edc_visit_schedule/migrations/0015_historicalonschedule_offschedule_onschedule.py +9 -13
- edc_visit_schedule/migrations/0017_alter_onschedule_managers.py +2 -1
- edc_visit_schedule/model_mixins/crf/crf_schedule_model_mixin.py +1 -1
- edc_visit_schedule/model_mixins/off_schedule_model_mixin.py +2 -6
- edc_visit_schedule/model_mixins/on_schedule_model_mixin.py +1 -3
- edc_visit_schedule/modelform_mixins/off_schedule_modelform_mixin.py +1 -3
- edc_visit_schedule/models/subject_schedule_history.py +3 -8
- edc_visit_schedule/ordered_collection.py +1 -3
- edc_visit_schedule/schedule/schedule.py +6 -17
- edc_visit_schedule/simple_model_validator.py +3 -8
- edc_visit_schedule/site_visit_schedules.py +5 -15
- edc_visit_schedule/subject_schedule.py +4 -16
- edc_visit_schedule/system_checks.py +1 -3
- edc_visit_schedule/utils.py +8 -17
- edc_visit_schedule/view_mixins.py +4 -10
- edc_visit_schedule/visit/crf.py +1 -2
- edc_visit_schedule/visit/requisition.py +1 -3
- edc_visit_schedule/visit/visit.py +6 -16
- edc_visit_schedule/visit/window_period.py +3 -3
- edc_visit_schedule/visit_schedule/visit_schedule.py +2 -5
- edc_visit_tracking/crf_date_validator.py +1 -2
- edc_visit_tracking/form_validators/visit_form_validator.py +2 -8
- edc_visit_tracking/form_validators/visit_missed_form_validator.py +3 -9
- edc_visit_tracking/migrations/0003_auto_20220913_2139.py +2 -6
- edc_visit_tracking/migrations/0004_subjectvisit_subjectvisitmissedreasons_extra_value_and_more.py +8 -16
- edc_visit_tracking/model_mixins/base/visit_methods_model_mixin.py +2 -6
- edc_visit_tracking/model_mixins/crfs/visit_tracking_crf_model_mixin.py +1 -3
- edc_visit_tracking/model_mixins/requisitions/visit_tracking_requisition_model_mixin.py +1 -3
- edc_visit_tracking/model_mixins/subject_visit_missed_model_mixin.py +1 -3
- edc_visit_tracking/model_mixins/visit_model_mixin/visit_model_fields_mixin.py +1 -2
- edc_visit_tracking/modeladmin_mixins/crf_model_admin_mixin.py +4 -8
- edc_visit_tracking/modeladmin_mixins/visit_model_admin_mixin.py +4 -6
- edc_visit_tracking/modelform_mixins/crf/visit_tracking_crf_modelform_mixin.py +2 -6
- edc_visit_tracking/modelform_mixins/utils.py +1 -3
- edc_visit_tracking/modelform_mixins/visit_tracking_modelform_mixin.py +1 -2
- edc_visit_tracking/models/signals.py +1 -3
- edc_visit_tracking/stubs.py +1 -3
- edc_visit_tracking/utils.py +1 -2
- edc_visit_tracking/view_utils/related_visit_button.py +1 -3
- edc_visit_tracking/visit_sequence.py +1 -3
- edc_vitals/__init__.py +2 -0
- edc_vitals/apps.py +6 -0
- edc_vitals/calculators/__init__.py +1 -0
- edc_vitals/calculators/bmi.py +70 -0
- edc_vitals/form_validators/__init__.py +5 -0
- edc_vitals/form_validators/blood_pressure_form_validator_mixin.py +40 -0
- edc_vitals/form_validators/bmi_form_validator_mixin.py +19 -0
- edc_vitals/form_validators/weight_height_with_bmi_form_validator_mixin.py +13 -0
- edc_vitals/migrations/__init__.py +0 -0
- edc_vitals/model_mixins/__init__.py +5 -0
- edc_vitals/model_mixins/blood_pressure_model_mixin.py +80 -0
- edc_vitals/model_mixins/weight_height_bmi_model_mixin.py +42 -0
- edc_vitals/models/__init__.py +10 -0
- edc_vitals/models/fields/__init__.py +7 -0
- edc_vitals/models/fields/blood_pressure.py +36 -0
- edc_vitals/models/fields/heart_rate.py +22 -0
- edc_vitals/models/fields/height.py +26 -0
- edc_vitals/models/fields/respiratory_rate.py +22 -0
- edc_vitals/models/fields/temperature.py +26 -0
- edc_vitals/models/fields/waist_circumference.py +23 -0
- edc_vitals/models/fields/weight.py +26 -0
- edc_vitals/utils.py +51 -0
- edc_vitals/validators.py +5 -0
- edc_lab_results/model_mixin_factory/__init__.py +0 -2
- {clinicedc-2.0.1.dist-info → clinicedc-2.0.2.dist-info}/licenses/LICENSE +0 -0
|
@@ -23,9 +23,7 @@ if TYPE_CHECKING:
|
|
|
23
23
|
from ..model_mixins.creates import CreatesMetadataModelMixin
|
|
24
24
|
from ..models import CrfMetadata, RequisitionMetadata
|
|
25
25
|
|
|
26
|
-
class RelatedVisitModel(
|
|
27
|
-
SiteModelMixin, CreatesMetadataModelMixin, Base, BaseUuidModel
|
|
28
|
-
):
|
|
26
|
+
class RelatedVisitModel(SiteModelMixin, CreatesMetadataModelMixin, Base, BaseUuidModel):
|
|
29
27
|
pass
|
|
30
28
|
|
|
31
29
|
|
|
@@ -99,9 +97,7 @@ class CrfCreator(SourceModelMetadataMixin):
|
|
|
99
97
|
if registered:
|
|
100
98
|
with transaction.atomic():
|
|
101
99
|
opts = dict(
|
|
102
|
-
entry_status=(
|
|
103
|
-
REQUIRED if self.crf.required else NOT_REQUIRED
|
|
104
|
-
),
|
|
100
|
+
entry_status=(REQUIRED if self.crf.required else NOT_REQUIRED),
|
|
105
101
|
show_order=self.crf.show_order,
|
|
106
102
|
site=self.related_visit.site,
|
|
107
103
|
due_datetime=self.due_datetime,
|
|
@@ -111,22 +107,16 @@ class CrfCreator(SourceModelMetadataMixin):
|
|
|
111
107
|
)
|
|
112
108
|
opts.update(**self.query_options)
|
|
113
109
|
try:
|
|
114
|
-
metadata_obj = self.metadata_model_cls.objects.create(
|
|
115
|
-
**opts
|
|
116
|
-
)
|
|
110
|
+
metadata_obj = self.metadata_model_cls.objects.create(**opts)
|
|
117
111
|
except IntegrityError as e:
|
|
118
|
-
msg =
|
|
119
|
-
f"Integrity error creating. Tried with {opts}. Got {e}."
|
|
120
|
-
)
|
|
112
|
+
msg = f"Integrity error creating. Tried with {opts}. Got {e}."
|
|
121
113
|
raise CreatesMetadataError(msg)
|
|
122
114
|
else:
|
|
123
115
|
if not registered:
|
|
124
116
|
metadata_obj.delete()
|
|
125
117
|
metadata_obj = None
|
|
126
118
|
if metadata_obj:
|
|
127
|
-
metadata_obj = self.update_entry_status_to_default_or_keyed(
|
|
128
|
-
metadata_obj
|
|
129
|
-
)
|
|
119
|
+
metadata_obj = self.update_entry_status_to_default_or_keyed(metadata_obj)
|
|
130
120
|
self._metadata_obj = metadata_obj
|
|
131
121
|
return self._metadata_obj
|
|
132
122
|
|
|
@@ -193,9 +183,7 @@ class RequisitionCreator(CrfCreator):
|
|
|
193
183
|
@property
|
|
194
184
|
def source_model_options(self) -> dict:
|
|
195
185
|
"""Source model query options"""
|
|
196
|
-
return dict(
|
|
197
|
-
subject_visit=self.related_visit, panel__name=self.requisition.panel.name
|
|
198
|
-
)
|
|
186
|
+
return dict(subject_visit=self.related_visit, panel__name=self.requisition.panel.name)
|
|
199
187
|
|
|
200
188
|
|
|
201
189
|
class Creator:
|
|
@@ -237,15 +225,8 @@ class Creator:
|
|
|
237
225
|
if self.related_visit.visit_code_sequence != 0:
|
|
238
226
|
# unscheduled + prn requisitions only
|
|
239
227
|
names = [f.name for f in self.related_visit.visit.requisitions_unscheduled]
|
|
240
|
-
requisitions = (
|
|
241
|
-
self.related_visit.visit.
|
|
242
|
-
+ tuple(
|
|
243
|
-
[
|
|
244
|
-
f
|
|
245
|
-
for f in self.related_visit.visit.requisitions_prn
|
|
246
|
-
if f.name not in names
|
|
247
|
-
]
|
|
248
|
-
)
|
|
228
|
+
requisitions = self.related_visit.visit.requisitions_unscheduled.forms + tuple(
|
|
229
|
+
[f for f in self.related_visit.visit.requisitions_prn if f.name not in names]
|
|
249
230
|
)
|
|
250
231
|
elif self.related_visit.reason == MISSED_VISIT:
|
|
251
232
|
# missed visit requisition only -- none
|
|
@@ -254,11 +235,7 @@ class Creator:
|
|
|
254
235
|
# scheduled + prn requisitions only
|
|
255
236
|
names = [f.name for f in self.related_visit.visit.requisitions]
|
|
256
237
|
requisitions = self.related_visit.visit.requisitions.forms + tuple(
|
|
257
|
-
[
|
|
258
|
-
f
|
|
259
|
-
for f in self.related_visit.visit.requisitions_prn
|
|
260
|
-
if f.name not in names
|
|
261
|
-
]
|
|
238
|
+
[f for f in self.related_visit.visit.requisitions_prn if f.name not in names]
|
|
262
239
|
)
|
|
263
240
|
return RequisitionCollection(*requisitions, name="requisitions")
|
|
264
241
|
|
|
@@ -290,9 +267,7 @@ class Destroyer:
|
|
|
290
267
|
metadata_crf_model = "edc_metadata.crfmetadata"
|
|
291
268
|
metadata_requisition_model = "edc_metadata.requisitionmetadata"
|
|
292
269
|
|
|
293
|
-
def __init__(
|
|
294
|
-
self, related_visit: RelatedVisitModel | CreatesMetadataModelMixin
|
|
295
|
-
) -> None:
|
|
270
|
+
def __init__(self, related_visit: RelatedVisitModel | CreatesMetadataModelMixin) -> None:
|
|
296
271
|
self.related_visit = related_visit
|
|
297
272
|
|
|
298
273
|
@property
|
|
@@ -334,9 +309,7 @@ class Metadata:
|
|
|
334
309
|
self._reason = None
|
|
335
310
|
self._reason_field = "reason"
|
|
336
311
|
self.related_visit = related_visit
|
|
337
|
-
self.creator = self.creator_cls(
|
|
338
|
-
related_visit=related_visit, update_keyed=update_keyed
|
|
339
|
-
)
|
|
312
|
+
self.creator = self.creator_cls(related_visit=related_visit, update_keyed=update_keyed)
|
|
340
313
|
self.destroyer = self.destroyer_cls(related_visit=related_visit)
|
|
341
314
|
|
|
342
315
|
def prepare(self) -> bool:
|
|
@@ -346,9 +319,7 @@ class Metadata:
|
|
|
346
319
|
metadata_exists = False
|
|
347
320
|
if self.reason in self.related_visit.visit_schedule.delete_metadata_on_reasons:
|
|
348
321
|
self.destroyer.delete()
|
|
349
|
-
elif
|
|
350
|
-
self.reason in self.related_visit.visit_schedule.create_metadata_on_reasons
|
|
351
|
-
):
|
|
322
|
+
elif self.reason in self.related_visit.visit_schedule.create_metadata_on_reasons:
|
|
352
323
|
if self.reason == MISSED_VISIT:
|
|
353
324
|
self.destroyer.delete(entry_status_not_in=[KEYED])
|
|
354
325
|
else:
|
|
@@ -57,12 +57,7 @@ class MetadataValidator:
|
|
|
57
57
|
f"{source_model_cls.related_visit_model_attr()}": self.related_visit
|
|
58
58
|
}
|
|
59
59
|
query_attrs.update(**self.extra_query_attrs)
|
|
60
|
-
if (
|
|
61
|
-
source_model_cls.objects.filter(**query_attrs)
|
|
62
|
-
.values("id")
|
|
63
|
-
.count()
|
|
64
|
-
> 1
|
|
65
|
-
):
|
|
60
|
+
if source_model_cls.objects.filter(**query_attrs).values("id").count() > 1:
|
|
66
61
|
raise MultipleObjectsReturned(
|
|
67
62
|
f"{source_model_cls._meta.label_lower} {self.related_visit}"
|
|
68
63
|
)
|
|
@@ -137,9 +132,7 @@ class MetadataGetter:
|
|
|
137
132
|
opts = {"show_order__gt": show_order}
|
|
138
133
|
if entry_status:
|
|
139
134
|
opts.update(entry_status=entry_status)
|
|
140
|
-
metadata_obj = (
|
|
141
|
-
self.metadata_objects.filter(**opts).order_by("show_order").first()
|
|
142
|
-
)
|
|
135
|
+
metadata_obj = self.metadata_objects.filter(**opts).order_by("show_order").first()
|
|
143
136
|
return metadata_obj
|
|
144
137
|
|
|
145
138
|
def validate_metadata_objects(
|
|
@@ -14,6 +14,4 @@ class RequisitionMetadataValidator(MetadataValidator):
|
|
|
14
14
|
class RequisitionMetadataGetter(MetadataGetter):
|
|
15
15
|
metadata_model: str = "edc_metadata.requisitionmetadata"
|
|
16
16
|
|
|
17
|
-
metadata_validator_cls: Type[RequisitionMetadataValidator] =
|
|
18
|
-
RequisitionMetadataValidator
|
|
19
|
-
)
|
|
17
|
+
metadata_validator_cls: Type[RequisitionMetadataValidator] = RequisitionMetadataValidator
|
edc_metadata/metadata_handler.py
CHANGED
|
@@ -17,9 +17,7 @@ if TYPE_CHECKING:
|
|
|
17
17
|
from .model_mixins.creates import CreatesMetadataModelMixin
|
|
18
18
|
from .models import CrfMetadata, RequisitionMetadata
|
|
19
19
|
|
|
20
|
-
class RelatedVisitModel(
|
|
21
|
-
SiteModelMixin, CreatesMetadataModelMixin, Base, BaseUuidModel
|
|
22
|
-
):
|
|
20
|
+
class RelatedVisitModel(SiteModelMixin, CreatesMetadataModelMixin, Base, BaseUuidModel):
|
|
23
21
|
pass
|
|
24
22
|
|
|
25
23
|
|
|
@@ -47,9 +45,7 @@ class MetadataHandler:
|
|
|
47
45
|
self.metadata_model: str = metadata_model
|
|
48
46
|
self.model: str = model
|
|
49
47
|
self.related_visit = related_visit
|
|
50
|
-
self.creator = self.creator_cls(
|
|
51
|
-
related_visit=self.related_visit, update_keyed=True
|
|
52
|
-
)
|
|
48
|
+
self.creator = self.creator_cls(related_visit=self.related_visit, update_keyed=True)
|
|
53
49
|
|
|
54
50
|
@property
|
|
55
51
|
def metadata_model_cls(self) -> Type[CrfMetadata] | Type[RequisitionMetadata]:
|
|
@@ -78,9 +74,7 @@ class MetadataHandler:
|
|
|
78
74
|
metadata_obj = None
|
|
79
75
|
try:
|
|
80
76
|
crf = [
|
|
81
|
-
f
|
|
82
|
-
for f in self.creator.related_visit.visit.all_crfs
|
|
83
|
-
if f.model == self.model
|
|
77
|
+
f for f in self.creator.related_visit.visit.all_crfs if f.model == self.model
|
|
84
78
|
][0]
|
|
85
79
|
except IndexError as e:
|
|
86
80
|
if self.related_visit.reason != MISSED_VISIT:
|
|
@@ -73,9 +73,7 @@ class MetadataHelperMixin(VisitScheduleFieldsProtocol):
|
|
|
73
73
|
)
|
|
74
74
|
return get_crf_metadata_model_cls().objects.filter(**opts)
|
|
75
75
|
|
|
76
|
-
def get_crf_metadata_by(
|
|
77
|
-
self, entry_status: str | list[str]
|
|
78
|
-
) -> QuerySet[CrfMetadata]:
|
|
76
|
+
def get_crf_metadata_by(self, entry_status: str | list[str]) -> QuerySet[CrfMetadata]:
|
|
79
77
|
if isinstance(entry_status, (list,)):
|
|
80
78
|
opts = dict(entry_status__in=entry_status)
|
|
81
79
|
else:
|
|
@@ -15,9 +15,7 @@ if TYPE_CHECKING:
|
|
|
15
15
|
|
|
16
16
|
from ..model_mixins.creates import CreatesMetadataModelMixin
|
|
17
17
|
|
|
18
|
-
class RelatedVisitModel(
|
|
19
|
-
SiteModelMixin, CreatesMetadataModelMixin, Base, BaseUuidModel
|
|
20
|
-
):
|
|
18
|
+
class RelatedVisitModel(SiteModelMixin, CreatesMetadataModelMixin, Base, BaseUuidModel):
|
|
21
19
|
pass
|
|
22
20
|
|
|
23
21
|
|
|
@@ -59,9 +57,7 @@ class SourceModelMetadataMixin:
|
|
|
59
57
|
@property
|
|
60
58
|
def source_model_obj_exists(self) -> bool:
|
|
61
59
|
"""Returns True if the source model instance exists."""
|
|
62
|
-
return self.source_model_cls.objects.filter(
|
|
63
|
-
**self.source_model_options
|
|
64
|
-
).exists()
|
|
60
|
+
return self.source_model_cls.objects.filter(**self.source_model_options).exists()
|
|
65
61
|
|
|
66
62
|
@property
|
|
67
63
|
def due_datetime(self) -> datetime | None:
|
|
@@ -73,9 +69,7 @@ class SourceModelMetadataMixin:
|
|
|
73
69
|
|
|
74
70
|
@property
|
|
75
71
|
def document_user(self) -> str | None:
|
|
76
|
-
return getattr(
|
|
77
|
-
self.source_model_obj, "user_created", self.related_visit.user_created
|
|
78
|
-
)
|
|
72
|
+
return getattr(self.source_model_obj, "user_created", self.related_visit.user_created)
|
|
79
73
|
|
|
80
74
|
@property
|
|
81
75
|
def document_name(self) -> str | None:
|
|
@@ -53,9 +53,7 @@ class MetadataRefresher:
|
|
|
53
53
|
self._source_models.append(rule_groups._meta.source_model)
|
|
54
54
|
self._source_models = list(set(self._source_models))
|
|
55
55
|
self._source_models.sort()
|
|
56
|
-
self._source_models.insert(
|
|
57
|
-
0, get_related_visit_model_cls()._meta.label_lower
|
|
58
|
-
)
|
|
56
|
+
self._source_models.insert(0, get_related_visit_model_cls()._meta.label_lower)
|
|
59
57
|
self._message(f" Found source models: {', '.join(self.source_models)}.\n")
|
|
60
58
|
return self._source_models
|
|
61
59
|
|
|
@@ -119,9 +117,7 @@ class MetadataRefresher:
|
|
|
119
117
|
and model not in self.admin_models
|
|
120
118
|
):
|
|
121
119
|
count = CrfMetadata.objects.filter(model=model).delete()
|
|
122
|
-
self._message(
|
|
123
|
-
f" * deleted {count} metadata records for model {model}.\n"
|
|
124
|
-
)
|
|
120
|
+
self._message(f" * deleted {count} metadata records for model {model}.\n")
|
|
125
121
|
self._message(" Done.\n")
|
|
126
122
|
|
|
127
123
|
def verifying_requisition_metadata_with_visit_schedule_and_admin(self) -> None:
|
|
@@ -134,9 +130,7 @@ class MetadataRefresher:
|
|
|
134
130
|
and model not in self.admin_models
|
|
135
131
|
):
|
|
136
132
|
count = RequisitionMetadata.objects.filter(model=model).delete()
|
|
137
|
-
self._message(
|
|
138
|
-
f" * deleted {count} metadata records for model {model}.\n"
|
|
139
|
-
)
|
|
133
|
+
self._message(f" * deleted {count} metadata records for model {model}.\n")
|
|
140
134
|
self._message(" Done.\n")
|
|
141
135
|
|
|
142
136
|
def create_or_update_metadata_for_all(self) -> None:
|
|
@@ -71,8 +71,7 @@ class CrfRuleGroup(RuleGroup, metaclass=RuleGroupMetaclass):
|
|
|
71
71
|
f"Got {target_model}=={related_visit._meta.label_lower}"
|
|
72
72
|
)
|
|
73
73
|
elif (
|
|
74
|
-
target_model.split(".")[1]
|
|
75
|
-
== related_visit._meta.label_lower.split(".")[1]
|
|
74
|
+
target_model.split(".")[1] == related_visit._meta.label_lower.split(".")[1]
|
|
76
75
|
):
|
|
77
76
|
raise TargetModelConflict(
|
|
78
77
|
f"Target model and visit model might be the same. "
|
|
@@ -84,9 +83,7 @@ class CrfRuleGroup(RuleGroup, metaclass=RuleGroupMetaclass):
|
|
|
84
83
|
if not entry_status:
|
|
85
84
|
raise RuleGroupError("Cannot be None. Got `entry_status`.")
|
|
86
85
|
# only do something if target model is in visit.crfs (including PRNs)
|
|
87
|
-
if target_model in [
|
|
88
|
-
c.model for c in cls.crfs_for_visit(related_visit)
|
|
89
|
-
]:
|
|
86
|
+
if target_model in [c.model for c in cls.crfs_for_visit(related_visit)]:
|
|
90
87
|
metadata_updater = cls.metadata_updater_cls(
|
|
91
88
|
related_visit=related_visit,
|
|
92
89
|
source_model=target_model,
|
|
@@ -89,9 +89,9 @@ class PersistantSingletonMixin:
|
|
|
89
89
|
timepoint=last_attended_visit.appointment.timepoint, **opts
|
|
90
90
|
).update(entry_status=REQUIRED)
|
|
91
91
|
else:
|
|
92
|
-
crf_metadata_model_cls.objects.filter(**opts).exclude(
|
|
93
|
-
entry_status=
|
|
94
|
-
)
|
|
92
|
+
crf_metadata_model_cls.objects.filter(**opts).exclude(entry_status=KEYED).update(
|
|
93
|
+
entry_status=NOT_REQUIRED
|
|
94
|
+
)
|
|
95
95
|
|
|
96
96
|
@staticmethod
|
|
97
97
|
def get_last_attended_scheduled_visit(visit):
|
|
@@ -114,8 +114,7 @@ class RequisitionRuleGroup(RuleGroup, metaclass=RequisitionMetaclass):
|
|
|
114
114
|
# only do something if target_panel is in
|
|
115
115
|
# visit.requisitions
|
|
116
116
|
if target_panel.name in [
|
|
117
|
-
r.panel.name
|
|
118
|
-
for r in cls.requisitions_for_visit(related_visit)
|
|
117
|
+
r.panel.name for r in cls.requisitions_for_visit(related_visit)
|
|
119
118
|
]:
|
|
120
119
|
metadata_updater = cls.metadata_updater_cls(
|
|
121
120
|
related_visit=related_visit,
|
|
@@ -28,9 +28,7 @@ class RuleEvaluatorRegisterSubjectError(Exception):
|
|
|
28
28
|
pass
|
|
29
29
|
|
|
30
30
|
|
|
31
|
-
show_edc_metadata_warnings = getattr(
|
|
32
|
-
settings, "EDC_METADATA_SHOW_NOVALUEERROR_WARNING", False
|
|
33
|
-
)
|
|
31
|
+
show_edc_metadata_warnings = getattr(settings, "EDC_METADATA_SHOW_NOVALUEERROR_WARNING", False)
|
|
34
32
|
|
|
35
33
|
|
|
36
34
|
class RuleEvaluator:
|
|
@@ -47,9 +47,7 @@ class RuleGroup:
|
|
|
47
47
|
# note: fields referenced in funcs in a predicate collection
|
|
48
48
|
# are not verified here.
|
|
49
49
|
if cls._meta.source_model:
|
|
50
|
-
model_cls = cls._lookup_model(
|
|
51
|
-
model=cls._meta.source_model, category="source"
|
|
52
|
-
)
|
|
50
|
+
model_cls = cls._lookup_model(model=cls._meta.source_model, category="source")
|
|
53
51
|
fields = [f.name for f in model_cls._meta.get_fields()]
|
|
54
52
|
fields.extend(default_fields)
|
|
55
53
|
for rule in cls.get_rules():
|
|
@@ -69,9 +67,7 @@ class RuleGroup:
|
|
|
69
67
|
try:
|
|
70
68
|
model_cls = django_apps.get_model(model)
|
|
71
69
|
except LookupError:
|
|
72
|
-
sys.stdout.write(
|
|
73
|
-
style.ERROR(f" (?) {model}. See {category} model in {cls}\n")
|
|
74
|
-
)
|
|
70
|
+
sys.stdout.write(style.ERROR(f" (?) {model}. See {category} model in {cls}\n"))
|
|
75
71
|
else:
|
|
76
72
|
sys.stdout.write(f" (*) {model}\n")
|
|
77
73
|
return model_cls
|
|
@@ -27,9 +27,7 @@ class RuleGroupMetaOptions:
|
|
|
27
27
|
except AttributeError:
|
|
28
28
|
setattr(meta, attr, None)
|
|
29
29
|
# populate options dictionary
|
|
30
|
-
self.options = {
|
|
31
|
-
k: getattr(meta, k) for k in meta.__dict__ if not k.startswith("_")
|
|
32
|
-
}
|
|
30
|
+
self.options = {k: getattr(meta, k) for k in meta.__dict__ if not k.startswith("_")}
|
|
33
31
|
# raise on any unknown attributes declared on the Meta class
|
|
34
32
|
for meta_attr in self.options:
|
|
35
33
|
if meta_attr not in [
|
edc_metadata/metadata_updater.py
CHANGED
|
@@ -46,9 +46,7 @@ class MetadataUpdater(SourceModelMetadataMixin):
|
|
|
46
46
|
f"source_model={self.source_model})"
|
|
47
47
|
)
|
|
48
48
|
|
|
49
|
-
def get_and_update(
|
|
50
|
-
self, entry_status: str = None
|
|
51
|
-
) -> CrfMetadata | RequisitionMetadata:
|
|
49
|
+
def get_and_update(self, entry_status: str = None) -> CrfMetadata | RequisitionMetadata:
|
|
52
50
|
metadata_obj = self.metadata_handler.metadata_obj
|
|
53
51
|
if entry_status != KEYED and self.source_model_obj_exists:
|
|
54
52
|
entry_status = KEYED
|
|
@@ -56,9 +56,7 @@ class MetadataWrapper:
|
|
|
56
56
|
def source_model_obj(self) -> CrfModelMixin:
|
|
57
57
|
if not self._source_model_obj:
|
|
58
58
|
try:
|
|
59
|
-
self._source_model_obj = self.source_model_cls.objects.get(
|
|
60
|
-
**self.options
|
|
61
|
-
)
|
|
59
|
+
self._source_model_obj = self.source_model_cls.objects.get(**self.options)
|
|
62
60
|
except AttributeError as e:
|
|
63
61
|
if "related_visit_model_attr" not in str(e):
|
|
64
62
|
raise ImproperlyConfigured(f"{e} See {repr(self.source_model_cls)}")
|
|
@@ -5,9 +5,10 @@ from __future__ import unicode_literals
|
|
|
5
5
|
import django_audit_fields.fields.uuid_auto_field
|
|
6
6
|
import django_extensions.db.fields
|
|
7
7
|
import django_revision.revision_field
|
|
8
|
+
from django.db import migrations, models
|
|
9
|
+
|
|
8
10
|
import edc_model_fields.fields.hostname_modification_field
|
|
9
11
|
import edc_model_fields.fields.userfield
|
|
10
|
-
from django.db import migrations, models
|
|
11
12
|
|
|
12
13
|
|
|
13
14
|
class Migration(migrations.Migration):
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
# Generated by Django 1.10.3 on 2016-11-27 22:26
|
|
3
3
|
from __future__ import unicode_literals
|
|
4
4
|
|
|
5
|
-
import edc_utils
|
|
6
5
|
from django.db import migrations, models
|
|
7
6
|
|
|
7
|
+
import edc_utils
|
|
8
|
+
|
|
8
9
|
|
|
9
10
|
class Migration(migrations.Migration):
|
|
10
11
|
dependencies = [("edc_metadata", "0001_initial")]
|
|
@@ -13,29 +14,21 @@ class Migration(migrations.Migration):
|
|
|
13
14
|
migrations.AlterField(
|
|
14
15
|
model_name="crfmetadata",
|
|
15
16
|
name="created",
|
|
16
|
-
field=models.DateTimeField(
|
|
17
|
-
default=edc_utils.date.get_utcnow, editable=False
|
|
18
|
-
),
|
|
17
|
+
field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
|
|
19
18
|
),
|
|
20
19
|
migrations.AlterField(
|
|
21
20
|
model_name="crfmetadata",
|
|
22
21
|
name="modified",
|
|
23
|
-
field=models.DateTimeField(
|
|
24
|
-
default=edc_utils.date.get_utcnow, editable=False
|
|
25
|
-
),
|
|
22
|
+
field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
|
|
26
23
|
),
|
|
27
24
|
migrations.AlterField(
|
|
28
25
|
model_name="requisitionmetadata",
|
|
29
26
|
name="created",
|
|
30
|
-
field=models.DateTimeField(
|
|
31
|
-
default=edc_utils.date.get_utcnow, editable=False
|
|
32
|
-
),
|
|
27
|
+
field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
|
|
33
28
|
),
|
|
34
29
|
migrations.AlterField(
|
|
35
30
|
model_name="requisitionmetadata",
|
|
36
31
|
name="modified",
|
|
37
|
-
field=models.DateTimeField(
|
|
38
|
-
default=edc_utils.date.get_utcnow, editable=False
|
|
39
|
-
),
|
|
32
|
+
field=models.DateTimeField(default=edc_utils.date.get_utcnow, editable=False),
|
|
40
33
|
),
|
|
41
34
|
]
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
# Generated by Django 1.10.4 on 2017-01-12 04:02
|
|
3
3
|
from __future__ import unicode_literals
|
|
4
4
|
|
|
5
|
+
from django.db import migrations, models
|
|
6
|
+
|
|
5
7
|
import edc_model_fields.fields.hostname_modification_field
|
|
6
8
|
import edc_model_fields.fields.userfield
|
|
7
9
|
import edc_utils
|
|
8
|
-
from django.db import migrations, models
|
|
9
10
|
|
|
10
11
|
|
|
11
12
|
class Migration(migrations.Migration):
|
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
from __future__ import unicode_literals
|
|
4
4
|
|
|
5
5
|
import _socket
|
|
6
|
-
import edc_model_fields.fields.userfield
|
|
7
6
|
from django.db import migrations, models
|
|
8
7
|
|
|
8
|
+
import edc_model_fields.fields.userfield
|
|
9
|
+
|
|
9
10
|
|
|
10
11
|
class Migration(migrations.Migration):
|
|
11
12
|
dependencies = [("edc_metadata", "0006_auto_20170209_0924")]
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import sys
|
|
4
4
|
|
|
5
5
|
from django.db import migrations
|
|
6
|
+
|
|
6
7
|
from edc_visit_schedule.site_visit_schedules import site_visit_schedules
|
|
7
8
|
|
|
8
9
|
|
|
@@ -13,12 +14,9 @@ def update_metadata_timepoint(apps, schema_editor):
|
|
|
13
14
|
for schedule in visit_schedule.schedules.values():
|
|
14
15
|
for visit in schedule.visits.values():
|
|
15
16
|
visit_str = (
|
|
16
|
-
f"{visit_schedule.name}.{schedule.name}.{visit.code}@"
|
|
17
|
-
f"{visit.timepoint}"
|
|
18
|
-
)
|
|
19
|
-
sys.stdout.write(
|
|
20
|
-
f" - updating CRF metadata timepoint for {visit_str}\n"
|
|
17
|
+
f"{visit_schedule.name}.{schedule.name}.{visit.code}@" f"{visit.timepoint}"
|
|
21
18
|
)
|
|
19
|
+
sys.stdout.write(f" - updating CRF metadata timepoint for {visit_str}\n")
|
|
22
20
|
CrfMetadata.objects.filter(
|
|
23
21
|
visit_schedule_name=visit_schedule.name,
|
|
24
22
|
schedule_name=schedule.name,
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
# Generated by Django 4.2.4 on 2023-08-23 01:13
|
|
2
2
|
|
|
3
3
|
import _socket
|
|
4
|
-
from django.db import migrations, models
|
|
5
4
|
import django_audit_fields.fields.hostname_modification_field
|
|
5
|
+
from django.db import migrations, models
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
class Migration(migrations.Migration):
|
|
@@ -14,16 +14,12 @@ class Migration(migrations.Migration):
|
|
|
14
14
|
migrations.AlterField(
|
|
15
15
|
model_name="crfmetadata",
|
|
16
16
|
name="device_created",
|
|
17
|
-
field=models.CharField(
|
|
18
|
-
blank=True, max_length=10, verbose_name="Device created"
|
|
19
|
-
),
|
|
17
|
+
field=models.CharField(blank=True, max_length=10, verbose_name="Device created"),
|
|
20
18
|
),
|
|
21
19
|
migrations.AlterField(
|
|
22
20
|
model_name="crfmetadata",
|
|
23
21
|
name="device_modified",
|
|
24
|
-
field=models.CharField(
|
|
25
|
-
blank=True, max_length=10, verbose_name="Device modified"
|
|
26
|
-
),
|
|
22
|
+
field=models.CharField(blank=True, max_length=10, verbose_name="Device modified"),
|
|
27
23
|
),
|
|
28
24
|
migrations.AlterField(
|
|
29
25
|
model_name="crfmetadata",
|
|
@@ -49,16 +45,12 @@ class Migration(migrations.Migration):
|
|
|
49
45
|
migrations.AlterField(
|
|
50
46
|
model_name="requisitionmetadata",
|
|
51
47
|
name="device_created",
|
|
52
|
-
field=models.CharField(
|
|
53
|
-
blank=True, max_length=10, verbose_name="Device created"
|
|
54
|
-
),
|
|
48
|
+
field=models.CharField(blank=True, max_length=10, verbose_name="Device created"),
|
|
55
49
|
),
|
|
56
50
|
migrations.AlterField(
|
|
57
51
|
model_name="requisitionmetadata",
|
|
58
52
|
name="device_modified",
|
|
59
|
-
field=models.CharField(
|
|
60
|
-
blank=True, max_length=10, verbose_name="Device modified"
|
|
61
|
-
),
|
|
53
|
+
field=models.CharField(blank=True, max_length=10, verbose_name="Device modified"),
|
|
62
54
|
),
|
|
63
55
|
migrations.AlterField(
|
|
64
56
|
model_name="requisitionmetadata",
|
|
@@ -94,9 +94,7 @@ class CreatesMetadataModelMixin(RelatedVisitProtocol, models.Model):
|
|
|
94
94
|
"""
|
|
95
95
|
with transaction.atomic():
|
|
96
96
|
for key in [CRF, REQUISITION]:
|
|
97
|
-
if [
|
|
98
|
-
obj for obj in self.metadata[key] if obj.get_entry_status() == KEYED
|
|
99
|
-
]:
|
|
97
|
+
if [obj for obj in self.metadata[key] if obj.get_entry_status() == KEYED]:
|
|
100
98
|
raise DeleteMetadataError(
|
|
101
99
|
f"Metadata cannot be deleted. {key}s have been "
|
|
102
100
|
f"keyed. Got {repr(self)}."
|
|
@@ -42,9 +42,7 @@ class UpdatesMetadataModelMixin(models.Model):
|
|
|
42
42
|
metadata_updater_cls = MetadataUpdater
|
|
43
43
|
metadata_category: str = CRF
|
|
44
44
|
|
|
45
|
-
def metadata_update(
|
|
46
|
-
self: CrfModel | RequisitionModel, entry_status: str = None
|
|
47
|
-
) -> None:
|
|
45
|
+
def metadata_update(self: CrfModel | RequisitionModel, entry_status: str = None) -> None:
|
|
48
46
|
"""Updates metatadata."""
|
|
49
47
|
self.metadata_updater.get_and_update(entry_status=entry_status)
|
|
50
48
|
|
|
@@ -38,15 +38,11 @@ class CrfMetadataModelMixin(
|
|
|
38
38
|
|
|
39
39
|
model = models.CharField(max_length=50)
|
|
40
40
|
|
|
41
|
-
document_name = models.CharField(
|
|
42
|
-
verbose_name=_("Document"), max_length=250, null=True
|
|
43
|
-
)
|
|
41
|
+
document_name = models.CharField(verbose_name=_("Document"), max_length=250, null=True)
|
|
44
42
|
|
|
45
43
|
show_order = models.IntegerField() # must always be provided!
|
|
46
44
|
|
|
47
|
-
entry_status = models.CharField(
|
|
48
|
-
max_length=25, choices=ENTRY_STATUS, default=REQUIRED
|
|
49
|
-
)
|
|
45
|
+
entry_status = models.CharField(max_length=25, choices=ENTRY_STATUS, default=REQUIRED)
|
|
50
46
|
|
|
51
47
|
due_datetime = models.DateTimeField(null=True, blank=True)
|
|
52
48
|
|
edc_metadata/next_form_getter.py
CHANGED
|
@@ -79,9 +79,7 @@ class NextFormGetter:
|
|
|
79
79
|
appointment=self.appointment
|
|
80
80
|
)
|
|
81
81
|
else:
|
|
82
|
-
self._getter = self.crf_metadata_getter_cls(
|
|
83
|
-
appointment=self.appointment
|
|
84
|
-
)
|
|
82
|
+
self._getter = self.crf_metadata_getter_cls(appointment=self.appointment)
|
|
85
83
|
return self._getter
|
|
86
84
|
|
|
87
85
|
@property
|
|
@@ -35,8 +35,9 @@ class RequisitionMetadataHandler(MetadataHandler):
|
|
|
35
35
|
except IndexError as e:
|
|
36
36
|
if self.related_visit.reason != MISSED_VISIT:
|
|
37
37
|
raise MetadataHandlerError(
|
|
38
|
-
"
|
|
39
|
-
f"
|
|
38
|
+
"Panel not found. Not in visit.all_requisitions. "
|
|
39
|
+
f"Panel `{self.panel}` at `{self.creator.related_visit.visit}`. "
|
|
40
|
+
f"Got {e}. Check your visit schedule."
|
|
40
41
|
)
|
|
41
42
|
else:
|
|
42
43
|
metadata_obj = self.creator.create_requisition(requisition_object)
|
|
@@ -42,6 +42,4 @@ class RequisitionMetadataUpdater(MetadataUpdater):
|
|
|
42
42
|
"""Returns a dictionary of query options to filter for, or
|
|
43
43
|
get, the SubjectRequisition model instance.
|
|
44
44
|
"""
|
|
45
|
-
return dict(
|
|
46
|
-
subject_visit_id=self.related_visit.id, panel__name=self.source_panel.name
|
|
47
|
-
)
|
|
45
|
+
return dict(subject_visit_id=self.related_visit.id, panel__name=self.source_panel.name)
|