RubyGems - renalware-core - Versions diffs - 2.0.157 → 2.0.162 - Mend

renalware-core 2.0.157 → 2.0.162

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (227) hide show

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

@@ -141,6 +141,7 @@ article.clinical-allergies {
 .patient-alerts {
   color: $white;
   background-color: transparent;
+  padding-top: .1rem;
   @media print {
     display: none;
@@ -186,6 +187,46 @@ article.clinical-allergies {
           }
         }
+        &.active-consult {
+          background-color: $nhs-pink;
+          &:hover {
+            background-color: darken($nhs-pink, 7);
+          }
+          .title a,
+          i:before {
+            color: $white;
+          }
+        }
+        &.vaccination {
+          background-color: $nhs-aqua-green;
+          &:hover {
+            background-color: darken($nhs-aqua-green, 4);
+          }
+          .title a,
+          i:before {
+            color: $white;
+          }
+        }
+        &.event {
+          background-color: $nhs-yellow;
+          &:hover {
+            background-color: darken($nhs-yellow, 7);
+          }
+          .title a,
+          .date,
+          i:before {
+            color: $dark-grey;
+          }
+        }
         &.research-study-participant {
           background-color: darken($nhs-green, 3);
           color: $white;

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

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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/medications/tabbed_prescriptions_list_component.html.slim CHANGED

@@ -2,11 +2,11 @@ div(data-controller="tabs" data-tabs-active-tab="active")
   .tabs-container
     ul.list-reset.sub-nav
       - groups.each do |group|
-        li(data-target="tabs.tab" data-action="click->tabs#change")
+        li(data-tabs-target="tab" data-action="click->tabs#change")
           a(class="" href="#" data-trigger-masonry-refresh="true")= group.title
   - groups.each do |group|
-    .hidden(data-target="tabs.panel")
+    .hidden(data-tabs-target="panel")
       table.prescriptions-list
         thead
           tr

data/app/components/renalware/pathology/sparkline_component.html.slim CHANGED

@@ -6,7 +6,7 @@
       / This is the stimulusjs version. See sparklines_controller.js
       div(data-controller="pathology-sparklines"
           data-pathology-sparklines-chart-data='[["2010-06-03T16:37:00.000+01:00","106"], ["2011-06-03T16:37:00.000+01:00","110"]]')
-        div(data-target="pathology-sparklines.chart")
+        div(data-pathology-sparklines-target="chart")
     - else
       / This implementation uses ChartKick to insert the chart javascript into the
       / page. It works fine, but when there are 50 path results on screen, we are

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

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -4,25 +4,23 @@
     header
       h2= title
-      /.flex.flex-row-reverse
       .flex.justify-end
         .inline-flex
-          a.reset.opacity-50.bg-white.m-05.pt-px.pb-0.px-1(href="#" data-target="tabs.tab"
+          a.reset.opacity-50.bg-white.m-05.pt-px.pb-0.px-1(href="#" data-tabs-target="tab"
             data-action="click->tabs#change")
             svg.h-6.w-6.fill-current.text-black xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"
               path d="M1 4h2v2H1V4zm4 0h14v2H5V4zM1 9h2v2H1V9zm4 0h14v2H5V9zm-4 5h2v2H1v-2zm4 0h14v2H5v-2z"
-          a.reset.opacity-50.bg-white.m-0.pt-px.px-2(data-target="tabs.tab" href="#"
+          a.reset.opacity-50.bg-white.m-0.pt-px.px-2(data-tabs-target="tab" href="#"
             data-action="click->tabs#change")
             svg.h-6.w-6.stroke-current.text-black viewBox="0 0 24 26"  stroke-width="3" stroke-linecap="round" stroke-linejoin="round"
               path d="M12 20V10M18 20V4M6 20v-4"
         = 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"
+    div#pet-results-table data-tabs-target="panel"
       = render "renalware/pd/pet_results/table",
                patient: patient,
@@ -30,7 +28,7 @@
                pagination: pagination,
                current_user: current_user
-    .chart.hidden.mt-5 data-target="tabs.panel"
+    .chart.hidden.mt-5 data-tabs-target="panel"
       div(style="display:block; position:relative; height: 400px; width: 100%; text-align: center; margin-bottom: 20px")
         #containerx(data-controller="pd-pet-chart"
                     data-pd-pet-chart-url=renalware.patient_pd_pet_results_path(patient, format: :json)

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

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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/{lib → app/documents}/document/attribute_initializer.rb RENAMED

File without changes

data/{lib → app/documents}/document/attribute_initializer/active_model.rb RENAMED

File without changes

data/{lib → app/documents}/document/attribute_initializer/base.rb RENAMED

File without changes

data/{lib → app/documents}/document/attribute_initializer/enum.rb RENAMED

File without changes

data/{lib → app/documents}/document/base.rb RENAMED

File without changes

data/{lib → app/documents}/document/embedded.rb RENAMED

File without changes

data/{lib → app/documents}/document/enum.rb RENAMED

File without changes

data/app/javascript/renalware/controllers/modal_controller.js CHANGED

@@ -11,7 +11,7 @@
 //   <span>Open Modal</span>
 //  </a>
 //  <!-- Modal Container -->
-//  <div data-target="modal.container" data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard" class="hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center" style="z-index: 9999;">
+//  <div data-modal-target="container" data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard" class="hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center" style="z-index: 9999;">
 //    <!-- Modal Inner Container -->
 //    <div class="max-h-screen w-full max-w-lg relative">
 //      <!-- Modal Card -->

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

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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} RENAMED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

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