renalware-core 2.0.159 → 2.0.160

data/app/views/renalware/letters/parts/_allergies.html.slim

@@ -1,5 +1,5 @@
 .list.allergies
-  h3 Allergies:
+  b.subtitle Allergies:
   - if allergies.any?
     ul
       - allergies.each do |allergy|

data/app/views/renalware/letters/parts/_problems.html.slim

@@ -1,5 +1,5 @@
 .list.problems
-  h3 Problems
+  b.subtitle Problems
 
   - if problems.any?
     ul.indented

data/app/views/renalware/letters/parts/_recent_pathology_results.html.slim

@@ -1,3 +1,3 @@
 .list.investigations
-  h3 Recent Investigations
+  b.subtitle Recent Investigations
   p= recent_pathology_results.results || " None"

data/app/views/renalware/medications/prescriptions/_current.html.slim

@@ -1,4 +1,4 @@
-h3 Current Medications
+b.subtitle Current Medications
 
 - if prescriptions.blank?
   p.prescription No medications listed

data/app/views/renalware/medications/prescriptions/_current_hd.html.slim

@@ -1,5 +1,5 @@
 - if prescriptions.any?
-  h3 Drugs to give on Haemodialysis
+  b.subtitle Drugs to give on Haemodialysis
 
   ul
       - prescriptions.each do |prescription|

data/app/views/renalware/medications/prescriptions/_prescription.html.slim

@@ -1,5 +1,4 @@
 - recently_changed = defined?(recently_changed) && recently_changed
-
 li.prescription class=("recently_changed" if recently_changed)
   = prescription.drug.name
   = blank_separator
@@ -8,6 +7,9 @@ li.prescription class=("recently_changed" if recently_changed)
   = prescription.medication_route.code
   = blank_separator
   = prescription.frequency
+  = blank_separator
+  i
+    b= prescription.provider_suffix
 
   / We pass in date_changed if the prescription is recently_changed or recently_stopped
   / It could be the prescribed_on or terminated_on date

data/app/views/renalware/medications/prescriptions/_recently_stopped.html.slim

@@ -1,4 +1,4 @@
-h3 Recently Stopped Medications
+b.subtitle Recently Stopped Medications
 
 - if prescriptions.blank?
   p.prescription None

data/config/initializers/core_extensions.rb

@@ -5,7 +5,7 @@ require "core_extensions/i18n/always_cascade"
 require "core_extensions/dumb_delegator"
 # require "core_extensions/active_record/sort"
 require "core_extensions/date"
-require "core_extensions/active_support/duration"
+require "core_extensions/active_support/duration_additions"
 require "core_extensions/scenic"
 require "core_extensions/hash"
 require "core_extensions/active_record/migration_helpers"

data/config/initializers/inflections.rb

@@ -32,6 +32,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "CCs"
   inflect.acronym "CM"
   inflect.acronym "CSV"
+  inflect.acronym "CRF"
   inflect.acronym "DNA"
   inflect.acronym "EDTA"
   inflect.acronym "ESRF"
@@ -55,6 +56,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "EQ5D"
   inflect.acronym "EQ5D5L"
   inflect.acronym "POS"
+  inflect.acronym "YAML"
   inflect.irregular "feedback", "feedback"
   inflect.acronym "NHS"
   inflect.uncountable %w(cache)

data/config/locales/renalware/virology/virology.en.yml

@@ -26,4 +26,6 @@ en:
         hbv_booster: HBV Booster
         influenza: Influenza
         pneumococcus: Pneumococcus
+        covid19_1: COVID-19 1
+        covid19_2: COVID-19 2
         patient_refused: Patient Refused

data/lib/failure.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require "service_result"
+
+class Failure < ServiceResult
+end

data/lib/gpg_encrypt_folder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
 # Shell out to gpg with a a command like this
 # gpg --armor --no-default-keyring --keyring keyring.gpg
 #     --trust-model always -r 'renalware_test'

data/lib/month_period.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class MonthPeriod
+  attr_reader :month, :year, :start, :finish
+
+  def initialize(month:, year:)
+    @month = month
+    @year = year
+    @start = Time.new(year, month, 1, 0, 0, 0)
+    @finish = start.end_of_month.end_of_day
+  end
+
+  def to_range
+    start..finish
+  end
+end

data/lib/renalware/configuration.rb

@@ -136,6 +136,9 @@ module Renalware
     # Note that the standard HL7 PID admin sex values are not adhered to here. For reference
     # they are:
     # F Female, M Male, O Other, U Unknown, A Ambiguous, N Not applicable
+    # Note
+    # - NS = Not Stated
+    # - NK = Not Known
     config_accessor(:hl7_pid_sex_map) do
       {
         "MALE" => "M",
@@ -144,7 +147,8 @@ module Renalware
         "UNKNOWN" => "NK",
         "NOTKNOWN" => "NK",
         "AMBIGUOUS" => "NS",
-        "NOT APPLICABLE" => "NS"
+        "NOT APPLICABLE" => "NS",
+        "BOTH" => "NS"
       }.freeze
     end
   end

data/lib/renalware/version_number.rb

@@ -5,6 +5,6 @@ module Renalware
   # to creat that class even though its not used. If we don't do this zeitwerk
   # complains that version.rb does export a constant called Version.
   class VersionNumber
-    VERSION = "2.0.159"
+    VERSION = "2.0.160"
   end
 end

data/lib/service_result.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ServiceResult
+  attr_reader :object
+
+  def initialize(object)
+    @object = object
+  end
+
+  def success?
+    false
+  end
+
+  def failure?
+    !success?
+  end
+end

data/lib/sql/indexed_case_stmt.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
-module SQL
+module Sql
   # Example:
   #
   #     indexed_case_stmt(:code, "DT", "AC", "XY")

data/lib/success.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "service_result"
+
+class Success < ServiceResult
+  def success?
+    true
+  end
+end

data/lib/tasks/ukrdc.rake

@@ -39,7 +39,7 @@ namespace :ukrdc do
       RubyProf.start
     end
     # Renalware::UKRDC::TreatmentTimeline::GenerateTreatments.call
-    Renalware::UKRDC::CreateEncryptedPatientXMLFiles.new(
+    Renalware::UKRDC::CreateEncryptedPatientXmlFiles.new(
       changed_since: ENV["changed_since"],
       patient_ids: ENV.fetch("patient_ids", "").split(",").map(&:to_i),
       force_send: ENV["force_send"] == "true"

data/lib/week_period.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class WeekPeriod
+  attr_reader :year, :week_number, :date_on_first_day_of_week
+
+  def self.from_date(date)
+    date = date.to_date
+    new(week_number: date.cweek, year: date.cwyear)
+  end
+
+  def initialize(week_number:, year:)
+    @week_number = week_number.to_i
+    @year = year.to_i
+    validate_week_number
+    validate_year
+    @date_on_first_day_of_week = Date.commercial(@year, @week_number)
+  end
+
+  def next
+    self.class.from_date(date_on_first_day_of_week + 1.week)
+  end
+
+  def previous
+    self.class.from_date(date_on_first_day_of_week - 1.week)
+  end
+
+  def to_a
+    [week_number, year]
+  end
+
+  def to_s
+    "#{I18n.l(date_on_first_day_of_week, format: :long)} " \
+    "to #{I18n.l(last_day_of_week, format: :long)}"
+  end
+
+  # The date of last day of the week (a Sunday)
+  def last_day_of_week
+    @last_day_of_week ||= (date_on_first_day_of_week + 1.week - 1.minute).to_date
+  end
+
+  def validate_week_number
+    if week_number < 1 || week_number > 53
+      raise(ArgumentError, "invalid date: week_number must be 1-53")
+    end
+  end
+
+  def validate_year
+    raise(ArgumentError, "invalid date year must be >= 2000") if year <= 2000
+  end
+
+  def to_h
+    {
+      year: year,
+      week_number: week_number
+    }
+  end
+end

data/spec/factories/events/events.rb

@@ -9,8 +9,7 @@ FactoryBot.define do
     description { "Needs blood sample taken." }
     notes { "Would like son to accompany them on clinic visit." }
 
-    factory :simple_event, class: "Renalware::Events::Simple" do
-    end
+    factory :simple_event, class: "Renalware::Events::Simple"
 
     factory :swab, class: "Renalware::Events::Swab" do
       event_type factory: :swab_event_type

data/spec/factories/letters/letters.rb

@@ -12,16 +12,9 @@ FactoryBot.define do
 
     author { accountable_actor }
 
-    factory :draft_letter, class: "Renalware::Letters::Letter::Draft" do
-    end
-
-    factory :pending_review_letter, class: "Renalware::Letters::Letter::PendingReview" do
-    end
-
-    factory :approved_letter, class: "Renalware::Letters::Letter::Approved" do
-    end
-
-    factory :completed_letter, class: "Renalware::Letters::Letter::Completed" do
-    end
+    factory :draft_letter, class: "Renalware::Letters::Letter::Draft"
+    factory :pending_review_letter, class: "Renalware::Letters::Letter::PendingReview"
+    factory :approved_letter, class: "Renalware::Letters::Letter::Approved"
+    factory :completed_letter, class: "Renalware::Letters::Letter::Completed"
   end
 end

data/spec/factories/medications/prescription_version.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :prescription_version, class: "Renalware::Medications::PrescriptionVersion" do
-  end
+  factory :prescription_version, class: "Renalware::Medications::PrescriptionVersion"
 end

data/spec/factories/patients/ethnicities.rb

@@ -5,7 +5,6 @@ FactoryBot.define do
     name { "White - British" }
     rr18_code { "A" }
 
-    trait :white_british do
-    end
+    trait :white_british
   end
 end

data/spec/factories/pd/bag_types.rb

@@ -2,8 +2,8 @@
 
 FactoryBot.define do
   factory :bag_type, class: "Renalware::PD::BagType" do
-    manufacturer { "Star Brand, Lucky Brand" }
-    description { "Green–2.34" }
+    manufacturer { "BagManufacturer" }
+    description { "BagDescription" }
     glucose_content { 2.8 }
     glucose_strength { :medium }
     amino_acid { true }

data/spec/factories/snippets/users.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :snippets_user, class: "Renalware::Snippets::User", parent: :user do
-  end
+  factory :snippets_user, class: "Renalware::Snippets::User", parent: :user
 end

data/spec/factories/transplants/recipient_followups.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :transplant_recipient_followup, class: "Renalware::Transplants::RecipientFollowup" do
-  end
+  factory :transplant_recipient_followup, class: "Renalware::Transplants::RecipientFollowup"
 end

data/spec/factories/virology/vaccinations.rb

@@ -3,6 +3,6 @@
 FactoryBot.define do
   factory :vaccination, class: "Renalware::Virology::Vaccination" do
     event_type factory: :vaccination_event_type
-    document {}
+    document { {} }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.159
+  version: 2.0.160
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -1261,8 +1261,6 @@ files:
 - app/components/renalware/surveys/pos_s_component.rb
 - app/components/renalware/system/admin_menu_component.html.slim
 - app/components/renalware/system/admin_menu_component.rb
-- app/components/renalware/system/article_component.html.slim
-- app/components/renalware/system/article_component.rb
 - app/components/renalware/system/users_awaiting_approval_component.html.slim
 - app/components/renalware/system/users_awaiting_approval_component.rb
 - app/components/renalware/users/last_signin_component.html.slim
@@ -1458,6 +1456,13 @@ files:
 - app/controllers/renalware/virology/dashboards_controller.rb
 - app/controllers/renalware/virology/profiles_controller.rb
 - app/controllers/renalware/virology/vaccinations_controller.rb
+- app/documents/document/attribute_initializer.rb
+- app/documents/document/attribute_initializer/active_model.rb
+- app/documents/document/attribute_initializer/base.rb
+- app/documents/document/attribute_initializer/enum.rb
+- app/documents/document/base.rb
+- app/documents/document/embedded.rb
+- app/documents/document/enum.rb
 - app/documents/renalware/accesses/assessment_document.rb
 - app/documents/renalware/age.rb
 - app/documents/renalware/binary_marker.rb
@@ -1579,11 +1584,8 @@ files:
 - app/jobs/renalware/letters/save_rtf_letter_to_file_job.rb
 - app/jobs/renalware/reporting/refresh_audit_data_job.rb
 - app/mailers/renalware/admin/user_mailer.rb
-- app/mailers/renalware/letters/delivery/errors.rb
+- app/mailers/renalware/letters/delivery.rb
 - app/mailers/renalware/letters/delivery/practice_mailer.rb
-- app/mailers/renalware/previews/report_preview.rb
-- app/mailers/renalware/previews/ukrdc_summary_preview.rb
-- app/mailers/renalware/previews/user_mailer_preview.rb
 - app/mailers/renalware/reporting/report_mailer.rb
 - app/mailers/renalware/ukrdc/summary_mailer.rb
 - app/models/application_record.rb
@@ -1635,6 +1637,7 @@ files:
 - app/models/renalware/admissions/request_reason.rb
 - app/models/renalware/admissions/specialty.rb
 - app/models/renalware/api.rb
+- app/models/renalware/automatic_age_calculator.rb
 - app/models/renalware/clinical.rb
 - app/models/renalware/clinical/allergy.rb
 - app/models/renalware/clinical/allergy_status_form.rb
@@ -2006,9 +2009,9 @@ files:
 - app/models/renalware/pd.rb
 - app/models/renalware/pd/adequacy_calculated_attributes.rb
 - app/models/renalware/pd/adequacy_result.rb
+- app/models/renalware/pd/apd.rb.dead
 - app/models/renalware/pd/apd/available_overnight_volume.rb
 - app/models/renalware/pd/apd/calculate_volumes.rb
-- app/models/renalware/pd/apd/exceptions.rb
 - app/models/renalware/pd/apd/glucose_calculator.rb
 - app/models/renalware/pd/apd/non_tidal_regime_calculations.rb
 - app/models/renalware/pd/apd/regime_calculations.rb
@@ -2047,6 +2050,7 @@ files:
 - app/models/renalware/problems/note.rb
 - app/models/renalware/problems/problem.rb
 - app/models/renalware/problems/version.rb
+- app/models/renalware/remembered_preferences.rb
 - app/models/renalware/renal.rb
 - app/models/renalware/renal/aki_alert.rb
 - app/models/renalware/renal/aki_alert_action.rb
@@ -4229,7 +4233,7 @@ files:
 - lib/breadcrumb.rb
 - lib/collection_presenter.rb
 - lib/core_extensions/active_record/migration_helpers.rb
-- lib/core_extensions/active_support/duration.rb
+- lib/core_extensions/active_support/duration_additions.rb
 - lib/core_extensions/date.rb
 - lib/core_extensions/dumb_delegator.rb
 - lib/core_extensions/hash.rb
@@ -4237,35 +4241,25 @@ files:
 - lib/core_extensions/i18n/handle_blank_value.rb
 - lib/core_extensions/ox/element_additions.rb
 - lib/core_extensions/scenic.rb
-- lib/document/attribute_initializer.rb
-- lib/document/attribute_initializer/active_model.rb
-- lib/document/attribute_initializer/base.rb
-- lib/document/attribute_initializer/enum.rb
-- lib/document/base.rb
-- lib/document/embedded.rb
-- lib/document/enum.rb
 - lib/dropdown_button_item.rb
 - lib/duration_calculator.rb
+- lib/failure.rb
 - lib/git_commit_sha.rb
 - lib/gpg_encrypt_folder.rb
 - lib/hash_collection.rb
 - lib/inline_image.rb
+- lib/month_period.rb
 - lib/numeric_inclusion_validator.rb
 - lib/pandoc/templates/default.rtf
 - lib/renalware.rb
-- lib/renalware/automatic_age_calculator.rb
 - lib/renalware/configuration.rb
 - lib/renalware/engine.rb
-- lib/renalware/failure.rb
-- lib/renalware/month_period.rb
-- lib/renalware/remembered_preferences.rb
-- lib/renalware/service_result.rb
-- lib/renalware/success.rb
 - lib/renalware/version_number.rb
-- lib/renalware/week_period.rb
+- lib/service_result.rb
 - lib/smart_delegator.rb
 - lib/sql/indexed_case_stmt.rb
 - lib/subscription_registry.rb
+- lib/success.rb
 - lib/tasks/audit.rake
 - lib/tasks/bundler_audit.rake
 - lib/tasks/cucumber.rake
@@ -4282,8 +4276,7 @@ files:
 - lib/tasks/spec.rake
 - lib/tasks/ukrdc.rake
 - lib/templates/slim/scaffold/_form.html.slim
-- lib/test_support/ajax_helpers.rb
-- lib/test_support/text_editor_helpers.rb
+- lib/week_period.rb
 - spec/factories/accesses/assessments.rb
 - spec/factories/accesses/catheter_insertion_techniques.rb
 - spec/factories/accesses/patients.rb
@@ -4450,6 +4443,7 @@ files:
 - spec/factories/ukrdc/modality_codes.rb
 - spec/factories/virology/patients.rb
 - spec/factories/virology/vaccinations.rb
+- spec/support/ajax_helpers.rb
 - spec/support/capybara_helper.rb
 - spec/support/database_functions_spec_helper.rb
 - spec/support/date_helpers.rb
@@ -4473,6 +4467,7 @@ files:
 - spec/support/shared_examples/accountable_examples.rb
 - spec/support/shared_examples/paranoia_examples.rb
 - spec/support/shared_examples/supersedable_examples.rb
+- spec/support/text_editor_helpers.rb
 - spec/support/translations.rb
 - spec/support/travel.rb
 - spec/support/ukrdc_helpers.rb