renalware-core 2.0.155 → 2.0.160

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

@@ -186,6 +186,19 @@ article.clinical-allergies {
           }
         }
 
+        &.active-consult {
+          background-color: $nhs-pink;
+
+          &:hover {
+            background-color: darken($nhs-pink, 7);
+          }
+
+          .title a,
+          i:before {
+            color: $white;
+          }
+        }
+
         &.research-study-participant {
           background-color: darken($nhs-green, 3);
           color: $white;

data/app/components/renalware/admissions/active_consult_alert_component.html.slim

@@ -1,4 +1,4 @@
-li.patient-alert.bg-pink-200.text-gray-700
+li.patient-alert.active-consult
   i.fas.fa-exclamation-triangle
   span.title
     = link_to "Active Consult", renalware.edit_admissions_consult_path(id: consult_id)

data/app/components/renalware/article_component.rb

@@ -6,7 +6,7 @@ module Renalware
   # build more and more useful components. Other components can use this component
   # in their markup.
   class ArticleComponent < ApplicationComponent
-    pattr_initialize [:title]
+    rattr_initialize [:title]
     with_content_areas :title_link, :actions
   end
 end

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

@@ -3,11 +3,7 @@
 module Renalware
   module Letters
     class LettersInProgressComponent < ApplicationComponent
-      attr_reader :current_user
-
-      def initialize(current_user:)
-        @current_user = current_user
-      end
+      pattr_initialize [:current_user!]
 
       # Note we want oldest letters ordered first here - elsewhere letters are newest first
       def letters_in_progress

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

@@ -4,11 +4,8 @@ module Renalware
   module Letters
     class UnreadElectronicCCsComponent < ApplicationComponent
       include Pundit::Helper
-      attr_reader :current_user
 
-      def initialize(current_user:)
-        @current_user = current_user
-      end
+      pattr_initialize [:current_user!]
 
       def unread_electronic_ccs
         @unread_electronic_ccs ||= begin

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

@@ -3,11 +3,7 @@
 module Renalware
   module Patients
     class BookmarksComponent < ApplicationComponent
-      attr_reader :current_user
-
-      def initialize(current_user:)
-        @current_user = current_user
-      end
+      pattr_initialize [:current_user!]
 
       def bookmarks
         @bookmarks ||= begin

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

@@ -8,13 +8,7 @@ module Renalware
       include Pagy::Frontend
       TITLE = "Messages"
 
-      attr_reader :patient, :current_user
-
-      def initialize(patient:, current_user:)
-        @patient = patient
-        @current_user = current_user
-        super
-      end
+      rattr_initialize [:patient!, :current_user!]
 
       def pagination
         load_messages unless @pagination
@@ -30,7 +24,7 @@ module Renalware
         if pagination.items < pagination.count
           "#{TITLE} (#{pagination.items} of #{pagination.count})"
         else
-          "#{TITLE} (#{pagination.items})"
+          "#{TITLE} (#{pagination.count})"
         end
       end
 

data/app/components/renalware/pd/adequacy_results_component.rb

@@ -9,7 +9,7 @@ module Renalware
       include Pagy::Backend
       include Pagy::Frontend
       include ToggleHelper
-      pattr_initialize [:patient!, :current_user!]
+      rattr_initialize [:patient!, :current_user!]
       attr_reader :pagination
 
       TITLE = "Adequacy Results"

data/app/components/renalware/pd/pet_results_component.html.slim

@@ -4,9 +4,6 @@
     header
       h2= title
 
-
-
-      /.flex.flex-row-reverse
       .flex.justify-end
 
         .inline-flex
@@ -22,6 +19,7 @@
 
         = link_to "Show all", renalware.patient_pd_pet_results_path(patient), remote: true, class: "float-none button flex-initial secondary"
         = link_to "Add", renalware.new_patient_pd_pet_result_path(patient), class: "float-none button flex-initial"
+
     div#pet-results-table data-target="tabs.panel"
 
       = render "renalware/pd/pet_results/table",

data/app/components/renalware/surveys/eq5d_component.rb

@@ -5,11 +5,7 @@ require_dependency "renalware/surveys"
 module Renalware
   module Surveys
     class EQ5DComponent < ApplicationComponent
-      attr_reader :patient
-
-      def initialize(patient:)
-        @patient = patient
-      end
+      rattr_initialize [:patient!]
 
       def rows
         @rows ||= EQ5DPivotedResponse.where(patient_id: patient.id)

data/app/components/renalware/surveys/pos_s_component.rb

@@ -7,11 +7,7 @@ module Renalware
     class POSSComponent < ApplicationComponent
       include ToggleHelper
 
-      attr_reader :patient
-
-      def initialize(patient:)
-        @patient = patient
-      end
+      rattr_initialize [:patient!]
 
       # Backed by a SQL view
       def rows

data/app/components/renalware/system/admin_menu_component.rb

@@ -5,11 +5,8 @@ module Renalware
     # Experimental ActionView component
     class AdminMenuComponent < ApplicationComponent
       include Renalware::UsersHelper
-      attr_reader :current_user
 
-      def initialize(current_user:)
-        @current_user = current_user
-      end
+      rattr_initialize [:current_user!]
 
       def admin_menu_item(*args)
         return unless

data/app/components/renalware/system/users_awaiting_approval_component.rb

@@ -3,11 +3,7 @@
 module Renalware
   module System
     class UsersAwaitingApprovalComponent < ApplicationComponent
-      attr_reader :current_user
-
-      def initialize(current_user:)
-        @current_user = current_user
-      end
+      rattr_initialize [:current_user!]
 
       def users_needing_approval_count
         @users_needing_approval_count ||= User.unapproved.count

data/app/controllers/renalware/api/token_authenticated_api_controller.rb

@@ -7,7 +7,7 @@ require "devise"
 
 module Renalware
   module API
-    class TokenAuthenticatedApiController < ApplicationController
+    class TokenAuthenticatedAPIController < ApplicationController
       before_action :authenticate_user_from_token!
       before_action :authenticate_user! # fallback
 

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

@@ -7,7 +7,7 @@ module Renalware
   module API
     module V1
       module Medications
-        class PrescriptionsController < TokenAuthenticatedApiController
+        class PrescriptionsController < TokenAuthenticatedAPIController
           def index
             render locals: {
               patient: patient,

data/app/controllers/renalware/api/v1/patients/patients_controller.rb

@@ -7,7 +7,7 @@ module Renalware
   module API
     module V1
       module Patients
-        class PatientsController < TokenAuthenticatedApiController
+        class PatientsController < TokenAuthenticatedAPIController
           include Concerns::Pageable
 
           def show

data/app/controllers/renalware/events/events_controller.rb

@@ -2,7 +2,6 @@
 
 # rubocop:disable Metrics/ClassLength
 require_dependency "renalware/events"
-require "attr_extras"
 
 module Renalware
   module Events

data/app/controllers/renalware/pd/pet_results_controller.rb

@@ -4,7 +4,7 @@ require_dependency "renalware/pd"
 
 module Renalware
   module PD
-    class PETResultsController < BaseController
+    class PETResultsController < PD::BaseController
       def new
         pet = PETResult.new(
           patient: patient,

data/app/jobs/renalware/hd/generate_monthly_statistics.rb

@@ -16,7 +16,7 @@ module Renalware
       def initialize(month: nil, year: nil)
         validate_args(month: month, year: year)
 
-        @period = Renalware::MonthPeriod.new(
+        @period = MonthPeriod.new(
           month: (month || default_month).to_i,
           year: (year || default_year).to_i
         )

data/app/jobs/renalware/hd/generate_monthly_statistics_for_patient_job.rb

@@ -10,7 +10,7 @@ module Renalware
 
       # :reek:UtilityFunction
       def perform(patient:, month:, year:)
-        period = Renalware::MonthPeriod.new(month: month, year: year)
+        period = MonthPeriod.new(month: month, year: year)
         GenerateMonthlyStatisticsForPatient.new(patient: patient, period: period).call
       end
     end

data/app/jobs/renalware/letters/calculate_page_count_job.rb

@@ -2,7 +2,6 @@
 
 require_dependency "renalware/letters"
 require "pdf/reader"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/jobs/renalware/letters/mailshots/create_mailshot_letters_job.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/jobs/renalware/letters/printing/batch_print_job.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/jobs/renalware/letters/save_rtf_letter_to_file_job.rb

@@ -7,7 +7,7 @@ module Renalware
   module Letters
     # Used for example in a host app like renalware-blt to generate an RTF letter for saving to
     # the electronic public register, aka EPR/CRS.
-    class SaveRtfLetterToFileJob < ApplicationJob
+    class SaveRTFLetterToFileJob < ApplicationJob
       queue_as :rtf_generation
       queue_with_priority 1
 

data/app/mailers/renalware/letters/{delivery/errors.rb → delivery.rb}

@@ -5,7 +5,8 @@ require_dependency "renalware/letters"
 module Renalware
   module Letters
     module Delivery
-      class LetterIsNotApprovedOrCompletedError < StandardError; end
+      # Test fail with the error class definition here
+      # class LetterIsNotApprovedOrCompletedError < StandardError; end
     end
   end
 end

data/app/mailers/renalware/letters/delivery/practice_mailer.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
-require_relative "./errors"
 
 module Renalware
   module Letters
     module Delivery
+      class LetterIsNotApprovedOrCompletedError < StandardError; end
+
       # Note PracticeMailer not the best name as we use this mailer to send a letter to any
       # recipient (practices, hospital secretaries etc)
       class PracticeMailer < ApplicationMailer

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

@@ -22,10 +22,10 @@ module Renalware
       end
 
       def inactive_message
-        if !approved?
-          :not_approved
-        else
+        if approved?
           super
+        else
+          :not_approved
         end
       end
     end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/admissions"
-require "attr_extras"
 
 module Renalware
   module Admissions

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/clinical"
-require_dependency "renalware/success"
-require_dependency "renalware/failure"
+require "success"
+require "failure"
 
 module Renalware
   module Clinical
@@ -17,9 +17,9 @@ module Renalware
         yield allergy if block_given?
         if allergy.valid?
           save_allergy(allergy)
-          ::Renalware::Success.new(allergy)
+          ::Success.new(allergy)
         else
-          ::Renalware::Failure.new(allergy)
+          ::Failure.new(allergy)
         end
       end
 

data/app/models/renalware/clinics/create_clinic_visit.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/clinics"
-require_dependency "renalware/success"
-require_dependency "renalware/failure"
+require "success"
+require "failure"
 
 module Renalware
   module Clinics
@@ -22,9 +22,9 @@ module Renalware
           visit = patient.clinic_visits.new(params)
           objects = OpenStruct.new(clinic_visit: visit, appointment: appointment)
           if visit.save && update_appointment_with(visit.id)
-            return ::Renalware::Success.new(objects)
+            return ::Success.new(objects)
           else
-            return ::Renalware::Failure.new(objects)
+            return ::Failure.new(objects)
           end
         end
       end

data/app/models/renalware/clinics/current_observations.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Clinics
-    # TODO: Move this to a view?
+    # TODO: Unused?
     class CurrentObservations
       NULL_DATE = nil
       pattr_initialize :patient
@@ -17,7 +16,7 @@ module Renalware
         @weight ||= begin
           result = ClinicVisit
                     .most_recent_for_patient(patient)
-                    .where("weight is not null")
+                    .where.not(weight: nil)
                     .pluck(:date, :weight).first || []
 
           Observation.new(result.first, result.last)
@@ -29,7 +28,7 @@ module Renalware
         @height ||= begin
           result = ClinicVisit
                     .most_recent_for_patient(patient)
-                    .where("height is not null")
+                    .where.not(height: nil)
                     .pluck(:date, :height).first || []
 
           Observation.new(result.first, result.last)

data/app/models/renalware/events/create_event.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/events"
-require "attr_extras"
 
 module Renalware
   module Events

data/app/models/renalware/feeds/files/exceptions.rb

@@ -7,6 +7,7 @@ module Renalware
     module Files
       class Exceptions
         class FileNotFoundError < StandardError; end
+
         class UnexpectedCSVFormatError < StandardError; end
       end
     end