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
|
@@ -20,17 +20,11 @@ def convert_dates_from_model(
|
|
|
20
20
|
if field_cls.name in source_df.columns:
|
|
21
21
|
date_cols.append(field_cls.name)
|
|
22
22
|
if date_cols:
|
|
23
|
-
source_df[date_cols] = source_df[date_cols].apply(
|
|
24
|
-
pd.to_datetime, errors="coerce"
|
|
25
|
-
)
|
|
23
|
+
source_df[date_cols] = source_df[date_cols].apply(pd.to_datetime, errors="coerce")
|
|
26
24
|
if normalize:
|
|
27
|
-
source_df[date_cols] = source_df[date_cols].apply(
|
|
28
|
-
lambda x: x.dt.normalize()
|
|
29
|
-
)
|
|
25
|
+
source_df[date_cols] = source_df[date_cols].apply(lambda x: x.dt.normalize())
|
|
30
26
|
if localize:
|
|
31
27
|
source_df[date_cols] = source_df[date_cols].apply(
|
|
32
|
-
lambda x: (
|
|
33
|
-
x.dt.tz_localize(None) if x.dtype == "datetime64[ns, UTC]" else x
|
|
34
|
-
)
|
|
28
|
+
lambda x: (x.dt.tz_localize(None) if x.dtype == "datetime64[ns, UTC]" else x)
|
|
35
29
|
)
|
|
36
30
|
return source_df
|
|
@@ -9,7 +9,5 @@ def convert_numerics_from_model(source_df: pd.DataFrame, model_cls) -> pd.DataFr
|
|
|
9
9
|
if field_cls.get_internal_type() in numeric_datatypes:
|
|
10
10
|
numeric_cols.append(field_cls.name)
|
|
11
11
|
if numeric_cols:
|
|
12
|
-
source_df[numeric_cols] = source_df[numeric_cols].apply(
|
|
13
|
-
pd.to_numeric, errors="coerce"
|
|
14
|
-
)
|
|
12
|
+
source_df[numeric_cols] = source_df[numeric_cols].apply(pd.to_numeric, errors="coerce")
|
|
15
13
|
return source_df
|
|
@@ -9,7 +9,5 @@ def convert_timedelta_from_model(source_df: pd.DataFrame, model_cls) -> pd.DataF
|
|
|
9
9
|
if field_cls.get_internal_type() in timedelta_datatypes:
|
|
10
10
|
date_cols.append(field_cls.name)
|
|
11
11
|
if date_cols:
|
|
12
|
-
source_df[date_cols] = source_df[date_cols].apply(
|
|
13
|
-
pd.to_timedelta, errors="coerce"
|
|
14
|
-
)
|
|
12
|
+
source_df[date_cols] = source_df[date_cols].apply(pd.to_timedelta, errors="coerce")
|
|
15
13
|
return source_df
|
|
@@ -17,9 +17,7 @@ def missing_subject_identifiers(
|
|
|
17
17
|
subject_identifiers=[a list of subject identifiers])
|
|
18
18
|
"""
|
|
19
19
|
# convert list of subject identifiers to a dataframe
|
|
20
|
-
df_subject_identifiers = pd.DataFrame(
|
|
21
|
-
subject_identifiers, columns=["subject_identifier"]
|
|
22
|
-
)
|
|
20
|
+
df_subject_identifiers = pd.DataFrame(subject_identifiers, columns=["subject_identifier"])
|
|
23
21
|
df_subject_identifiers["identifier"] = df_subject_identifiers["subject_identifier"]
|
|
24
22
|
df_subject_identifiers = df_subject_identifiers.set_index("subject_identifier")
|
|
25
23
|
if verbose:
|
|
@@ -12,9 +12,7 @@ from ...models import Receive, RepackRequest, Stock
|
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
@admin.display(description="Confirm repacked and labeled stock")
|
|
15
|
-
def confirm_repacked_stock_action(
|
|
16
|
-
modeladmin, request, queryset: QuerySet[RepackRequest]
|
|
17
|
-
):
|
|
15
|
+
def confirm_repacked_stock_action(modeladmin, request, queryset: QuerySet[RepackRequest]):
|
|
18
16
|
if queryset.count() > 1 or queryset.count() == 0:
|
|
19
17
|
messages.add_message(
|
|
20
18
|
request,
|
|
@@ -27,9 +25,7 @@ def confirm_repacked_stock_action(
|
|
|
27
25
|
|
|
28
26
|
|
|
29
27
|
@admin.display(description="Confirm received and labeled stock")
|
|
30
|
-
def confirm_received_stock_action(
|
|
31
|
-
modeladmin, request, queryset: QuerySet[RepackRequest]
|
|
32
|
-
):
|
|
28
|
+
def confirm_received_stock_action(modeladmin, request, queryset: QuerySet[RepackRequest]):
|
|
33
29
|
if queryset.count() > 1 or queryset.count() == 0:
|
|
34
30
|
messages.add_message(
|
|
35
31
|
request,
|
|
@@ -23,9 +23,7 @@ def delete_order_items_action(modeladmin, request, queryset: QuerySet[OrderItem]
|
|
|
23
23
|
messages.add_message(
|
|
24
24
|
request,
|
|
25
25
|
messages.SUCCESS,
|
|
26
|
-
gettext(
|
|
27
|
-
f"Successfully deleted {success_count} {OrderItem._meta.verbose_name}."
|
|
28
|
-
),
|
|
26
|
+
gettext(f"Successfully deleted {success_count} {OrderItem._meta.verbose_name}."),
|
|
29
27
|
)
|
|
30
28
|
if failed_count > 0:
|
|
31
29
|
messages.add_message(
|
|
@@ -20,9 +20,7 @@ def delete_receive_items_action(modeladmin, request, queryset: QuerySet[ReceiveI
|
|
|
20
20
|
messages.add_message(
|
|
21
21
|
request,
|
|
22
22
|
messages.SUCCESS,
|
|
23
|
-
gettext(
|
|
24
|
-
f"Successfully deleted {success_count} {ReceiveItem._meta.verbose_name}."
|
|
25
|
-
),
|
|
23
|
+
gettext(f"Successfully deleted {success_count} {ReceiveItem._meta.verbose_name}."),
|
|
26
24
|
)
|
|
27
25
|
if failed_count > 0:
|
|
28
26
|
messages.add_message(
|
|
@@ -13,8 +13,6 @@ def print_stock_report_action(modeladmin, request, queryset):
|
|
|
13
13
|
if queryset.count() > 1:
|
|
14
14
|
session_uuid = str(uuid4())
|
|
15
15
|
request.session[session_uuid] = list(queryset.values_list("pk", flat=True))
|
|
16
|
-
url = reverse(
|
|
17
|
-
"edc_pharmacy:stock_report", kwargs={"session_uuid": session_uuid}
|
|
18
|
-
)
|
|
16
|
+
url = reverse("edc_pharmacy:stock_report", kwargs={"session_uuid": session_uuid})
|
|
19
17
|
return HttpResponseRedirect(url)
|
|
20
18
|
return None
|
|
@@ -17,9 +17,7 @@ class MedicationsListFilter(SimpleListFilter):
|
|
|
17
17
|
def lookups(self, request, model_admin):
|
|
18
18
|
medications = []
|
|
19
19
|
for medication in Medication.objects.all().order_by("name"):
|
|
20
|
-
medications.append(
|
|
21
|
-
(medication.name, medication.name.replace("_", " ").title())
|
|
22
|
-
)
|
|
20
|
+
medications.append((medication.name, medication.name.replace("_", " ").title()))
|
|
23
21
|
medications.append(("none", "None"))
|
|
24
22
|
return tuple(medications)
|
|
25
23
|
|
|
@@ -139,23 +137,15 @@ class TransferredListFilter(SimpleListFilter):
|
|
|
139
137
|
if self.value() == YES:
|
|
140
138
|
qs = queryset.filter(
|
|
141
139
|
container__may_request_as=True,
|
|
142
|
-
allocation__stock_request_item__stock_request__location=F(
|
|
143
|
-
"location"
|
|
144
|
-
),
|
|
140
|
+
allocation__stock_request_item__stock_request__location=F("location"),
|
|
145
141
|
)
|
|
146
142
|
elif self.value() == NO:
|
|
147
143
|
qs = queryset.filter(
|
|
148
|
-
~Q(
|
|
149
|
-
allocation__stock_request_item__stock_request__location=F(
|
|
150
|
-
"location"
|
|
151
|
-
)
|
|
152
|
-
),
|
|
144
|
+
~Q(allocation__stock_request_item__stock_request__location=F("location")),
|
|
153
145
|
container__may_request_as=True,
|
|
154
146
|
)
|
|
155
147
|
elif self.value() == NOT_APPLICABLE:
|
|
156
|
-
qs = queryset.filter(
|
|
157
|
-
allocation__isnull=True, container__may_request_as=False
|
|
158
|
-
)
|
|
148
|
+
qs = queryset.filter(allocation__isnull=True, container__may_request_as=False)
|
|
159
149
|
return qs
|
|
160
150
|
|
|
161
151
|
|
|
@@ -410,9 +400,7 @@ class OrderItemStatusListFilter(SimpleListFilter):
|
|
|
410
400
|
if self.value() == RECEIVED:
|
|
411
401
|
qs = queryset.filter(unit_qty=0)
|
|
412
402
|
elif self.value() == PARTIAL:
|
|
413
|
-
qs = queryset.filter(
|
|
414
|
-
Q(unit_qty_ordered__gt=F("unit_qty")) & ~Q(unit_qty=0)
|
|
415
|
-
)
|
|
403
|
+
qs = queryset.filter(Q(unit_qty_ordered__gt=F("unit_qty")) & ~Q(unit_qty=0))
|
|
416
404
|
elif self.value() == NEW:
|
|
417
405
|
qs = queryset.filter(unit_qty=F("unit_qty_ordered"))
|
|
418
406
|
return qs
|
|
@@ -51,6 +51,4 @@ class ModelAdminMixin(
|
|
|
51
51
|
kwargs=opts,
|
|
52
52
|
)
|
|
53
53
|
context = dict(title="Go to subject's dashboard", url=url, label=label)
|
|
54
|
-
return render_to_string(
|
|
55
|
-
"edc_subject_dashboard/dashboard_button.html", context=context
|
|
56
|
-
)
|
|
54
|
+
return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)
|
|
@@ -80,18 +80,14 @@ class RxAdmin(ModelAdminSubjectDashboardMixin, admin.ModelAdmin):
|
|
|
80
80
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_rxrefill_add")
|
|
81
81
|
url = f"{url}?rx={obj.id}"
|
|
82
82
|
context = dict(title="Add refill", url=url, label="Add refill")
|
|
83
|
-
return render_to_string(
|
|
84
|
-
"edc_subject_dashboard/dashboard_button.html", context=context
|
|
85
|
-
)
|
|
83
|
+
return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)
|
|
86
84
|
|
|
87
85
|
@admin.display
|
|
88
86
|
def refills(self, obj=None, label=None):
|
|
89
87
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_rxrefill_changelist")
|
|
90
88
|
url = f"{url}?q={obj.id}"
|
|
91
89
|
context = dict(title="RX items", url=url, label="Refills")
|
|
92
|
-
return render_to_string(
|
|
93
|
-
"edc_subject_dashboard/dashboard_button.html", context=context
|
|
94
|
-
)
|
|
90
|
+
return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)
|
|
95
91
|
|
|
96
92
|
@admin.display
|
|
97
93
|
def rx_medications(self, obj):
|
|
@@ -133,9 +133,7 @@ class RxRefillAdmin(ModelAdminMixin, admin.ModelAdmin):
|
|
|
133
133
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_rx_changelist")
|
|
134
134
|
url = f"{url}?q={obj.rx.id}"
|
|
135
135
|
context = dict(title="Back to RX", url=url, label="Rx")
|
|
136
|
-
return render_to_string(
|
|
137
|
-
"edc_subject_dashboard/dashboard_button.html", context=context
|
|
138
|
-
)
|
|
136
|
+
return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)
|
|
139
137
|
|
|
140
138
|
@admin.display(description="Description of Refill")
|
|
141
139
|
def description(self, obj=None):
|
|
@@ -122,8 +122,4 @@ class StockAvailabilityModelAdmin(
|
|
|
122
122
|
return obj.created
|
|
123
123
|
|
|
124
124
|
def get_view_only_site_ids_for_user(self, request) -> list[int]:
|
|
125
|
-
return [
|
|
126
|
-
s.id
|
|
127
|
-
for s in request.user.userprofile.sites.all()
|
|
128
|
-
if s.id != request.site.id
|
|
129
|
-
]
|
|
125
|
+
return [s.id for s in request.user.userprofile.sites.all() if s.id != request.site.id]
|
|
@@ -197,30 +197,22 @@ class AllocationAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
197
197
|
label=f"{obj.stock_request_item.stock_request.request_identifier}",
|
|
198
198
|
title="Go to stock request",
|
|
199
199
|
)
|
|
200
|
-
return render_to_string(
|
|
201
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
202
|
-
)
|
|
200
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
203
201
|
|
|
204
202
|
@admin.display(description="Stock #")
|
|
205
203
|
def stock_changelist(self, obj):
|
|
206
204
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stock_changelist")
|
|
207
205
|
url = f"{url}?q={obj.stock.code}"
|
|
208
206
|
context = dict(url=url, label=f"{obj.stock.code}", title="Go to stock")
|
|
209
|
-
return render_to_string(
|
|
210
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
211
|
-
)
|
|
207
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
212
208
|
|
|
213
|
-
@admin.display(
|
|
214
|
-
description="Subject #", ordering="registered_subject__subject_identifier"
|
|
215
|
-
)
|
|
209
|
+
@admin.display(description="Subject #", ordering="registered_subject__subject_identifier")
|
|
216
210
|
def dashboard(self, obj=None, label=None):
|
|
217
211
|
context = {}
|
|
218
212
|
try:
|
|
219
213
|
url = reverse(
|
|
220
214
|
self.get_subject_dashboard_url_name(),
|
|
221
|
-
kwargs={
|
|
222
|
-
"subject_identifier": obj.registered_subject.subject_identifier
|
|
223
|
-
},
|
|
215
|
+
kwargs={"subject_identifier": obj.registered_subject.subject_identifier},
|
|
224
216
|
)
|
|
225
217
|
except NoReverseMatch:
|
|
226
218
|
url = None
|
|
@@ -231,7 +223,5 @@ class AllocationAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
231
223
|
label=obj.registered_subject.subject_identifier,
|
|
232
224
|
)
|
|
233
225
|
if url:
|
|
234
|
-
return render_to_string(
|
|
235
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
236
|
-
)
|
|
226
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
237
227
|
return None
|
|
@@ -19,9 +19,7 @@ class AllocationProxyAdmin(AllocationAdmin):
|
|
|
19
19
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stockproxy_changelist")
|
|
20
20
|
url = f"{url}?q={obj.stock.code}"
|
|
21
21
|
context = dict(url=url, label=f"{obj.stock.code}", title="Go to stock")
|
|
22
|
-
return render_to_string(
|
|
23
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
24
|
-
)
|
|
22
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
25
23
|
|
|
26
24
|
def get_queryset(self, request):
|
|
27
25
|
return (
|
|
@@ -82,6 +82,4 @@ class ConfirmationAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
82
82
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stock_changelist")
|
|
83
83
|
url = f"{url}?q={obj.stock.code}"
|
|
84
84
|
context = dict(url=url, label=f"{obj.stock.code}", title="Go to stock")
|
|
85
|
-
return render_to_string(
|
|
86
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
87
|
-
)
|
|
85
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
@@ -70,9 +70,7 @@ class ConfirmationAtSiteAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
70
70
|
),
|
|
71
71
|
)
|
|
72
72
|
|
|
73
|
-
@admin.display(
|
|
74
|
-
description="CONFIRMATION #", ordering="-transfer_confirmation_identifier"
|
|
75
|
-
)
|
|
73
|
+
@admin.display(description="CONFIRMATION #", ordering="-transfer_confirmation_identifier")
|
|
76
74
|
def identifier(self, obj):
|
|
77
75
|
return obj.transfer_confirmation_identifier.split("-")[0]
|
|
78
76
|
|
|
@@ -83,18 +81,14 @@ class ConfirmationAtSiteAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
83
81
|
@admin.display(description="Confirmed items")
|
|
84
82
|
def confirmation_at_site_item_changelist(self, obj):
|
|
85
83
|
item_count = obj.confirmationatsiteitem_set.all().count()
|
|
86
|
-
url = reverse(
|
|
87
|
-
"edc_pharmacy_admin:edc_pharmacy_confirmationatsiteitem_changelist"
|
|
88
|
-
)
|
|
84
|
+
url = reverse("edc_pharmacy_admin:edc_pharmacy_confirmationatsiteitem_changelist")
|
|
89
85
|
url = f"{url}?q={obj.id}"
|
|
90
86
|
context = dict(
|
|
91
87
|
url=url,
|
|
92
88
|
label=_("Confirmed items (%(item_count)s)") % {"item_count": item_count},
|
|
93
89
|
title="Go to stock transfer confirmation items",
|
|
94
90
|
)
|
|
95
|
-
return render_to_string(
|
|
96
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
97
|
-
)
|
|
91
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
98
92
|
|
|
99
93
|
@admin.display(
|
|
100
94
|
description="Stock Transfer", ordering="stock_transfer__transfer_identifier"
|
|
@@ -109,6 +103,4 @@ class ConfirmationAtSiteAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
109
103
|
),
|
|
110
104
|
title="Go to stock transfer",
|
|
111
105
|
)
|
|
112
|
-
return render_to_string(
|
|
113
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
114
|
-
)
|
|
106
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
@@ -14,9 +14,7 @@ from ..model_admin_mixin import ModelAdminMixin
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
@admin.register(ConfirmationAtSiteItem, site=edc_pharmacy_admin)
|
|
17
|
-
class ConfirmationAtSiteItemAdmin(
|
|
18
|
-
SiteModelAdminMixin, ModelAdminMixin, SimpleHistoryAdmin
|
|
19
|
-
):
|
|
17
|
+
class ConfirmationAtSiteItemAdmin(SiteModelAdminMixin, ModelAdminMixin, SimpleHistoryAdmin):
|
|
20
18
|
change_list_title = "Pharmacy: Stock items confirmed at site"
|
|
21
19
|
change_form_title = "Pharmacy: Stock item confirmed at site"
|
|
22
20
|
history_list_display = ()
|
|
@@ -85,9 +83,7 @@ class ConfirmationAtSiteItemAdmin(
|
|
|
85
83
|
def transfer_confirmation_item_date(self, obj):
|
|
86
84
|
return to_local(obj.transfer_confirmation_item_datetime).date()
|
|
87
85
|
|
|
88
|
-
@admin.display(
|
|
89
|
-
description="Site", ordering="confirmation_at_site__location__site__id"
|
|
90
|
-
)
|
|
86
|
+
@admin.display(description="Site", ordering="confirmation_at_site__location__site__id")
|
|
91
87
|
def site(self, obj):
|
|
92
88
|
return obj.confirmation_at_site.location.site.id
|
|
93
89
|
|
|
@@ -110,22 +106,14 @@ class ConfirmationAtSiteItemAdmin(
|
|
|
110
106
|
label=obj.confirmation_at_site.transfer_confirmation_identifier,
|
|
111
107
|
title="Go to stock transfer confirmation",
|
|
112
108
|
)
|
|
113
|
-
return render_to_string(
|
|
114
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
115
|
-
)
|
|
109
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
116
110
|
|
|
117
111
|
@admin.display(description="Stock", ordering="stock__code")
|
|
118
112
|
def stock_changelist(self, obj):
|
|
119
113
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stockproxy_changelist")
|
|
120
114
|
url = f"{url}?q={obj.stock.code}"
|
|
121
115
|
context = dict(url=url, label=obj.stock.code, title="Go to stock")
|
|
122
|
-
return render_to_string(
|
|
123
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
124
|
-
)
|
|
116
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
125
117
|
|
|
126
118
|
def get_view_only_site_ids_for_user(self, request) -> list[int]:
|
|
127
|
-
return [
|
|
128
|
-
s.id
|
|
129
|
-
for s in request.user.userprofile.sites.all()
|
|
130
|
-
if s.id != request.site.id
|
|
131
|
-
]
|
|
119
|
+
return [s.id for s in request.user.userprofile.sites.all() if s.id != request.site.id]
|
|
@@ -93,22 +93,14 @@ class DispenseAdmin(SiteModelAdminMixin, ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
93
93
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_dispenseitem_changelist")
|
|
94
94
|
url = f"{url}?q={obj.id}"
|
|
95
95
|
context = dict(url=url, label="Dispense items", title="Go to items")
|
|
96
|
-
return render_to_string(
|
|
97
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
98
|
-
)
|
|
96
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
99
97
|
|
|
100
98
|
@admin.display(description="Stock")
|
|
101
99
|
def stock_changelist(self, obj):
|
|
102
100
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stock_changelist")
|
|
103
101
|
url = f"{url}?q={obj.id}"
|
|
104
102
|
context = dict(url=url, label="Stock", title="Go to stock")
|
|
105
|
-
return render_to_string(
|
|
106
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
107
|
-
)
|
|
103
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
108
104
|
|
|
109
105
|
def get_view_only_site_ids_for_user(self, request) -> list[int]:
|
|
110
|
-
return [
|
|
111
|
-
s.id
|
|
112
|
-
for s in request.user.userprofile.sites.all()
|
|
113
|
-
if s.id != request.site.id
|
|
114
|
-
]
|
|
106
|
+
return [s.id for s in request.user.userprofile.sites.all() if s.id != request.site.id]
|
|
@@ -93,25 +93,15 @@ class DispenseItemAdmin(SiteModelAdminMixin, ModelAdminMixin, SimpleHistoryAdmin
|
|
|
93
93
|
def dispense_changelist(self, obj):
|
|
94
94
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_dispense_changelist")
|
|
95
95
|
url = f"{url}?q={obj.dispense.id}"
|
|
96
|
-
context = dict(
|
|
97
|
-
|
|
98
|
-
)
|
|
99
|
-
return render_to_string(
|
|
100
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
101
|
-
)
|
|
96
|
+
context = dict(url=url, label=obj.dispense.dispense_identifier, title="Go to dispense")
|
|
97
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
102
98
|
|
|
103
99
|
@admin.display(description="Stock #")
|
|
104
100
|
def stock_changelist(self, obj):
|
|
105
101
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stockproxy_changelist")
|
|
106
102
|
url = f"{url}?q={obj.stock.code}"
|
|
107
103
|
context = dict(url=url, label=obj.stock.code, title="Go to stock")
|
|
108
|
-
return render_to_string(
|
|
109
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
110
|
-
)
|
|
104
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
111
105
|
|
|
112
106
|
def get_view_only_site_ids_for_user(self, request) -> list[int]:
|
|
113
|
-
return [
|
|
114
|
-
s.id
|
|
115
|
-
for s in request.user.userprofile.sites.all()
|
|
116
|
-
if s.id != request.site.id
|
|
117
|
-
]
|
|
107
|
+
return [s.id for s in request.user.userprofile.sites.all() if s.id != request.site.id]
|
|
@@ -114,9 +114,7 @@ class OrderAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
114
114
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_receive_changelist")
|
|
115
115
|
url = f"{url}?q={str(rcv_obj.receive_identifier)}"
|
|
116
116
|
context = dict(url=url, label=rcv_obj.receive_identifier, title="Receive #")
|
|
117
|
-
return render_to_string(
|
|
118
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
119
|
-
)
|
|
117
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
120
118
|
return None
|
|
121
119
|
|
|
122
120
|
def get_form(self, request, obj=None, **kwargs):
|
|
@@ -126,9 +126,7 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
126
126
|
|
|
127
127
|
@admin.display(description="Product", ordering="product__name")
|
|
128
128
|
def product_name(self, obj):
|
|
129
|
-
return obj.product.formulation.get_description_with_assignment(
|
|
130
|
-
obj.product.assignment
|
|
131
|
-
)
|
|
129
|
+
return obj.product.formulation.get_description_with_assignment(obj.product.assignment)
|
|
132
130
|
|
|
133
131
|
@admin.display(description="Container", ordering="container__name")
|
|
134
132
|
def container_name(self, obj):
|
|
@@ -139,9 +137,7 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
139
137
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_order_changelist")
|
|
140
138
|
url = f"{url}?q={obj.order.order_identifier}"
|
|
141
139
|
context = dict(url=url, label=obj.order.order_identifier, title="Back to order")
|
|
142
|
-
return render_to_string(
|
|
143
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
144
|
-
)
|
|
140
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
145
141
|
|
|
146
142
|
@admin.display(description="Stock")
|
|
147
143
|
def stock_changelist(self, obj):
|
|
@@ -149,9 +145,7 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
149
145
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stock_changelist")
|
|
150
146
|
url = f"{url}?q={obj.order.id}"
|
|
151
147
|
context = dict(url=url, label="Stock", title="Go to stock")
|
|
152
|
-
return render_to_string(
|
|
153
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
154
|
-
)
|
|
148
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
155
149
|
return None
|
|
156
150
|
|
|
157
151
|
@admin.display(description="RECEIVE #")
|
|
@@ -184,9 +178,7 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
184
178
|
if not receive:
|
|
185
179
|
return self.render_start_receiving_button(obj)
|
|
186
180
|
if (obj.unit_qty_received or Decimal(0)) < obj.unit_qty_ordered:
|
|
187
|
-
receive_this_item_button = self.render_receive_this_item_button(
|
|
188
|
-
obj, receive
|
|
189
|
-
)
|
|
181
|
+
receive_this_item_button = self.render_receive_this_item_button(obj, receive)
|
|
190
182
|
received_items_link = self.render_received_items_link(obj)
|
|
191
183
|
renders = [
|
|
192
184
|
receive_this_item_button,
|
|
@@ -255,7 +247,5 @@ class OrderItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
255
247
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_receiveitem_changelist")
|
|
256
248
|
url = f"{url}?q={str(obj.pk)}"
|
|
257
249
|
context = dict(url=url, label=status_label, title=_("Go to received items"))
|
|
258
|
-
return render_to_string(
|
|
259
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
260
|
-
)
|
|
250
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
261
251
|
return None
|
|
@@ -99,30 +99,22 @@ class ReceiveAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
99
99
|
count = obj.receiveitem_set.all().count()
|
|
100
100
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_receiveitem_changelist")
|
|
101
101
|
url = f"{url}?q={obj.id}"
|
|
102
|
-
context = dict(
|
|
103
|
-
|
|
104
|
-
)
|
|
105
|
-
return render_to_string(
|
|
106
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
107
|
-
)
|
|
102
|
+
context = dict(url=url, label=f"Received ({count})", title="Go to received items")
|
|
103
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
108
104
|
|
|
109
105
|
@admin.display(description="Order #")
|
|
110
106
|
def order_changelist(self, obj):
|
|
111
107
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_order_changelist")
|
|
112
108
|
url = f"{url}?q={str(obj.order.order_identifier)}"
|
|
113
109
|
context = dict(url=url, label=obj.order.order_identifier, title="Back to order")
|
|
114
|
-
return render_to_string(
|
|
115
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
116
|
-
)
|
|
110
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
117
111
|
|
|
118
112
|
@admin.display(description="Stock")
|
|
119
113
|
def stock_changelist(self, obj):
|
|
120
114
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stock_changelist")
|
|
121
115
|
url = f"{url}?q={obj.id}"
|
|
122
116
|
context = dict(url=url, label="Stock", title="Go to stock")
|
|
123
|
-
return render_to_string(
|
|
124
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
125
|
-
)
|
|
117
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
126
118
|
|
|
127
119
|
def formfield_for_foreignkey(self, db_field, request, **kwargs):
|
|
128
120
|
if db_field.name == "order" and request.GET.get("order"):
|
|
@@ -109,9 +109,7 @@ class ReceiveItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
109
109
|
context = dict(
|
|
110
110
|
url=url, label=obj.receive.receive_identifier, title="Back to receiving"
|
|
111
111
|
)
|
|
112
|
-
return render_to_string(
|
|
113
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
114
|
-
)
|
|
112
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
115
113
|
|
|
116
114
|
@admin.display(description="Stock")
|
|
117
115
|
def stock_changelist(self, obj):
|
|
@@ -119,9 +117,7 @@ class ReceiveItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
119
117
|
url = f"{url}?q={obj.id}"
|
|
120
118
|
label = "Stock"
|
|
121
119
|
context = dict(url=url, label=label, title="Go to stock")
|
|
122
|
-
return render_to_string(
|
|
123
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
124
|
-
)
|
|
120
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
125
121
|
|
|
126
122
|
@admin.display(description="Order #")
|
|
127
123
|
def order_changelist(self, obj):
|
|
@@ -130,9 +126,7 @@ class ReceiveItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
130
126
|
context = dict(
|
|
131
127
|
url=url, label=obj.order_item.order.order_identifier, title="Back to order"
|
|
132
128
|
)
|
|
133
|
-
return render_to_string(
|
|
134
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
135
|
-
)
|
|
129
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
136
130
|
|
|
137
131
|
@admin.display(description="Order item #")
|
|
138
132
|
def order_items_changelist(self, obj):
|
|
@@ -143,9 +137,7 @@ class ReceiveItemAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
143
137
|
label=obj.order_item.order_item_identifier,
|
|
144
138
|
title="Back to order item",
|
|
145
139
|
)
|
|
146
|
-
return render_to_string(
|
|
147
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
148
|
-
)
|
|
140
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
149
141
|
|
|
150
142
|
@admin.display(description="RECEIVE ITEM #", ordering="-receive_item_identifier")
|
|
151
143
|
def identifier(self, obj):
|
|
@@ -135,18 +135,14 @@ class RequestRepackAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
135
135
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stock_changelist")
|
|
136
136
|
url = f"{url}?q={obj.id}"
|
|
137
137
|
context = dict(url=url, label="Stock", title="Go to stock")
|
|
138
|
-
return render_to_string(
|
|
139
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
140
|
-
)
|
|
138
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
141
139
|
|
|
142
140
|
@admin.display(description="From stock", ordering="from_stock__code")
|
|
143
141
|
def from_stock_changelist(self, obj):
|
|
144
142
|
url = reverse("edc_pharmacy_admin:edc_pharmacy_stock_changelist")
|
|
145
143
|
url = f"{url}?q={obj.from_stock.code}&decanted=No"
|
|
146
144
|
context = dict(url=url, label=obj.from_stock.code, title="Go to stock")
|
|
147
|
-
return render_to_string(
|
|
148
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
149
|
-
)
|
|
145
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
150
146
|
|
|
151
147
|
@admin.display(description="REPACK #", ordering="-repack_identifier")
|
|
152
148
|
def identifier(self, obj):
|
|
@@ -77,7 +77,5 @@ class StockAdjustmentAdmin(ModelAdminMixin, SimpleHistoryAdmin):
|
|
|
77
77
|
label=obj.stock.code,
|
|
78
78
|
title="Go to stock",
|
|
79
79
|
)
|
|
80
|
-
return render_to_string(
|
|
81
|
-
"edc_pharmacy/stock/items_as_link.html", context=context
|
|
82
|
-
)
|
|
80
|
+
return render_to_string("edc_pharmacy/stock/items_as_link.html", context=context)
|
|
83
81
|
return None
|