renalware-core 2.0.0.pre.beta4 → 2.0.0.pre.beta5

data/app/views/renalware/patients/{show.html.slim → patients/show.html.slim}

@@ -6,26 +6,26 @@
     .grid
       .row
         .columns.medium-6.large-4.xlarge-3
-          = render "renalware/patients/show/patient_demographics", patient: patient
+          = render "renalware/patients/patients/show/patient_demographics", patient: patient
         .columns.medium-6.large-4.xlarge-3
           article
             header
               h1 Current Address
             = render patient.current_address if patient.current_address
         .columns.medium-6.large-4.xlarge-3
-          = render "renalware/patients/show/hospital_numbers", patient: patient
+          = render "renalware/patients/patients/show/hospital_numbers", patient: patient
         .columns.medium-6.large-4.xlarge-3
-          = render "renalware/patients/show/primary_care_physician", patient: patient
+          = render "renalware/patients/patients/show/primary_care_physician", patient: patient
         .columns.medium-6.large-4.xlarge-3
-          = render "renalware/patients/show/letter_preferences", patient: patient
+          = render "renalware/patients/patients/show/letter_preferences", patient: patient
         .columns.medium-6.large-4.xlarge-3
-          = render "renalware/patients/show/ukrdc_preferences", patient: patient
+          = render "renalware/patients/patients/show/ukrdc_preferences", patient: patient
         .columns.medium-6.large-4.xlarge-3
-          = render "renalware/patients/show/contact_details", patient: patient
+          = render "renalware/patients/patients/show/contact_details", patient: patient
         .columns.medium-6.large-4.xlarge-3
           article
             header
               h2 Current Address
             = render patient.current_address if patient.current_address
         .columns.medium-6.large-4.xlarge-3
-          = render "renalware/patients/show/referral", patient: patient
+          = render "renalware/patients/patients/show/referral", patient: patient

data/app/views/renalware/patients/side_menu/_actions.html.slim

@@ -0,0 +1,27 @@
+li.heading.actions-heading= t(".heading")
+
+- bookmark = find_user_bookmark_for_patient(patient)
+
+- if bookmark.present?
+  li.link.action= render partial: "renalware/patients/bookmarks/delete",
+                  locals: { bookmark: bookmark, link_text: t(".delete_bookmark") }
+- else
+  li.link.action= render partial: "renalware/patients/bookmarks/new",
+                  locals: { patient: patient, link_text: t(".create_bookmark") }
+
+- if patient.worry.present?
+  li.link.action= render partial: "renalware/patients/worries/delete",
+                  locals: { patient: patient }
+- else
+  li.link.action= render partial: "renalware/patients/worries/new",
+                  locals: { patient: patient }
+
+li.link.action= render partial: "renalware/messaging/messages/send_message_link",
+                locals: { patient: patient, link_text: t(".send_message") }
+
+= render "renalware/messaging/messages/modal_dialog_placeholder"
+
+li.link.action
+  = render partial: "renalware/patients/alerts/create_alert_link",
+           locals: { patient: patient, link_text: t(".create_alert") }
+  = render "renalware/patients/alerts/modal_dialog_placeholder"

data/app/views/renalware/patients/side_menu/_general.html.slim

@@ -4,11 +4,11 @@ li.heading= t(".heading")
 
 = patient_menu_item title: t(".clinical_summary"),
                     path: patient_clinical_summary_path(patient),
-                    active_when_controller_matches: %r{renalware/clinical_summaries}
+                    active_when_controller_matches: %r{renalware/patients/clinical_summaries}
 
 = patient_menu_item title: t(".demographics"),
                     path: patient_path(patient),
-                    active_when_controller_matches: %r{renalware/patients}
+                    active_when_controller_matches: %r{renalware/patients/patients}
 
 = patient_menu_item title: t(".contacts", count: summary.contacts_count),
                     path: patient_letters_contacts_path(patient),
@@ -53,3 +53,5 @@ li.heading= t(".heading")
 = patient_menu_item title: t(".access_profiles", count: summary.access_profiles_count),
                     path: patient_accesses_dashboard_path(patient),
                     active_when_controller_matches: %r{renalware/accesses}
+
+hr

data/app/views/renalware/patients/side_menu/_modalities.html.slim

@@ -1,5 +1,3 @@
-li.divider
-
 li.heading= t(".heading")
 
 = patient_menu_item title: t(".pd"),
@@ -11,3 +9,5 @@ li.heading= t(".heading")
                     path: patient_hd_dashboard_path(patient),
                     active_when_controller_matches: %r{renalware/hd},
                     enabled: display_hd_menu?(patient)
+
+hr

data/app/views/renalware/patients/side_menu/{_options.html.slim → _options.html.slim.redundant}

@@ -17,3 +17,8 @@ li.heading= t(".heading")
 - else
   li.link= render partial: "renalware/patients/worries/new",
                   locals: { patient: patient }
+
+li.link.action
+  = render partial: "renalware/patients/alerts/create_alert_link",
+           locals: { patient: patient, link_text: t(".create_alert") }
+  = render "renalware/patients/alerts/modal_dialog_placeholder"

data/app/views/renalware/patients/side_menu/_transplants.html.slim

@@ -1,5 +1,4 @@
 - transplant_patient = Renalware::Transplants.cast_patient(patient)
-li.divider
 
 li.heading= t(".heading")
 
@@ -11,3 +10,5 @@ li.heading= t(".heading")
 = patient_menu_item title: t(".recipient_summary"),
                     path: patient_transplants_recipient_dashboard_path(patient),
                     active_when_controller_matches: %r{renalware/transplants/recipient}
+
+hr

data/app/views/renalware/patients/worries/_delete.html.slim

@@ -1,4 +1,5 @@
-=link_to(t(".title"),
-         patient_worry_path(patient, patient.worry),
+=link_to(patient_worry_path(patient, patient.worry),
          method: :delete,
-         data: { confirm: t(".confirm") })
+         data: { confirm: t(".confirm") }) do
+  i.fa.fa-link-annotation.fa-flag
+  = t(".title")

data/app/views/renalware/patients/worries/_new.html.slim

@@ -1,4 +1,23 @@
-=link_to(t(".title"),
-         patient_worry_path(patient, patient.worry),
-         method: :post,
-         data: { confirm: t(".confirm") })
+
+/ Link to launch the modal dialog
+= link_to("#",
+          data: { "reveal-id" => "add-patient-worry-modal" }) do
+  i.fa.fa-link-annotation.fa-flag-o
+  = t(".title")
+
+/ The modal dialog
+#add-patient-worry-modal.reveal-modal.medium(data-reveal)
+  =simple_form_for Renalware::Patients::Worry.new,
+                   html: { autocomplete: "off" },
+                   url: patient_worry_path(patient) do |f|
+    h2= t(".title")
+    =f.input :notes,
+             as: :text,
+             input_html: { autofocus: :autofocus },
+             label: "Optional notes"
+    =f.submit t(".save"), class: :button
+    span= " or "
+    =link_to t(".cancel"),
+             "#",
+             "aria-label" => "Close",
+             class: "reveal-modal-close"

data/app/views/renalware/patients/worryboard/_filters.html.slim

@@ -0,0 +1,15 @@
+.row.search-form.filters
+  = simple_form_for query,
+      as: :q,
+      url: worryboard_path,
+      method: :get do |f|
+
+    .small-6.medium-2.large-2.columns
+      = f.input :patient_current_modality_description_id_eq,
+                collection: modalities,
+                label: "Modality"
+
+    .medium-2.large-3.columns.actions.end
+      = f.submit "Filter", class: "button"
+      span= " or "
+      = link_to t("helpers.reset"), worryboard_path

data/app/views/renalware/patients/worryboard/_table.html.slim

@@ -1,16 +1,23 @@
 table#patients
   thead
     tr
-      th.col-width-tiny
-      th.col-width-medium Name
+      th.at-least.col-width-medium
+        = sort_link(query,
+                   :patient_family_name,
+                   [:patient_family_name, 'patient_given_name asc'],
+                   "Name")
       th.col-width-nhs-no NHS No.
       th.col-width-reference-no Hosp No.
       th.col-width-tiny Sex
       th.col-width-date Date of Birth
-      th.col-width-tiny Age
-      th.col-width-small Date Added
-      th.col-width-small Added By
-      th.col-width-small Modality
+      th.col-width-tiny.show-for-large-up Age
+      th.col-width-small= sort_link(query, :created_at, "Date Added")
+      th.col-width-medium Added By
+      th Notes
+      th.col-width-small
+        = sort_link(query,
+                   :patient_current_modality_description_name,
+                   "Modality")
 
   tbody
     = render partial: "worry", collection: worries

data/app/views/renalware/patients/worryboard/_worry.html.slim

@@ -1,13 +1,15 @@
 - patient = worry.patient
 tr
-  td
-    = link_to "View", patient_clinical_summary_path(patient), title: "Clinical Summary"
-  td.full-name= patient.to_s(format: :default)
+  td.full-name
+    = link_to(patient.to_s(format: :default),
+              patient_clinical_summary_path(patient),
+              title: "Clinical Summary")
   td= patient.nhs_number
   td= patient.hospital_identifier
   td= patient.sex.code
   td= patient.born_on
-  td= patient.age
+  td.show-for-large-up= patient.age
   td= l(worry.created_at.to_date)
   td= worry.created_by.to_s
+  td= worry.notes
   td= patient.current_modality

data/app/views/renalware/patients/worryboard/show.html.slim

@@ -1,5 +1,3 @@
-.row
-  h1 Worryboard
-
-.row
-  = render "table", worries: worries
+= within_admin_layout(title: "Worryboard") do
+  = render "filters", query: query, modalities: modalities
+  = render "table", query: query, worries: worries

data/app/views/renalware/pd/dashboards/show.html.slim

@@ -41,5 +41,14 @@
               training_sessions: dashboard.training_sessions,
               patient: patient
   .row
-    .medium-6.large-4.xlarge-3.columns
-      = render "renalware/clinical/dry_weights/list", patient: patient, limit: 5
+    .medium-6.large-6.columns
+      = render "renalware/clinical/dry_weights/list",
+               patient: patient,
+               limit: 5
+
+    - if dashboard.latest_pd_line_change_events.any?
+      .medium-6.large-6.columns.end
+        = render "renalware/events/events/simple/list",
+                 events: dashboard.latest_pd_line_change_events,
+                 patient: patient,
+                 title: "Latest Line Change Event"

data/app/views/renalware/pd/mdm/_top.html.slim

@@ -2,4 +2,9 @@
   - if mdm.current_regime
     = render "renalware/pd/regimes/current_regime", current_regime: mdm.current_regime
 .columns.medium-12.large-6
-    = render "prescriptions", mdm: mdm, with_esa: true
+  = render "prescriptions", mdm: mdm, with_esa: true
+.columns.medium-12.large-6
+  = render "renalware/events/events/simple/list",
+           events: mdm.latest_pd_line_change_events,
+           patient: mdm.patient,
+           title: "Latest Line Change Event"

data/app/views/renalware/renal/profiles/_form.html.slim

@@ -44,8 +44,9 @@
           locals: { legend: "Comorbidities", name: "comorbidities" } do
         = fd.simple_fields_for :comorbidities, fd.object.comorbidities do |fcm|
           = link_to "Set all comorbidities to No", "#", class: "set_all_comorbidities_to_no"
-          table.comorbidities
+          table.comorbidities.align-centre
             - fcm.object.class.attributes_list.each do |attribute|
+              - p attribute
               = render_input fcm, attribute
 
       = render layout: "renalware/shared/fieldset",

data/app/views/renalware/renal/profiles/show.html.slim

@@ -17,7 +17,7 @@
         = render "renalware/shared/documents/attributes_group",
                  group: profile.document.comorbidities,
                  legend: "Comorbidities",
-                 width: "xlarge"
+                 width: "xxlarge"
 
         = render "renalware/shared/documents/attributes_group",
                  group: profile.document.low_clearance,

data/app/views/renalware/shared/documents/_smoking_status.html.slim

@@ -0,0 +1 @@
+= smoking_status.value.try(&:text)

data/app/views/renalware/shared/documents/_smoking_status_input.html.slim

@@ -0,0 +1,5 @@
+= f.simple_fields_for attribute, f.object.public_send(attribute) do |fd|
+  tr
+    td= fd.label :value, f.object.class.human_attribute_name(attribute)
+    td= fd.input :value, label: false, wrapper: "vertical_form", as: :inline_radio_buttons
+    td

data/app/views/renalware/transplants/mdm_patients/_filters.html.slim

@@ -1,9 +1,8 @@
 - named_filter_param = params[:named_filter]
 
-.row
-  dl.sub-nav
-    dd(class=("active" unless named_filter_param.present?))
-       = link_to t(".filter.all"), transplants_mdm_patients_path
-    - %i(recent on_worryboard).each do |filter|
-      dd(class=("active" if named_filter_param == filter.to_s))
-        = link_to t(".filter.#{filter}"), transplants_filtered_mdm_patients_path(named_filter: filter)
+dl.sub-nav
+  dd(class=("active" unless named_filter_param.present?))
+     = link_to t(".filter.all"), transplants_mdm_patients_path
+  - %i(recent on_worryboard).each do |filter|
+    dd(class=("active" if named_filter_param == filter.to_s))
+      = link_to t(".filter.#{filter}"), transplants_filtered_mdm_patients_path(named_filter: filter)

data/config/cucumber.yml

@@ -1,9 +1,12 @@
 <%
+# Note that @legacy tags are applied to features which are really web. We take them out by default
+# and add them back into the rake_web profile.
+# See https://github.com/cucumber/cucumber/wiki/Tags
 env_format = "#{ENV['CUCUMBER_FORMAT']}"
 base_opts = (env_format == "" ? "" : "--format #{env_format}") + " -r features"
-std_opts = "#{base_opts} --tags ~@wip --tags ~@pending --strict"
+std_opts = "#{base_opts} --tags ~@wip --tags ~@legacy --tags ~@pending --strict"
 wip_opts = "#{base_opts} --tags @wip:100 --wip"
-web_opts = "#{base_opts} --tags ~@wip --tags @web --tags ~@pending --strict"
+web_opts = "#{base_opts} --tags @web,@legacy --tags ~@wip --tags ~@pending --strict"
 %>
 default: <%= std_opts %>
 wip: <%= wip_opts %>

data/config/initializers/renalware.rb

@@ -1,5 +1,18 @@
 require_dependency "renalware"
 
+# New subscription registry - previous implementation does not work across threads
+
+Renalware.configure do |config|
+  config.broadcast_subscription_map = {
+    "Renalware::Modalities::ChangePatientModality" =>
+      [
+        "Renalware::Medications::PatientListener",
+        "Renalware::Letters::PatientListener",
+        "Renalware::HD::PatientListener"
+      ]
+  }
+end
+
 Renalware::Patients.configure
 Renalware::Pathology.configure
 Renalware::PD.configure do |config|

data/config/initializers/simple_form_foundation.rb

@@ -106,7 +106,9 @@ SimpleForm.setup do |config|
       ba.use :label, class: "right inline"
     end
 
-    b.wrapper :right_input_wrapper, tag: :div, class: "small-12 medium-8 large-9 columns" do |ba|
+    b.wrapper :right_input_wrapper,
+              tag: :div,
+              class: "small-12 medium-8 large-9 columns horizontal_medium" do |ba|
       ba.use :input, class: "medium-input"
       ba.use :error, wrap_with: { tag: :small, class: ["error", "medium-input"] }
       ba.use :hint,  wrap_with: { tag: :span, class: ["hint", "medium-input"] }

data/config/locales/renalware/dashboard/dashboard.yml

@@ -24,4 +24,3 @@ en:
           notes: Notes
           modality: Modality
           bookmarked_on: Bookmarked
-

data/config/locales/renalware/errors.en.yml

@@ -1,16 +1,17 @@
 en:
   renalware:
-    errors:
-      not_found:
-        page_title: Page not found
-        heading: Sorry, we couldn't find what you were looking for
-        subheading: More text here
-        support_info: Support information here...
-      internal_server_error:
-        # You can test the content on this page by navigating to
-        # /the generate_test_internal_server_error
-        page_title: Server error
-        heading: It looks like something went wrong!
-        subheading: >
-          Try again in a few minutes. If it still doesn't work, please let us know.
-        support_info: Support information here...
+    system:
+      errors:
+        not_found:
+          page_title: Page not found
+          heading: Sorry, we couldn't find what you were looking for
+          subheading: More text here
+          support_info: Support information here...
+        internal_server_error:
+          # You can test the content on this page by navigating to
+          # /the generate_test_internal_server_error
+          page_title: Server error
+          heading: It looks like something went wrong!
+          subheading: >
+            Try again in a few minutes. If it still doesn't work, please let us know.
+          support_info: Support information here...

data/config/locales/renalware/events/events.yml

@@ -13,3 +13,8 @@ en:
       renalware/events/event:
         date_time: Date time
         notes: Notes
+    errors:
+      models:
+        renalware/events/event:
+          event_type_id:
+            blank: please select an option

data/config/locales/renalware/hd/mdm_patients.yml

@@ -4,7 +4,7 @@ en:
       mdm_patients:
         patient:
           view: "View"
-        index:
+        table:
           page_title: HD MDM patients
           name: Name
           nhs_no: NHS No.

data/config/locales/renalware/hospitals/unit.yml

@@ -10,3 +10,4 @@ en:
         renal_registry_code: NRD Code
         unit_type: Unit Type
         is_hd_site: Can provide HD treatments?
+        number_of_hd_stations: Maximum number of stations

data/config/locales/renalware/mdm.yml

@@ -3,7 +3,7 @@ en:
     mdm_patients:
       patient:
         view: "View"
-      index:
+      table:
         name: Name
         nhs_no: NHS No.
         hosp_no: Hosp No.

data/config/locales/renalware/messaging/messages.en.yml

@@ -0,0 +1,29 @@
+en:
+  renalware:
+    messaging:
+      messages:
+        form:
+          title: Send a message
+          cancel: Cancel
+          recipient_ids: Recipients
+        table:
+          from: From
+          sent_at: Sent at
+          patient_name: Patient
+          subject: Subject
+          body: Body
+          urgent: Urgent
+          age: Age
+          hosp_no: Hosp No.
+          recipients: Recipients
+      receipts:
+        table:
+          from: From
+          sent_at: Sent at
+          patient_name: Patient
+          subject: Subject
+          body: Body
+          urgent: Urgent
+          age: Age
+          hosp_no: Hosp No.
+

data/config/locales/renalware/patients/alerts.en.yml

@@ -0,0 +1,10 @@
+en:
+  renalware:
+    patients:
+      alerts:
+        form:
+          title: Create an alert for this patient
+          save: Save
+          cancel: Cancel
+        delete:
+          confirm: Are you sure you want to remove this alert?

data/config/locales/renalware/patients/side_menu.en.yml

@@ -2,6 +2,12 @@ en:
   renalware:
     patients:
       side_menu:
+        actions:
+          heading: Actions
+          create_bookmark: Bookmark
+          delete_bookmark: Remove bookmark
+          send_message: Send message
+          create_alert: Create alert
         general:
           heading: General
           clinic_visits: Clinic Visits (%{count})
@@ -25,7 +31,4 @@ en:
           heading: Transplants
           donor_summary: Donor Summary
           recipient_summary: Recipient Summary
-        options:
-          heading: Options
-          create_bookmark: Bookmark this patient
-          delete_bookmark: Remove from bookmarks
+

data/config/locales/renalware/patients/worries.en.yml

@@ -3,7 +3,7 @@ en:
     patients:
       worries:
         delete:
-          title: Remove from worryboard
+          title: Remove worry
           confirm: Remove this patient from the worryboard?
         new:
           title: Add to Worryboard

data/config/routes.rb

@@ -1,9 +1,9 @@
 Renalware::Engine.routes.draw do
 
-  match "/404", to: "errors#not_found", via: :all
-  match "/500", to: "errors#internal_server_error", via: :all
+  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: "errors#generate_test_internal_server_error",
+        to: "system/errors#generate_test_internal_server_error",
         via: :get
 
   devise_for :users,
@@ -33,13 +33,26 @@ Renalware::Engine.routes.draw do
 
   root to: "dashboard/dashboards#show"
 
-  resources :mock_errors, only: [:index]
+  resources :mock_errors, only: [:index], controller: "system/mock_errors"
 
   namespace :reporting do
     resources :audits, except: [:destroy]
     resources :audit_refreshments, only: [:create]
   end
 
+  namespace :messaging 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: "messages#sent", as: :sent_messages
+    end
+  end
+
   namespace :admin do
     resources :users
   end
@@ -109,6 +122,11 @@ Renalware::Engine.routes.draw do
     resource :ongoing_sessions, only: :show
     resources :mdm_patients, only: :index
     resources :unmet_preferences, only: :index
+    resources :units, :only => [] do
+      resources :stations do
+        post :sort, on: :collection
+      end
+    end
   end
 
   namespace :hospitals do
@@ -182,12 +200,12 @@ Renalware::Engine.routes.draw do
   #
   # Please add all non patient-scoped routes above
   #
-  resources :patients, except: [:destroy] do
+  resources :patients, except: [:destroy], controller: "patients/patients" do
     collection do
       get :search
     end
 
-    resource :clinical_summary, only: :show
+    resource :clinical_summary, only: :show, controller: "patients/clinical_summaries"
     resource :death, only: [:edit, :update]
     resource :primary_care_physician,
              controller: "patients/primary_care_physician",
@@ -202,6 +220,7 @@ Renalware::Engine.routes.draw do
     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

data/config/spring.rb

@@ -1,3 +1,5 @@
+Spring.application_root = "./spec/dummy"
+
 %w(
   .ruby-version
   .rbenv-vars

data/db/migrate/20170725120242_add_units_to_pathology_observation_descriptions.rb

@@ -0,0 +1,19 @@
+class AddUnitsToPathologyObservationDescriptions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :pathology_measurement_units do |t|
+      t.string :name, null: false
+      t.string :description, null: true
+    end
+
+    add_index :pathology_measurement_units, :name, unique: true
+
+    add_column :pathology_observation_descriptions,
+               :measurement_unit_id,
+               :integer,
+               null: true
+
+    add_foreign_key :pathology_observation_descriptions,
+                    :pathology_measurement_units,
+                    column: :measurement_unit_id
+  end
+end

data/db/migrate/20170809080925_add_notes_to_patient_worries.rb

@@ -0,0 +1,5 @@
+class AddNotesToPatientWorries < ActiveRecord::Migration[5.1]
+  def change
+    add_column :patient_worries, :notes, :text
+  end
+end