renalware-core 2.0.72 → 2.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e283c0fb737a52927b551762ea2204f875ef28cd5673206fc9e8c8d5d85500f
-  data.tar.gz: fbb0521235f06ac34c8a53c145bd11bb66e4bc64418c3b876733ce380397b987
+  metadata.gz: fa22b53287a50bfb41fc8de7c46fe936fe87387b2b209b46e34caee3e330ef5a
+  data.tar.gz: dfd75e90ef80382dccc2118e1c7983d1ac04f0dfcb94dbca78c89d12b85ad2ba
 SHA512:
-  metadata.gz: bf8c3050912034740b3909f03f4282e3c195361a25d84db3a0989184ef812e318be6d2bfd8a444674f402656827260512539fade7d56f764753edb902d358fdb
-  data.tar.gz: cc6d16506b95182555b76cb4432ef8ac4945080543a0ba994798ea75d3fb72b951b3ce39b51313129df74261f4f597fc748c386c22113fc7469bee7ca572c9cc
+  metadata.gz: 71693a8d39c32435d5b2175341c9377bc472bcec42249e1fe8eb34f76f7144c02258af99c47c3cab2e47885e9af5e23777a8385508c7008b4d3b97d05d93b656
+  data.tar.gz: a5056e47da3cd879f1e6ec4836d7846448f76aee72c38881d9500876e06252bd2f561dec5efc84d60232f5ae079a7664bea493874f49513de3f2525ca24bcdc1

data/app/assets/stylesheets/renalware/partials/_errors.scss

@@ -59,7 +59,8 @@
   }
 }
 
-ul.error-messages {
+ul.error-messages,
+.non-patient-page ul.error-messages {
   background-color: $error-background;
   color: $nhs-red;
   margin: 0;

data/app/assets/stylesheets/renalware/partials/_tables.scss

@@ -108,6 +108,16 @@ table {
         color: $monsoon;
         text-align: right;
       }
+
+      dd {
+        * {
+          font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+          font-size: 1rem;
+          border: 0;
+          margin: 0;
+          padding: 0;
+        }
+      }
     }
   }
 

data/app/controllers/renalware/clinics/clinic_visits_controller.rb

@@ -7,9 +7,10 @@ module Renalware
       before_action :load_clinic_visit, only: [:edit, :update, :destroy]
 
       def index
+        visits = patient.clinic_visits.includes([:clinic, :created_by]).ordered
         render locals: {
           patient: patient,
-          clinic_visits: patient.clinic_visits.includes([:clinic, :created_by]).ordered
+          clinic_visits: CollectionPresenter.new(visits, ClinicVisitPresenter)
         }
       end
 

data/app/controllers/renalware/clinics/visits_controller.rb

@@ -12,7 +12,7 @@ module Renalware
         authorize visits
 
         render locals: {
-          visits: visits,
+          visits: CollectionPresenter.new(visits, ClinicVisitPresenter),
           query: visits_query.search,
           clinics: Clinic.ordered,
           users: User.ordered

data/app/helpers/renalware/definition_list_helper.rb

@@ -12,8 +12,8 @@ module Renalware
         super(model)
       end
 
-      def definition(attribute)
-        text = @model_klass.human_attribute_name(attribute)
+      def definition(attribute, label = nil)
+        text = label || @model_klass.human_attribute_name(attribute)
         value = public_send(attribute)
         value = yield(value) if value.present? && block_given?
         capture do

data/app/models/renalware/pathology/lab.rb

@@ -10,6 +10,10 @@ module Renalware
       scope :ordered, -> { order(name: :asc) }
 
       validates :name, presence: true
+
+      def self.unknown
+        find_by!(name: "Lab: Unknown")
+      end
     end
   end
 end

data/app/models/renalware/pathology/observation_requests_attributes_builder.rb

@@ -87,13 +87,16 @@ module Renalware
       end
 
       def find_request_description(code)
-        RequestDescription.find_by!(code: code)
+        RequestDescription.find_or_create_by!(code: code) do |desc|
+          desc.name = code
+          desc.lab = Lab.unknown
+        end
       rescue ActiveRecord::RecordNotFound
         raise MissingRequestDescriptionError, code
       end
 
       def find_observation_description(code)
-        ObservationDescription.find_by!(code: code)
+        ObservationDescription.find_or_create_by!(code: code) { |desc| desc.name = code }
       rescue ActiveRecord::RecordNotFound
         raise MissingObservationDescriptionError, code
       end

data/app/models/renalware/patient.rb

@@ -170,7 +170,13 @@ module Renalware
     end
 
     def validate_sex
-      errors.add(:sex, "is invalid option (#{sex.code})") unless sex.valid?
+      unless sex.valid?
+        if sex.code.present?
+          errors.add(:sex, "has an invalid option (#{sex.code})")
+        else
+          errors.add(:sex, "is required")
+        end
+      end
     end
 
     def must_have_at_least_one_identifier

data/app/presenters/renalware/clinics/clinic_visit_presenter.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/clinics"
+require_dependency "collection_presenter"
+
+module Renalware
+  module Clinics
+    class ClinicVisitPresenter < DumbDelegator
+      def sanitized_notes
+        ::Rails::Html::WhiteListSanitizer.new.sanitize(notes, tags: %w(p br ol li ul span div))
+      end
+    end
+  end
+end

data/app/views/renalware/admissions/requests/destroy.js.erb

@@ -1,3 +1,3 @@
 // Remove the just-deleted admissions request from the
 <%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
-$("#admissions_request_<%=request_id %>").fadeOut(300, function(){ $(this).remove();})
+$("#admissions_request_<%=request_id %>").remove();

data/app/views/renalware/patients/patients/_form.html.slim

@@ -15,15 +15,13 @@
     = f.input :family_name, wrapper: :horizontal_small
     = f.input :given_name, wrapper: :horizontal_small
     = f.input :suffix, wrapper: :horizontal_small
-    = f.input :email, wrapper: :horizontal_small
-    = f.input :telephone1, wrapper: :horizontal_small
-    = f.input :telephone2, wrapper: :horizontal_small
+    = f.input :born_on, as: :date_picker, label: "DoB", wrapper: :horizontal_datepicker
     = f.input :sex,
         selected: patient.sex.code,
-        placeholder: "Please select gender",
         collection: Renalware::Gender.all,
         label_method: :name, value_method: :code,
-        include_blank: "Please select gender",
+        include_blank: "Please select",
+        required: true,
         wrapper: :horizontal_small
     = f.association :ethnicity,
         label_method: :name, value_method: :id,
@@ -43,12 +41,15 @@
     = f.input :marital_status,
                     include_blank: "Please select marital status",
                     wrapper: :horizontal_small
-    = f.input :born_on, as: :date_picker, label: "DoB", wrapper: :horizontal_datepicker
     = f.input :paediatric_patient_indicator,
         as: :inline_radio_buttons,
         label: "If under 18 years, is the recipient being treated in a paediatric unit?",
         wrapper: :horizontal_small
 
+    = f.input :telephone1, wrapper: :horizontal_small
+    = f.input :telephone2, wrapper: :horizontal_small
+    = f.input :email, wrapper: :horizontal_small
+
     - if patient.persisted?
       .row
         .section-underliner

data/app/views/renalware/patients/patients/edit.html.slim

@@ -6,9 +6,6 @@
                       wrapper: "horizontal_form",
                       html: { autocomplete: "off" } do |f|
 
+      .columns= save_or_cancel(form: f, back_path: patient_path(patient))
       = render "form", f: f, patient: patient
-
-      .columns.large-12
-        = submit_tag "Update", class: "button"
-        span= " or "
-        = link_to "Cancel", patient_path(patient)
+      .columns= save_or_cancel(form: f, back_path: patient_path(patient))

data/app/views/renalware/patients/patients/new.html.slim

@@ -20,8 +20,6 @@
                       html: { autocomplete: "off" },
                       wrapper: "horizontal_form" do |f|
 
+      .columns= save_or_cancel(form: f, back_path: patients_path)
       = render "form", f: f, patient: patient
-
-      = submit_tag "Save", class: "button"
-      span= " or "
-      = link_to "cancel", patients_path
+      .columns= save_or_cancel(form: f, back_path: patients_path)

data/config/initializers/routing_draw.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# Adds draw method into Rails routing.
+# It allows us to keep routes split into files, one per module.
+class ActionDispatch::Routing::Mapper
+  def draw(routes_name)
+    instance_eval(File.read(Renalware::Engine.root.join("config/routes/#{routes_name}.rb")))
+  end
+end

data/config/routes.rb

@@ -1,517 +1,34 @@
 # frozen_string_literal: true
 
 Renalware::Engine.routes.draw do
-  match "/404", to: "system/errors#not_found", via: :all
-  match "/500", to: "system/errors#internal_server_error", via: :all
-  match "/generate_test_internal_server_error",
-        to: "system/errors#generate_test_internal_server_error",
-        via: :get
-
-  devise_for :users,
-             class_name: "Renalware::User",
-             controllers: {
-               registrations: "renalware/devise/registrations",
-               sessions: "renalware/devise/sessions",
-               passwords: "renalware/devise/passwords"
-             },
-             module: :devise
-
-  # An ajax-polled route which will cause the users browser to redirect to the login page
-  #  when their session expires
-  get "/session_timed_out" => "session_timeout#has_user_timed_out", as: "session_timed_out"
-
-  super_admin_constraint = lambda do |request|
-    current_user = request.env["warden"].user || Renalware::NullUser.new
-    current_user.has_role?(:super_admin)
-  end
-
-  constraints super_admin_constraint do
-    match "/delayed_job" => DelayedJobWeb, :anchor => false, via: [:get, :post]
-  end
-
-  # enable mail previews in all environments
-  get "/rails/mailers" => "rails/mailers#index"
-  get "/rails/mailers/*path" => "rails/mailers#preview"
-
   root to: "dashboard/dashboards#show"
-
-  resources :mock_errors, only: [:index], controller: "system/mock_errors"
-
-  namespace :reporting do
-    resources :audits, except: [:destroy, :create, :new]
-    resources :audit_refreshments, only: [:create]
-  end
-
-  namespace :admissions do
-    resources :requests, except: :show do
-      post :sort, on: :collection
-    end
-    resources :consults, except: :show
-    resources :admissions, except: :show
-  end
-
-  namespace :messaging do
-    namespace :internal do
-      resources :messages, only: [:new, :create] do
-        resources :receipts, only: [] do
-          patch :mark_as_read, on: :member
-        end
-      end
-      scope :messages do
-        get "inbox", to: "receipts#unread", as: :inbox
-        get "read", to: "receipts#read", as: :read_receipts
-        get "sent", to: "receipts#sent", as: :sent_messages
-      end
-    end
-  end
-
-  namespace :admin do
-    resources :users
-    namespace :feeds do
-      resources :files, only: [:index, :show, :new, :create]
-    end
-    resource :cache, only: [:show, :destroy]
-  end
-
-  namespace :api do
-    # The UKRDC XML API
-    namespace :ukrdc, defaults: { format: :xml } do
-      resources :patients,
-                only: :show,
-                constraints: { format: :xml }
-    end
-    # The JSON API
-    namespace :v1, constraints: { format: :json }, defaults: { format: :json } do
-      resources :patients, only: [:show, :index], controller: "patients/patients" do
-        resources :prescriptions, controller: "medications/prescriptions", only: [:index]
-        namespace :hd do
-          resource :current_profile,
-                   only: :show,
-                   path: "/profiles/current",
-                   controller: "current_profile"
-        end
-      end
-    end
-  end
-
-  namespace :research do
-    resources :studies do
-      resources :participants, controller: :study_participants
-    end
-  end
-
-  resources :snippets, controller: "snippets/snippets", except: :show do
-    resources :snippet_clones,
-              controller: "snippets/snippet_clones",
-              only: :create, as: :clones
-    resources :snippet_invocations,
-              controller: "snippets/snippet_invocations",
-              only: :create,
-              as: :invocations
-  end
-
-  resources :bookmarks, controller: "patients/bookmarks", only: [:destroy, :index]
-  resource :dashboard, only: :show, controller: "dashboard/dashboards"
-  resource :worryboard, only: :show, controller: "patients/worryboard"
-
-  # Clinics
-  resources :appointments, controller: "clinics/appointments", only: [:new, :create, :index]
-  resources :clinic_visits, only: :index, controller: "clinics/visits"
-
-  resources :deaths, only: :index, as: :patient_deaths
-
-  namespace :directory do
-    resources :people, except: [:delete] do
-      collection do
-        get :search
-      end
-    end
-  end
-
-  namespace :drugs do
-    resources :drugs, except: :show do
-      collection do
-        scope format: true, constraints: { format: :json } do
-          get :selected_drugs
-        end
-      end
-    end
-  end
-
-  namespace :medications do
-    # medications_esa_prescriptions => /medications/esa_prescriptions
-    resources :esa_prescriptions,
-              only: :index,
-              drug_type_name: :esa,
-              controller: "drug_types/prescriptions"
-  end
-
-  namespace :events do
-    resources :types, except: :show
-  end
-
-  namespace :hd do
-    scope format: true, constraints: { format: :json } do
-      get "patients_dialysing_at_unit" => "patients#dialysing_at_unit"
-      get "patients_dialysing_at_hospital" => "patients#dialysing_at_hospital"
-    end
-
-    resources :transmission_logs, only: [:show, :index]
-    resources :cannulation_types, except: :show
-    resources :dialysers, except: :show
-    resources :dialysates, except: :show
-    resource :ongoing_sessions, only: :show
-    resources :mdm_patients, only: :index
-    resources :mdm_patients, only: :index
-    constraints(named_filter: /(on_worryboard)/) do
-      get "mdm_patients/:named_filter", to: "mdm_patients#index", as: :filtered_mdm_patients
-    end
-    resources :unmet_preferences, only: :index
-    resources :units, only: [] do
-      resources :stations do
-        post :sort, on: :collection
-      end
-      resources :diaries, only: [:index, :show]
-      get "diaries/:year/:week_number/edit", to: "diaries#edit", as: :edit_diary
-    end
-    resources :diaries, only: [] do
-      resources :slots, except: :show, controller: :diary_slots
-      get "slots/day/:day_of_week/period/:diurnal_period_code_id/station/:station_id",
-          to: "diary_slots#show",
-          as: :refresh_slot
-    end
-  end
-
-  namespace :hospitals do
-    resources :units, except: :show do
-      resources :wards
-      scope format: true, constraints: { format: :json } do
-        resources :wards, only: :index
-      end
-    end
-  end
-
-  namespace :modalities do
-    resources :descriptions, except: [:show]
-    resources :reasons, only: [:index]
-  end
-
-  namespace :letters do
-    resource :pdf_letter_cache, only: [:destroy], controller: "pdf_letter_cache"
-    resources :descriptions, only: :search do
-      collection do
-        get :search
-      end
-    end
-    resource :list, only: :show
-    resources :letters, only: [] do
-      resources :electronic_receipts, only: [] do
-        patch :mark_as_read, on: :member
-      end
-    end
-    resources :electronic_receipts, only: [] do
-      collection do
-        get :unread
-        get :read
-        get :sent
-      end
-    end
-  end
-  get "authors/:author_id/letters", to: "letters/letters#author", as: "author_letters"
-
-  namespace :pathology do
-    namespace :requests do
-      # NOTE: This needs to be POST since the params may exceed url char limit in GET
-      post "requests/new", to: "requests#new", as: "new_request"
-      resources :requests, only: [:create, :index, :show]
-      resources :rules, only: :index
-    end
-  end
-
-  namespace :patients do
-    resources :primary_care_physicians
-    resources :practices, only: [] do
-      collection do
-        get :search
-      end
-      resources :primary_care_physicians,
-                only: :index,
-                controller: "practices/primary_care_physicians"
-    end
-  end
-
-  namespace :pd do
-    resources :bag_types, except: [:show]
-    resources :infection_organisms
-    resources :mdm_patients, only: :index
-    constraints(named_filter: /(on_worryboard)/) do
-      get "mdm_patients/:named_filter", to: "mdm_patients#index", as: :filtered_mdm_patients
-    end
-  end
-
-  namespace :renal do
-    resources :prd_descriptions, only: [:search] do
-      collection do
-        get :search
-      end
-    end
-    resources :aki_alerts, only: [:edit, :update, :index]
-    resources :registry_preflight_checks, only: [] do
-      collection do
-        get :patients
-        get :deaths
-      end
-    end
-  end
-
-  namespace :low_clearance do
-    resources :mdm_patients, only: :index
-    constraints(named_filter: /#{Renalware::LowClearance::MDM_FILTERS.join("|")}/) do
-      get "mdm_patients/:named_filter", to: "mdm_patients#index", as: :filtered_mdm_patients
-    end
-  end
-
-  namespace :system do
-    resources :email_templates, only: :index
-    resources :user_feedback, except: :destroy, controller: "user_feedback"
-    resources :messages
-  end
-
-  namespace :transplants do
-    constraints(named_filter: /#{Renalware::Transplants::WAITLIST_FILTERS.join("|")}/) do
-      get "wait_list/:named_filter", to: "wait_lists#show", as: :wait_list
-    end
-    resources :live_donors, only: :index
-    resources :mdm_patients, only: :index
-    constraints(named_filter: /(recent|on_worryboard|past_year)/) do
-      get "mdm_patients/:named_filter", to: "mdm_patients#index", as: :filtered_mdm_patients
-    end
-  end
-
-  # Patient-scoped Routes
-  #
-  # Please add all non patient-scoped routes above
-  #
-  resources :patients, except: [:destroy], controller: "patients/patients" do
-    collection do
-      get :search
-    end
-
-    resource :clinical_summary, only: :show, controller: "patients/clinical_summaries"
-    resource :death, only: [:edit, :update]
-    resource :primary_care_physician,
-             controller: "patients/primary_care_physician",
-             only: [:edit, :update]
-
-    resources :admissions, only: [:index], controller: "admissions/patient_admissions"
-
-    namespace :clinical do
-      resources :allergies, only: [:create, :destroy]
-      resource :allergy_status, only: [:update]
-      resource :profile, only: [:show, :edit, :update]
-      resources :dry_weights, only: [:new, :create, :index]
-      resources :body_compositions, except: :destroy
-    end
-
-    resources :bookmarks, only: :create, controller: "patients/bookmarks"
-    resources :alerts, only: [:new, :create, :destroy], controller: "patients/alerts"
-    resource :worry, only: [:create, :destroy], controller: "patients/worry"
-
-    namespace :accesses do
-      resource :dashboard, only: :show
-      resources :assessments, except: [:index, :destroy]
-      resources :procedures, except: [:index, :destroy]
-      resources :profiles, except: [:index, :destroy]
-      resources :plans, except: [:index, :destroy]
-    end
-
-    # Clinics
-    resources :clinic_visits, controller: "clinics/clinic_visits"
-
-    # Events
-    resources :events, only: [:new, :create, :index], controller: "events/events"
-    constraints(format: /(pdf)/) do
-      resources :events, only: :show, controller: "events/events"
-    end
-
-    resources :swabs,
-              only: [:new, :create, :edit, :update],
-              controller: "events/swabs",
-              defaults: { slug: :swabs }
-
-    resources :investigations,
-              only: [:new, :create, :edit, :update],
-              controller: "events/investigations",
-              defaults: { slug: :investigations }
-
-    # Here we could enable new event by any other slug
-    # eg patient_new_specific_event(slug: "transplant_biopsies")
-    # get "events/:slug/new",
-    #     to: "events/events#new",
-    #     as: :new_specific_event
-    # or we could hardwire routes as we do for swabs.
-
-    namespace :hd do
-      resource :mdm, only: :show, controller: "mdm"
-      resource :dashboard, only: :show
-      resource :protocol,
-               only: :show,
-               constraints: { format: /(pdf)/ },
-               defaults: { format: :pdf }
-      resource :preference_set, only: [:edit, :update]
-      resource :current_profile,
-               only: [:show, :edit, :update],
-               path: "/profiles/current",
-               controller: "current_profile"
-      resources :historical_profiles,
-                only: [:index, :show],
-                path: "/profiles/historical"
-      resources :sessions
-    end
-
-    # Medications
-    resources :prescriptions, controller: "medications/prescriptions", except: [:destroy]
-    namespace :medications do
-      namespace :home_delivery do
-        resources :prescriptions,
-                  only: [:index],
-                  constraints: { format: /(pdf)/ },
-                  defaults: { format: :pdf }
-      end
-      resources :prescriptions, only: [] do
-        resource :termination, only: [:new, :create]
-      end
-    end
-
-    namespace :letters do
-      resources :contacts, only: [:index, :new, :create, :edit, :update]
-      resources :letters do
-        resource :pending_review, controller: "pending_review_letters", only: :create
-        resource :rejected, controller: "rejected_letters", only: :create
-        resource :approved, controller: "approved_letters", only: :create
-        resource :completed, controller: "completed_letters", only: [:new, :create]
-        resource :formatted, controller: "formatted_letters", only: :show
-        resource :printable,
-                 controller: "printable_letters",
-                 only: :show,
-                 constraints: { format: /(pdf)/ },
-                 defaults: { format: :pdf }
-        collection do
-          get :contact_added
-        end
-      end
-    end
-
-    namespace :renal do
-      resource :profile, only: [:show, :edit, :update]
-    end
-
-    # Modalities
-    resources :modalities, only: [:new, :create, :index], controller: "modalities/modalities"
-
-    namespace :pd do
-      resource :dashboard, only: :show
-      resources :apd_regimes,
-                controller: "regimes",
-                type: "PD::APDRegime",
-                only: [:new, :create, :edit, :update, :show]
-      resources :capd_regimes,
-                controller: "regimes",
-                type: "PD::CAPDRegime",
-                only: [:new, :create, :edit, :update, :show]
-      resources :regimes, only: [:new, :create, :edit, :update, :show]
-      resources :peritonitis_episodes, only: [:new, :create, :show, :edit, :update]
-      resources :exit_site_infections, only: [:new, :create, :show, :edit, :update]
-      resources :pet_adequacy_results, except: [:destroy]
-      resources :assessments, except: [:index, :destroy]
-      resources :training_sessions, except: [:index, :destroy]
-      resource :mdm, only: :show, controller: "mdm"
-    end
-
-    namespace :low_clearance do
-      resource :dashboard, only: :show
-      resource :profile, only: [:edit, :update]
-      resource :mdm, only: :show, controller: "mdm"
-    end
-
-    member do
-      get :capd_regime
-      get :apd_regime
-    end
-
-    namespace :pathology do
-      get "observations/current",
-          to: "current_observation_results#index",
-          as: "current_observations"
-      get "observations/recent",
-          to: "recent_observation_results#index",
-          as: "recent_observations"
-      get "observations/historical",
-          to: "historical_observation_results#index",
-          as: "historical_observations"
-      resources :observation_requests, only: [:index, :show]
-      resources :patient_rules
-      get "descriptions/:description_id/observations",
-          to: "observations#index",
-          as: "observations"
-      resources :required_observations, only: :index
-    end
-
-    namespace :virology do
-      resource :dashboard, only: :show, path: "/dashboard"
-      resource :profile, except: :destroy
-
-      resources :vaccinations,
-              only: [:new, :create, :edit, :update],
-              defaults: { slug: :vaccinations }
-    end
-
-    # Problems
-    resources :problems, controller: "problems/problems" do
-      post :sort, on: :collection
-      resources :notes, only: [:index, :new, :create], controller: "problems/notes"
-    end
-
-    namespace :transplants do
-      resource :mdm, only: :show, controller: "mdm"
-
-      scope "/donor" do
-        resource :donor_dashboard, only: :show, path: "/dashboard"
-        resource :donor_workup, only: [:show, :edit, :update], path: "/workup"
-        resources :donor_operations, except: [:index, :destroy], path: "/operations" do
-          resource :followup,
-                   except: :destroy,
-                   controller: "donor_followups",
-                   path: "/follow_up"
-        end
-        resources :donations, except: [:index, :destroy]
-        resource :donor_stage, only: [:new, :create], path: "/stage"
-      end
-
-      scope "/recipient" do
-        resource :recipient_dashboard, only: :show, path: "/dashboard"
-        resource :recipient_workup, only: [:show, :edit, :update], path: "/workup"
-        resources :recipient_operations, except: [:index, :destroy], path: "/operations" do
-          resource :followup,
-                   except: :destroy,
-                   controller: "recipient_followups",
-                   path: "/follow_up"
-        end
-        resource :registration, only: [:show, :edit, :update] do
-          resources :statuses, except: [:index, :show], controller: "registration_statuses"
-        end
-      end
-    end
-  end
-
-  # Some safety-net routes in case we happen to fall through the above routed without a match.
-  # For example, redirect to the HD dashboard if they hit just /hd/
-  # In theory we should only ever hit these routes if the user manually edits/enters the URL.
-  get "/patients/:id/hd", to: redirect("/patients/%{id}/hd/dashboard")
-  get "/patients/:id/pd", to: redirect("/patients/%{id}/pd/dashboard")
-  get "/patients/:id/transplants", to: redirect("/patients/%{id}")
-  get "/patients/:id/transplants/donor",
-    to: redirect("/patients/%{id}/transplants/donor/dashboard")
-  get "/patients/:id/transplants/recipient",
-      to: redirect("/patients/%{id}/transplants/recipient/dashboard")
+  draw :accesses
+  draw :admin
+  draw :admissions
+  draw :api
+  draw :clinical
+  draw :clinics
+  draw :directory
+  draw :drugs
+  draw :events
+  draw :hd
+  draw :hospitals
+  draw :letters
+  draw :low_clearance
+  draw :medications
+  draw :messaging
+  draw :modalities
+  draw :pathology
+  draw :patients
+  draw :pd
+  draw :renal
+  draw :reporting
+  draw :research
+  draw :snippets
+  draw :system
+  draw :transplants
+  draw :virology
+
+  # Last
+  draw :fallbacks
 end