renalware-core 2.0.132 → 2.0.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f670bf5df7603c7132365ac119ae9f6bdbb43dde12a24a04d3d015b5a694626c
-  data.tar.gz: 0a8dde1dd0be593ee8483e01f8128e31f544a1c6eed362fe8fd263e78fd78684
+  metadata.gz: 958097e494920445885eb75809fb828e40462d27b0b65ed48e3aab2e0c0d8cc8
+  data.tar.gz: 935763fcf2fae4e1a76c2b2fca9e5f3b48b0a7d457b971a65b9c913864ef0024
 SHA512:
-  metadata.gz: dc8e11f2b13664bddaabdef7d8bede3f1e2a14bc63862b703a628ad3f8fd6019bcb6d285fd40a81bdd530417ce5c46cbfc8ba8f6a61d5901b7e8523ca783b6a6
-  data.tar.gz: 5d77baac6abc4e238faa59e4147948315beed80cf363fac2b8c6cb88436b44ff8898a668ef71a3c81a5ccc3e8ca520f596a1919a242275c4540128431f7fa46d
+  metadata.gz: b0749b3a7697bcec528d027e5660f89992490fe516e981900bcdfd2560ccffafe08d27229b9ac46257a4de9a3547f90d4fd737091e53e8251adc8e328c63ae97
+  data.tar.gz: 95f5b2ab947a8d66e3e6072dda55aeba46bdb441fded424a7c7aaa09a2e6c5a4227f126edf32315270bba351d838e85c9a645740cc2fdde9a241a136cc7e1c75

data/app/assets/javascripts/renalware/core.js.erb

@@ -32,7 +32,7 @@
 //= require underscore/underscore
 //= require select2/dist/js/select2
 //= require jquery_nested_form
-//= require foundation-datepicker
+//= require foundation-datepicker/js/foundation-datepicker
 //= require renalware/double_scroll
 //= require cocoon
 //= require mousetrap/mousetrap

data/app/assets/stylesheets/renalware/core.scss

@@ -7,7 +7,7 @@
 
 @import "font-awesome-sprockets";
 @import "font-awesome";
-@import "foundation-datepicker";
+@import "foundation-datepicker/css/foundation-datepicker";
 @import "dataTables/jquery.dataTables.foundation";
 @import "trix";
 @import "balloon-css/src/balloon";

data/app/assets/stylesheets/renalware/modules/_clinics.scss

@@ -1,5 +1,4 @@
-.page--visits {
-
+.page--clinics-visits {
   .filters__output {
     display: none;
   }

data/app/assets/stylesheets/renalware/modules/_patients.scss

@@ -353,7 +353,7 @@ form {
   }
 }
 
-.page--clinical_summaries {
+.page--patients-clinical_summaries {
   .summary-part--letters {
     @include grid-column(12);
   }

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

@@ -0,0 +1,15 @@
+@media only screen and (min-width: 830px) {
+  // Add body page--* classes to give them, the dashboard look.
+  body.page--dashboard-dashboards {
+    .main-content {
+      background-color: #E8EDEE;
+    }
+
+    article {
+      background-color: #fff;
+      padding: 0.3rem .5rem .5rem;
+      border-top-width: 2px;
+      border-top-color: $nhs-bright-blue;
+    }
+  }
+}

data/app/components/renalware/application_component.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Renalware
+  class ApplicationComponent < ActionView::Component::Base
+    include Renalware::Engine.routes.url_helpers
+    include Pundit::Helper
+
+    # Not sure why include Renalware::Engine.routes.url_helpers does not make the 
+    # engine urls visible in the views (seems to resolve alwatys to /assets?..) 
+    # so we expose routes here so inside a component html file we can use 
+    # e.g. renalware.bookmarks_path 
+    def renalware
+      Renalware::Engine.routes.url_helpers
+    end
+
+    # Added this helper as I can't seem to get the Pundit #policy helper to be included
+    # in the context when renderingt a component template.
+    def policy(record)
+      current_user && Pundit.policy(current_user, record)
+    end
+  end
+end

data/app/components/renalware/events/biopsies_component.html.slim

@@ -0,0 +1,14 @@
+article.events
+  header
+    h2 Biopsies
+    .supplemental
+      span= "#{biopsies.length} of #{total_biopsies}"
+      span.noprint
+        = link_to "View All",
+                  renalware.patient_events_path(patient),
+                  class: "button secondary"
+
+  = render "renalware/events/events/table",
+           events: biopsies,
+           exclude_type_column: true,
+           toggle_prefix: "biopsy"

data/app/components/renalware/events/biopsies_component.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Events
+    class BiopsiesComponent < ApplicationComponent
+      validates :patient, presence: true
+
+      def initialize(patient:, limit: 6)
+        @patient = patient
+        relation = Biopsy.for_patient(patient).includes(:created_by)
+        @biopsies = relation.limit(limit).ordered
+        @total_biopsies = relation.count
+      end
+
+      private
+
+      attr_reader :patient, :biopsies, :total_biopsies
+    end
+  end
+end

data/app/components/renalware/letters/letters_in_progress_component.html.slim

@@ -0,0 +1,8 @@
+article.letters
+  header
+    h2 Letters in Progress
+  - if letters_in_progress.any?
+    #letters-in-progress
+      = render "renalware/dashboard/letters/table", letters: letters_in_progress
+  - else
+    p.empty-section Letters in Progress

data/app/components/renalware/letters/letters_in_progress_component.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Letters
+    class LettersInProgressComponent < ApplicationComponent
+      attr_reader :current_user
+      
+      def initialize(current_user:)
+        @current_user = current_user
+      end
+
+      # Note we want oldest letters ordered first here - elsewhere letters are newest first
+      def letters_in_progress
+        @letters_in_progress ||= begin
+          present_letters(
+            Letters::Letter
+              .reversed
+              .where("author_id = ? or created_by_id = ?", current_user.id, current_user.id)
+              .in_progress
+              .includes(:author, :patient, :letterhead)
+          )
+        end
+      end
+
+      private 
+      
+      def present_letters(letters)
+        CollectionPresenter.new(letters, Letters::LetterPresenterFactory)
+      end
+    end
+  end
+end

data/app/components/renalware/letters/unread_electronic_ccs_component.html.slim

@@ -0,0 +1,7 @@
+article.electonic_ccs
+  header
+    h2 Electronic CCs
+  - if unread_electronic_ccs.any?
+    = render "renalware/letters/electronic_receipts/table", receipts: unread_electronic_ccs
+  - else
+    p.empty-section You have no electronic CCs.

data/app/components/renalware/letters/unread_electronic_ccs_component.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Letters
+    class UnreadElectronicCCsComponent < ApplicationComponent
+      attr_reader :current_user
+
+      def initialize(current_user:)
+        @current_user = current_user
+      end
+
+      def unread_electronic_ccs
+        @unread_electronic_ccs ||= begin
+          receipts = Letters::ElectronicReceipt
+            .includes(letter: [:patient, :author, :letterhead])
+            .unread
+            .for_recipient(current_user.id)
+            .order(created_at: :asc)
+          CollectionPresenter.new(receipts, Letters::ElectronicReceiptPresenter)
+        end
+      end
+    end
+  end
+end

data/app/components/renalware/messaging/unread_messages_component.html.slim

@@ -0,0 +1,11 @@
+article.messages
+  header
+    h2 Messages
+    ul
+      li= render "renalware/messaging/shared/key"
+  - if unread_message_receipts.any?
+    .unread-messages
+      = render "renalware/messaging/internal/receipts/table",
+                receipts: unread_message_receipts
+  - else
+    p.empty-section You have no messages.

data/app/components/renalware/messaging/unread_messages_component.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Messaging
+    class UnreadMessagesComponent < ApplicationComponent
+      attr_reader :current_user
+
+      def initialize(current_user:)
+        @current_user = Messaging::Internal.cast_recipient(current_user)
+      end
+
+      def unread_message_receipts
+        @unread_message_receipts ||= begin
+          receipts = current_user
+            .receipts
+            .includes(message: [:author, :patient])
+            .order("messaging_messages.sent_at asc")
+            .unread
+          CollectionPresenter.new(receipts, Messaging::Internal::ReceiptPresenter)
+        end
+      end
+    end
+  end
+end

data/app/components/renalware/patients/bookmarks_component.html.slim

@@ -0,0 +1,11 @@
+article.bookmarks
+  header
+    h2.title= "Bookmarked Patients"
+    ul
+      li= link_to "View All", renalware.bookmarks_path, class: "button"
+
+  - if bookmarks.any?
+    #bookmarks
+      = render "renalware/dashboard/bookmarks/table", bookmarks: bookmarks
+  - else
+    p.empty-section= t(".bookmarks.none")

data/app/components/renalware/patients/bookmarks_component.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Patients
+    class BookmarksComponent < ApplicationComponent
+      attr_reader :current_user
+
+      def initialize(current_user:)
+        @current_user = current_user
+      end
+
+      def bookmarks
+        @bookmarks ||= begin
+          Patients.cast_user(current_user)
+            .bookmarks
+            .ordered
+            .includes(patient: [current_modality: :description])
+        end
+      end
+    end
+  end
+end

data/app/controllers/renalware/clinical/body_compositions_controller.rb

@@ -89,7 +89,7 @@ module Renalware
           :assessed_on, :overhydration, :volume_of_distribution, :total_body_water,
           :extracellular_water, :intracellular_water, :lean_tissue_index,
           :fat_tissue_index, :lean_tissue_mass, :fat_tissue_mass, :adipose_tissue_mass,
-          :body_cell_mass, :quality_of_reading, :assessor_id, :notes
+          :body_cell_mass, :quality_of_reading, :assessor_id, :notes, :weight, :pre_post_hd
         ]
       end
     end

data/app/controllers/renalware/pathology/code_groups_controller.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/pathology"
+
+module Renalware
+  module Pathology
+    class CodeGroupsController < Pathology::BaseController
+      def index
+        groups = CodeGroup.order(:name)
+        authorize groups, :index?
+        render locals: { groups: groups }
+      end
+
+      def show
+        render locals: { group: find_authorize_group }
+      end
+
+      def edit
+        render locals: { group: find_authorize_group }
+      end
+
+      def update
+        group = find_authorize_group
+        if group.update_by(current_user, code_group_params)
+          redirect_to pathology_code_groups_path, notice: "Group saved"
+        else
+          render :edit, locals: { group: group }
+        end
+      end
+
+      private
+
+      def find_authorize_group
+        CodeGroup.find(params[:id]).tap { |group| authorize group }
+      end
+
+      def code_group_params
+        params
+          .require(:code_group)
+          .permit(:description)
+      end
+    end
+  end
+end

data/app/controllers/renalware/transplants/wait_lists_controller.rb

@@ -7,30 +7,39 @@ module Renalware
     class WaitListsController < BaseController
       include Renalware::Concerns::Pageable
 
+      # Here we display a named filter eg Active and query for patients based on registration
+      # status and also any search criteria entered in the search form which is backed by our
+      # ransack #search object.
       def show
+        form = Registrations::WaitListForm.new(form_params)
+        query = query_for(form)
         registrations = query.call.page(page).per(per_page || 50)
         authorize registrations
         render locals: {
           path_params: path_params,
           registrations: CollectionPresenter.new(registrations, WaitListRegistrationPresenter),
-          q: query.search
+          q: query.search,
+          form: form
         }
       end
 
       private
 
-      def query
-        @query ||= begin
-          Registrations::WaitListQuery.new(
-            named_filter: params[:named_filter],
-            q: params[:q]
-          )
-        end
+      def query_for(form)
+        Registrations::WaitListQuery.new(
+          named_filter: params[:named_filter],
+          ukt_recipient_number: form.ukt_recipient_number,
+          q: params[:q]
+        )
       end
 
       def path_params
         params.permit([:controller, :action, :named_filter])
       end
+
+      def form_params
+        params.fetch(:form, {}).permit(:ukt_recipient_number)
+      end
     end
   end
 end

data/app/models/renalware/clinical/body_composition.rb

@@ -9,6 +9,12 @@ module Renalware
       include PatientScope
       include Accountable
 
+      # This maps to a PG enum
+      enum pre_post_hd: {
+        pre: "pre",
+        post: "post"
+      }
+
       belongs_to :patient, class_name: "Renalware::Clinical::Patient", touch: true
       belongs_to :assessor, class_name: "User", foreign_key: "assessor_id"
       belongs_to :modality_description, class_name: "Modalities::Description"
@@ -32,6 +38,7 @@ module Renalware
       validates :body_cell_mass, presence: true, numeric_inclusion: { in: 0..150 }
       validates :quality_of_reading, presence: true, numeric_inclusion: { in: 50..100 }
       validates :assessed_on, presence: true, timeliness: { type: :date, allow_blank: false }
+      validates :weight, "renalware/patients/weight" => true
     end
   end
 end

data/app/models/renalware/hd/mdm_patients_query.rb

@@ -23,6 +23,15 @@ module Renalware
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def search
         @search ||= begin
+          nasty_join_sql_to_get_around_a_kaminari_count_issue = <<-SQL
+            inner join modality_modalities X1 
+              on patients.id = X1.patient_id 
+              and X1.state = 'current' 
+              and X1.ended_on IS NULL 
+            inner join modality_descriptions MD1 
+              on MD1.id = X1.description_id 
+              and MD1.code = 'hd'
+          SQL
           HD::Patient
             .include(QueryablePatient)
             .extending(PatientTransplantScopes)
@@ -34,7 +43,7 @@ module Renalware
             .extending(NamedFilterScopes)
             .with_current_pathology
             .with_registration_statuses
-            .with_current_modality_of_class(Renalware::HD::ModalityDescription)
+            .joins(nasty_join_sql_to_get_around_a_kaminari_count_issue)
             .public_send(named_filter.to_s)
             .ransack(params)
         end

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

@@ -28,9 +28,14 @@ module Renalware
     #         G.name,
     #         M.subgroup,
     #         M.position_within_subgroup;
-
     class CodeGroup < ApplicationRecord
+      include Accountable
+      has_paper_trail(
+        class_name: "Renalware::Pathology::Version", 
+        on: [:create, :update, :destroy]
+      )
       validates :name, presence: true, uniqueness: true
+      validates :description, presence: true
       has_many(
         :memberships,
         class_name: "CodeGroupMembership",
@@ -42,8 +47,10 @@ module Renalware
       )
 
       def self.descriptions_for_group(name)
-        CodeGroup
-          .find_by!(name: name)
+        group = CodeGroup.find_by(name: name)
+        return [] if group.nil?
+
+        group 
           .observation_descriptions
           .order(subgroup: :asc, position_within_subgroup: :asc)
       end