renalware-core 2.0.0.pre.beta7 → 2.0.0.pre.beta8

data/app/views/renalware/letters/letters/_actions.html.slim

@@ -53,4 +53,4 @@ ul.f-dropdown#download-options(data-dropdown-content aria-hidden="true")
   = blank_separator
 = blank_separator
 = link_to "back to list",
-          patient_letters_letters_path(letter.patient)
+          params.fetch(:back_url, patient_letters_letters_path(letter.patient))

data/app/views/renalware/letters/letters/_electronic_ccs.html.slim

@@ -0,0 +1,16 @@
+article.electonic_ccs
+  header
+    h2= t(".title")
+
+  =f.input :electronic_cc_recipient_ids,
+           label: "CC electronically to",
+           collection: electronic_recipient_options,
+           as: :grouped_select,
+           group_method: :users,
+           group_label_method: :name,
+           label_method: :to_s,
+           value_method: :id,
+           input_html: {\
+              class: "searchable_select",
+              multiple: "multiple"\
+            }

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

@@ -1,5 +1,5 @@
 ruby:
-  back_path = patient_letters_letters_path(@patient)
+  back_path = patient_letters_letters_path(patient)
   event = f.object.event
 
 .row.top
@@ -35,8 +35,13 @@ ruby:
           user_to_promote_to_top: current_user \
         )
 
-  = render "main_recipient", f: f, contacts: contacts, patient: @patient
-  = render "additional_ccs", f: f, contacts: contacts, patient: @patient
+  = render "main_recipient", f: f, contacts: contacts, patient: patient
+  = render "additional_ccs", f: f, contacts: contacts, patient: patient
+  = render "electronic_ccs",
+           f: f,
+           contacts: contacts,
+           patient: patient,
+           electronic_recipient_options: electronic_recipient_options
 
   article
     header

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

@@ -10,7 +10,13 @@
         as: :letter,
         wrapper: "horizontal_form",
         html: { id: "letter-form", autocomplete: "off" } do |f|
-      = render "form", f: f, patient: patient, contact: contact, contacts: contacts
+
+      = render "form",
+               f: f,
+               patient: patient,
+               contact: contact,
+               contacts: contacts,
+               electronic_recipient_options: electronic_recipient_options
 
 = render "add_contact",
          patient: patient,

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

@@ -10,7 +10,12 @@
         wrapper: "horizontal_form",
         html: { id: "letter-form", autocomplete: "off" } do |f|
 
-      = render "form", f: f, patient: patient, contact: contact, contacts: contacts
+      = render "form",
+               f: f,
+               patient: patient,
+               contact: contact,
+               contacts: contacts,
+               electronic_recipient_options: electronic_recipient_options
 
 = render "add_contact",
           patient: patient,

data/app/views/renalware/letters/shared/_electronic_cc_type_tabs.html.slim

@@ -0,0 +1,7 @@
+dl.sub-nav
+  dd
+    =link_to("Unread", unread_letters_electronic_receipts_path)
+  dd
+    =link_to("Read", read_letters_electronic_receipts_path)
+  dd
+    =link_to("Sent", sent_letters_electronic_receipts_path)

data/app/views/renalware/messaging/{messages → internal/messages}/_form.html.slim

@@ -2,7 +2,8 @@
 = simple_form_for form,
                 html: { autocomplete: "off"},
                 remote: true,
-                url: messaging_messages_path(patient_id: patient) do |f|
+                as: :internal_message,
+                url: messaging_internal_messages_path(patient_id: patient) do |f|
     h2= t(".title")
     =f.input :replying_to_message_id, as: :hidden
 

data/app/views/renalware/messaging/{messages → internal/messages}/_send_message_link.html.slim

@@ -1,7 +1,7 @@
 / This partial is pulled in when the whole page renders, and creates the link and
 / associated modal dialog wiring sending a message.
 - patient = Renalware::Messaging.cast_patient(patient)
-- url = new_messaging_message_path(patient_id: patient, format: :html)
+- url = new_messaging_internal_message_path(patient_id: patient, format: :html)
 
 / Link to launch the modal dialog
 =link_to(url,

data/app/views/renalware/messaging/{messages → internal/messages}/_send_reply_link.html.slim

@@ -1,9 +1,9 @@
 / This partial is pulled in when the whole page renders, and creates the link and
 / associated modal dialog wiring sending a message.
 - patient = Renalware::Messaging.cast_patient(patient)
-- url = new_messaging_message_path(patient_id: patient,
-                                   replying_to_message_id: replying_to_message_id,
-                                   format: :html)
+- url = new_messaging_internal_message_path(patient_id: patient,
+                                            replying_to_message_id: replying_to_message_id,
+                                            format: :html)
 / Link to launch the modal dialog
 =link_to(url,
          data: { "reveal-id" => "send-message-modal", "reveal-ajax" => "true" },

data/app/views/renalware/messaging/{receipts → internal/receipts}/_receipt.html.slim

@@ -31,12 +31,12 @@ tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
                   data: { behaviour: "toggler" },
                   class: "button secondary keep-as-unread"
 
-      li= render partial: "renalware/messaging/messages/send_reply_link",
+      li= render partial: "renalware/messaging/internal/messages/send_reply_link",
                  locals: { patient: message.patient,
                            link_text: "Reply",
                            replying_to_message_id: message.id }
 
-      li= link_to(mark_as_read_messaging_message_receipt_path(message, receipt),
+      li= link_to(mark_as_read_messaging_internal_message_receipt_path(message, receipt),
                   class: "button mark-as-read",
                   method: :patch,
                   remote: true) do

data/app/views/renalware/messaging/{messages/_message.html.slim → internal/receipts/_sent_receipt.html.slim}

@@ -1,9 +1,10 @@
+- message = sent_receipt.message
 tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
   td=l(message.sent_at)
   td= link_to(message.patient, patient_clinical_summary_path(message.patient))
   td= message.patient.hospital_identifier
   td= message.subject
-  td= message.recipients.map(&:to_s).join(",")
+  td= sent_receipt.recipient
   td
     = link_to "View",
               "##{message.html_preview_identifier}",

data/app/views/renalware/messaging/internal/receipts/_sent_table.html.slim

@@ -0,0 +1,12 @@
+.sent-messages
+  table.messages.messages-sent.has_togglable_content
+    thead
+      tr
+        th.col-width-date-time= t(".sent_at")
+        th.col-width-large= t(".patient_name")
+        th.col-width-reference-no= t(".hosp_no")
+        th= t(".subject")
+        th= t(".recipients")
+        td
+    tbody
+      = render partial: "sent_receipt", collection: receipts

data/app/views/renalware/messaging/{receipts → internal/receipts}/_table.html.slim

@@ -11,6 +11,6 @@ table.auto-layout.align-top.messages.has-togglable-rows
       td.col-width-small
 
   tbody
-    = render partial: "renalware/messaging/receipts/receipt", collection: receipts
+    = render partial: "renalware/messaging/internal/receipts/receipt", collection: receipts
 
-= render "renalware/messaging/messages/modal_dialog_placeholder"
+= render "renalware/messaging/internal/messages/modal_dialog_placeholder"

data/app/views/renalware/messaging/{receipts → internal/receipts}/read.html.slim

@@ -1,5 +1,6 @@
 = within_admin_layout(title: "Messages") do
   = render "renalware/messaging/shared/messages_type_tabs"
+  = render search_form
   .read-messages
-    = render "renalware/messaging/receipts/table", receipts: receipts
+    = render "table", receipts: receipts
   = paginate receipts

data/app/views/renalware/messaging/internal/receipts/sent.html.slim

@@ -0,0 +1,7 @@
+= within_admin_layout(title: "Messages") do
+  = render "renalware/messaging/shared/messages_type_tabs"
+  = render search_form
+  = render "sent_table", receipts: receipts
+  = paginate receipts
+  = render "renalware/messaging/internal/messages/modal_dialog_placeholder"
+

data/app/views/renalware/messaging/{receipts → internal/receipts}/unread.html.slim

@@ -1,5 +1,6 @@
 = within_admin_layout(title: "Messages") do
   = render "renalware/messaging/shared/messages_type_tabs"
+  = render search_form
   .unread-messages
-    = render "renalware/messaging/receipts/table", receipts: receipts
+    = render "table", receipts: receipts
   = paginate receipts

data/app/views/renalware/messaging/shared/_messages_type_tabs.html.slim

@@ -1,7 +1,7 @@
 dl.sub-nav
   dd
-    =link_to("Inbox", messaging_inbox_path)
+    =link_to("Inbox", messaging_internal_inbox_path)
   dd
-    =link_to("Read", messaging_read_receipts_path)
+    =link_to("Read", messaging_internal_read_receipts_path)
   dd
-    =link_to("Sent", messaging_sent_messages_path)
+    =link_to("Sent", messaging_internal_sent_messages_path)

data/app/views/renalware/navigation/_main.html.slim

@@ -1,4 +1,4 @@
-nav.top-bar(data-topbar role="navigation")
+nav#top-menu-bar.top-bar(data-topbar role="navigation")
   ul.title-area
     li.name
     li.toggle-topbar.menu-icon

data/app/views/renalware/navigation/_patients_admin.html.slim

@@ -9,3 +9,5 @@ li.has-dropdown
       = link_to "Deceased Patients", patient_deaths_path
     li
       = link_to "Worryboard", worryboard_path
+    li
+      = link_to "Admission Requests", admissions_requests_path

data/app/views/renalware/navigation/_user.html.slim

@@ -8,4 +8,5 @@ li.has-dropdown
     li= link_to "Update Profile", edit_user_registration_path
     li= link_to "View Letters", author_letters_path(current_user.id)
     li= link_to "Manage Snippets", snippets_path
-    li= link_to "Messages", messaging_inbox_path
+    li= link_to "Messages", messaging_internal_inbox_path
+    li= link_to "Electronic CCs", unread_letters_electronic_receipts_path

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

@@ -0,0 +1,12 @@
+/ A re-usable partial for filtering a page by patient name or nhs/local hospital number.
+/ The search_form must be an instance of Patients::SearchForm.
+= simple_form_for search_form,
+                  as: :patient_search,
+                  url: search_form.url,
+                  method: :get,
+                  html: { autocomplete: "off"} do |f|
+  .row
+    .medium-5.columns
+      = f.input :term, label: false, placeholder: "Search by patient surname, NHS or Hosp. no."
+    .medium-7.columns.actions
+      = f.submit "Search", class: :button

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

@@ -16,12 +16,16 @@ li.heading.actions-heading= t(".heading")
   li.link.action= render partial: "renalware/patients/worries/new",
                   locals: { patient: patient }
 
-li.link.action= render partial: "renalware/messaging/messages/send_message_link",
+li.link.action= render partial: "renalware/messaging/internal/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/admissions/requests/create_request_link",
+                locals: { patient: patient, link_text: t(".request_admission") }
 
 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"
+
+= render "renalware/admissions/requests/modal_dialog_placeholder"
+= render "renalware/messaging/internal/messages/modal_dialog_placeholder"

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

@@ -46,7 +46,6 @@
           = link_to "Set all comorbidities to No", "#", class: "set_all_comorbidities_to_no"
           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/_mini.html.slim

@@ -1,3 +1,4 @@
+- require_dependency "renalware/renal"
 - patient = Renalware::Renal.cast_patient(patient)
 - profile = patient.profile
 

data/app/views/renalware/snippets/snippets/_list.html.slim

@@ -5,7 +5,7 @@
   .modal-header
     h1= t("#{i18n_scope}.page_title")
 
-    = render "modal_close_link" if remote
+    = render "renalware/shared/modal_close_link" if remote
 
   - unless remote
     .columns.small-12

data/app/views/renalware/transplants/donations/_form.html.slim

@@ -16,22 +16,23 @@ ruby:
       locals: { legend: "Recipient", name: "recipient" } do
     = f.input :relationship_with_recipient, wrapper: :horizontal_medium
     = f.input :relationship_with_recipient_other, wrapper: :horizontal_medium
-    .row
-      .columns.small-12.medium-4.large-3
-        = label_tag "recipient_auto_complete",
-            f.object.class.human_attribute_name(:recipient),
-            class: "right inline"
-      .columns.small-12.medium-8.large-9
-        = text_field_tag "recipient_auto_complete", \
-            f.object.recipient.try(:to_s, :long),
-            data: { \
-              autocomplete_source: search_patients_path, \
-              autocomplete_rel: "[name='transplants_donation[recipient_id]']" \
-            },
-            spellcheck: false,
-            placeholder: "Start entering the last name (min. 2 characters)",
-            class: "medium-input"
-    = f.input :recipient_id, as: :hidden
+    br
+
+    ruby:
+      recipient = f.object.recipient
+      default_value = { id: recipient.id, text: recipient.to_s(:long) } if recipient.present?
+
+    = f.input :recipient_id,
+              collection: [],
+              include_blank: false,
+              wrapper: :horizontal_medium,
+              input_html: {\
+                 class: "select2-ajax-search",
+                 data: { "ajax--url" => search_patients_path(format: :json),
+                         "default-value" => default_value,
+                         "placeholder" => "Start entering the last name (min. 3 characters)" }\
+              }
+
     = f.input :blood_group_compatibility,
               as: :inline_radio_buttons,
               wrapper: :horizontal_medium

data/config/initializers/simple_form_foundation.rb

@@ -138,7 +138,6 @@ SimpleForm.setup do |config|
     end
   end
 
-
   config.wrappers :horizontal_form, tag: "div", class: "row",
     hint_class: :field_with_hint, error_class: :error do |b|
     b.use :html5

data/config/locales/renalware/admissions/requests.en.yml

@@ -0,0 +1,12 @@
+en:
+  activerecord:
+    errors:
+      models:
+        renalware/admissions/request:
+          patient_id:
+            taken: already has an admission request
+
+    attributes:
+      renalware/admissions/request:
+        reason_id: Reason
+        hospital_unit_id: Current location

data/config/locales/renalware/letters/contact.en.yml

@@ -36,3 +36,6 @@ en:
         add_contact: Add a different recipient via the contacts Directory
       additional_ccs:
         add_contact_as_cc: Add new person to the list
+      electronic_ccs:
+        title: Electronic CCs
+        add: Add

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

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

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

@@ -0,0 +1,5 @@
+en:
+  activemodel:
+    attributes:
+      renalware/patients/search_form:
+        term: Search by patient surname, NHS Number or local hospital number

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

@@ -8,6 +8,7 @@ en:
           delete_bookmark: Remove bookmark
           send_message: Send message
           create_alert: Create alert
+          request_admission: Request admission
         general:
           heading: General
           clinic_visits: Clinic Visits (%{count})

data/config/routes.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Style/FormatStringToken
 Renalware::Engine.routes.draw do
 
   match "/404", to: "system/errors#not_found", via: :all
@@ -10,7 +11,8 @@ Renalware::Engine.routes.draw do
              class_name: "Renalware::User",
              controllers: {
                registrations: "renalware/devise/registrations",
-               sessions: "renalware/devise/sessions"
+               sessions: "renalware/devise/sessions",
+               passwords: "renalware/devise/passwords"
              },
              module: :devise
 
@@ -40,16 +42,24 @@ Renalware::Engine.routes.draw do
     resources :audit_refreshments, only: [:create]
   end
 
+  namespace :admissions do
+    resources :requests do
+      post :sort, on: :collection
+    end
+  end
+
   namespace :messaging do
-    resources :messages, only: [:new, :create] do
-      resources :receipts, only: [] do
-        patch :mark_as_read, on: :member
+    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
-    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
 
@@ -122,7 +132,7 @@ 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 :units, only: [] do
       resources :stations do
         post :sort, on: :collection
       end
@@ -145,6 +155,18 @@ Renalware::Engine.routes.draw do
       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"