renalware-core 2.0.149 → 2.0.151
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +23 -2
- data/app/assets/config/renalware/core/manifest.js +1 -0
- data/app/assets/images/renalware/icons/align-justify.svg +3 -0
- data/app/assets/images/renalware/icons/bar-chart.svg +1 -0
- data/app/assets/images/renalware/icons/chart-bar.svg +1 -0
- data/app/assets/images/renalware/icons/chart.svg +3 -0
- data/app/assets/images/renalware/icons/list-bullet.svg +1 -0
- data/app/assets/images/renalware/icons/list.svg +8 -0
- data/app/assets/javascripts/renalware/README.md +25 -1
- data/app/assets/javascripts/renalware/components/dialogs.js.erb +3 -1
- data/app/assets/javascripts/renalware/components/hd.js +2 -2
- data/app/assets/javascripts/renalware/components/letters.js +1 -1
- data/app/assets/javascripts/renalware/components/masonry.run.js +2 -2
- data/app/assets/javascripts/renalware/components/patient_menu.js +1 -1
- data/app/assets/javascripts/renalware/components/toggler.js +1 -1
- data/app/assets/javascripts/renalware/rollup_compiled.css +87457 -0
- data/app/assets/javascripts/renalware/rollup_compiled.js +3148 -3
- data/app/assets/stylesheets/renalware/core.scss +1 -0
- data/app/assets/stylesheets/renalware/modules/_hd.scss +8 -4
- data/app/assets/stylesheets/renalware/modules/_pathology.scss +8 -1
- data/app/assets/stylesheets/renalware/modules/_pd.scss +35 -0
- data/app/assets/stylesheets/renalware/partials/_charting.scss +17 -0
- data/app/assets/stylesheets/renalware/partials/_forms.scss +5 -1
- data/app/assets/stylesheets/renalware/partials/_simple_form.scss +8 -0
- data/app/assets/stylesheets/renalware/partials/_utilities.scss +12 -0
- data/app/assets/stylesheets/tailwind/tailwind.css +3 -0
- data/app/components/renalware/application_component.rb +2 -1
- data/app/components/renalware/events/{biopsies_component.html.slim → event_list_component.html.slim} +5 -4
- data/app/components/renalware/events/event_list_component.rb +77 -0
- data/app/components/renalware/hd/administer_prescription_dropdown_component.rb +1 -5
- data/app/components/renalware/hd/prescription_last_administration_component.html.slim +0 -1
- data/app/components/renalware/hd/prescription_last_administration_component.rb +8 -7
- data/app/components/renalware/letters/unread_electronic_ccs_component.rb +1 -0
- data/app/components/renalware/pathology/chart_component.html.slim +5 -0
- data/app/components/renalware/pathology/chart_component.rb +40 -0
- data/app/components/renalware/pathology/sparkline_component.html.slim +15 -0
- data/app/components/renalware/pathology/sparkline_component.rb +135 -0
- data/app/components/renalware/patients/side_menu_component.rb +2 -11
- data/app/components/renalware/pd/adequacy_results_component.html.slim +9 -0
- data/app/components/renalware/pd/adequacy_results_component.rb +39 -0
- data/app/components/renalware/pd/pet_results_component.html.slim +37 -0
- data/app/components/renalware/pd/pet_results_component.rb +84 -0
- data/app/{views/renalware/surveys/_eq5d_summary_part.html.slim → components/renalware/surveys/eq5d_component.html.slim} +5 -5
- data/app/{models/renalware/surveys/eq5d_summary_part.rb → components/renalware/surveys/eq5d_component.rb} +7 -5
- data/app/{views/renalware/surveys/_pos_s_summary_part.html.slim → components/renalware/surveys/pos_s_component.html.slim} +6 -9
- data/app/{models/renalware/surveys/pos_s_summary_part.rb → components/renalware/surveys/pos_s_component.rb} +9 -5
- data/app/components/renalware/system/admin_menu_component.rb +2 -2
- data/app/components/renalware/system/article_component.html.slim +3 -0
- data/app/components/renalware/system/article_component.rb +9 -0
- data/app/controllers/renalware/admissions/consults_controller.rb +1 -1
- data/app/controllers/renalware/concerns/pdf_renderable.rb +1 -1
- data/app/controllers/renalware/hd/scheduling/diaries_controller.rb +1 -1
- data/app/controllers/renalware/medications/prescriptions_controller.rb +1 -1
- data/app/controllers/renalware/pathology/charts_controller.rb +21 -0
- data/app/controllers/renalware/pathology/current_observation_results_controller.rb +1 -1
- data/app/controllers/renalware/pathology/historical_observation_results_controller.rb +1 -1
- data/app/controllers/renalware/pathology/nearest_observation_results_controller.rb +52 -0
- data/app/controllers/renalware/pathology/observation_requests_controller.rb +1 -1
- data/app/controllers/renalware/pathology/observations_controller.rb +26 -2
- data/app/controllers/renalware/pathology/requests/requests_controller.rb +7 -5
- data/app/controllers/renalware/pd/adequacy_completions_controller.rb +18 -0
- data/app/controllers/renalware/pd/adequacy_results_controller.rb +98 -0
- data/app/controllers/renalware/pd/pet_completions_controller.rb +18 -0
- data/app/controllers/renalware/pd/pet_results_controller.rb +122 -0
- data/app/controllers/renalware/pd/unified_pet_adequacies_controller.rb +102 -0
- data/app/controllers/renalware/renal/aki_alerts_controller.rb +1 -1
- data/app/controllers/renalware/renal/registry_preflight_checks_controller.rb +55 -19
- data/app/documents/renalware/age.rb +3 -1
- data/app/helpers/renalware/application_helper.rb +7 -7
- data/app/helpers/renalware/article_helper.rb +3 -3
- data/app/helpers/renalware/boolean_helper.rb +15 -0
- data/app/helpers/renalware/clipboard_helper.rb +2 -3
- data/app/helpers/renalware/dashboards_helper.rb +2 -2
- data/app/helpers/renalware/definition_list_helper.rb +3 -3
- data/app/helpers/renalware/devise_helper.rb +1 -1
- data/app/helpers/renalware/form_helper.rb +2 -2
- data/app/helpers/renalware/letters_helper.rb +1 -1
- data/app/helpers/renalware/link_helper.rb +1 -1
- data/app/helpers/renalware/mdm_helper.rb +1 -0
- data/app/helpers/renalware/navigation_helper.rb +1 -1
- data/app/helpers/renalware/patient_helper.rb +2 -2
- data/app/helpers/renalware/snippets_helper.rb +9 -10
- data/app/helpers/renalware/toggle_helper.rb +6 -6
- data/app/helpers/renalware/tooltip_helper.rb +14 -16
- data/app/inputs/clock_picker_input.rb +3 -3
- data/app/inputs/date_picker_input.rb +3 -3
- data/app/inputs/simple_time_input.rb +3 -3
- data/app/inputs/trix_editor_input.rb +2 -0
- data/app/javascript/renalware/controllers/blas_controller.js +37 -0
- data/app/javascript/renalware/controllers/modal_controller.js +137 -0
- data/app/javascript/renalware/controllers/pathology/sparklines_controller.js +206 -0
- data/app/javascript/renalware/controllers/pd/pet_charts_controller.js +169 -0
- data/app/javascript/renalware/controllers/session_controller.js +1 -1
- data/app/javascript/renalware/controllers/simple_toggle_controller.js +17 -0
- data/app/javascript/renalware/controllers/tabs_controller.js +43 -0
- data/app/javascript/renalware/controllers/toggle_controller.js +2 -2
- data/app/javascript/renalware/index.js +10 -0
- data/app/models/concerns/renalware/patients_ransack_helper.rb +2 -0
- data/app/models/renalware/clinics/body_surface_area.rb +40 -0
- data/app/models/renalware/clinics/clinic_visit.rb +21 -1
- data/app/models/renalware/clinics/total_body_water.rb +63 -0
- data/app/models/renalware/events/advanced_care_plan.rb +24 -0
- data/app/models/renalware/events/clinical_frailty_score.rb +24 -0
- data/app/models/renalware/feeds/hl7_message.rb +1 -0
- data/app/models/renalware/hd/prescription_last_administration_query.rb +4 -0
- data/app/models/renalware/hd/session_forms/pdf_renderer.rb +1 -1
- data/app/models/renalware/hd/sessions/auditable_session_collection.rb +4 -1
- data/app/models/renalware/letters/html_renderer.rb +1 -1
- data/app/models/renalware/letters/printing/duplex_interleaved_pdf_renderer.rb +1 -1
- data/app/models/renalware/letters/recipient_address_pdf_renderer.rb +1 -1
- data/app/models/renalware/pathology/nearest_observations_query.rb +44 -0
- data/app/models/renalware/pathology/observations_jsonb_serializer.rb +1 -1
- data/app/models/renalware/patient.rb +16 -1
- data/app/models/renalware/patients/alert.rb +1 -0
- data/app/models/renalware/patients/ingestion/update_master_patient_index.rb +1 -0
- data/app/models/renalware/patients/patient_hospital_identifiers.rb +1 -0
- data/app/models/renalware/pd.rb +2 -0
- data/app/models/renalware/pd/adequacy_calculated_attributes.rb +159 -0
- data/app/models/renalware/pd/adequacy_result.rb +76 -0
- data/app/models/renalware/pd/apd/glucose_calculator.rb +1 -0
- data/app/models/renalware/pd/patient.rb +4 -0
- data/app/models/renalware/pd/pet_dextrose_concentration.rb +17 -0
- data/app/models/renalware/pd/pet_result.rb +92 -0
- data/app/models/renalware/pd/unified_pet_adequacy_form.rb +46 -0
- data/app/models/renalware/renal/registry/preflight_checks/missing_esrf_query.rb +50 -0
- data/app/models/renalware/snippets/duplicate_snippet_title_generator.rb +1 -0
- data/app/models/renalware/transplants/recipient_workup_builder.rb +1 -0
- data/app/models/renalware/transplants/registration_status.rb +1 -1
- data/app/models/renalware/ukrdc/outgoing/rendering/patient_number.rb +1 -1
- data/app/models/renalware/user.rb +10 -0
- data/app/pdfs/renalware/events/event_pdf.rb +1 -0
- data/app/policies/renalware/events/advanced_care_plan_policy.rb +10 -0
- data/app/policies/renalware/events/clinical_frailty_score_policy.rb +10 -0
- data/app/policies/renalware/pd/adequacy_result_policy.rb +15 -0
- data/app/policies/renalware/pd/pet_result_policy.rb +15 -0
- data/app/policies/renalware/renal/registry_preflight_check_policy.rb +4 -0
- data/app/presenters/renalware/clinical/profile_presenter.rb +1 -0
- data/app/presenters/renalware/hd/dashboard_presenter.rb +1 -0
- data/app/presenters/renalware/hd/profile_presenter.rb +1 -0
- data/app/presenters/renalware/hd/scheduling/diary_presenter.rb +1 -0
- data/app/presenters/renalware/hd/session_presenter.rb +1 -0
- data/app/presenters/renalware/hd/unmet_preferences_presenter.rb +1 -1
- data/app/presenters/renalware/mdm_patients_presenter.rb +1 -0
- data/app/presenters/renalware/pd/dashboard_presenter.rb +10 -2
- data/app/presenters/renalware/ukrdc/patient_presenter.rb +1 -0
- data/app/presenters/renalware/user_session_presenter.rb +1 -1
- data/app/validators/renalware/patients/nhs_number_validator.rb +88 -0
- data/app/values/renalware/address.rb +1 -0
- data/app/views/renalware/accesses/assessments/show.html.slim +1 -1
- data/app/views/renalware/accesses/procedures/show.html.slim +1 -1
- data/app/views/renalware/accesses/profiles/show.html.slim +1 -1
- data/app/views/renalware/admin/cache/show.html.slim +36 -0
- data/app/views/renalware/admin/playgrounds/show.html.slim +3 -0
- data/app/views/renalware/clinical/profiles/show.html.slim +11 -1
- data/app/views/renalware/clinics/clinic_visits/_table.html.slim +2 -0
- data/app/views/renalware/clinics/clinic_visits/_table_row.html.slim +2 -0
- data/app/views/renalware/dashboard/letters/_letter.html.slim +1 -1
- data/app/views/renalware/directory/people/show.html.slim +1 -1
- data/app/views/renalware/events/advanced_care_plans/_cell.html.slim +2 -0
- data/app/views/renalware/events/advanced_care_plans/_inputs.html.slim +4 -0
- data/app/views/renalware/events/advanced_care_plans/_toggled_cell.html.slim +8 -0
- data/app/views/renalware/events/clinical_frailty_score/_cell.html.slim +2 -0
- data/app/views/renalware/events/clinical_frailty_score/_inputs.html.slim +4 -0
- data/app/views/renalware/events/clinical_frailty_score/_toggled_cell.html.slim +8 -0
- data/app/views/renalware/events/events/_table.html.slim +1 -1
- data/app/views/renalware/hd/current_profile/_show.html.slim +1 -1
- data/app/views/renalware/hd/current_profile/show.html.slim +1 -1
- data/app/views/renalware/hd/prescription_administrations/_form.html.slim +2 -0
- data/app/views/renalware/hd/sessions/_show.html.slim +1 -1
- data/app/views/renalware/hd/witnesses/_form.html.slim +2 -0
- data/app/views/renalware/letters/electronic_receipts/_table.html.slim +1 -1
- data/app/views/renalware/low_clearance/dashboards/show.html.slim +10 -0
- data/app/views/renalware/mdm/_pathology.html.slim +0 -1
- data/app/views/renalware/mdm/show.html.slim +1 -1
- data/app/views/renalware/navigation/_menu.html.slim +1 -0
- data/app/views/renalware/navigation/_pd.html.slim +5 -0
- data/app/views/renalware/pathology/charts/show.html.slim +11 -0
- data/app/views/renalware/pathology/current_observation_results/index.html.slim +6 -0
- data/app/views/renalware/pathology/historical_observation_results/_table.html.slim +4 -3
- data/app/views/renalware/pathology/historical_observation_results/index.html.slim +1 -1
- data/app/views/renalware/pathology/observations/_diff.html.slim +1 -1
- data/app/views/renalware/patients/patients/show.html.slim +1 -1
- data/app/views/renalware/pd/_exit_site_infections.html.slim +4 -0
- data/app/views/renalware/pd/_peritonitis_episodes.html.slim +3 -0
- data/app/views/renalware/pd/adequacy_completions/_filters.html.slim +19 -0
- data/app/views/renalware/pd/adequacy_completions/index.html.slim +4 -0
- data/app/views/renalware/pd/adequacy_results/_form_fields.html.slim +9 -0
- data/app/views/renalware/pd/adequacy_results/_table.html.slim +72 -0
- data/app/views/renalware/pd/adequacy_results/edit.html.slim +89 -0
- data/app/views/renalware/pd/adequacy_results/index.js.erb +1 -0
- data/app/views/renalware/pd/adequacy_results/new.html.slim +8 -0
- data/app/views/renalware/pd/dashboards/show.html.slim +3 -0
- data/app/views/renalware/pd/dashboards/show/_page_actions.html.slim +14 -0
- data/app/views/renalware/pd/pet_completions/_filters.html.slim +24 -0
- data/app/views/renalware/pd/pet_completions/index.html.slim +4 -0
- data/app/views/renalware/pd/pet_results/_form_fields.html.slim +12 -0
- data/app/views/renalware/pd/pet_results/_pathology_results.html.slim +36 -0
- data/app/views/renalware/pd/pet_results/_table.html.slim +62 -0
- data/app/views/renalware/pd/pet_results/edit.html.slim +35 -0
- data/app/views/renalware/pd/pet_results/index.js.erb +1 -0
- data/app/views/renalware/pd/pet_results/new.html.slim +8 -0
- data/app/views/renalware/pd/unified_pet_adequacies/_form.html.slim +22 -0
- data/app/views/renalware/pd/unified_pet_adequacies/new.html.slim +2 -0
- data/app/views/renalware/renal/profiles/show.html.slim +1 -1
- data/app/views/renalware/renal/registry_preflight_checks/_filters.html.slim +5 -3
- data/app/views/renalware/renal/registry_preflight_checks/_navigation.html.slim +1 -0
- data/app/views/renalware/renal/registry_preflight_checks/deaths.html.slim +2 -1
- data/app/views/renalware/renal/registry_preflight_checks/missing_esrf.html.slim +12 -0
- data/app/views/renalware/renal/registry_preflight_checks/patients.html.slim +1 -2
- data/app/views/renalware/surveys/dashboards/show.html.slim +2 -2
- data/app/views/renalware/transplants/donor_workups/show.html.slim +1 -1
- data/app/views/renalware/transplants/mdm/_bottom.html.slim +3 -1
- data/app/views/renalware/transplants/recipient_followups/show.html.slim +1 -1
- data/app/views/renalware/transplants/recipient_operations/show.html.slim +1 -1
- data/app/views/renalware/transplants/recipient_workups/show.html.slim +1 -1
- data/app/views/renalware/transplants/registrations/show.html.slim +1 -1
- data/config/initializers/inflections.rb +8 -0
- data/config/initializers/wicked_pdf.rb +12 -0
- data/config/locales/en-GB.yml +1 -1
- data/config/locales/renalware/events/advanced_care_plan.en.yml +12 -0
- data/config/locales/renalware/events/biopsy.en.yml +2 -0
- data/config/locales/renalware/events/clinical_frailty_score.en.yml +16 -0
- data/config/locales/renalware/events/clinical_frailty_score_component.en.yml +8 -0
- data/config/locales/renalware/nhs_number.en.yml +6 -0
- data/config/locales/renalware/pd/adequacy_result.en.yml +9 -0
- data/config/locales/renalware/pd/dashboard.en.yml +3 -0
- data/config/locales/renalware/pd/pet_result.en.yml +23 -0
- data/config/locales/renalware/renal/registry.en.yml +1 -0
- data/config/routes/pathology.rb +6 -0
- data/config/routes/pd.rb +5 -0
- data/config/routes/renal.rb +1 -0
- data/db/functions/generate_secure_id_v01.sql +1 -1
- data/db/migrate/20200226145010_add_unique_indexes.rb +46 -0
- data/db/migrate/20200421082715_add_body_surface_area_to_clinic_visits.rb +8 -0
- data/db/migrate/20200421132911_create_pd_pet_dextrose_concentrations.rb +13 -0
- data/db/migrate/20200421143546_create_pet_results.rb +66 -0
- data/db/migrate/20200427123229_create_adequacy_results.rb +54 -0
- data/db/migrate/20200616115709_add_height_weight_to_pd_adequacy_results.rb +8 -0
- data/db/migrate/20200618144228_add_feature_flags_to_users.rb +14 -0
- data/db/seeds/default/events/event_types.csv +2 -0
- data/lib/renalware/engine.rb +4 -2
- data/lib/renalware/version_number.rb +11 -0
- data/lib/tasks/renalware.rake +7 -1
- data/spec/factories/accesses/profiles.rb +1 -0
- data/spec/factories/events/events_types.rb +12 -0
- data/spec/factories/patients/patients.rb +22 -1
- data/spec/factories/pd/adequacy_results.rb +16 -0
- data/spec/factories/pd/pet_results.rb +9 -0
- metadata +115 -25
- data/app/components/renalware/events/biopsies_component.rb +0 -20
- data/lib/renalware/version.rb +0 -5
@@ -0,0 +1,46 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_dependency "renalware/pd"
|
4
|
+
|
5
|
+
# Captures data used for PET (Peritoneal Equilibration Test) and Adequacy.
|
6
|
+
module Renalware
|
7
|
+
module PD
|
8
|
+
class UnifiedPETAdequacyForm
|
9
|
+
include ActiveModel::Model
|
10
|
+
include Virtus::Model
|
11
|
+
|
12
|
+
attribute :pet, PETResult
|
13
|
+
attribute :adequacy, AdequacyResult
|
14
|
+
attribute :patient, Patient
|
15
|
+
|
16
|
+
attribute :pet_missing, Boolean
|
17
|
+
attribute :adequacy_missing, Boolean
|
18
|
+
|
19
|
+
def valid?
|
20
|
+
objects_to_save.each(&:validate).all?(&:valid?)
|
21
|
+
end
|
22
|
+
|
23
|
+
def save_by!(user)
|
24
|
+
PETResult.transaction do
|
25
|
+
objects_to_save.each { |obj| obj.save_by!(user) }
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
def objects_to_save
|
30
|
+
@objects_to_save ||= begin
|
31
|
+
[].tap do |arr|
|
32
|
+
arr << pet unless pet_missing
|
33
|
+
arr << adequacy unless adequacy_missing
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
# This method lets us just use eg simple_form_for in the view without
|
39
|
+
# having to specify the url option i.e. PatientPDUnifiedPetAdequacy here will
|
40
|
+
# resolve to 'patient_pd_pet_adequacy_results_path'
|
41
|
+
def self.model_name
|
42
|
+
ActiveModel::Name.new(self, nil, "PatientPDUnifiedPetAdequacy")
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
@@ -0,0 +1,50 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_dependency "renalware/renal"
|
4
|
+
|
5
|
+
module Renalware
|
6
|
+
module Renal
|
7
|
+
module Registry
|
8
|
+
module PreflightChecks
|
9
|
+
# Finds patients with a current modality of HD, PD or Transplant, who have no ESRF date
|
10
|
+
class MissingESRFQuery
|
11
|
+
include ModalityScopes
|
12
|
+
MODALITY_NAMES = %w(HD PD Transplant).freeze
|
13
|
+
|
14
|
+
attr_reader :relation, :query_params
|
15
|
+
|
16
|
+
def initialize(relation: nil, query_params: {})
|
17
|
+
@relation = relation || default_relation
|
18
|
+
@query_params = query_params
|
19
|
+
@query_params[:s] = "modality_descriptions_name ASC" if @query_params[:s].blank?
|
20
|
+
end
|
21
|
+
|
22
|
+
def default_relation
|
23
|
+
Renalware::Renal::Patient.left_outer_joins(:profile)
|
24
|
+
end
|
25
|
+
|
26
|
+
def call
|
27
|
+
search
|
28
|
+
.result
|
29
|
+
.extending(ModalityScopes)
|
30
|
+
.preload(current_modality: [:description])
|
31
|
+
.merge(HD::Patient.with_profile)
|
32
|
+
.eager_load(:profile)
|
33
|
+
.with_current_modality_matching(MODALITY_NAMES)
|
34
|
+
.where("renal_profiles.esrf_on IS NULL")
|
35
|
+
end
|
36
|
+
|
37
|
+
def search
|
38
|
+
@search ||= relation.ransack(query_params)
|
39
|
+
end
|
40
|
+
|
41
|
+
def self.missing_data_for(_patient)
|
42
|
+
[
|
43
|
+
:esrf
|
44
|
+
]
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
@@ -14,7 +14,7 @@ module Renalware
|
|
14
14
|
scope :reversed, -> { order(started_on: :desc, created_at: :desc) }
|
15
15
|
|
16
16
|
validates :description_id, presence: true
|
17
|
-
validates :started_on, timeliness: { type: :date, allow_blank: false }
|
17
|
+
validates :started_on, presence: true, timeliness: { type: :date, allow_blank: false }
|
18
18
|
validates :terminated_on, timeliness: { type: :date, allow_blank: true }
|
19
19
|
|
20
20
|
validate :constraint_started_on_today_or_before, if: :started_on
|
@@ -15,7 +15,7 @@ module Renalware
|
|
15
15
|
|
16
16
|
def name_element
|
17
17
|
create_node("PatientNumber") do |elem|
|
18
|
-
elem << create_node("Number", number)
|
18
|
+
elem << create_node("Number", number&.delete(" "))
|
19
19
|
elem << create_node("Organization", organisation)
|
20
20
|
elem << create_node("NumberType", type)
|
21
21
|
end
|
@@ -42,6 +42,8 @@ module Renalware
|
|
42
42
|
scope :hidden, -> { where(hidden: true) }
|
43
43
|
scope :picklist, -> { visible.ordered }
|
44
44
|
|
45
|
+
store_accessor :preferences, :experimental_features
|
46
|
+
|
45
47
|
# Non-persistent attribute to signify we want to use extended validation.
|
46
48
|
# We need to refactor this by ising a form object for updating a user.
|
47
49
|
attr_accessor :with_extended_validation
|
@@ -100,6 +102,14 @@ module Renalware
|
|
100
102
|
# Pundit.policy(self, record).public_send(method.to_sym)
|
101
103
|
# end
|
102
104
|
|
105
|
+
# We can enable experiment features for particular users using the bitmask user#feature_flags
|
106
|
+
# property and bitwise operators.
|
107
|
+
# For example given the the feature flag FANCY_GRAPHS = 2, we if they user should see these with
|
108
|
+
# FANCY_GRAPHS & feature_flags == FANCY_GRAPHS
|
109
|
+
def wants_feature?(flag)
|
110
|
+
(flag & feature_flags) == flag
|
111
|
+
end
|
112
|
+
|
103
113
|
private
|
104
114
|
|
105
115
|
def build_authentication_token
|
@@ -29,13 +29,21 @@ module Renalware
|
|
29
29
|
|
30
30
|
def peritonitis_episodes
|
31
31
|
@peritonitis_episodes ||= begin
|
32
|
-
episodes = PeritonitisEpisode
|
32
|
+
episodes = PeritonitisEpisode
|
33
|
+
.for_patient(patient)
|
34
|
+
.ordered
|
35
|
+
.includes(:episode_types, infection_organisms: :organism_code)
|
33
36
|
present(episodes, PeritonitisEpisodePresenter)
|
34
37
|
end
|
35
38
|
end
|
36
39
|
|
37
40
|
def exit_site_infections
|
38
|
-
@exit_site_infections ||=
|
41
|
+
@exit_site_infections ||= begin
|
42
|
+
ExitSiteInfection
|
43
|
+
.for_patient(patient)
|
44
|
+
.includes(infection_organisms: :organism_code)
|
45
|
+
.ordered
|
46
|
+
end
|
39
47
|
end
|
40
48
|
|
41
49
|
def pet_adequacies
|
@@ -31,7 +31,7 @@ module Renalware
|
|
31
31
|
"login-path": urls.new_user_session_path,
|
32
32
|
"check-alive-path": urls.check_session_expired_path,
|
33
33
|
"keep-alive-path": urls.keep_session_alive_path,
|
34
|
-
debug: Rails.env.development?.to_s,
|
34
|
+
debug: Rails.env.development?.to_s, # eg "true" or "false"
|
35
35
|
"register-user-activity-after":
|
36
36
|
Renalware.config.session_register_user_user_activity_after.to_i,
|
37
37
|
timeout: ::Devise.timeout_in
|
@@ -0,0 +1,88 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Renalware
|
4
|
+
module Patients
|
5
|
+
# Validates an NHS number which should be 10 characters long and confirm to the modulo 11
|
6
|
+
# algorithm where the 10th character is a check digit.
|
7
|
+
class NHSNumberValidator < ActiveModel::EachValidator
|
8
|
+
def validate_each(record, attribute, value)
|
9
|
+
return if value.blank?
|
10
|
+
|
11
|
+
Validator.new(record, attribute, value).validate
|
12
|
+
end
|
13
|
+
|
14
|
+
class Validator
|
15
|
+
pattr_initialize :record, :attribute, :number
|
16
|
+
LENGTH = 10
|
17
|
+
|
18
|
+
def validate
|
19
|
+
strip_spaces_from_nhs_number
|
20
|
+
validate_length
|
21
|
+
validate_numeric
|
22
|
+
validate_using_modulus_11
|
23
|
+
end
|
24
|
+
|
25
|
+
private
|
26
|
+
|
27
|
+
def strip_spaces_from_nhs_number
|
28
|
+
@record[attribute] = @number = @number.delete(" ")
|
29
|
+
end
|
30
|
+
|
31
|
+
def validate_length
|
32
|
+
ActiveModel::Validations::LengthValidator.new(
|
33
|
+
is: LENGTH,
|
34
|
+
attributes: [attribute]
|
35
|
+
).validate(record)
|
36
|
+
end
|
37
|
+
|
38
|
+
def validate_numeric
|
39
|
+
return if record.errors[attribute].any?
|
40
|
+
|
41
|
+
unless number =~ /\d{10}/
|
42
|
+
record.errors.add(attribute, :nhs_number_not_numeric)
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
# See https://www.datadictionary.nhs.uk/data_dictionary/attributes/n/nhs/nhs_number_de.asp
|
47
|
+
# rubocop:disable Metrics/AbcSize
|
48
|
+
def validate_using_modulus_11
|
49
|
+
return if record.errors[attribute].any?
|
50
|
+
|
51
|
+
# Step 1 Multiply each of the first nine digits by a weighting factor
|
52
|
+
# Digit Position Factor
|
53
|
+
# 1 10
|
54
|
+
# 2 9
|
55
|
+
# 3 8
|
56
|
+
# 4 7
|
57
|
+
# 5 6
|
58
|
+
# 6 5
|
59
|
+
# 7 4
|
60
|
+
# 8 3
|
61
|
+
# 9 2
|
62
|
+
weighting_factors = [10, 9, 8, 7, 6, 5, 4, 3, 2]
|
63
|
+
first_9_digits = number.chars.map(&:to_i).take(9)
|
64
|
+
first_9_digits_weighted = first_9_digits.each_with_index.map do |num, idx|
|
65
|
+
num * weighting_factors[idx]
|
66
|
+
end
|
67
|
+
|
68
|
+
# Step 2 Add the results of each multiplication together.
|
69
|
+
# Step 3 Divide the total by 11 and establish the remainder.
|
70
|
+
# Step 4 Subtract the remainder from 11 to give the check digit.
|
71
|
+
checkdigit = 11 - (first_9_digits_weighted.sum % 11)
|
72
|
+
|
73
|
+
# If the result is 11 then a check digit of 0 is used.
|
74
|
+
checkdigit = 0 if checkdigit == 11
|
75
|
+
|
76
|
+
# If the result is 10 then the NHS NUMBER is invalid and not used.
|
77
|
+
# Step 5 Check the remainder matches the check digit. Otherwise the NHS NUMBER is invalid.
|
78
|
+
if checkdigit == 10 || number[9].to_i != checkdigit
|
79
|
+
# record.errors[attribute] << "Invalid NHS number (checkdigit mismatch)"
|
80
|
+
record.errors.add(attribute, :nhs_number_invalid_checkdigit)
|
81
|
+
end
|
82
|
+
end
|
83
|
+
# rubocop:enable Metrics/AbcSize
|
84
|
+
end
|
85
|
+
private_constant :Validator
|
86
|
+
end
|
87
|
+
end
|
88
|
+
end
|
@@ -11,6 +11,7 @@ module Renalware
|
|
11
11
|
# Set to true to avoid address validation - useful when archiving a letter with a migrated
|
12
12
|
# address that might not have a postcode for instance
|
13
13
|
attr_accessor :skip_validation
|
14
|
+
|
14
15
|
validates_with AddressValidator, unless: :skip_validation
|
15
16
|
|
16
17
|
def self.reject_if_blank
|