clinicedc 2.0.0__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.0.dist-info → clinicedc-2.0.2.dist-info}/METADATA +15 -22
- {clinicedc-2.0.0.dist-info → clinicedc-2.0.2.dist-info}/RECORD +895 -792
- {clinicedc-2.0.0.dist-info → clinicedc-2.0.2.dist-info}/WHEEL +1 -1
- edc_action_item/action.py +13 -32
- 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 +7 -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/migrations/0038_alter_actionitem_revision_alter_actiontype_revision_and_more.py +86 -0
- 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 +4 -12
- 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/migrations/0015_alter_aeactionclassification_revision_and_more.py +74 -0
- 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_appconfig/apps.py +3 -2
- 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/appointments_creator.py +3 -2
- 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/migrations/0049_alter_appointment_revision_and_more.py +38 -0
- edc_appointment/model_mixins/appointment_methods_model_mixin.py +1 -5
- edc_appointment/model_mixins/appointment_model_mixin.py +7 -12
- 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/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/migrations/0034_alter_edcpermissions_revision_alter_role_revision.py +38 -0
- 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 +5 -8
- 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 +4 -8
- edc_consent/migrations/0001_initial.py +1 -1
- edc_consent/migrations/0002_alter_edcpermissions_device_created_and_more.py +3 -7
- edc_consent/migrations/0005_alter_edcpermissions_revision.py +26 -0
- edc_consent/model_mixins/consent_extension_model_mixin.py +2 -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 +6 -10
- edc_consent/modelform_mixins/requires_consent_modelform_mixin.py +1 -3
- edc_consent/models/signals.py +3 -6
- edc_consent/site_consents.py +6 -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 +4 -7
- edc_crf/crf_form_validator_mixins.py +2 -6
- edc_crf/migrations/0004_alter_crfstatus_device_created_and_more.py +3 -7
- edc_crf/migrations/0008_alter_crfstatus_revision.py +26 -0
- 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/migrations/0005_alter_edcpermissions_revision.py +26 -0
- 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/migrations/0039_alter_datadictionary_revision_and_more.py +101 -0
- 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/migrations/0021_alter_datarequest_revision_and_more.py +173 -0
- 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/migrations/0015_alter_healthfacility_revision_and_more.py +38 -0
- 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/migrations/0004_alter_issue_revision.py +26 -0
- 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_alter_identifiermodel_revision.py +26 -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/migrations/0035_alter_aliquot_revision_alter_box_revision_and_more.py +266 -0
- 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/migrations/0004_alter_edcpermissions_revision.py +26 -0
- 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 +5 -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/migrations/0006_alter_zpllabeltemplates_revision.py +29 -0
- 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/migrations/0006_alter_listboard_revision.py +29 -0
- 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/migrations/0039_alter_historicalsubjectlocator_revision_and_more.py +38 -0
- 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/migrations/0030_alter_crfmetadata_revision_and_more.py +38 -0
- 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/migrations/0008_alter_edcpermissions_revision.py +26 -0
- 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/migrations/0010_alter_notification_revision.py +26 -0
- 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/migrations/0022_alter_historicalsubjectoffstudy_revision_and_more.py +41 -0
- 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_admin.py +5 -4
- edc_pharmacy/admin/stock/stock_request_item_admin.py +10 -19
- 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 +1 -1
- 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 +1 -0
- 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/migrations/0088_alter_allocation_revision_alter_assignment_revision_and_more.py +794 -0
- 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 +6 -11
- 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/migrations/0023_alter_historicalprotocoldeviationviolation_revision_and_more.py +65 -0
- 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/migrations/0012_alter_labelconfiguration_revision.py +26 -0
- 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/migrations/0018_alter_edcpermissions_revision_alter_note_revision.py +38 -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 +4 -7
- 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/migrations/0013_alter_edcpermissions_revision_and_more.py +50 -0
- 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 +4 -7
- 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_refusal/migrations/0011_alter_historicalsubjectrefusal_revision_and_more.py +38 -0
- 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/migrations/0032_alter_historicalregisteredsubject_revision_and_more.py +38 -0
- 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/forms/reportables_form_validator_mixin.py +5 -4
- 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 +370 -0
- 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 +3 -4
- 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/molecular_weight_model_cls.py +1 -1
- 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/migrations/0005_alter_edcpermissions_revision.py +26 -0
- 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/migrations/0004_alter_edcpermissions_revision.py +26 -0
- 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_screening/screening_eligibility.py +1 -0
- 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/migrations/0009_alter_edcpermissions_revision.py +26 -0
- edc_sites/single_site/get_languages.py +1 -3
- edc_sites/single_site/single_site.py +1 -1
- edc_sites/site.py +6 -12
- edc_sites/system_checks.py +1 -4
- edc_sites/utils/add_or_update_django_sites.py +2 -4
- 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/migrations/0004_alter_edcpermissions_revision.py +26 -0
- 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/migrations/0013_alter_historicalunblindingrequest_revision_and_more.py +62 -0
- 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/migrations/0018_alter_historicalonschedule_revision_and_more.py +86 -0
- 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 +10 -20
- edc_visit_schedule/simple_model_validator.py +3 -8
- edc_visit_schedule/site_visit_schedules.py +6 -16
- edc_visit_schedule/subject_schedule.py +6 -17
- 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/migrations/0008_alter_historicalsubjectvisit_revision_and_more.py +65 -0
- 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.0.dist-info → clinicedc-2.0.2.dist-info}/licenses/LICENSE +0 -0
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
# Generated by Django 3.2.13 on 2022-08-25 01:51
|
|
2
2
|
|
|
3
3
|
import _socket
|
|
4
|
-
from django.db import migrations, models
|
|
5
4
|
import django_audit_fields.fields.hostname_modification_field
|
|
6
5
|
import django_audit_fields.fields.userfield
|
|
7
6
|
import django_audit_fields.fields.uuid_auto_field
|
|
8
7
|
import django_audit_fields.models.audit_model_mixin
|
|
9
8
|
import django_revision.revision_field
|
|
9
|
+
from django.db import migrations, models
|
|
10
10
|
|
|
11
11
|
|
|
12
12
|
class Migration(migrations.Migration):
|
|
@@ -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="edcpermissions",
|
|
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="edcpermissions",
|
|
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="edcpermissions",
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
# Generated by Django 5.2.4 on 2025-09-10 03:24
|
|
2
|
+
|
|
3
|
+
import django_revision.revision_field
|
|
4
|
+
from django.db import migrations
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
class Migration(migrations.Migration):
|
|
8
|
+
|
|
9
|
+
dependencies = [
|
|
10
|
+
("edc_screening", "0003_alter_edcpermissions_options_and_more"),
|
|
11
|
+
]
|
|
12
|
+
|
|
13
|
+
operations = [
|
|
14
|
+
migrations.AlterField(
|
|
15
|
+
model_name="edcpermissions",
|
|
16
|
+
name="revision",
|
|
17
|
+
field=django_revision.revision_field.RevisionField(
|
|
18
|
+
blank=True,
|
|
19
|
+
editable=False,
|
|
20
|
+
help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
|
|
21
|
+
max_length=75,
|
|
22
|
+
null=True,
|
|
23
|
+
verbose_name="Revision",
|
|
24
|
+
),
|
|
25
|
+
),
|
|
26
|
+
]
|
|
@@ -51,9 +51,7 @@ class EligibilityModelMixin(EligibilityFieldsModelMixin, models.Model):
|
|
|
51
51
|
if not self.id:
|
|
52
52
|
self.screening_identifier = self.identifier_cls().identifier
|
|
53
53
|
if self.eligible:
|
|
54
|
-
self.eligibility_datetime = (
|
|
55
|
-
self.get_report_datetime_for_eligibility_datetime()
|
|
56
|
-
)
|
|
54
|
+
self.eligibility_datetime = self.get_report_datetime_for_eligibility_datetime()
|
|
57
55
|
self.real_eligibility_datetime = get_utcnow()
|
|
58
56
|
else:
|
|
59
57
|
self.eligibility_datetime = None
|
|
@@ -54,6 +54,8 @@ class ScreeningFieldsModeMixin(SiteModelMixin, models.Model):
|
|
|
54
54
|
validators=[MinValueValidator(0), MaxValueValidator(110)]
|
|
55
55
|
)
|
|
56
56
|
|
|
57
|
+
ethnicity = models.CharField(max_length=25, null=True, blank=True)
|
|
58
|
+
|
|
57
59
|
consent_ability = models.CharField(
|
|
58
60
|
verbose_name="Participant or legal guardian/representative able and "
|
|
59
61
|
"willing to give informed consent.",
|
|
@@ -34,9 +34,7 @@ class AlreadyConsentedFormMixin:
|
|
|
34
34
|
kwargs={"subject_identifier": self.instance.subject_identifier},
|
|
35
35
|
)
|
|
36
36
|
|
|
37
|
-
def already_consented_validation_message(
|
|
38
|
-
self, cleaned_data: dict | None = None
|
|
39
|
-
) -> str:
|
|
37
|
+
def already_consented_validation_message(self, cleaned_data: dict | None = None) -> str:
|
|
40
38
|
return format_html(
|
|
41
39
|
'Not allowed. Subject has already consented. See subject <A href="{}">{}</A>',
|
|
42
40
|
self.already_consented_validation_url(cleaned_data),
|
edc_search/search_slug.py
CHANGED
|
@@ -20,9 +20,7 @@ if TYPE_CHECKING:
|
|
|
20
20
|
|
|
21
21
|
|
|
22
22
|
class SearchSlug:
|
|
23
|
-
def __init__(
|
|
24
|
-
self, obj: Model | SearchSlugModelMixin = None, fields: list[str] = None
|
|
25
|
-
):
|
|
23
|
+
def __init__(self, obj: Model | SearchSlugModelMixin = None, fields: list[str] = None):
|
|
26
24
|
self.warning = None
|
|
27
25
|
self.slug = ""
|
|
28
26
|
self.model_cls = None
|
|
@@ -49,8 +47,6 @@ class SearchSlug:
|
|
|
49
47
|
from django_crypto_fields.fields import BaseField
|
|
50
48
|
|
|
51
49
|
encrypted_fields = [
|
|
52
|
-
fld.name
|
|
53
|
-
for fld in self.model_cls._meta.fields
|
|
54
|
-
if isinstance(fld, BaseField)
|
|
50
|
+
fld.name for fld in self.model_cls._meta.fields if isinstance(fld, BaseField)
|
|
55
51
|
]
|
|
56
52
|
return [f for f in fields if f not in encrypted_fields]
|
edc_search/updater.py
CHANGED
|
@@ -20,13 +20,10 @@ class SearchSlugDuplicateFields(Exception):
|
|
|
20
20
|
class SearchSlugUpdater:
|
|
21
21
|
search_slug_cls = SearchSlug
|
|
22
22
|
|
|
23
|
-
def __init__(
|
|
24
|
-
self, fields: list[str], model_obj: Model | SearchSlugModelMixin = None
|
|
25
|
-
):
|
|
23
|
+
def __init__(self, fields: list[str], model_obj: Model | SearchSlugModelMixin = None):
|
|
26
24
|
if len(fields) > len(list(set(fields))):
|
|
27
25
|
raise SearchSlugDuplicateFields(
|
|
28
|
-
f"Duplicate search slug fields detected. Got {fields}. "
|
|
29
|
-
f"See {repr(self)}"
|
|
26
|
+
f"Duplicate search slug fields detected. Got {fields}. " f"See {repr(self)}"
|
|
30
27
|
)
|
|
31
28
|
search_slug = self.search_slug_cls(obj=model_obj, fields=fields)
|
|
32
29
|
self.warning = search_slug.warning
|
|
@@ -42,9 +42,7 @@ class SiteModelAdminMixin:
|
|
|
42
42
|
"""
|
|
43
43
|
if self.has_viewallsites_permission(request):
|
|
44
44
|
return [
|
|
45
|
-
s.id
|
|
46
|
-
for s in request.user.userprofile.sites.all()
|
|
47
|
-
if s.id != request.site.id
|
|
45
|
+
s.id for s in request.user.userprofile.sites.all() if s.id != request.site.id
|
|
48
46
|
]
|
|
49
47
|
return sites.get_view_only_site_ids_for_user(request=request)
|
|
50
48
|
|
|
@@ -108,9 +106,7 @@ class SiteModelAdminMixin:
|
|
|
108
106
|
def get_queryset(self, request) -> QuerySet:
|
|
109
107
|
"""Limit modeladmin queryset for the current site only"""
|
|
110
108
|
qs = super().get_queryset(request)
|
|
111
|
-
site_ids = [request.site.id] + self.get_view_only_site_ids_for_user(
|
|
112
|
-
request=request
|
|
113
|
-
)
|
|
109
|
+
site_ids = [request.site.id] + self.get_view_only_site_ids_for_user(request=request)
|
|
114
110
|
try:
|
|
115
111
|
qs = qs.select_related("site").filter(site_id__in=site_ids)
|
|
116
112
|
except FieldError:
|
|
@@ -131,9 +127,7 @@ class SiteModelAdminMixin:
|
|
|
131
127
|
"""Use site id to select languages to show in choices."""
|
|
132
128
|
if db_field.name == self.language_db_field_name:
|
|
133
129
|
try:
|
|
134
|
-
language_choices = sites.get_language_choices_tuple(
|
|
135
|
-
request.site, other=True
|
|
136
|
-
)
|
|
130
|
+
language_choices = sites.get_language_choices_tuple(request.site, other=True)
|
|
137
131
|
except AttributeError as e:
|
|
138
132
|
if "WSGIRequest" not in str(e):
|
|
139
133
|
raise
|
|
@@ -210,9 +204,7 @@ class SiteModelAdminMixin:
|
|
|
210
204
|
orig = []
|
|
211
205
|
for field_list in field_lists:
|
|
212
206
|
orig.extend(field_list or [])
|
|
213
|
-
if dups := [
|
|
214
|
-
item for item, count in collections.Counter(orig).items() if count > 1
|
|
215
|
-
]:
|
|
207
|
+
if dups := [item for item, count in collections.Counter(orig).items() if count > 1]:
|
|
216
208
|
raise SiteModeAdminMixinError(
|
|
217
209
|
f"Related field appears in more than one list. Got {dups}."
|
|
218
210
|
)
|
|
@@ -75,7 +75,5 @@ class Command(BaseCommand):
|
|
|
75
75
|
style.ERROR(f" {single_site.domain}: <not found>. Got {e}\n")
|
|
76
76
|
)
|
|
77
77
|
else:
|
|
78
|
-
sys.stdout.write(
|
|
79
|
-
f" {single_site.domain}: {host} {style.SUCCESS('OK')}\n"
|
|
80
|
-
)
|
|
78
|
+
sys.stdout.write(f" {single_site.domain}: {host} {style.SUCCESS('OK')}\n")
|
|
81
79
|
sys.stdout.write("Done \n")
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
# Generated by Django 4.2.7 on 2023-12-07 01:01
|
|
2
2
|
|
|
3
3
|
import _socket
|
|
4
|
-
from django.db import migrations, models
|
|
5
4
|
import django_audit_fields.fields.hostname_modification_field
|
|
6
5
|
import django_audit_fields.fields.userfield
|
|
7
6
|
import django_audit_fields.fields.uuid_auto_field
|
|
8
7
|
import django_audit_fields.models.audit_model_mixin
|
|
9
8
|
import django_revision.revision_field
|
|
9
|
+
from django.db import migrations, models
|
|
10
10
|
|
|
11
11
|
|
|
12
12
|
class Migration(migrations.Migration):
|
|
@@ -82,9 +82,7 @@ class Migration(migrations.Migration):
|
|
|
82
82
|
),
|
|
83
83
|
(
|
|
84
84
|
"device_created",
|
|
85
|
-
models.CharField(
|
|
86
|
-
blank=True, max_length=10, verbose_name="Device created"
|
|
87
|
-
),
|
|
85
|
+
models.CharField(blank=True, max_length=10, verbose_name="Device created"),
|
|
88
86
|
),
|
|
89
87
|
(
|
|
90
88
|
"device_modified",
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
# Generated by Django 5.2.4 on 2025-09-10 03:24
|
|
2
|
+
|
|
3
|
+
import django_revision.revision_field
|
|
4
|
+
from django.db import migrations
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
class Migration(migrations.Migration):
|
|
8
|
+
|
|
9
|
+
dependencies = [
|
|
10
|
+
("edc_sites", "0008_delete_edcsite_remove_siteprofile_description"),
|
|
11
|
+
]
|
|
12
|
+
|
|
13
|
+
operations = [
|
|
14
|
+
migrations.AlterField(
|
|
15
|
+
model_name="edcpermissions",
|
|
16
|
+
name="revision",
|
|
17
|
+
field=django_revision.revision_field.RevisionField(
|
|
18
|
+
blank=True,
|
|
19
|
+
editable=False,
|
|
20
|
+
help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
|
|
21
|
+
max_length=75,
|
|
22
|
+
null=True,
|
|
23
|
+
verbose_name="Revision",
|
|
24
|
+
),
|
|
25
|
+
),
|
|
26
|
+
]
|
|
@@ -8,9 +8,7 @@ class SiteLanguagesError(Exception):
|
|
|
8
8
|
def get_languages(language_codes: list[str], site_id: int) -> dict[str, str]:
|
|
9
9
|
defined_languages = get_languages_from_settings()
|
|
10
10
|
if language_codes:
|
|
11
|
-
if unknown_language_codes := [
|
|
12
|
-
c for c in language_codes if c not in defined_languages
|
|
13
|
-
]:
|
|
11
|
+
if unknown_language_codes := [c for c in language_codes if c not in defined_languages]:
|
|
14
12
|
raise SiteLanguagesError(
|
|
15
13
|
"Unknown language code(s) associated with site. Language code must be "
|
|
16
14
|
"defined in settings.LANGUAGES. "
|
edc_sites/site.py
CHANGED
|
@@ -3,7 +3,7 @@ from __future__ import annotations
|
|
|
3
3
|
import dataclasses
|
|
4
4
|
import sys
|
|
5
5
|
from copy import deepcopy
|
|
6
|
-
from typing import
|
|
6
|
+
from typing import TYPE_CHECKING, Any
|
|
7
7
|
|
|
8
8
|
from django.apps import apps as django_apps
|
|
9
9
|
from django.conf import settings
|
|
@@ -16,6 +16,7 @@ from django.utils.module_loading import import_module, module_has_submodule
|
|
|
16
16
|
from edc_auth.utils import user_has_change_perms
|
|
17
17
|
from edc_constants.constants import OTHER
|
|
18
18
|
from edc_model_admin.utils import add_to_messages_once
|
|
19
|
+
|
|
19
20
|
from .exceptions import InvalidSiteForUser
|
|
20
21
|
from .single_site import SingleSite
|
|
21
22
|
from .utils import (
|
|
@@ -159,9 +160,7 @@ class Sites:
|
|
|
159
160
|
single_site = dataclasses.replace(single_site, domain=domain)
|
|
160
161
|
|
|
161
162
|
if single_site.site_id in self._registry:
|
|
162
|
-
raise AlreadyRegistered(
|
|
163
|
-
f"Site already registered. Got `{single_site}`."
|
|
164
|
-
)
|
|
163
|
+
raise AlreadyRegistered(f"Site already registered. Got `{single_site}`.")
|
|
165
164
|
elif single_site.name in [s.name for s in self._registry.values()]:
|
|
166
165
|
raise AlreadyRegisteredName(
|
|
167
166
|
f"Site with this name is already registered. Got `{single_site}`."
|
|
@@ -199,9 +198,7 @@ class Sites:
|
|
|
199
198
|
return single_site
|
|
200
199
|
raise SiteDoesNotExist(f"No site exists with `{attrname}`==`{value}`.")
|
|
201
200
|
|
|
202
|
-
def all(
|
|
203
|
-
self, aslist: bool | None = None
|
|
204
|
-
) -> dict[int, SingleSite] | list[SingleSite]:
|
|
201
|
+
def all(self, aslist: bool | None = None) -> dict[int, SingleSite] | list[SingleSite]:
|
|
205
202
|
if aslist:
|
|
206
203
|
return list(self._registry.values())
|
|
207
204
|
return self._registry
|
|
@@ -209,8 +206,7 @@ class Sites:
|
|
|
209
206
|
@property
|
|
210
207
|
def countries(self) -> list[str]:
|
|
211
208
|
return (
|
|
212
|
-
list(set([single_site.country for single_site in self._registry.values()]))
|
|
213
|
-
or []
|
|
209
|
+
list(set([single_site.country for single_site in self._registry.values()])) or []
|
|
214
210
|
)
|
|
215
211
|
|
|
216
212
|
def get_by_country(
|
|
@@ -275,9 +271,7 @@ class Sites:
|
|
|
275
271
|
get_message_text(messages.ERROR),
|
|
276
272
|
)
|
|
277
273
|
else:
|
|
278
|
-
site_ids = [
|
|
279
|
-
s.id for s in user.userprofile.sites.all() if s.id != site_id
|
|
280
|
-
]
|
|
274
|
+
site_ids = [s.id for s in user.userprofile.sites.all() if s.id != site_id]
|
|
281
275
|
if request:
|
|
282
276
|
add_to_messages_once(
|
|
283
277
|
request, messages.WARNING, get_message_text(messages.WARNING)
|
edc_sites/system_checks.py
CHANGED
|
@@ -40,10 +40,7 @@ def compare_single_sites_with_db():
|
|
|
40
40
|
if not get_site_model_cls().objects.all().exists():
|
|
41
41
|
raise SitesCheckError("No sites have been imported. You need to run migrate")
|
|
42
42
|
ids1 = sorted(list(site_sites.all()))
|
|
43
|
-
ids2 = [
|
|
44
|
-
x[0]
|
|
45
|
-
for x in get_site_model_cls().objects.values_list("id").all().order_by("id")
|
|
46
|
-
]
|
|
43
|
+
ids2 = [x[0] for x in get_site_model_cls().objects.values_list("id").all().order_by("id")]
|
|
47
44
|
if ids1 != ids2:
|
|
48
45
|
raise SitesCheckError(
|
|
49
46
|
f"Site table is out of sync. Got registered sites = {ids1}. "
|
|
@@ -5,9 +5,9 @@ import sys
|
|
|
5
5
|
from django.apps import apps as django_apps
|
|
6
6
|
from django.core.exceptions import ObjectDoesNotExist
|
|
7
7
|
|
|
8
|
+
from ..single_site import SingleSite
|
|
8
9
|
from .get_or_create_site_obj import get_or_create_site_obj
|
|
9
10
|
from .get_or_create_site_profile_obj import get_or_create_site_profile_obj
|
|
10
|
-
from ..single_site import SingleSite
|
|
11
11
|
|
|
12
12
|
|
|
13
13
|
class UpdateDjangoSitesError(Exception):
|
|
@@ -57,9 +57,7 @@ def add_or_update_django_sites(
|
|
|
57
57
|
if single_site.name == "edc_sites.sites":
|
|
58
58
|
continue
|
|
59
59
|
if verbose:
|
|
60
|
-
sys.stdout.write(
|
|
61
|
-
f" * SingleSite: {single_site.site_id}: {single_site.domain}.\n"
|
|
62
|
-
)
|
|
60
|
+
sys.stdout.write(f" * SingleSite: {single_site.site_id}: {single_site.domain}.\n")
|
|
63
61
|
site_obj = get_or_create_site_obj(single_site, apps)
|
|
64
62
|
if verbose:
|
|
65
63
|
sys.stdout.write(f" - Site model: {site_obj.id}: {site_obj.domain}.\n")
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
# Generated by Django 3.2.13 on 2022-08-25 01:51
|
|
2
2
|
|
|
3
3
|
import _socket
|
|
4
|
-
from django.db import migrations, models
|
|
5
4
|
import django_audit_fields.fields.hostname_modification_field
|
|
6
5
|
import django_audit_fields.fields.userfield
|
|
7
6
|
import django_audit_fields.fields.uuid_auto_field
|
|
8
7
|
import django_audit_fields.models.audit_model_mixin
|
|
9
8
|
import django_revision.revision_field
|
|
9
|
+
from django.db import migrations, models
|
|
10
10
|
|
|
11
11
|
|
|
12
12
|
class Migration(migrations.Migration):
|
|
@@ -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="edcpermissions",
|
|
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="edcpermissions",
|
|
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="edcpermissions",
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
# Generated by Django 5.2.4 on 2025-09-10 03:24
|
|
2
|
+
|
|
3
|
+
import django_revision.revision_field
|
|
4
|
+
from django.db import migrations
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
class Migration(migrations.Migration):
|
|
8
|
+
|
|
9
|
+
dependencies = [
|
|
10
|
+
("edc_subject_dashboard", "0003_edcpermissions_locale_created_and_more"),
|
|
11
|
+
]
|
|
12
|
+
|
|
13
|
+
operations = [
|
|
14
|
+
migrations.AlterField(
|
|
15
|
+
model_name="edcpermissions",
|
|
16
|
+
name="revision",
|
|
17
|
+
field=django_revision.revision_field.RevisionField(
|
|
18
|
+
blank=True,
|
|
19
|
+
editable=False,
|
|
20
|
+
help_text="System field. From git repository (tag:branch:commit), project metadata, project toml, project VERSION, or settings.",
|
|
21
|
+
max_length=75,
|
|
22
|
+
null=True,
|
|
23
|
+
verbose_name="Revision",
|
|
24
|
+
),
|
|
25
|
+
),
|
|
26
|
+
]
|
|
@@ -25,9 +25,7 @@ class RequisitionLabels:
|
|
|
25
25
|
if requisition.is_drawn != NO:
|
|
26
26
|
item_count = requisition.item_count or 1
|
|
27
27
|
for item in range(1, item_count + 1):
|
|
28
|
-
label = self.label_cls(
|
|
29
|
-
requisition=requisition, user=user, item=item
|
|
30
|
-
)
|
|
28
|
+
label = self.label_cls(requisition=requisition, user=user, item=item)
|
|
31
29
|
zpl_datas.append(label.render_as_zpl_data(copies=1))
|
|
32
30
|
else:
|
|
33
31
|
self.requisitions_not_printed.append(requisition)
|
|
@@ -42,9 +42,7 @@ class RequisitionReport(Report):
|
|
|
42
42
|
try:
|
|
43
43
|
shipper = Shipper.objects.all()[0]
|
|
44
44
|
except IndexError:
|
|
45
|
-
messages.error(
|
|
46
|
-
self.request, "Unable to print report. Please define the shipper."
|
|
47
|
-
)
|
|
45
|
+
messages.error(self.request, "Unable to print report. Please define the shipper.")
|
|
48
46
|
shipper = Shipper()
|
|
49
47
|
return shipper
|
|
50
48
|
|
|
@@ -62,9 +60,7 @@ class RequisitionReport(Report):
|
|
|
62
60
|
Paragraph("REFERENCE", self.styles["line_label"]),
|
|
63
61
|
],
|
|
64
62
|
[
|
|
65
|
-
Paragraph(
|
|
66
|
-
get_utcnow().strftime("%Y-%m-%d"), self.styles["line_data_largest"]
|
|
67
|
-
),
|
|
63
|
+
Paragraph(get_utcnow().strftime("%Y-%m-%d"), self.styles["line_data_largest"]),
|
|
68
64
|
Paragraph(
|
|
69
65
|
convert_to_human_readable(self.timestamp),
|
|
70
66
|
self.styles["line_data_largest"],
|
|
@@ -86,12 +82,8 @@ class RequisitionReport(Report):
|
|
|
86
82
|
|
|
87
83
|
data = [
|
|
88
84
|
[
|
|
89
|
-
Paragraph(
|
|
90
|
-
|
|
91
|
-
),
|
|
92
|
-
Paragraph(
|
|
93
|
-
"DELIVER TO (complete name and address)", self.styles["line_label"]
|
|
94
|
-
),
|
|
85
|
+
Paragraph("FROM (complete name and address)", self.styles["line_label"]),
|
|
86
|
+
Paragraph("DELIVER TO (complete name and address)", self.styles["line_label"]),
|
|
95
87
|
],
|
|
96
88
|
[
|
|
97
89
|
Paragraph(
|
|
@@ -186,9 +178,7 @@ class RequisitionReport(Report):
|
|
|
186
178
|
),
|
|
187
179
|
],
|
|
188
180
|
[
|
|
189
|
-
Paragraph(
|
|
190
|
-
"SIGNATURE (sign next to your name.)", self.styles["line_label"]
|
|
191
|
-
),
|
|
181
|
+
Paragraph("SIGNATURE (sign next to your name.)", self.styles["line_label"]),
|
|
192
182
|
"",
|
|
193
183
|
Paragraph("DATE", self.styles["line_label"]),
|
|
194
184
|
],
|
|
@@ -27,9 +27,7 @@ class RequisitionVerifier:
|
|
|
27
27
|
self.requisition.is_drawn = self.requisition.is_drawn or YES
|
|
28
28
|
self.requisition.item_count = self.requisition.item_count or 1
|
|
29
29
|
self.requisition.item_type = self.requisition.item_type or TUBE
|
|
30
|
-
self.requisition.drawn_datetime = (
|
|
31
|
-
self.requisition.drawn_datetime or get_utcnow()
|
|
32
|
-
)
|
|
30
|
+
self.requisition.drawn_datetime = self.requisition.drawn_datetime or get_utcnow()
|
|
33
31
|
self.requisition.save()
|
|
34
32
|
self.verified = self.requisition.clinic_verified
|
|
35
33
|
|
|
@@ -37,10 +35,7 @@ class RequisitionVerifier:
|
|
|
37
35
|
return f"{self.requisition_identifier} {self.verified}"
|
|
38
36
|
|
|
39
37
|
def __repr__(self):
|
|
40
|
-
return (
|
|
41
|
-
f"<{self.__class__.__name__}("
|
|
42
|
-
"{self.requisition_identifier}) {self.verified}>"
|
|
43
|
-
)
|
|
38
|
+
return f"<{self.__class__.__name__}(" "{self.requisition_identifier}) {self.verified}>"
|
|
44
39
|
|
|
45
40
|
@property
|
|
46
41
|
def requisition(self):
|
|
@@ -176,9 +176,7 @@ def render_crf_totals(appointment: Appointment = None) -> dict[str, bool | int]:
|
|
|
176
176
|
overdue = True
|
|
177
177
|
else:
|
|
178
178
|
crf_keyed = helper.get_crf_metadata_by(entry_status=KEYED).count()
|
|
179
|
-
requisition_keyed = helper.get_requisition_metadata_by(
|
|
180
|
-
entry_status=KEYED
|
|
181
|
-
).count()
|
|
179
|
+
requisition_keyed = helper.get_requisition_metadata_by(entry_status=KEYED).count()
|
|
182
180
|
crf_total = helper.get_crf_metadata_by(entry_status=[REQUIRED, KEYED]).count()
|
|
183
181
|
requisition_total = helper.get_requisition_metadata_by(
|
|
184
182
|
entry_status=[REQUIRED, KEYED]
|
|
@@ -470,9 +468,7 @@ def render_screening_button(context, subject_screening) -> dict:
|
|
|
470
468
|
def render_subject_schedule_button(
|
|
471
469
|
subject_dashboard_url: str, subject_identifier: str
|
|
472
470
|
) -> dict:
|
|
473
|
-
url = reverse(
|
|
474
|
-
subject_dashboard_url, kwargs=dict(subject_identifier=subject_identifier)
|
|
475
|
-
)
|
|
471
|
+
url = reverse(subject_dashboard_url, kwargs=dict(subject_identifier=subject_identifier))
|
|
476
472
|
return dict(url=url, subject_identifier=subject_identifier)
|
|
477
473
|
|
|
478
474
|
|
|
@@ -46,8 +46,7 @@ class SubjectVisitViewMixin:
|
|
|
46
46
|
self._related_visit = self.appointment.related_visit
|
|
47
47
|
except AttributeError as e:
|
|
48
48
|
raise SubjectVisitViewMixinError(
|
|
49
|
-
"Visit model must have a OneToOne relation to appointment. "
|
|
50
|
-
f"Got {e}"
|
|
49
|
+
"Visit model must have a OneToOne relation to appointment. " f"Got {e}"
|
|
51
50
|
)
|
|
52
51
|
return self._related_visit
|
|
53
52
|
|
|
@@ -14,9 +14,7 @@ class CrfButton(DashboardModelButton):
|
|
|
14
14
|
|
|
15
15
|
@property
|
|
16
16
|
def extra_kwargs(self) -> dict[str, str | int | UUID]:
|
|
17
|
-
return {
|
|
18
|
-
self.model_cls().related_visit_model_attr(): self.appointment.related_visit.id
|
|
19
|
-
}
|
|
17
|
+
return {self.model_cls().related_visit_model_attr(): self.appointment.related_visit.id}
|
|
20
18
|
|
|
21
19
|
@property
|
|
22
20
|
def disabled(self) -> str:
|
|
@@ -56,9 +56,7 @@ class SubjectConsentListboardButton(ModelButton):
|
|
|
56
56
|
|
|
57
57
|
@property
|
|
58
58
|
def site(self) -> Site | None:
|
|
59
|
-
return getattr(self.screening_obj, "site", None) or getattr(
|
|
60
|
-
self.request, "site", None
|
|
61
|
-
)
|
|
59
|
+
return getattr(self.screening_obj, "site", None) or getattr(self.request, "site", None)
|
|
62
60
|
|
|
63
61
|
@property
|
|
64
62
|
def label(self) -> str:
|
|
@@ -32,9 +32,7 @@ SKIPPED = 2
|
|
|
32
32
|
|
|
33
33
|
@dataclass
|
|
34
34
|
class TimepointStatusButton(AppointmentButton):
|
|
35
|
-
labels: tuple[str, str, str] = field(
|
|
36
|
-
default=("Start", "Visit Report", "Visit Report")
|
|
37
|
-
)
|
|
35
|
+
labels: tuple[str, str, str] = field(default=("Start", "Visit Report", "Visit Report"))
|
|
38
36
|
colors: tuple[str, str, str, str] = field(
|
|
39
37
|
default=("warning", "success", "default", "danger")
|
|
40
38
|
)
|
|
@@ -70,9 +70,7 @@ class RequisitionPrintActionsView(BaseRequisitionView):
|
|
|
70
70
|
|
|
71
71
|
if labels.zpl_data:
|
|
72
72
|
try:
|
|
73
|
-
job_id = self.clinic_label_printer.stream_print(
|
|
74
|
-
zpl_data=labels.zpl_data
|
|
75
|
-
)
|
|
73
|
+
job_id = self.clinic_label_printer.stream_print(zpl_data=labels.zpl_data)
|
|
76
74
|
except (PrintServerError, PrinterError) as e:
|
|
77
75
|
messages.error(self.request, str(e))
|
|
78
76
|
else:
|
|
@@ -84,9 +82,7 @@ class RequisitionPrintActionsView(BaseRequisitionView):
|
|
|
84
82
|
)
|
|
85
83
|
messages.success(self.request, job_result.message)
|
|
86
84
|
if labels.requisitions_not_printed:
|
|
87
|
-
panels = ", ".join(
|
|
88
|
-
[str(r.panel_object) for r in labels.requisitions_not_printed]
|
|
89
|
-
)
|
|
85
|
+
panels = ", ".join([str(r.panel_object) for r in labels.requisitions_not_printed])
|
|
90
86
|
messages.warning(
|
|
91
87
|
self.request, f"Some selected labels were not printed. See {panels}."
|
|
92
88
|
)
|
|
@@ -102,9 +98,7 @@ class RequisitionPrintActionsView(BaseRequisitionView):
|
|
|
102
98
|
)
|
|
103
99
|
response = requisition_report.render_to_response()
|
|
104
100
|
else:
|
|
105
|
-
messages.error(
|
|
106
|
-
self.request, 'Nothing to do. No "verified" requisitions selected.'
|
|
107
|
-
)
|
|
101
|
+
messages.error(self.request, 'Nothing to do. No "verified" requisitions selected.')
|
|
108
102
|
response = None
|
|
109
103
|
return response
|
|
110
104
|
|
|
@@ -114,9 +108,7 @@ class RequisitionPrintActionsView(BaseRequisitionView):
|
|
|
114
108
|
appointment.
|
|
115
109
|
"""
|
|
116
110
|
if not self._requisition_metadata:
|
|
117
|
-
appointment = Appointment.objects.get(
|
|
118
|
-
pk=self.request.POST.get("appointment")
|
|
119
|
-
)
|
|
111
|
+
appointment = Appointment.objects.get(pk=self.request.POST.get("appointment"))
|
|
120
112
|
subject_identifier = self.request.POST.get("subject_identifier")
|
|
121
113
|
opts = dict(
|
|
122
114
|
subject_identifier=subject_identifier,
|
|
@@ -15,9 +15,7 @@ class RequisitionVerifyActionsView(BaseRequisitionView):
|
|
|
15
15
|
appointment_pk = request.POST.get("appointment")
|
|
16
16
|
if request.POST.get("requisition_identifier"):
|
|
17
17
|
requisition_identifier = (
|
|
18
|
-
request.POST.get("requisition_identifier")
|
|
19
|
-
.replace("-", "")
|
|
20
|
-
.replace(" ", "")
|
|
18
|
+
request.POST.get("requisition_identifier").replace("-", "").replace(" ", "")
|
|
21
19
|
)
|
|
22
20
|
requisition_verifier = self.requisition_verifier_cls(
|
|
23
21
|
appointment_pk=appointment_pk,
|