renalware-core 2.0.0.pre.rc9 → 2.0.0.pre.rc10

data/app/policies/renalware/virology/dasboard_policy.rb

@@ -0,0 +1,8 @@
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class DashboardPolicy < BasePolicy
+    end
+  end
+end

data/app/policies/renalware/virology/vaccination_policy.rb

@@ -0,0 +1,8 @@
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class VaccinationPolicy < BasePolicy
+    end
+  end
+end

data/app/presenters/renalware/admissions/summary_part.rb

@@ -0,0 +1,30 @@
+require_dependency "renalware/medications"
+require "collection_presenter"
+
+module Renalware
+  module Admissions
+    class SummaryPart < Renalware::SummaryPart
+      delegate :nhs_number, to: :patient, prefix: true
+
+      def admissions
+        @admissions ||= begin
+          CollectionPresenter.new(
+            Admissions::Admission.where(patient: patient).limit(5),
+            Renalware::Admissions::AdmissionPresenter
+          )
+        end
+      end
+
+      def admissions_count
+        title_friendly_collection_count(
+          actual: admissions.size,
+          total: Admissions::Admission.where(patient: patient).count
+        )
+      end
+
+      def to_partial_path
+        "renalware/admissions/summary_part"
+      end
+    end
+  end
+end

data/app/presenters/renalware/events/summary_part.rb

@@ -0,0 +1,31 @@
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    class SummaryPart < Renalware::SummaryPart
+      def current_events
+        @current_events ||= begin
+          Events::Event.includes([:created_by, :event_type])
+                       .for_patient(patient)
+                       .limit(Renalware.config.clinical_summary_max_events_to_display)
+                       .ordered
+        end
+      end
+
+      def current_events_count
+        title_friendly_collection_count(
+          actual: current_events.size,
+          total: patient.summary.events_count
+        )
+      end
+
+      def to_partial_path
+        "renalware/events/events/summary_part"
+      end
+
+      # def cache_key
+      #   Events::Event.for_patient(patient).maximum(:updated_at)
+      # end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+require_dependency "renalware/letters"
+require "collection_presenter"
+
+module Renalware
+  module Letters
+    class SummaryPart < Renalware::SummaryPart
+      def letters
+        present_letters(find_letters)
+      end
+
+      def letters_count
+        title_friendly_collection_count(
+          actual: letters.size,
+          total: patient.summary.letters_count
+        )
+      end
+
+      def to_partial_path
+        "renalware/letters/summary_part"
+      end
+
+      # def cache_key
+      #   letters_patient.letters.maximum(:updated_at)
+      # end
+
+      private
+
+      def find_letters
+        letters_patient
+          .letters
+          .with_main_recipient
+          .with_letterhead
+          .with_author
+          .with_patient
+          .limit(Renalware.config.clinical_summary_max_letters_to_display)
+          .order(issued_on: :desc)
+      end
+
+      def present_letters(letters)
+        CollectionPresenter.new(letters, Renalware::Letters::LetterPresenterFactory)
+      end
+
+      def letters_patient
+        Renalware::Letters.cast_patient(patient)
+      end
+    end
+  end
+end

data/app/presenters/renalware/medications/summary_part.rb

@@ -0,0 +1,23 @@
+require_dependency "renalware/medications"
+require "collection_presenter"
+
+module Renalware
+  module Medications
+    class SummaryPart < Renalware::SummaryPart
+      def current_prescriptions
+        @current_prescriptions ||= begin
+          prescriptions = patient.prescriptions
+                                 .includes(drug: [:drug_types, :classifications])
+                                 .includes(:medication_route)
+                                 .current
+                                 .ordered
+          CollectionPresenter.new(prescriptions, Medications::PrescriptionPresenter)
+        end
+      end
+
+      def to_partial_path
+        "renalware/medications/summary_part"
+      end
+    end
+  end
+end

data/app/presenters/renalware/problems/summary_part.rb

@@ -0,0 +1,19 @@
+require_dependency "renalware/problems"
+
+module Renalware
+  module Problems
+    class SummaryPart < Renalware::SummaryPart
+      def current_problems
+        @current_problems ||= patient.problems.current.ordered
+      end
+
+      # def cache_key
+      #   current_problems.maximum(:updated_at)
+      # end
+
+      def to_partial_path
+        "renalware/problems/problems/summary_part"
+      end
+    end
+  end
+end

data/app/presenters/renalware/renal/clinical_summary_presenter.rb

@@ -1,99 +1,14 @@
 require_dependency "renalware/renal"
-require "collection_presenter"
+require "attr_extras"
 
 module Renalware
   module Renal
     class ClinicalSummaryPresenter
-      def initialize(patient)
-        @patient = patient
-      end
-
-      def current_prescriptions
-        @current_prescriptions ||= begin
-          prescriptions = @patient.prescriptions
-                                  .includes(drug: [:drug_types, :classifications])
-                                  .includes(:medication_route)
-                                  .current
-                                  .ordered
-          CollectionPresenter.new(prescriptions, Medications::PrescriptionPresenter)
-        end
-      end
-
-      def current_problems
-        @current_problems ||= @patient.problems
-                                      .current
-                                      .ordered
-      end
-
-      def current_events
-        @current_events ||= begin
-          Events::Event.includes([:created_by, :event_type])
-                       .for_patient(@patient)
-                       .limit(Renalware.config.clinical_summary_max_events_to_display)
-                       .ordered
-        end
-      end
-
-      def current_events_count
-        title_friendly_collection_count(
-          actual: current_events.size,
-          total: patient.summary.events_count
-        )
-      end
-
-      def letters
-        present_letters(find_letters)
-      end
-
-      def letters_count
-        title_friendly_collection_count(
-          actual: letters.size,
-          total: patient.summary.letters_count
-        )
-      end
-
-      def admissions
-        @admissions ||= begin
-          CollectionPresenter.new(
-            Admissions::Admission.where(patient: patient).limit(5),
-            Renalware::Admissions::AdmissionPresenter
-          )
-        end
-      end
-
-      def admissions_count
-        title_friendly_collection_count(
-          actual: admissions.size,
-          total: Admissions::Admission.where(patient: patient).count
-        )
-      end
-
-      private
-
-      attr_reader :patient
-
-      # Returns e.g. "9" or "10 of 11"
-      def title_friendly_collection_count(actual:, total:)
-        if total > actual
-          "#{actual} of #{total}"
-        else
-          actual
-        end
-      end
-
-      def find_letters
-        patient = Renalware::Letters.cast_patient(@patient)
-        patient.letters
-               .with_main_recipient
-               .with_letterhead
-               .with_author
-               .with_patient
-               .limit(Renalware.config.clinical_summary_max_letters_to_display)
-               .order(issued_on: :desc)
-      end
+      rattr_initialize :patient
 
-      def present_letters(letters)
-        CollectionPresenter.new(letters, Renalware::Letters::LetterPresenterFactory)
+      # Host application may override the order or add other summary presenters
+      def summary_parts
+        Renalware.config.page_layouts[:clinical_summary].map(&:constantize)
       end
     end
   end

data/app/presenters/renalware/summary_part.rb

@@ -0,0 +1,34 @@
+require "attr_extras"
+
+module Renalware
+  # A base class for Summary presenters in other name-spaces. SummaryParts can be composed into
+  # reporting dashboards or summary pages. The Clinical Summary for instance comprises an array
+  # of various SummaryParts
+  class SummaryPart
+    rattr_initialize :patient
+    attr_implement :to_partial_path
+
+    # If the subclass defines a cache_key Rails will cache the partial
+    def cache_key
+      nil
+    end
+
+    def cache?
+      cache_key.present?
+    end
+
+    def render?
+      true
+    end
+
+    protected
+
+    def title_friendly_collection_count(actual:, total:)
+      if total > actual
+        "#{actual} of #{total}"
+      else
+        actual
+      end
+    end
+  end
+end

data/app/views/renalware/admissions/_summary_part.html.slim

@@ -0,0 +1,14 @@
+.columns.large-12.xlarge-6
+  #admissions
+    article
+      header
+        h2= "Admissions (#{summary_part.admissions_count})"
+
+        ul
+          li= link_to admissions_admissions_path(query: { term: summary_part.patient_nhs_number }),
+                      class: "button" do
+            | View All
+
+      = render "renalware/admissions/admissions/table",
+               admissions: summary_part.admissions,
+               compact: true

data/app/views/renalware/clinical/_header.html.slim

@@ -10,7 +10,7 @@ ruby:
         - result = header.blood_pressure_measurement.compact.join("/")
         - if result.present?
           dd= result
-          dd.date= l(header.blood_pressure_date)
+          dd.date= l(header.blood_pressure_date, format: :compact)
         - else
           dd.empty
     li
@@ -19,7 +19,7 @@ ruby:
         - result = header.weight_measurement
         - if result.present?
           dd= "#{result} kg"
-          dd.date= l(header.weight_date)
+          dd.date= l(header.weight_date, format: :compact)
         - else
           dd.empty
     li
@@ -42,6 +42,6 @@ ruby:
           - result = current_pathology.send(:"#{code}_result")
           - if result.present?
             dd= result
-            dd.date= l(current_pathology.send(:"#{code}_observed_at"))
+            dd.date= l(current_pathology.send(:"#{code}_observed_at"), format: :compact)
           - else
             dd.empty

data/app/views/renalware/clinics/visits/index.html.slim

@@ -1,4 +1,3 @@
-- content_for(:body_class) { "page--cinic-visits" }
 
 = within_admin_layout(title: "Clinic Visits") do
   = render "filters", query: query, clinics: clinics, users: users

data/app/views/renalware/events/events/_event.html.slim

@@ -12,12 +12,12 @@ tr
   - unless local_assigns[:exclude_type_column] == true
     td= event.event_type
   td.col-width-medium-with-ellipsis
-    = render partial: "renalware/events/events/cell/#{event.to_partial_path}",
+    = render partial: event.to_cell_partial_path,
                locals: { event: event }
   td.created_at= l(event.date_time)
   td.created_by= event.created_by.full_name
 = content_tag(:tr, id: "#{toggle_prefix}-quick-preview-#{event.id}", style: "display: none")
   td(colspan=6)
     .quick-preview
-      = render partial: "renalware/events/events/toggled_cell/#{event.to_partial_path}",
+      = render partial: event.to_toggled_cell_partial_path,
                locals: { event: event }

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

@@ -24,8 +24,7 @@
   / The contents of this div will get replaced if a user selects an alternative
   / event type in the drop-down above. See events.js.
   #event-type-specific-inputs
-    = render partial: "renalware/events/events/inputs/#{event.to_partial_path}",
-             locals: { event: event, f: f }
+    = render partial: event.to_input_partial_path, locals: { event: event, f: f }
 
   = f.label :notes
   = snippets_modal_and_link_to_open_it(target_input_for_seleted_snippet: ".event-notes")

data/app/views/renalware/events/events/_summary_part.html.slim

@@ -0,0 +1,15 @@
+.columns.large-12.xlarge-6
+  span
+  #events
+    article
+      header
+        h2= link_to "Events (#{summary_part.current_events_count})",
+                    patient_events_path(summary_part.patient)
+
+        ul
+          li= link_to new_patient_event_path(summary_part.patient), class: "button" do
+            | Add
+          li= link_to patient_events_path(summary_part.patient), class: "button" do
+            | View All
+
+      = render "renalware/events/events/table", events: summary_part.current_events

data/app/views/renalware/events/events/new.js.erb

@@ -9,10 +9,9 @@
 // still means the ruby is interpreted and the block and its argument f are available!
 '<%= simple_form_for(event, url: new_patient_event_path(patient), as: :events_event, wrapper: "horizontal_form") do |f| %>'
   <%=
-    partial_name = "renalware/events/events/inputs/#{event.to_partial_path}"
     refresh("#event-type-specific-inputs",
-              partial: partial_name,
-              locals: { f: f, event: event })
+            partial: event.to_partial_path,
+            locals: { f: f, event: event })
   %>
 '<% end %>'
 initDatepickersIn("#event-type-specific-inputs");

data/app/views/renalware/events/events/simple/_event.html.slim

@@ -8,5 +8,4 @@ tr
 = content_tag(:tr, id: "#{toggle_prefix}-quick-preview-#{event.id}", style: "display: none")
   td(colspan=4)
     .quick-preview
-      = render partial: "renalware/events/events/toggled_cell/#{event.to_partial_path}",
-               locals: { event: event }
+      = render partial: event.to_toggled_cell_partial_path, locals: { event: event }

data/app/views/renalware/layouts/_patient.html.slim

@@ -32,6 +32,7 @@
             = render_if_exists partial, local_assigns.reverse_merge!(patient: current_patient)
       .row
         = yield
+        = yield(:below_content)
 
   nav.patient-side-nav.full-screenable
     .layout-wrapper

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

@@ -0,0 +1,16 @@
+#letters.summary-part--letters
+  article
+    header
+      h2
+        = link_to "Letters (#{summary_part.letters_count})",
+                  patient_letters_letters_path(summary_part.patient)
+
+      ul
+        li= link_to patient_letters_letters_path(summary_part.patient), class: "button" do
+              | Draft letter
+        li= link_to patient_letters_letters_path(summary_part.patient), class: "button" do
+              | View All
+
+    = render "renalware/letters/letters/table",
+             letters: summary_part.letters,
+             patient: summary_part.patient