renalware-core 2.0.151 → 2.0.157
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/renalware/components/navigation.js +0 -7
- data/app/assets/javascripts/renalware/components/sortable.js +3 -0
- data/app/assets/javascripts/renalware/core.js.erb +0 -2
- data/app/assets/javascripts/renalware/rollup_compiled.css +69147 -50289
- data/app/assets/javascripts/renalware/rollup_compiled.js +10 -14
- data/app/assets/stylesheets/renalware/base/_variables.scss +1 -0
- data/app/assets/stylesheets/renalware/lib/_foundation_and_overrides.scss +1 -620
- data/app/assets/stylesheets/renalware/lib/_select2-foundation5-overrides.scss +1 -1
- data/app/assets/stylesheets/renalware/modules/_medications.scss +9 -9
- data/app/assets/stylesheets/renalware/modules/_patients.scss +4 -0
- data/app/assets/stylesheets/renalware/modules/_users.scss +2 -1
- data/app/assets/stylesheets/renalware/partials/_forms.scss +11 -0
- data/app/assets/stylesheets/renalware/partials/_navigation.scss +15 -12
- data/app/assets/stylesheets/renalware/partials/_simple_form.scss +1 -1
- data/app/assets/stylesheets/renalware/partials/_tables.scss +15 -8
- data/app/assets/stylesheets/renalware/partials/_toggle.scss +0 -66
- data/app/assets/stylesheets/renalware/partials/_toggling.scss +18 -0
- data/app/assets/stylesheets/renalware/partials/_trix.scss +12 -0
- data/app/components/renalware/admissions/active_consult_alert_component.html.slim +4 -0
- data/app/components/renalware/admissions/active_consult_alert_component.rb +25 -0
- data/app/components/renalware/article_component.html.slim +5 -0
- data/app/components/renalware/article_component.rb +12 -0
- data/app/components/renalware/events/event_list_component.rb +6 -1
- data/app/components/renalware/medications/tabbed_prescriptions_list_component.html.slim +41 -0
- data/app/components/renalware/medications/tabbed_prescriptions_list_component.rb +47 -0
- data/app/components/renalware/patients/messages_component.html.slim +45 -0
- data/app/components/renalware/patients/messages_component.rb +52 -0
- data/app/components/renalware/pd/adequacy_results_component.html.slim +3 -5
- data/app/components/renalware/system/admin_menu_component.html.slim +3 -1
- data/app/components/renalware/users/last_signin_component.html.slim +3 -0
- data/app/components/renalware/users/last_signin_component.rb +23 -0
- data/app/controllers/renalware/admin/playgrounds_controller.rb +1 -1
- data/app/controllers/renalware/admin/users_controller.rb +1 -0
- data/app/controllers/renalware/drugs/drugs_controller.rb +4 -0
- data/app/controllers/renalware/hd/historical_profiles_controller.rb +1 -1
- data/app/controllers/renalware/medications/prescriptions_controller.rb +5 -2
- data/app/controllers/renalware/messaging/internal/messages_controller.rb +14 -5
- data/app/controllers/renalware/pathology/observation_descriptions_controller.rb +58 -0
- data/app/controllers/renalware/patients/mdms_controller.rb +104 -0
- data/app/controllers/renalware/system/view_metadata_controller.rb +61 -0
- data/app/controllers/renalware/users_controller.rb +25 -0
- data/app/helpers/renalware/application_helper.rb +2 -1
- data/app/helpers/renalware/drugs_helper.rb +6 -0
- data/app/helpers/renalware/layout_helper.rb +1 -1
- data/app/models/concerns/renalware/sortable.rb +49 -0
- data/app/models/renalware/accesses/patient.rb +2 -2
- data/app/models/renalware/accesses/plan.rb +1 -1
- data/app/models/renalware/admissions/request.rb +1 -0
- data/app/models/renalware/clinical/body_composition.rb +1 -1
- data/app/models/renalware/clinical/dry_weight.rb +1 -1
- data/app/models/renalware/clinics/clinic_visit.rb +5 -4
- data/app/models/renalware/feeds/files/create_feed_file.rb +1 -1
- data/app/models/renalware/hd/patient.rb +1 -1
- data/app/models/renalware/hd/preference_set.rb +1 -1
- data/app/models/renalware/hd/profile.rb +4 -4
- data/app/models/renalware/hd/schedule_definition.rb +1 -1
- data/app/models/renalware/hd/session.rb +2 -2
- data/app/models/renalware/hd/session_forms/batch_compile_pdfs.rb +1 -1
- data/app/models/renalware/hd/station.rb +2 -1
- data/app/models/renalware/letters/description.rb +2 -0
- data/app/models/renalware/letters/letter.rb +1 -1
- data/app/models/renalware/letters/part/prescriptions.rb +12 -3
- data/app/models/renalware/letters/pdf_letter_cache.rb +1 -1
- data/app/models/renalware/letters/printing/batch_compile_pdfs.rb +1 -1
- data/app/models/renalware/letters/recipient_params_processor.rb +1 -1
- data/app/models/renalware/medications/prescription.rb +0 -4
- data/app/models/renalware/messaging/internal/message_form.rb +1 -0
- data/app/models/renalware/messaging/internal/message_form_builder.rb +2 -1
- data/app/models/renalware/pathology/current_observations_for_descriptions_query.rb +3 -3
- data/app/models/renalware/pathology/measurement_unit.rb +13 -0
- data/app/models/renalware/pathology/observation_description.rb +23 -5
- data/app/models/renalware/pathology/observation_descriptions_by_code_query.rb +1 -1
- data/app/models/renalware/pathology/observation_requests_attributes_builder.rb +45 -5
- data/app/models/renalware/pathology/observations_within_date_range_query.rb +1 -1
- data/app/models/renalware/patient.rb +2 -2
- data/app/models/renalware/patients/bookmark.rb +2 -2
- data/app/models/renalware/patients/mdm_menu.rb +41 -0
- data/app/models/renalware/patients/mdm_patients_query.rb +1 -1
- data/app/models/renalware/patients/search_query.rb +1 -1
- data/app/models/renalware/patients/worry.rb +0 -1
- data/app/models/renalware/pd/mdm_patients_query.rb +1 -1
- data/app/models/renalware/problems/problem.rb +2 -1
- data/app/models/renalware/snippets/snippet_query.rb +1 -1
- data/app/models/renalware/surveys/question.rb +1 -2
- data/app/models/renalware/system/column_definition.rb +43 -0
- data/app/models/renalware/system/filter_definition.rb +29 -0
- data/app/models/renalware/system/update_user.rb +5 -0
- data/app/models/renalware/system/version.rb +11 -0
- data/app/models/renalware/system/view_metadata.rb +25 -0
- data/app/models/renalware/transplants/donation.rb +1 -1
- data/app/models/renalware/transplants/donor_followup.rb +0 -1
- data/app/models/renalware/transplants/failure_cause_description.rb +1 -1
- data/app/models/renalware/transplants/mdm_patients_query.rb +2 -2
- data/app/models/renalware/transplants/patient.rb +1 -1
- data/app/models/renalware/transplants/recipient_followup.rb +1 -3
- data/app/models/renalware/transplants/registration.rb +1 -3
- data/app/models/renalware/transplants/registrations/wait_list_query.rb +4 -4
- data/app/models/renalware/ukrdc/measurement_unit.rb +21 -0
- data/app/models/renalware/ukrdc/outgoing/rendering/lab_order.rb +30 -2
- data/app/models/renalware/ukrdc/paths.rb +1 -1
- data/app/models/renalware/ukrdc/treatment_timeline/prepare_tables.rb +1 -1
- data/app/models/renalware/ukrdc/treatment_timeline/remap_model_table_names_to_their_prepared_equivalents.rb +1 -1
- data/app/policies/application_policy.rb +1 -1
- data/app/policies/renalware/medications/prescription_policy.rb +35 -0
- data/app/policies/renalware/system/view_metadata_policy.rb +17 -0
- data/app/presenters/concerns/renalware/accountable_presentation.rb +33 -0
- data/app/presenters/renalware/clinics/visit_presenter.rb +11 -0
- data/app/presenters/renalware/events/event_presenter.rb +11 -0
- data/app/presenters/renalware/mdm_presenter.rb +11 -0
- data/app/presenters/renalware/pathology/results_presenter.rb +1 -2
- data/app/presenters/renalware/renal/clinical_summary_presenter.rb +9 -6
- data/app/views/renalware/admin/playgrounds/show.html.slim +2 -6
- data/app/views/renalware/admin/users/edit.html.slim +9 -0
- data/app/views/renalware/admin/users/index.html.slim +6 -0
- data/app/views/renalware/admissions/admissions/_filters.html.slim +8 -16
- data/app/views/renalware/clinical/allergies/_list.html.slim +3 -1
- data/app/views/renalware/dashboard/dashboards/show.html.slim +1 -0
- data/app/views/renalware/hd/protocols/_virology.html.slim +4 -5
- data/app/views/renalware/letters/letters/_form.html.slim +1 -1
- data/app/views/renalware/letters/parts/_prescriptions.html.slim +4 -0
- data/app/views/renalware/mdm/_prescriptions.html.slim +4 -13
- data/app/views/renalware/mdm/prescriptions/_table.html.slim +3 -1
- data/app/views/renalware/medications/prescriptions/_current_hd.html.slim +13 -0
- data/app/views/renalware/medications/prescriptions/_filter_form.html.slim +26 -13
- data/app/views/renalware/medications/prescriptions/_form.html.slim +3 -2
- data/app/views/renalware/medications/prescriptions/_options.html.slim +3 -3
- data/app/views/renalware/medications/prescriptions/_table.html.slim +5 -4
- data/app/views/renalware/medications/prescriptions/_tables.html.slim +13 -16
- data/app/views/renalware/medications/prescriptions/index.html.slim +5 -4
- data/app/views/renalware/messaging/internal/messages/_form.html.slim +3 -0
- data/app/views/renalware/messaging/internal/messages/index.html.slim +36 -0
- data/app/views/renalware/navigation/_mdms.html.slim +5 -0
- data/app/views/renalware/navigation/_renal.html.slim +1 -0
- data/app/views/renalware/navigation/{_super_admin.html.slim → _super_admin.html.slim.dead} +0 -0
- data/app/views/renalware/pathology/code_groups/edit.html.slim +5 -5
- data/app/views/renalware/pathology/code_groups/index.html.slim +4 -5
- data/app/views/renalware/pathology/code_groups/show.html.slim +25 -26
- data/app/views/renalware/pathology/observation_descriptions/_filters.html.slim +14 -0
- data/app/views/renalware/pathology/observation_descriptions/edit.html.slim +21 -0
- data/app/views/renalware/pathology/observation_descriptions/index.html.slim +38 -0
- data/app/views/renalware/pathology/requests/requests/request_form/_crs_form.html.slim +1 -1
- data/app/views/renalware/patients/alerts/_list.html.slim +1 -0
- data/app/views/renalware/patients/mdms/_filters.html.slim +38 -0
- data/app/views/renalware/patients/mdms/_table.html.slim +72 -0
- data/app/views/renalware/patients/mdms/show.html.slim +18 -0
- data/app/views/renalware/patients/side_menu/_general.html.slim +4 -0
- data/app/views/renalware/patients/worryboard/_filters.html.slim +18 -13
- data/app/views/renalware/pd/_peritonitis_episodes.html.slim +13 -13
- data/app/views/renalware/pd/adequacy_results/_form_fields.html.slim +1 -1
- data/app/views/renalware/pd/adequacy_results/_table.html.slim +2 -2
- data/app/views/renalware/pd/dashboards/show.html.slim +3 -3
- data/app/views/renalware/pd/dashboards/show/_page_actions.html.slim +9 -16
- data/app/views/renalware/pd/dashboards/show/_pet_adequacies.html.slim +1 -1
- data/app/views/renalware/pd/peritonitis_episodes/show.html.slim +8 -6
- data/app/views/renalware/shared/_fieldset.html.slim +1 -2
- data/app/views/renalware/shared/_magellan_block.html.slim +1 -2
- data/app/views/renalware/system/view_metadata/_columns_table.html.slim +44 -0
- data/app/views/renalware/system/view_metadata/_filters_form.html.slim +19 -0
- data/app/views/renalware/system/view_metadata/_versions.html.slim +23 -0
- data/app/views/renalware/system/view_metadata/edit.html.slim +66 -0
- data/app/views/renalware/transplants/mdm/_prescriptions.html.slim +6 -22
- data/app/views/renalware/users/_filters.html.slim +11 -0
- data/app/views/renalware/users/index.html.slim +24 -0
- data/config/initializers/core_extensions.rb +2 -2
- data/config/initializers/delayed_job.rb +1 -1
- data/config/initializers/inflections.rb +1 -0
- data/config/initializers/pagy.rb +5 -0
- data/config/locales/renalware/clinical/allergies.en.yml +1 -0
- data/config/locales/renalware/medications/tabbed_prescriptions_list_component.yml +15 -0
- data/config/locales/renalware/navigation/renal.en.yml +1 -0
- data/config/locales/renalware/patients/side_menu.en.yml +1 -0
- data/config/permissions.yml +1 -0
- data/config/routes.rb +1 -0
- data/config/routes/messaging.rb +9 -1
- data/config/routes/pathology.rb +1 -0
- data/config/routes/patients.rb +1 -0
- data/config/routes/system.rb +3 -0
- data/config/routes/users.rb +3 -0
- data/db/functions/convert_to_float_with_explicit_return_v01.sql +18 -0
- data/db/functions/update_current_observation_set_from_trigger_v05.sql +92 -0
- data/db/functions/update_pathology_observations_nresult_from_trigger_v01.sql +13 -0
- data/db/migrate/20200122182018_update_patient_current_modalities.rb +7 -0
- data/db/migrate/20200122182036_create_transplant_mdm_patients.rb +7 -0
- data/db/migrate/20200122190909_create_view_metadata.rb +44 -0
- data/db/migrate/20200131133223_create_hd_mdm_patients.rb +7 -0
- data/db/migrate/20200205185151_add_columns_to_system_view_metadata.rb +13 -0
- data/db/migrate/20200219113324_create_supportive_care_mdm_patients_view.rb +7 -0
- data/db/migrate/20200226145010_add_unique_indexes.rb +12 -11
- data/db/migrate/20200622120232_add_limits_to_path_obs_descriptions.rb +18 -0
- data/db/migrate/20200626081248_overload_convert_to_float_function.rb +13 -0
- data/db/migrate/20200626090256_add_nresult_to_pathology_observations.rb +29 -0
- data/db/migrate/20200628094228_add_prescriber_to_users.rb +14 -0
- data/db/migrate/20200812074223_add_public_flag_to_messages.rb +18 -0
- data/db/migrate/20200815150303_create_system_versions.rb +16 -0
- data/db/migrate/20200817085618_create_pd_mdm_patients.rb +7 -0
- data/db/migrate/20200817103930_create_low_clearance_mdm_patients.rb +7 -0
- data/db/migrate/20201001144512_update_fn_update_current_obs_set_triggerv05.rb +13 -0
- data/db/migrate/20201001145452_add_position_to_letter_descriptions.rb +5 -0
- data/db/migrate/20201009090959_make_drug_types_unique.rb +8 -0
- data/db/migrate/20201012160414_add_suggested_measurement_unit_to_pathology_observation_descriptions.rb +18 -0
- data/db/migrate/20201012171428_create_ukrdc_measurement_units.rb +18 -0
- data/db/migrate/20201015160542_add_position_to_drug_types.rb +31 -0
- data/db/migrate/20201020155510_add_bmi_to_clinic_visits.rb +31 -0
- data/db/migrate/20201020164524_update_pd_mdm_patients_view.rb +7 -0
- data/db/migrate/20201020170921_update_hd_mdm_patients_view.rb +7 -0
- data/db/migrate/20201020171139_update_low_clearance_mdm_patients_view.rb +7 -0
- data/db/migrate/20201021153832_update_supportive_care_mdm_patients_view.rb +7 -0
- data/db/migrate/20201021154809_update_transplant_mdm_patients_view.rb +7 -0
- data/db/migrate/20201023092859_remove_unused_indexes.rb +20 -0
- data/db/seeds/default/system/seeds.rb +1 -0
- data/db/seeds/default/system/view_metadata.rb +91 -0
- data/db/seeds/default/ukrdc/measurement_units.csv +12 -0
- data/db/seeds/default/ukrdc/measurement_units.rb +15 -0
- data/db/seeds/default/ukrdc/seeds.rb +1 -0
- data/db/triggers/update_pathology_observations_nresult_trigger_v01.sql +11 -0
- data/db/views/hd_mdm_patients_v01.sql +69 -0
- data/db/views/hd_mdm_patients_v02.sql +70 -0
- data/db/views/low_clearance_mdm_patients_v01.sql +38 -0
- data/db/views/low_clearance_mdm_patients_v02.sql +39 -0
- data/db/views/patient_current_modalities_v02.sql +18 -0
- data/db/views/pd_mdm_patients_v01.sql +42 -0
- data/db/views/pd_mdm_patients_v02.sql +43 -0
- data/db/views/supportive_care_mdm_patients_v01.sql +28 -0
- data/db/views/supportive_care_mdm_patients_v02.sql +29 -0
- data/db/views/transplant_mdm_patients_v01.sql +46 -0
- data/db/views/transplant_mdm_patients_v02.sql +47 -0
- data/lib/renalware/configuration.rb +2 -0
- data/lib/renalware/engine.rb +2 -2
- data/lib/renalware/version_number.rb +1 -2
- data/lib/tasks/db.rake +9 -0
- data/lib/tasks/pd.rake +28 -0
- data/spec/factories/drugs/drug_types.rb +5 -1
- data/spec/factories/messaging/internal/messages.rb +1 -0
- data/spec/factories/patients/practices.rb +1 -1
- data/spec/factories/patients/primary_care_physicians.rb +1 -1
- data/spec/factories/system/users.rb +1 -0
- data/spec/factories/system/view_metadata.rb +20 -0
- data/spec/support/capybara_helper.rb +2 -4
- data/spec/support/letters_spec_helper.rb +1 -1
- data/spec/support/matchers/validate_timeliness_of.rb +1 -1
- data/spec/support/pathology_spec_helper.rb +1 -2
- data/spec/support/policy_spec_helper.rb +12 -0
- data/vendor/assets/javascripts/foundation/foundation.alert.js +43 -0
- data/vendor/assets/javascripts/foundation/foundation.dropdown.js +468 -0
- data/vendor/assets/javascripts/foundation/foundation.js +727 -0
- data/vendor/assets/javascripts/foundation/foundation.reveal.js +522 -0
- data/vendor/assets/javascripts/foundation/foundation.tab.js +247 -0
- data/vendor/assets/javascripts/foundation/foundation.tooltip.js +348 -0
- data/vendor/assets/javascripts/foundation/foundation.topbar.js +458 -0
- data/vendor/assets/stylesheets/foundation/_functions.scss +156 -0
- data/vendor/assets/stylesheets/foundation/components/_alert-boxes.scss +128 -0
- data/vendor/assets/stylesheets/foundation/components/_buttons.scss +261 -0
- data/vendor/assets/stylesheets/foundation/components/_dropdown-buttons.scss +130 -0
- data/vendor/assets/stylesheets/foundation/components/_dropdown.scss +269 -0
- data/vendor/assets/stylesheets/foundation/components/_forms.scss +601 -0
- data/vendor/assets/stylesheets/foundation/components/_global.scss +566 -0
- data/vendor/assets/stylesheets/foundation/components/_grid.scss +292 -0
- data/vendor/assets/stylesheets/foundation/components/_labels.scss +106 -0
- data/vendor/assets/stylesheets/foundation/components/_pagination.scss +163 -0
- data/vendor/assets/stylesheets/foundation/components/_panels.scss +107 -0
- data/vendor/assets/stylesheets/foundation/components/_reveal.scss +212 -0
- data/vendor/assets/stylesheets/foundation/components/_side-nav.scss +120 -0
- data/vendor/assets/stylesheets/foundation/components/_split-buttons.scss +203 -0
- data/vendor/assets/stylesheets/foundation/components/_sub-nav.scss +125 -0
- data/vendor/assets/stylesheets/foundation/components/_tables.scss +135 -0
- data/vendor/assets/stylesheets/foundation/components/_tabs.scss +142 -0
- data/vendor/assets/stylesheets/foundation/components/_tooltips.scss +142 -0
- data/vendor/assets/stylesheets/foundation/components/_top-bar.scss +745 -0
- data/vendor/assets/stylesheets/foundation/components/_type.scss +525 -0
- data/vendor/assets/stylesheets/foundation/components/_visibility.scss +425 -0
- metadata +162 -64
- data/app/views/renalware/pd/infection_organisms/_edit.html.slim.obsolete +0 -16
- data/app/views/renalware/transplants/donor_operations/_sections_nav.html.slim +0 -11
- data/app/views/renalware/transplants/donor_workups/_sections_nav.html.slim +0 -15
- data/app/views/renalware/transplants/recipient_operations/_sections_nav.html.slim +0 -14
- data/app/views/renalware/transplants/recipient_workups/_sections_nav.html.slim +0 -15
- data/lib/core_extensions/active_record/sort.rb +0 -52
- data/spec/support/pages/accesses/procedure_page.rb +0 -53
- data/spec/support/pages/accesses/profile_page.rb +0 -45
- data/spec/support/pages/admissions/consults_page.rb +0 -26
- data/spec/support/pages/clinical/allergy_page.rb +0 -74
- data/spec/support/pages/clinical/profile_page.rb +0 -28
- data/spec/support/pages/hd/prescription_administration_dialog.rb +0 -132
- data/spec/support/pages/letters/form.rb +0 -63
- data/spec/support/pages/letters/mailshots/form.rb +0 -58
- data/spec/support/pages/letters/patient_letters.rb +0 -20
- data/spec/support/pages/low_clearance/profile_page.rb +0 -70
- data/spec/support/pages/medications/home_delivery_dialog.rb +0 -77
- data/spec/support/pages/medications/prescription_fom.rb +0 -62
- data/spec/support/pages/page_object.rb +0 -10
@@ -6,15 +6,14 @@ module Renalware
|
|
6
6
|
module Pathology
|
7
7
|
class ObservationDescription < ApplicationRecord
|
8
8
|
belongs_to :measurement_unit
|
9
|
+
belongs_to :suggested_measurement_unit, class_name: "MeasurementUnit"
|
10
|
+
|
9
11
|
has_many :observations,
|
10
12
|
class_name: "Pathology::Observation",
|
11
13
|
inverse_of: :description,
|
12
14
|
dependent: :restrict_with_exception
|
13
|
-
has_many :code_group_memberships,
|
14
|
-
|
15
|
-
dependent: :destroy
|
16
|
-
has_many :code_groups,
|
17
|
-
through: :code_group_memberships
|
15
|
+
has_many :code_group_memberships, dependent: :destroy
|
16
|
+
has_many :code_groups, through: :code_group_memberships
|
18
17
|
|
19
18
|
scope :in_display_order, lambda {
|
20
19
|
where("display_group is not null and display_order is not null")
|
@@ -24,6 +23,10 @@ module Renalware
|
|
24
23
|
enum rr_type: { rr_type_simple: 0, rr_type_interpretation: 1 }
|
25
24
|
enum rr_coding_standard: { ukrr: 0, pv: 1 }
|
26
25
|
|
26
|
+
validates :lower_threshold, numericality: { allow_nil: true }
|
27
|
+
validates :upper_threshold, numericality: { allow_nil: true }
|
28
|
+
validate :lower_threshold_lteq_upper_threshold
|
29
|
+
|
27
30
|
def self.for(codes)
|
28
31
|
ObservationDescriptionsByCodeQuery.new(codes: codes).call
|
29
32
|
end
|
@@ -31,6 +34,21 @@ module Renalware
|
|
31
34
|
def to_s
|
32
35
|
code
|
33
36
|
end
|
37
|
+
|
38
|
+
def self.policy_class
|
39
|
+
BasePolicy
|
40
|
+
end
|
41
|
+
|
42
|
+
private
|
43
|
+
|
44
|
+
def lower_threshold_lteq_upper_threshold
|
45
|
+
return if lower_threshold.blank?
|
46
|
+
return if upper_threshold.blank?
|
47
|
+
|
48
|
+
if lower_threshold.to_f >= upper_threshold.to_f
|
49
|
+
errors.add(:lower_threshold, "must be less than the upper threshold")
|
50
|
+
end
|
51
|
+
end
|
34
52
|
end
|
35
53
|
end
|
36
54
|
end
|
@@ -6,7 +6,7 @@ require "sql/indexed_case_stmt"
|
|
6
6
|
module Renalware
|
7
7
|
module Pathology
|
8
8
|
class ObservationDescriptionsByCodeQuery
|
9
|
-
def initialize(relation: ObservationDescription
|
9
|
+
def initialize(codes:, relation: ObservationDescription)
|
10
10
|
@relation = relation
|
11
11
|
@codes = Array(codes)
|
12
12
|
end
|
@@ -8,8 +8,15 @@ module Renalware
|
|
8
8
|
# that can be persisted by ObservationRequest.
|
9
9
|
# Note:
|
10
10
|
# - A message can have multiple observation_requests, each with its own observations.
|
11
|
-
# -
|
12
|
-
#
|
11
|
+
# - We create any missing *_description or measurement_unit rows - ie if a new OBR 'ABC' arrives
|
12
|
+
# - from the lab and we have not seen it before, we create a corresponding
|
13
|
+
# - observation_request_description first. Likewise for previously unseen OBX codes we will
|
14
|
+
# - create a new observation_description in realtime. If a OBC has a unit we have not seen
|
15
|
+
# before eg MW (Megawatts!) we create that also. In this way the pathology 'metadata' is
|
16
|
+
# keep up to date based on what the lab/send.
|
17
|
+
#
|
18
|
+
# Note this class could be removed and a Builder class used to create the database models
|
19
|
+
# directly - this would remove the extra level of indirection that this class introduces.
|
13
20
|
class ObservationRequestsAttributesBuilder
|
14
21
|
DEFAULT_REQUESTOR_NAME = "UNKNOWN"
|
15
22
|
delegate :patient_identification, :observation_requests, to: :hl7_message
|
@@ -53,6 +60,10 @@ module Renalware
|
|
53
60
|
@request_params ||= build_observation_request_params
|
54
61
|
end
|
55
62
|
|
63
|
+
# Returns an array of hashes each containing an observation_request entry
|
64
|
+
# that wil be used to create associatwd database rows
|
65
|
+
# e.g. [ { observation_request: {..} }, {...} ]
|
66
|
+
#
|
56
67
|
# rubocop:disable Metrics/MethodLength
|
57
68
|
def build_observation_request_params
|
58
69
|
requests.each_with_object([]) do |request, arr|
|
@@ -74,12 +85,19 @@ module Renalware
|
|
74
85
|
end
|
75
86
|
# rubocop:enable Metrics/MethodLength
|
76
87
|
|
88
|
+
# Returns an array of hashes where each has the attributes used to create a new
|
89
|
+
# pathology_observation in the datbase when passed inside the observation_request hash]
|
90
|
+
# built in build_observation_request_params { observations_attributes: [..] }
|
77
91
|
# rubocop:disable Metrics/MethodLength
|
78
92
|
def build_observations_params(request)
|
79
93
|
request.observations.map do |observation|
|
94
|
+
unit = if observation.units.present?
|
95
|
+
MeasurementUnit.find_or_create_by!(name: observation.units)
|
96
|
+
end
|
80
97
|
observation_description = find_observation_description(
|
81
98
|
code: observation.identifier,
|
82
|
-
name: observation.name
|
99
|
+
name: observation.name,
|
100
|
+
measurement_unit: unit
|
83
101
|
)
|
84
102
|
next unless validate_observation(observation, observation_description)
|
85
103
|
|
@@ -103,8 +121,30 @@ module Renalware
|
|
103
121
|
raise MissingRequestDescriptionError, code
|
104
122
|
end
|
105
123
|
|
106
|
-
|
107
|
-
|
124
|
+
# Finds an observation_description or creates one if not found.
|
125
|
+
# Makes sure the description.measurement_unit, if unset, is set to the HL7 unit (eg mg) if
|
126
|
+
# passed in. Also set the suggested_measurement_unit, which may be different to the
|
127
|
+
# observation_description if was set uncorrectly at some point.
|
128
|
+
# The idea of suggested_measurement_unit is that it always updated dynamically if missing,
|
129
|
+
# whereas measurement_unit is only updated if missing. This is to cope with the case where
|
130
|
+
# the units of an OBX changes (eg by a factor of 10 as HB was a while back at KCH); in this
|
131
|
+
# instance we only update the suggested_measurement_unit so its clear(ish) what the correct
|
132
|
+
# value should be.
|
133
|
+
def find_observation_description(code:, name:, measurement_unit:)
|
134
|
+
created_jit = false
|
135
|
+
desc = ObservationDescription.find_or_create_by!(code: code) do |desc|
|
136
|
+
desc.name = name || code
|
137
|
+
desc.measurement_unit = measurement_unit
|
138
|
+
desc.suggested_measurement_unit = measurement_unit
|
139
|
+
created_jit = true
|
140
|
+
end
|
141
|
+
|
142
|
+
if created_jit == false && measurement_unit.present?
|
143
|
+
desc.measurement_unit ||= measurement_unit
|
144
|
+
desc.suggested_measurement_unit = measurement_unit
|
145
|
+
desc.save! if desc.changed?
|
146
|
+
end
|
147
|
+
desc
|
108
148
|
rescue ActiveRecord::RecordNotFound
|
109
149
|
raise MissingObservationDescriptionError, code
|
110
150
|
end
|
@@ -8,7 +8,7 @@ module Renalware
|
|
8
8
|
# the specified date range.
|
9
9
|
#
|
10
10
|
class ObservationsWithinDateRangeQuery
|
11
|
-
def initialize(relation: Observation.all
|
11
|
+
def initialize(date_range:, relation: Observation.all)
|
12
12
|
@relation = relation
|
13
13
|
@date_range = date_range
|
14
14
|
end
|
@@ -54,8 +54,8 @@ module Renalware
|
|
54
54
|
has_many :alerts, class_name: "Patients::Alert"
|
55
55
|
has_one :worry, class_name: "Patients::Worry"
|
56
56
|
|
57
|
-
belongs_to :first_cause, class_name: "Deaths::Cause"
|
58
|
-
belongs_to :second_cause, class_name: "Deaths::Cause"
|
57
|
+
belongs_to :first_cause, class_name: "Deaths::Cause"
|
58
|
+
belongs_to :second_cause, class_name: "Deaths::Cause"
|
59
59
|
|
60
60
|
belongs_to :primary_care_physician, class_name: "Patients::PrimaryCarePhysician"
|
61
61
|
belongs_to :practice, class_name: "Patients::Practice"
|
@@ -7,9 +7,9 @@ module Renalware
|
|
7
7
|
class Bookmark < ApplicationRecord
|
8
8
|
acts_as_paranoid
|
9
9
|
|
10
|
-
belongs_to :user, class_name: "Renalware::Patients::User"
|
10
|
+
belongs_to :user, class_name: "Renalware::Patients::User"
|
11
11
|
# No touch required on patient
|
12
|
-
belongs_to :patient, class_name: "Renalware::Patient"
|
12
|
+
belongs_to :patient, class_name: "Renalware::Patient"
|
13
13
|
|
14
14
|
validates :patient, presence: true
|
15
15
|
validates :user, presence: true
|
@@ -0,0 +1,41 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Renalware
|
4
|
+
module Patients
|
5
|
+
# Queries for and stores in a class variable the list of MDM 'scopes' to use when building
|
6
|
+
# the MDM menu. An example of a scope is "transplant" or "low_clearance".
|
7
|
+
# If you make changes to the system_view_metadata table to add/edit/remove a scope,
|
8
|
+
# you will need to restart the app for changes to to reflect in the menu. It is done this
|
9
|
+
# way as a changes are rare and we want to avoid running this query too many times.
|
10
|
+
# I think it will run once per procethread
|
11
|
+
class MDMMenu
|
12
|
+
thread_cattr_accessor :cached_items
|
13
|
+
|
14
|
+
def self.items
|
15
|
+
return cached_items if cached_items
|
16
|
+
|
17
|
+
self.cached_items = array_of_distinct_scopes_for_all_mdm_list_views
|
18
|
+
cached_items
|
19
|
+
end
|
20
|
+
|
21
|
+
def self.array_of_distinct_scopes_for_all_mdm_list_views
|
22
|
+
Rails.logger.info "#### Loading MDM scope names! ####"
|
23
|
+
scopes = Renalware::System::ViewMetadata
|
24
|
+
.distinct("scope")
|
25
|
+
.where(category: :mdm)
|
26
|
+
.pluck(:scope)
|
27
|
+
|
28
|
+
remove_invalid_scope_names_that_could_break_menu_rendering(scopes)
|
29
|
+
end
|
30
|
+
|
31
|
+
# Only accept MDM scopes names that are simple lower case underscored
|
32
|
+
# strings eg "my_view_name".
|
33
|
+
def self.remove_invalid_scope_names_that_could_break_menu_rendering(scopes)
|
34
|
+
scopes.select { |scope| scope.match?(/^[a-z0-9_]*$/) }
|
35
|
+
end
|
36
|
+
|
37
|
+
private_class_method :array_of_distinct_scopes_for_all_mdm_list_views
|
38
|
+
private_class_method :cached_items
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
@@ -8,7 +8,7 @@ module Renalware
|
|
8
8
|
attr_reader :modality_names, :q, :relation
|
9
9
|
|
10
10
|
# modality_names: eg "HD" or "PD"
|
11
|
-
def initialize(relation: Patient.all
|
11
|
+
def initialize(q:, modality_names:, relation: Patient.all)
|
12
12
|
@modality_names = modality_names
|
13
13
|
@q = q
|
14
14
|
@relation = relation
|
@@ -8,7 +8,7 @@ module Renalware
|
|
8
8
|
DEFAULT_SEARCH_PREDICATE = "hgb_date desc"
|
9
9
|
attr_reader :q, :relation, :named_filter
|
10
10
|
|
11
|
-
def initialize(relation: PD::Patient.all,
|
11
|
+
def initialize(q:, relation: PD::Patient.all, named_filter: nil)
|
12
12
|
@q = q || {}
|
13
13
|
@q[:s] = DEFAULT_SEARCH_PREDICATE if @q[:s].blank?
|
14
14
|
@relation = relation
|
@@ -7,6 +7,7 @@ module Renalware
|
|
7
7
|
class Problem < ApplicationRecord
|
8
8
|
include PatientScope
|
9
9
|
include Accountable
|
10
|
+
include Sortable
|
10
11
|
|
11
12
|
acts_as_paranoid
|
12
13
|
|
@@ -23,7 +24,7 @@ module Renalware
|
|
23
24
|
scope :with_patient, -> { includes(:patient) }
|
24
25
|
scope :with_versions, -> { includes(versions: :item) }
|
25
26
|
|
26
|
-
# This scope is called by
|
27
|
+
# This scope is called by Sortable concern
|
27
28
|
scope :position_sorting_scope, ->(problem) { where(patient_id: problem.patient.id) }
|
28
29
|
|
29
30
|
validates :patient, presence: true
|
@@ -11,8 +11,7 @@ module Renalware
|
|
11
11
|
has_many(
|
12
12
|
:responses,
|
13
13
|
class_name: "Response",
|
14
|
-
dependent: :nullify
|
15
|
-
foreign_key: :question_id
|
14
|
+
dependent: :nullify
|
16
15
|
)
|
17
16
|
validates :code, presence: true, uniqueness: { scope: :survey_id }
|
18
17
|
validates :label, presence: true
|
@@ -0,0 +1,43 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_dependency "renalware/system"
|
4
|
+
|
5
|
+
module Renalware
|
6
|
+
module System
|
7
|
+
# Backed by Jsonb, stored in view_metadata.columns, a model to allow
|
8
|
+
# us to specify how a SQL view column is displayed in an HTML table in the
|
9
|
+
# UI.
|
10
|
+
class ColumnDefinition
|
11
|
+
include StoreModel::Model
|
12
|
+
attribute :code, :string
|
13
|
+
# An optional title for the column. Code will be used if title is missing
|
14
|
+
attribute :name, :string
|
15
|
+
attribute :hidden, :boolean, default: false
|
16
|
+
# The width enum corresponds to various classes we apply to columns, e.g.
|
17
|
+
# if tiny is chosen, then class applied to the th will be col-width-tiny
|
18
|
+
enum(
|
19
|
+
:width,
|
20
|
+
%i(
|
21
|
+
tiny
|
22
|
+
small
|
23
|
+
medium
|
24
|
+
large
|
25
|
+
date
|
26
|
+
datetime
|
27
|
+
nhs_number
|
28
|
+
hospital_numbers
|
29
|
+
patient_name
|
30
|
+
)
|
31
|
+
)
|
32
|
+
# If truncate_with_ellipsis is true we add a class to the td so that it
|
33
|
+
# will truncate the text and add .. onm the end
|
34
|
+
attribute :truncate, :boolean, default: false
|
35
|
+
|
36
|
+
validates :code, presence: true
|
37
|
+
|
38
|
+
def title
|
39
|
+
@title ||= name.presence || code.humanize
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
@@ -0,0 +1,29 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_dependency "renalware/system"
|
4
|
+
|
5
|
+
module Renalware
|
6
|
+
module System
|
7
|
+
# Backed by JSONB, stored in view_metadata.fitlers, a model to allow
|
8
|
+
# us to specify how filters for a SQL view are displayed in HTML
|
9
|
+
class FilterDefinition
|
10
|
+
include StoreModel::Model
|
11
|
+
attribute :code, :string
|
12
|
+
# The type enum detemines how the filter is constructed eg as a list of distinct values
|
13
|
+
enum(
|
14
|
+
:type,
|
15
|
+
%i(
|
16
|
+
list
|
17
|
+
search
|
18
|
+
)
|
19
|
+
)
|
20
|
+
validates :code, presence: true
|
21
|
+
validates :type, presence: true
|
22
|
+
|
23
|
+
def title
|
24
|
+
code.humanize
|
25
|
+
# @title ||= name.presence || code.humanize
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
@@ -20,12 +20,16 @@ module Renalware
|
|
20
20
|
|
21
21
|
private
|
22
22
|
|
23
|
+
# rubocop:disable Metrics/MethodLength
|
23
24
|
def update!(params)
|
24
25
|
User.transaction do
|
25
26
|
approve if can_approve?(params)
|
26
27
|
unexpire if can_unexpire?(params)
|
27
28
|
user.consultant = true?(params[:consultant])
|
28
29
|
user.hidden = true?(params[:hidden])
|
30
|
+
if params[:prescriber] # if not a supperadmin, may not be submitted
|
31
|
+
user.prescriber = true?(params[:prescriber])
|
32
|
+
end
|
29
33
|
authorise(params)
|
30
34
|
user.telephone = params[:telephone]
|
31
35
|
user.save!
|
@@ -33,6 +37,7 @@ module Renalware
|
|
33
37
|
rescue ActiveRecord::RecordInvalid
|
34
38
|
false
|
35
39
|
end
|
40
|
+
# rubocop:enable Metrics/MethodLength
|
36
41
|
|
37
42
|
def notify!
|
38
43
|
notifications.each { |n| n.public_send(delivery_method) } if notifications.any?
|
@@ -0,0 +1,25 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_dependency "renalware/system"
|
4
|
+
|
5
|
+
module Renalware
|
6
|
+
module System
|
7
|
+
# Information on SQL views used to build parts of the UI
|
8
|
+
class ViewMetadata < ApplicationRecord
|
9
|
+
has_paper_trail(
|
10
|
+
versions: { class_name: "Renalware::System::Version" },
|
11
|
+
on: [:create, :update, :destroy]
|
12
|
+
)
|
13
|
+
|
14
|
+
attribute :columns, ColumnDefinition.to_array_type
|
15
|
+
validates :columns, store_model: true
|
16
|
+
|
17
|
+
attribute :filters, FilterDefinition.to_array_type
|
18
|
+
validates :filters, store_model: true
|
19
|
+
|
20
|
+
# This maps to a PG enum
|
21
|
+
enum display_type: { tabular: "tabular" }
|
22
|
+
enum category: { mdm: "mdm", report: "report" }
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
@@ -10,7 +10,7 @@ module Renalware
|
|
10
10
|
extend Enumerize
|
11
11
|
|
12
12
|
belongs_to :patient, touch: true
|
13
|
-
belongs_to :recipient, class_name: "Patient",
|
13
|
+
belongs_to :recipient, class_name: "Patient", touch: true
|
14
14
|
|
15
15
|
has_paper_trail(
|
16
16
|
versions: { class_name: "Renalware::Transplants::Version" },
|