renalware-core 2.0.35 → 2.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a779b18871bd5f31fe4baa1fc6a868aac2861668a743389e5815729922f1fca3
-  data.tar.gz: ada4dd9150fdfb89dd42dc995516895c133393bd4974c0bbd7981e04bc33d60e
+  metadata.gz: bfed2445c848af3b0113640b06aedc9fd3debee0dca9281fa939a956aafabbad
+  data.tar.gz: 5dbd07809c7d6aa3c5b5ee64bc743c21419168bfb729bf7b2ba4a8d70aa2be81
 SHA512:
-  metadata.gz: 1fb542eadec8a2362be78fa93f34d9a399c04aeb9337106edcc69934d00a679a999dea68e5464a5768c41d4ebba119cbb5216dc0e6e752d879e0e83d01f2a1b5
-  data.tar.gz: e91844cdde10cb7044a6ca6a39ebb9b277f68f38d4c8606e3211fb646ac851d791e77b609c210d541e267e58e83bce8c171b156a8cdf2e99a46d2f87d871a22f
+  metadata.gz: 4981dfe990c64aa289d15d18c28c8e7cd1154133cbbc232db7cac4d1486b1dcdd2968d0e069dace77c76086a1fcb660cbd6d49298dce7846766beccf06155859
+  data.tar.gz: a3ebbd8cd62ab6c407e5316840cea7a782e71e69f36770134c83bd6f8afcd739660ad003e1932f2292bd813c673f10e87f08e705678ec2d161abc1af33d1745f

data/app/controllers/renalware/letters/lists_controller.rb

@@ -7,6 +7,8 @@ module Renalware
     class ListsController < Letters::BaseController
       include Renalware::Concerns::Pageable
 
+      # rubocop:disable Metrics/MethodLength
+      # TODO: Use a presenter here
       def show
         query = LetterQuery.new(q: params[:q])
         letters = find_and_authorize_letters(query)
@@ -15,17 +17,15 @@ module Renalware
           letters: letters,
           authors: User.author.ordered,
           typists: User.ordered,
+          letterheads: Letters::Letterhead.ordered,
           q: query.search
         }
         respond_to do |format|
-          format.html do
-            render locals: locals
-          end
-          format.js do
-            render locals: locals, layout: false
-          end
+          format.html { render(locals: locals) }
+          format.js   { render(locals: locals, layout: false) }
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       private
 

data/app/models/renalware/letters/letter.rb

@@ -56,8 +56,8 @@ module Renalware
       }
       singleton_class.send(:alias_method, :in_progress, :pending)
 
-      scope :reverse, -> { order(updated_at: :asc) }
-      scope :ordered, -> { order(updated_at: :desc) }
+      scope :reverse, -> { order("#{effective_date_sort} asc")  }
+      scope :ordered, -> { order("#{effective_date_sort} desc") }
       scope :with_letterhead, -> { includes(:letterhead) }
       scope :with_main_recipient, -> { includes(main_recipient: [:address, :addressee]) }
       scope :with_author, -> { includes(:author) }
@@ -78,6 +78,10 @@ module Renalware
         where(event: event).first
       end
 
+      def self.effective_date_sort
+        "coalesce(completed_at, approved_at, submitted_for_approval_at, created_at)"
+      end
+
       EVENTS_MAP = {
         Clinics::ClinicVisit => Event::ClinicVisit,
         NilClass => Event::Unknown
@@ -124,6 +128,10 @@ module Renalware
       def archive_recipients!
         recipients.each(&:archive!)
       end
+
+      def effective_date
+        completed_at || approved_at || submitted_for_approval_at || created_at
+      end
     end
   end
 end

data/app/models/renalware/letters/letter_query.rb

@@ -5,23 +5,30 @@ require_dependency "renalware/letters"
 module Renalware
   module Letters
     module QueryableLetter
-      def finder_needs_type_condition?
-        false
-      end
+      extend ActiveSupport::Concern
+      included do
+        self.ransacker :effective_date, type: :date do
+          Arel.sql(Letter.effective_date_sort)
+        end
 
-      def ransackable_scopes(_auth_object = nil)
-        %i(state_eq)
-      end
+        def self.state_eq(state = :draft)
+          where(type: Letter.state_class_name(state))
+        end
+
+        def self.finder_needs_type_condition?
+          false
+        end
 
-      def state_eq(state = :draft)
-        where(type: Letter.state_class_name(state))
+        def self.ransackable_scopes(_auth_object = nil)
+          %i(state_eq)
+        end
       end
     end
 
     class LetterQuery
       def initialize(q: nil)
         @q = q || {}
-        @q[:s] ||= ["updated_at desc"]
+        @q[:s] ||= ["effective_date desc"]
       end
 
       def call
@@ -29,7 +36,7 @@ module Renalware
       end
 
       def search
-        @search ||= Letter.extend(QueryableLetter).includes(:event).search(@q)
+        @search ||= Letter.include(QueryableLetter).includes(:event).search(@q)
       end
     end
   end

data/app/models/renalware/letters/letterhead.rb

@@ -9,6 +9,8 @@ module Renalware
       validates :unit_info, presence: true
       validates :trust_name, presence: true
       validates :trust_caption, presence: true
+
+      scope :ordered, ->{ order(name: :asc) }
     end
   end
 end

data/app/models/renalware/medications/prescription.rb

@@ -46,7 +46,9 @@ module Renalware
                 in: DoseUnit.codes,
                 i18n_scope: "enumerize.renalware.medications.prescription.dose_unit"
 
-      scope :ordered, -> { joins(:drug).order("drugs.name") }
+      scope :ordered, lambda {
+        joins(:drug).order("drugs.name asc, prescribed_on desc")
+      }
       scope :with_medication_route, -> { includes(:medication_route) }
       scope :with_drugs, -> { includes(drug: :drug_types) }
       scope :with_classifications, -> { includes(drug: :classifications) }
@@ -77,7 +79,7 @@ module Renalware
 
       # This is a Ransack-compatible search predicate
       def self.default_search_order
-        "drug_name"
+        ["drug_name asc", "prescribed_on desc"]
       end
 
       def self.policy_class

data/app/policies/renalware/reporting/audit_policy.rb

@@ -5,7 +5,17 @@ require_dependency "renalware/reporting"
 module Renalware
   module Reporting
     class AuditPolicy < BasePolicy
-      # TODO: use a devops role for controlling edit update etc
+      def refresh?
+        user_is_super_admin?
+      end
+
+      def edit?
+        user_is_super_admin?
+      end
+
+      def update?
+        user_is_super_admin?
+      end
     end
   end
 end

data/app/views/renalware/api/ukrdc/patients/_patient.xml.builder

@@ -20,6 +20,7 @@ xml.Patient do
         xml.Organization "LOCALHOSP"
         xml.NumberType "MRN"
       end
+      break
     end
   end
 
@@ -44,26 +45,6 @@ xml.Patient do
     end
   end
 
-  xml.FamilyDoctor do
-    xml.GPPracticeId patient.practice&.code
-    xml.GPId patient.primary_care_physician&.code
-  end
-
-  if patient.ethnicity.present?
-    xml.EthnicGroup do
-      xml.CodingStandard "NHS_DATA_DICTIONARY"
-      xml.Code patient.ethnicity&.rr18_code
-    end
-  end
-
-  if patient.language.present?
-    xml.PrimaryLanguage do
-      xml.CodingStandard "NHS_DATA_DICTIONARY_LANGUAGE_CODE" # ISO 639-1 plus braille and sign
-      xml.Code patient.language&.code
-      xml.Description patient.language
-    end
-  end
-
   if patient.contact_details?
     xml.ContactDetails do
       if patient.email.present?
@@ -84,6 +65,26 @@ xml.Patient do
     end
   end
 
+  xml.FamilyDoctor do
+    xml.GPPracticeId patient.practice&.code
+    xml.GPId patient.primary_care_physician&.code
+  end
+
+  if patient.ethnicity.present?
+    xml.EthnicGroup do
+      xml.CodingStandard "NHS_DATA_DICTIONARY"
+      xml.Code patient.ethnicity&.rr18_code
+    end
+  end
+
+  if patient.language.present?
+    xml.PrimaryLanguage do
+      xml.CodingStandard "NHS_DATA_DICTIONARY_LANGUAGE_CODE" # ISO 639-1 plus braille and sign
+      xml.Code patient.language&.code
+      xml.Description patient.language
+    end
+  end
+
   if patient.dead?
     xml.Death true
   end

data/app/views/renalware/dashboard/letters/_letter.html.slim

@@ -1,7 +1,7 @@
 tr(class=letter.state.dasherize)
   td.state
     span= letter.state_description
-  td= l letter.updated_at
+  td= l letter.effective_date
   td= letter.author
   td= link_to letter.patient, patient_clinical_summary_path(letter.patient)
   td= letter.description

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

@@ -17,7 +17,7 @@
 
     td.state
       span= letter.state_description
-    td= l(letter.updated_at)
+    td= l(letter.effective_date)
     - if columns.include?(:author)
       td.col-width-medium-with-ellipsis= letter.author
     - if columns.include?(:patient)

data/app/views/renalware/letters/lists/_letter.html.slim

@@ -29,7 +29,7 @@ tr(class=letter.state.dasherize)
   td.full-name= default_patient_link(letter.patient)
   td= letter.patient.nhs_number
   td= letter.enclosures&.truncate(6)
-  td= l letter.updated_at
+  td= l(letter.effective_date)
   td= letter.author
   td= letter.typist
   td.col-width-medium-with-ellipsis= letter.main_recipient.address

data/app/views/renalware/letters/lists/_table.html.slim

@@ -8,7 +8,7 @@
         th.col-width-medium= sort_link([:renalware, q], :patient_family_name, "Patient")
         th.col-width-nhs-no= sort_link([:renalware, q], :patient_nhs_number, "NHS No")
         th= sort_link([:renalware, q], :enclosures, "Enc.")
-        th.col-width-date-time = sort_link([:renalware, q], :updated_at, "Date", default_order: :desc)
+        th.col-width-date-time = sort_link([:renalware, q], :effective_date, "Date", default_order: :desc)
         th= sort_link([:renalware, q], :author_family_name, "Author")
         th= sort_link([:renalware, q], :created_by_family_name, "Typist")
         th.col-width-small Recipient

data/app/views/renalware/letters/lists/show.html.slim

@@ -9,13 +9,15 @@
         .row
           .small-6.medium-1.large-1.columns
             = f.input :enclosures_present, as: :select, label: "Enclosure"
-          .small-6.medium-3.large-2.columns
+          .small-6.medium-2.large-2.columns
             = f.input :state_eq, collection: state_options_for_receptionists, label: "State"
-          .small-6.medium-3.large-2.columns
+          .small-6.medium-2.large-2.columns
             = f.input :author_id_eq, as: :user_picker, collection: authors, label: "Author"
-          .small-6.medium-3.large-2.columns
+          .small-6.medium-2.large-2.columns
             = f.input :created_by_id_eq, as: :user_picker, collection: typists, label: "Typist"
-          .small-12.medium-2.large-4.columns.actions.end
+          .small-6.medium-3.large-2.columns
+            = f.input :letterhead_id_eq, collection: letterheads, label: "Letterhead"
+          .small-12.medium-2.large-2.columns.actions.end
             = f.submit t("helpers.submit.filter"), class: "button"
             span= " or "
             = link_to t("helpers.reset"), letters_list_path

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

@@ -3,16 +3,19 @@ article
     h2 Contact Details
 
   dl.dl-horizontal
-    dt Email
     - if patient.email.present?
+      dt Email
       dd= patient.email
     - if patient.current_address&.email.present?
+      dt Email
       dd= patient.current_address&.email
 
-    dt Telephone
     - if patient.telephone1.present?
+      dt Telephone
       dd= patient.telephone1
     - if patient.telephone2.present?
+      dt Telephone
       dd= patient.telephone2
     - if patient.current_address&.telephone.present?
+      dt Telephone
       dd= patient.current_address&.telephone

data/app/views/renalware/reporting/audits/index.html.slim

@@ -16,8 +16,9 @@
         tr
           td
             = link_to("View", reporting_audit_path(audit))
-            = pipe_separator
-            = link_to("Edit", edit_reporting_audit_path(audit))
+            - if policy(audit).edit?
+              = pipe_separator
+              = link_to("Edit", edit_reporting_audit_path(audit))
           td= audit.name
           td= audit.view_name
           td= yes_no audit.materialized?
@@ -25,7 +26,7 @@
           td= l(audit.updated_at)
           td= l(audit.refreshed_at)
           td
-            - if audit.materialized?
+            - if audit.materialized? && policy(audit).refresh?
               = link_to("Refresh Data",
                         reporting_audit_refreshments_path(audit_id: audit.id),
                         remote: true,

data/db/migrate/20180628132323_add_letter_date_indexes.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddLetterDateIndexes < ActiveRecord::Migration[5.1]
+  def change
+    add_index :letter_letters, :created_at
+    add_index :letter_letters, :submitted_for_approval_at
+    add_index :letter_letters, :approved_at
+    add_index :letter_letters, :completed_at
+    add_index :letter_letters,
+      "(COALESCE(completed_at, approved_at, submitted_for_approval_at, created_at))",
+      name: "letter_effective_date_idx"
+  end
+end

data/db/seeds/default/medications/medication_routes.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Medication Routes" do
-
     module RR
       ORAL = 1
       TOPICAL = 2
@@ -26,6 +25,7 @@ module Renalware
       MRoute.find_or_create_by!(code: "PERCUT", name: "Percutaneous", rr_code: RR::OTHER)
       MRoute.find_or_create_by!(code: "TOP", name: "Topical", rr_code: RR::TOPICAL)
       MRoute.find_or_create_by!(code: "OTHER", name: "Other", rr_code: RR::OTHER)
+      MRoute.find_or_create_by!(code: "PR", name: "PerRectum", rr_code: RR::OTHER)
     end
   end
 end

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.35"
+  VERSION = "2.0.36"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.35
+  version: 2.0.36
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -3275,6 +3275,7 @@ files:
 - db/migrate/20180605114332_create_pseudo_encrypt_function.rb
 - db/migrate/20180605141806_add_external_id_to_research_study_participants.rb
 - db/migrate/20180605175211_add_application_url_to_research_studies.rb
+- db/migrate/20180628132323_add_letter_date_indexes.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3356,7 +3357,6 @@ files:
 - db/seeds/default/transplants/transplant_failure_cause_descriptions.rb
 - db/seeds/default/transplants/transplant_registration_statuses.rb
 - db/seeds/seeds_helper.rb
-- db/static.obsolete/medication_routes.yml
 - db/triggers/feed_messages_preprocessing_trigger_v01.sql
 - db/triggers/update_current_observation_set_trigger_v01.sql
 - db/triggers/update_research_study_participants_trigger_v01.sql

data/db/static.obsolete/medication_routes.yml

@@ -1,20 +0,0 @@
-- !ruby/object:MedicationRoute
-  id: 1
-  name: PO
-  decription: "Oral"
-- !ruby/object:MedicationRoute
-  id: 2
-  name: IV
-  description: "Intravenous"
-- !ruby/object:MedicationRoute
-  id: 3
-  name: SC
-  description: "Subcutaneous"
-- !ruby/object:MedicationRoute
-  id: 4
-  name: IM
-  description: "Intramuscular"
-- !ruby/object:MedicationRoute
-  id: 5
-  name: Other (Please specify in notes)
-  description: "Other (Please specify in notes)"