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

data/app/models/renalware/patients/search_form.rb

@@ -0,0 +1,17 @@
+require_dependency "renalware/patients"
+
+# A form object for use behind a form (see to_partial_path) which can add a patient filter
+# to a page. See Letters/ElectronicReceiptsController for an example.
+# Works in concert with Patients::SearchQuery.
+module Renalware
+  module Patients
+    class SearchForm
+      include ActiveModel::Model
+      attr_accessor :term, :url
+
+      def to_partial_path
+        "renalware/patients/search_form"
+      end
+    end
+  end
+end

data/app/models/renalware/patients/search_query.rb

@@ -1,37 +1,36 @@
+# A generic patient search that returns an AR relation that can used directly or merged into other
+# queries if required in order to use the extensive patient search criteria added by the
+# `identity_match` ransacker. See also a corresponding Patients::SearchForm form object and its
+# partial.
+#
+# Example usage to find letters relating to any patient with rabbit in their surname:
+#   Letter
+#     .joins(:patients)
+#     .merge(
+#       Patients::SearchQuery.new(term: "rabbit").call
+#     )
+#
 module Renalware
   module Patients
     class SearchQuery
-      attr_reader :term, :page, :per_page
+      attr_reader :term
 
-      def initialize(term:, page: 1, per_page: 20)
+      def initialize(term:)
         @term = term
-        @page = page
-        @per_page = per_page
       end
 
       def call
-        search
-          .result.page(page).per(per_page)
-          .select(fields)
-          .map do |patient|
-            {
-              id: patient.id,
-              label: patient.to_s(:long)
-            }
-          end
+        search.result
       end
 
-      private
-
       def search
-        @search ||= Patient.search(family_name_cont: term).tap do |srch|
-          srch.sorts = %w(family_name given_name)
+        @search ||= begin
+          Patient
+            .search(identity_match: term).tap do |search|
+              search.sorts = %w(family_name given_name)
+            end
         end
       end
-
-      def fields
-        %i(id family_name given_name nhs_number)
-      end
     end
   end
 end

data/app/models/renalware/patients/summary.rb

@@ -1,7 +1,7 @@
 require_dependency "renalware"
 
 ##
-# Backed by a SQL view, the patient summary is principally a set of counts fo various entities
+# Backed by a SQL view, the patient summary is principally a set of counts for various entities
 # which hang off a patient, for example prescriptions_count, problems_count etc.
 # These can be used for instance when building the patient navigation.
 #

data/app/models/renalware/user.rb

@@ -9,8 +9,12 @@ module Renalware
     validates_presence_of :given_name
     validates_presence_of :family_name
     validate :approval_with_roles, on: :update
-    validates_presence_of :professional_position, on: :update, unless: :super_admin_update
-    validates_presence_of :signature, on: :update, unless: :super_admin_update
+    validates_presence_of :professional_position,
+                          on: :update,
+                          unless: :skip_validation
+    validates_presence_of :signature,
+                          on: :update,
+                          unless: :skip_validation
 
     scope :unapproved, -> { where(approved: [nil, false]) }
     scope :inactive, lambda {
@@ -22,6 +26,10 @@ module Renalware
     # Non-persistent attribute to signify an update by an admin (bypassing some validations)
     attr_accessor :super_admin_update
 
+    def skip_validation
+      super_admin_update || reset_password_token
+    end
+
     def self.policy_class
       UserPolicy
     end
@@ -38,6 +46,14 @@ module Renalware
       @role_names ||= roles.pluck(:name)
     end
 
+    # Official name for use when displaying e.g. on a letter. For example:
+    #   Dr Isaac Newton (Consultant Gravitationalist)
+    def professional_signature
+      signed = signature || full_name
+      signed += " (#{professional_position})" if professional_position?
+      signed
+    end
+
     private
 
     def approval_with_roles

data/app/policies/renalware/admissions/request_policy.rb

@@ -0,0 +1,8 @@
+require_dependency "renalware/admissions"
+
+module Renalware
+  module Admissions
+    class RequestPolicy < BasePolicy
+    end
+  end
+end

data/app/policies/renalware/letters/electronic_receipt_policy.rb

@@ -0,0 +1,23 @@
+require_dependency "renalware/letters/letter_policy"
+
+module Renalware
+  module Letters
+    class ElectronicReceiptPolicy < BasePolicy
+      def mark_as_read?
+        !record.read? && record.letter.approved?
+      end
+
+      def unread?
+        index?
+      end
+
+      def read?
+        index?
+      end
+
+      def sent?
+        index?
+      end
+    end
+  end
+end

data/app/policies/renalware/messaging/{message_policy.rb → internal/message_policy.rb}

@@ -2,9 +2,8 @@ require_dependency "renalware/messaging"
 
 module Renalware
   module Messaging
-    class MessagePolicy < BasePolicy
-      def sent?
-        index?
+    module Internal
+      class MessagePolicy < BasePolicy
       end
     end
   end

data/app/policies/renalware/messaging/internal/receipt_policy.rb

@@ -0,0 +1,25 @@
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Messaging
+    module Internal
+      class ReceiptPolicy < BasePolicy
+        def mark_as_read?
+          update?
+        end
+
+        def unread?
+          index?
+        end
+
+        def read?
+          index?
+        end
+
+        def sent?
+          index?
+        end
+      end
+    end
+  end
+end

data/app/presenters/renalware/dashboard/dashboard_presenter.rb

@@ -33,8 +33,15 @@ module Renalware
 
       def unread_messages_receipts
         @unread_messages_receipts ||= begin
-          receipts = Messaging.cast_recipient(user).receipts.unread
-          CollectionPresenter.new(receipts, Messaging::ReceiptPresenter)
+          receipts = Messaging::Internal.cast_recipient(user).receipts.unread
+          CollectionPresenter.new(receipts, Messaging::Internal::ReceiptPresenter)
+        end
+      end
+
+      def unread_electronic_ccs
+        @unread_electronic_ccs ||= begin
+          receipts = Letters::ElectronicReceipt.unread.for_recipient(user.id).ordered
+          CollectionPresenter.new(receipts, Letters::ElectronicReceiptPresenter)
         end
       end
 

data/app/presenters/renalware/hd/station_presenter.rb

@@ -7,4 +7,3 @@ module Renalware
     end
   end
 end
-

data/app/presenters/renalware/letters/electronic_receipt_presenter.rb

@@ -0,0 +1,15 @@
+require_dependency "renalware/letters"
+
+module Renalware
+  module Letters
+    class ElectronicReceiptPresenter < DumbDelegator
+      def html_identifier
+        "electronic-receipt-#{id}"
+      end
+
+      def html_preview_identifier
+        "electronic-receipt-preview-#{id}"
+      end
+    end
+  end
+end

data/app/presenters/renalware/letters/letter_presenter.rb

@@ -28,6 +28,11 @@ module Renalware
         end
       end
 
+      def electronic_cc_receipts
+        @electronic_cc_receipts ||=
+          CollectionPresenter.new(super, Letters::ElectonicReceiptPresenter)
+      end
+
       def description
         "(#{letterhead.site_code}) #{super}"
       end

data/app/presenters/renalware/mdm_presenter.rb

@@ -55,6 +55,7 @@ module Renalware
     # to sorting by drug name
     def current_prescriptions
       @current_prescriptions ||= begin
+        # TODO: maybe use #sort_by(:prescribed_on) here
         execute_prescriptions_query(patient.prescriptions.current)
           .sort{ |presc1, presc2| presc2.prescribed_on <=> presc1.prescribed_on }
       end
@@ -81,6 +82,7 @@ module Renalware
     # to sorting by drug name
     def esa_prescriptions
       @esa_prescriptions ||= begin
+        # TODO: maybe use #sort_by(:prescribed_on) here
         execute_prescriptions_query(
           patient.prescriptions.having_drug_of_type("esa")
         ).sort{ |presc1, presc2| presc2.prescribed_on <=> presc1.prescribed_on }

data/app/presenters/renalware/messaging/internal/message_presenter.rb

@@ -0,0 +1,21 @@
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Messaging
+    module Internal
+      class MessagePresenter < SimpleDelegator
+        def age_in_days
+          (Time.zone.now.to_date - sent_at.to_date).to_i
+        end
+
+        def html_identifier
+          "message-#{id}"
+        end
+
+        def html_preview_identifier
+          "message-preview-#{id}"
+        end
+      end
+    end
+  end
+end

data/app/presenters/renalware/messaging/internal/receipt_presenter.rb

@@ -0,0 +1,13 @@
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Messaging
+    module Internal
+      class ReceiptPresenter < SimpleDelegator
+        def message
+          @message ||= Renalware::Messaging::Internal::MessagePresenter.new(super)
+        end
+      end
+    end
+  end
+end

data/app/presenters/renalware/pathology/observation_presenter.rb

@@ -3,6 +3,10 @@ require_dependency "renalware/pathology"
 module Renalware
   module Pathology
     class ObservationPresenter < SimpleDelegator
+      delegate :name, to: :description, prefix: true, allow_nil: true
+      delegate :measurement_unit, to: :description
+      delegate :name, to: :measurement_unit, prefix: true
+
       def html_class
         description.to_s.downcase
       end

data/app/presenters/renalware/ukrdc/patient_presenter.rb

@@ -5,6 +5,7 @@ module Renalware
     class PatientPresenter < SimpleDelegator
       delegate :allergies, to: :clinical_patient
       delegate :clinic_visits, to: :clinics_patient
+      delegate :observation_requests, to: :pathology_patient
 
       def smoking_history
         @smoking_history ||= document.history&.smoking&.upcase
@@ -34,6 +35,10 @@ module Renalware
       def letters_patient
         @letters_patient ||= Renalware::Letters.cast_patient(__getobj__)
       end
+
+      def pathology_patient
+        @pathology_patient ||= Renalware::Pathology.cast_patient(__getobj__)
+      end
     end
   end
 end

data/app/views/renalware/admissions/requests/_create_request_link.html.slim

@@ -0,0 +1,10 @@
+/ This partial is pulled in when the whole page renders, and creates the link and
+/ associated modal dialog wiring for creating an admission request (TCI).
+- url = new_admissions_request_path(patient_id: patient, format: :html)
+
+/ Link to launch the modal dialog
+=link_to(url,
+         id: "create-admissions-request",
+         data: { "reveal-id" => "admissions-request-modal", "reveal-ajax" => "true" }) do
+  i.fa.fa-link-annotation.fa-hand-o-right
+  = link_text

data/app/views/renalware/admissions/requests/_form.html.slim

@@ -0,0 +1,31 @@
+.modal
+  .modal__header
+    h2= "#{controller.action_name.capitalize} Request Admission (TCI)"
+    = render "renalware/shared/modal_close_link"
+
+  .modal__body
+    = render "renalware/shared/errors", model: request
+
+    = simple_form_for(request,
+                      remote: true,
+                      wrapper: :horizontal_form) do |f|
+
+      .row.admissions-request-patient
+        .small-12.medium-4.large-3.columns
+          label.right.inline Patient
+        .small-12.medium-8.large-9.columns
+          strong= request.patient.to_s(:long)
+
+      = f.input :patient_id, as: :hidden
+      = f.input :reason_id, collection: reasons, wrapper: :horizontal_medium
+      = f.input :priority, wrapper: :horizontal_small
+      = f.input :hospital_unit_id, collection: hospital_units, wrapper: :horizontal_medium
+      = f.input :notes, as: :text, wrapper: :horizontal_large, input_html: { rows: 5 }
+      = f.submit class: :button
+      span= " or "
+      =link_to "Cancel",
+               "#",
+               "aria-label" => "Close",
+                class: "reveal-modal-close"
+
+    .modal__footer

data/app/views/renalware/admissions/requests/_modal_dialog_placeholder.html.slim

@@ -0,0 +1,2 @@
+/ The modal dialog container for internal message sending
+#admissions-request-modal.reveal-modal.medium(data-reveal)

data/app/views/renalware/admissions/requests/_request.html.slim

@@ -0,0 +1,34 @@
+- patient = request.patient
+- unit = Renalware::Hospitals::Unit.find_by(id: request.hospital_unit_id)
+- editing_history = "Created #{l(request.created_at)} by #{request.created_by}\n"\
+                    "Updated #{l(request.updated_at)} by #{request.updated_by}"
+= content_tag_for(:tr,
+                  request,
+                  class: "sortable priority-#{request.priority}") do
+  td(class="sortable-position-for-model-id-#{request.id}")= request.position
+  td.priority
+    span= request.priority.text
+  td= request.reason.description
+  td= default_patient_link(patient)
+  td= patient.nhs_number
+  td= patient.hospital_identifiers
+  td= unit&.name
+  td.col-width-medium-with-ellipsis(title=request.notes)
+    = request.notes
+  td(title=editing_history)= l(request.created_at)
+  td
+    = link_to admissions_request_path(request),
+              remote: true,
+              method: :delete,
+              class: "remove",
+              data: { confirm: "Are you sure you want to remove this item?" } do
+      i.fa.fa-trash.fa-link-annotation
+      |  |  
+      = link_to "Edit",
+                edit_admissions_request_path(request, format: :html),
+                remote: true,
+                method: :get,
+                data: { "reveal-id" => "admissions-request-modal", "reveal-ajax" => "true" }
+  td.handle
+    i.fa.fa-reorder
+

data/app/views/renalware/admissions/requests/_table.html.slim

@@ -0,0 +1,19 @@
+table.admissions_requests
+  thead
+    th Rank
+    th Priority
+    th Reason
+    th Patient
+    th.col-width-nhs-no NHS Number
+    th Hospital Nos.
+    th Location
+    th Notes
+    th.col-width-date-time Created
+    th.col-width-small
+    th
+  = content_tag(:tbody,
+                class: "sortables",
+                data: { rel: sort_admissions_requests_path }) do
+    = render requests
+
+= render "modal_dialog_placeholder"