renalware-core 2.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81e21d5cabf3ae2ba1262453b826728f6f073183d3eaee442f8b2cee24621913
-  data.tar.gz: 0fef8595387d5105b4e5b4e5b3dbf920caab7aa2875ee9912be18648f5f61021
+  metadata.gz: 35f1da96bf99bc1165eafb40df5d2061d5840831ef9d061373448bb6fc0d8dad
+  data.tar.gz: cf73511f92c66f3a6192b26daefd7ed7a1bd69265edee4a283fa17d6e138e38b
 SHA512:
-  metadata.gz: b89e19bd60da8177ad89186370fe7aec2130b60199033de61c512381f24bb46fb187aa173d56dd167a2f2528520a31712ae543049ab42beb8dffa15feb4a2259
-  data.tar.gz: 50d8d2ca192f7e92163d089f5c83905828c6b53a708d76596d48f6f9200c80567791f6917d73413722b57d665a0593f4f6f6c39c7e9a3b3a6b55c4135cc7145e
+  metadata.gz: 571bf241c4d5c4249267c2a948b46d3e1455f6bdd453891f13df6e66b45774eae011971a37a96280b6c0a5e1a60e8faeef22e9342ca0770ea99427ff116d626d
+  data.tar.gz: f9700de2153b34d22684d45f79350bc4b996d5deb7b95faeb8d57adf0af85a24e6dd061cd423fd26f47aff4f6a2d13ba77351a6f89befc14e096fba68dd6a5d1

data/app/assets/javascripts/renalware/primary_care_physician_search.js

@@ -3,11 +3,15 @@ var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
 Renalware.PrimaryCarePhysicianSearch = (function() {
 
   var formatPractice = function(practice) {
-    return practice.name;
+    if (practice.name != undefined) {
+      return "<b>" + practice.name + "</b>&nbsp;" + practice.address;
+    }
   };
 
   var formatPracticeSelection = function(practice) {
-    return practice.name;
+    if (practice.name  != undefined) {
+      return practice.name;
+    }
   };
 
   var initPracticeAutocomplete = function(){
@@ -41,7 +45,7 @@ Renalware.PrimaryCarePhysicianSearch = (function() {
     }).select2('open');
 
     // When a Practice is selected from the autocomplete list,
-    // Do an ajax replace on the <form> in this modal by sendin a .js request
+    // Do an ajax replace on the <form> in this modal by sending a .js request
     // to the url the modal was loaded from (this is in a data attribute on the pratice-search
     // select). This will load in just the form under the practice-search select, bringing
     // with it a list of pcps associated with this practice.

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

@@ -50,6 +50,11 @@ table.contacts tbody td{
 #add-patient-contact-as-cc-modal {
   max-height: $max-modal-height;
   overflow-y: auto;
+
+  .columns {
+    padding-left: .2rem;
+    padding-right: .2rem;
+  }
 }
 
 textarea.letter-body {

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

@@ -346,3 +346,14 @@ form {
     }
   }
 }
+
+
+#select2-practice-search-results {
+  li {
+    font-size: 0.9rem;
+    b {
+      font-size: 1rem;
+      display: block;
+    }
+  }
+}

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

@@ -5,6 +5,7 @@
   }
 
   &.modal {
+    overflow-y: initial !important;
 
     .modal-header {
       border-bottom: solid 1px #ccc;
@@ -26,6 +27,12 @@
         }
       }
     }
+
+    .scrollable {
+      height: 300px;
+      overflow-y: auto;
+      clear: both;
+    }
   }
 
   #snippet-search-form {
@@ -44,7 +51,11 @@
       vertical-align: top;
 
       &:first-child {
-        padding-top: 0;
+        //padding-top: 0;
+      }
+
+      &.title {
+        vertical-align: middle;
       }
     }
 
@@ -57,6 +68,39 @@
       }
     }
 
+    td.body {
+      position: relative;
+      height: 1rem;
+
+      &:after {
+        content: '';
+        width: 100%;
+        //height: 2rem;
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        box-shadow: 0 0 .5em 0.5em #fff;
+        height: 0;
+        //background:linear-gradient(rgba(255,255,255,0) 0, white);
+      }
+
+      &.expanded {
+        height: 100%;
+
+        .body-content {
+          height: 100%;
+        }
+
+        &:after {
+          background: none;
+        }
+      }
+
+      .body-content {
+        height: 1rem;
+      }
+    }
+
     @media #{$medium-up} {
       td, th {
         &.author {

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

@@ -22,6 +22,7 @@
   .error-content {
     padding: 50px;
     text-align: center;
+    height: 100%;
   }
 
   .heading {

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

@@ -4,9 +4,17 @@ table td.actions-dropdown {
   padding-bottom: 0.3rem;
   padding-right: 0;
 
+  > div  {
+    display: inline-block;
+  }
+
   .button.dropdown {
     padding: .2rem 2.3rem .2rem .4rem;
     margin: 0;
+
+    &:after {
+      right: 0.5rem;
+    }
   }
 
   .f-dropdown {
@@ -17,6 +25,12 @@ table td.actions-dropdown {
       left: 160px;
     }
   }
+
+  &.going-right {
+    .f-dropdown {
+      margin-left: 0px;
+    }
+  }
 }
 
 table {

data/app/controllers/renalware/admissions/consults_controller.rb

@@ -6,7 +6,9 @@ module Renalware
     class ConsultsController < BaseController
       include Renalware::Concerns::Pageable
 
+      # rubocop:disable Metrics/AbcSize
       def index
+        session[:consults_results] = nil if params.key?(:reset)
         query = ConsultQuery.new(params[:q])
         consults = query.call.page(page).per(per_page)
         authorize consults
@@ -15,6 +17,7 @@ module Renalware
           query: query.search
         }
       end
+      # rubocop:enable Metrics/AbcSize
 
       def new
         consult = Consult.new(started_on: Time.zone.today)
@@ -40,7 +43,8 @@ module Renalware
       def update
         consult = find_and_authorize_consult
         if consult.update_by(current_user, consult_params)
-          redirect_to admissions_consults_path, notice: success_msg_for("consult")
+          url = session[:consults_results] || admissions_consults_path
+          redirect_to url, notice: success_msg_for("consult")
         else
           render_edit(consult)
         end

data/app/controllers/renalware/clinics/clinic_visits_controller.rb

@@ -42,7 +42,7 @@ module Renalware
       end
 
       def update
-        if @clinic_visit.update_attributes(visit_params)
+        if @clinic_visit.update(visit_params)
           redirect_to patient_clinic_visits_path(@patient),
             notice: t(".success", model_name: "clinic visit")
         else

data/app/controllers/renalware/hd/current_profile_controller.rb

@@ -36,7 +36,7 @@ module Renalware
         if profile.persisted?
           ReviseHDProfile.new(profile).call(profile_params)
         else
-          profile.update_attributes(profile_params.merge(active: true))
+          profile.update(profile_params.merge(active: true))
         end
       end
 

data/app/controllers/renalware/hd/preference_sets_controller.rb

@@ -13,7 +13,7 @@ module Renalware
       def update
         preference_set = PreferenceSet.for_patient(patient).first_or_initialize
 
-        if preference_set.update_attributes(preference_set_params)
+        if preference_set.update(preference_set_params)
           redirect_to patient_hd_dashboard_path(patient),
             notice: t(".success", model_name: "HD preferences")
         else

data/app/controllers/renalware/medications/prescriptions_controller.rb

@@ -87,7 +87,6 @@ module Renalware
         )
       end
       # rubocop:enable Metrics/LineLength
-      # rubocop:enable Metrics/MethodLength
 
       def pdf_filename
         "#{patient.family_name}_#{patient.hospital_identifier&.id}" \

data/app/controllers/renalware/patients/practices_controller.rb

@@ -16,7 +16,27 @@ module Renalware
       private
 
       def practices_matching_search_term
-        PracticeSearchQuery.new(search_term: params[:q]).call
+        PracticeSearchQuery.new(search_term: params[:q])
+          .call
+          .map { |practice| format_practice_into_hash_for_json(practice) }
+      end
+
+      def null_address
+        Address.new
+      end
+
+      def format_practice_into_hash_for_json(practice)
+        address = practice.address || null_address
+        {
+          id: practice.id,
+          name: practice.name,
+          address: [
+            address.street_1,
+            address.town,
+            address.county,
+            address.postcode
+          ].reject(&:blank?).join(", ")
+        }
       end
     end
   end

data/app/controllers/renalware/patients/worry_controller.rb

@@ -29,7 +29,7 @@ module Renalware
 
       def update_worry_notes_if_supplied(worry)
         if worry_params[:notes].present?
-          worry.update_attributes(worry_params.merge!(by: current_user))
+          worry.update(worry_params.merge!(by: current_user))
         end
       end
 

data/app/controllers/renalware/renal/aki_alerts_controller.rb

@@ -23,7 +23,7 @@ module Renalware
 
       def update
         authorize alert
-        if alert.update_attributes(aki_alert_params.merge(by: current_user))
+        if alert.update(aki_alert_params.merge(by: current_user))
           redirect_to renal_aki_alerts_path
         else
           render_edit(alert)

data/app/controllers/renalware/renal/profiles_controller.rb

@@ -23,7 +23,7 @@ module Renalware
       def update
         profile = find_profile
 
-        if profile.update_attributes(profile_params)
+        if profile.update(profile_params)
           redirect_to patient_renal_profile_path(patient),
             notice: t(".success", model_name: "profile")
         else

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

@@ -22,7 +22,7 @@ module Renalware
       def update
         workup = DonorWorkup.for_patient(patient).first_or_initialize
 
-        if workup.update_attributes(workup_params)
+        if workup.update(workup_params)
           redirect_to patient_transplants_donor_workup_path(patient),
             notice: t(".success", model_name: "donor work up")
         else

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

@@ -27,7 +27,7 @@ module Renalware
       def update
         workup = RecipientWorkup.for_patient(patient).first_or_initialize
 
-        if workup.update_attributes workup_params
+        if workup.update workup_params
           redirect_to patient_transplants_recipient_workup_path(patient),
             notice: t(".success", model_name: "recipient work up")
         else

data/app/helpers/renalware/layout_helper.rb

@@ -63,11 +63,11 @@ module Renalware
     #
     # See http://stackoverflow.com/questions/339130/how-do-i-render-a-partial-of-a-\
     # different-format-in-rails/3427634#3427634
-    def with_format(format, &block)
+    def with_format(format)
       old_formats = formats
       begin
         self.formats = [format]
-        return block.call
+        return yield
       ensure
         self.formats = old_formats
       end

data/app/models/concerns/renalware/patients_ransack_helper.rb

@@ -66,7 +66,6 @@ module Renalware
         sql += " OR patients.ukrdc_external_id = :exact_term" if query_is_a_uuid?(query)
         sql
       end
-      # rubocop:enable Metrics/MethodLength
 
       def query_is_a_uuid?(query)
         query.match(UUID_REGEXP)

data/app/models/renalware/admissions/consult.rb

@@ -5,6 +5,7 @@ module Renalware
     class Consult < ApplicationRecord
       include Accountable
       extend Enumerize
+      include PatientsRansackHelper
       validates :patient_id, presence: true
       validates :started_on, presence: true
       validates :description, presence: true
@@ -22,7 +23,6 @@ module Renalware
       enumerize :aki_risk, in: %i(yes no unknown)
 
       scope :active, ->{ where(ended_on: nil) }
-
     end
   end
 end

data/app/models/renalware/admissions/consult_query.rb

@@ -5,16 +5,32 @@ module Renalware
     class ConsultQuery
       attr_reader :query
 
-      def initialize(query = {})
-        @query = query
+      def initialize(query = nil)
+        @query = query || {}
+        @query[:ended_on_null] ||= true
       end
 
       def call
         search.result
       end
 
+      # Note we *MUST* join onto patients for PatientsRansackHelper.identity_match to work.
+      # It might be better to refactor PatientsRansackHelper so we can include where required
+      # eg below using .extending(PatientsRansackHelper) rather than relying on it being in
+      # included in the model file.
       def search
-        @search ||= Consult.active.order(created_at: :desc).ransack(query)
+        @search ||= begin
+          Consult
+            .joins(:patient)
+            .includes(
+              :created_by,
+              :consult_site,
+              :hospital_ward,
+              patient: { current_modality: :description }
+            )
+            .order(created_at: :desc)
+            .ransack(query)
+        end
       end
     end
   end

data/app/models/renalware/feeds/files/practices/convert_xml_to_csv.rb

@@ -5,6 +5,8 @@ module Renalware
     module Files
       module Practices
         class ConvertXmlToCsv
+          PRACTICE_ROLES = %w(RO177 RO76).freeze
+
           def self.call(xml_path)
             new.call(xml_path)
           end
@@ -100,10 +102,12 @@ module Renalware
                     for_element "PostCode" do org.postcode = inner_xml end
                     for_element "Country" do
                       country_name = inner_xml
+
                       CountryMap.new.map(country_name).tap do |mapped|
                         org.region = mapped.region
                         found_country = countries.find_by(name: mapped.country)
                         if found_country.blank?
+                          Rails.logger.warn("#{country_name} not mapped")
                           org.skip = true
                           org.region = country_name
                           # raise(CountryNotFoundError, country_name)
@@ -119,12 +123,12 @@ module Renalware
                 end
               end
 
-              if org.roles.include?("RO76")
+              if (PRACTICE_ROLES & org.roles).any?
                 fail unless org.code&.length == 6
                 practices_count += 1
                 if org.skip
                   Rails.logger.warn(
-                    "Not importing practice, probably because country #{country_name} not found. "\
+                    "Not importing practice, probably because country country_name not found. "\
                     "#{org}"
                   )
                 else