renalware-core 2.0.0.pre.beta9 → 2.0.0.pre.beta10

data/db/views/reporting_anaemia_audit_v01.sql

@@ -2,7 +2,7 @@
 --explain analyze
 select
   modality_desc       modality,
-  count(e1.patient_id)   count_patients,
+  count(e1.patient_id)  patient_count,
   round(avg(hgb),2)    avg_hgb,
   round(count(hgb_gt_eq_10) / greatest(count(hgb), 1.0) * 100.0, 2) pct_hgb_gt_eq_10,
   round(count(hgb_gt_eq_11) / greatest(count(hgb), 1.0) * 100.0, 2) pct_hgb_gt_eq_11,

data/db/views/reporting_hd_overall_audit_v05.sql

@@ -0,0 +1,13 @@
+SELECT
+  units.name,
+  count(stats.id) AS patient_count,
+  0 as percentage_hb_gt_100,
+  0 as percentage_urr_gt_65,
+  0 as percentage_phosphate_lt_1_8,
+  0 as percentage_access_fistula_or_graft,
+  0 as avg_missed_hd_time,
+  ROUND((count(number_of_sessions_with_dialysis_minutes_shortfall_gt_5_pct) / COUNT(stats.id)) * 100, 1)
+    as pct_shortfall_gt_5_pct
+  FROM (hd_patient_statistics stats
+  JOIN hospital_units units ON ((units.id = stats.hospital_unit_id)))
+  GROUP BY units.name;

data/db/views/reporting_pd_audit_v01.sql

@@ -0,0 +1,26 @@
+
+with pd_patients as (
+SELECT
+  patients.id from patients
+  inner join modality_modalities current_modality on current_modality.patient_id = patients.id
+  inner join modality_descriptions current_modality_description
+       on current_modality_description.id = current_modality.description_id
+       where current_modality.ended_on is null
+  and current_modality.started_on <= current_date
+  and current_modality_description.name = 'PD'
+),
+current_regimes as(
+  select * from pd_regimes where start_date >= current_date AND end_date is null
+),
+current_apd_regimes as(
+  select * from current_regimes where type like '%::APD%'
+),
+current_capd_regimes as(
+  select * from current_regimes where type like '%::CAPD%'
+)
+select 'APD' pd_type, count(patient_id) as patient_count, 0 as avg_hgb, 0 as pct_hgb_gt_100, 0 as pct_on_epo,
+ 0 as pct_pth_gt_500, 0 as pct_phosphate_gt_1_8, 0 as pct_strong_medium_bag_gt_1l from current_apd_regimes
+union all
+select 'CAPD', count(patient_id), 0, 0, 0, 0, 0, 0 from current_capd_regimes
+union all
+select 'PD', count(id), 0, 0, 0, 0, 0, 0 from pd_patients

data/lib/dropdown_button_item.rb

@@ -0,0 +1,51 @@
+require "virtus"
+
+class DropdownButtonItem < ActionView::Base
+  include ActionView::Helpers::TagHelper
+  include Virtus.model(mass_assignment: false)
+
+  attribute :title, String
+  attribute :url, String
+  attribute :icon, String
+  attribute :url_options, Hash
+  attribute :enabled, Boolean
+
+  def initialize(**options)
+    @title = options.delete(:title)
+    @url = options.delete(:url)
+    @icon = options.delete(:icon)
+    @url_options = options
+    @enabled = options.delete(:enabled) || true
+  end
+
+  def to_html
+    enabled? ? enabled_html : disabled_html
+  end
+
+  private
+
+  def enabled_html
+    content_tag(:li) do
+      capture do
+        link_to(url, url_options) do
+          concat(icon_html)
+          concat(title) if title.present?
+        end
+      end
+    end
+  end
+
+  def disabled_html
+    content_tag(:li, class: "disabled") do
+      concat(icon_html)
+      concat(title) if title.present?
+    end
+  end
+
+  # rubocop:disable Rails/OutputSafety
+  def icon_html
+    return if icon.blank?
+    "<i class='fa fa-link-annotation #{icon}'></i>".html_safe
+  end
+  # rubocop:enable Rails/OutputSafety
+end

data/lib/renalware/configuration.rb

@@ -25,6 +25,7 @@ module Renalware
     config_accessor(:session_timeout_polling_frequency) { 15.seconds }
     config_accessor(:duration_of_last_url_memory_after_session_expiry) { 30.minutes }
     config_accessor(:broadcast_subscription_map) { {} }
+    config_accessor(:include_sunday_on_hd_diaries) { false }
   end
 
   def self.config

data/lib/renalware/engine.rb

@@ -95,6 +95,7 @@ module Renalware
       app.config.assets.precompile += %w(renalware/iframeResizer.contentWindow.js)
       app.config.assets.precompile += %w(renalware/pdf.css renalware/watermark.css)
       app.config.assets.precompile += %w(renalware/protocol_pdf.css)
+      app.config.assets.precompile += %w(renalware/hd_diary_pdf.css)
       app.config.assets.precompile += %w(
         renalware/NHS-Black.jpg
         renalware/favicon/manifest.json

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.0.pre.beta9".freeze
+  VERSION = "2.0.0.pre.beta10".freeze
 end

data/lib/renalware/week_period.rb

@@ -0,0 +1,58 @@
+module Renalware
+  class WeekPeriod
+    attr_reader :year, :week_number, :first_day_of_week
+
+    def self.from_date(date)
+      date = date.to_date
+      new(week_number: date.cweek, year: date.year)
+    end
+
+    def initialize(week_number:, year:)
+      @week_number = week_number.to_i
+      @year = year.to_i
+      validate_week_number
+      validate_year
+      @first_day_of_week = Date.commercial(@year, @week_number)
+    end
+
+    def next
+      self.class.from_date(first_day_of_week + 1.week)
+    end
+
+    def previous
+      self.class.from_date(first_day_of_week - 1.week)
+    end
+
+    def to_a
+      [week_number, year]
+    end
+
+    def to_s
+      "#{I18n.l(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 ||= (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
+      if year <= 2000
+        raise(ArgumentError, "invalid date year must be >= 2000")
+      end
+    end
+
+    def to_h
+      {
+        year: year,
+        week_number: week_number
+      }
+    end
+  end
+end

data/spec/factories/accesses/patients.rb

@@ -1,3 +1,3 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :accesses_patient, class: "Renalware::Accesses::Patient", parent: :patient
 end

data/spec/factories/accesses/plans.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :access_plan, class: Renalware::Accesses::Plan do
     accountable
     association :patient, factory: :accesses_patient

data/spec/factories/accesses/plans_types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :access_plan_type, class: Renalware::Accesses::PlanType do
     name "Continue"
   end

data/spec/factories/accesses/procedures.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :access_procedure, class: Renalware::Accesses::Procedure do
     type { create(:access_type) }
     side "R"

data/spec/factories/accesses/profiles.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :access_profile, class: Renalware::Accesses::Profile do
     accountable
     patient

data/spec/factories/accesses/sites.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :access_site, class: Renalware::Accesses::Site do
     name "Femoral vein line"
     code "12"

data/spec/factories/accesses/types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :access_type, class: Renalware::Accesses::Type do
     name "Tunnelled subclav"
     abbreviation "TLN LS"

data/spec/factories/admissions/consults.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :admissions_consult, class: "Renalware::Admissions::Consult" do
+    accountable
+    patient { create(:patient, by: accountable_actor) }
+    hospital_unit
+  end
+end

data/spec/factories/admissions/request_reasons.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :admissions_request_reason, class: "Renalware::Admissions::RequestReason" do
     initialize_with do
       Renalware::Admissions::RequestReason.find_or_create_by!(description: description)

data/spec/factories/admissions/requests.rb

@@ -1,5 +1,5 @@
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :admissions_request, class: "Renalware::Admissions::Request" do
     accountable
     association :reason, factory: :admissions_request_reason

data/spec/factories/clinical/allergies.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :allergy, class: "Renalware::Clinical::Allergy" do
     patient
     description { Faker::Lorem.sentence }

data/spec/factories/clinical/body_compositions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :body_composition, class: "Renalware::Clinical::BodyComposition" do
     accountable
     patient

data/spec/factories/clinical/dry_weights.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :dry_weight, class: "Renalware::Clinical::DryWeight" do
     accountable
     patient

data/spec/factories/clinical/patients.rb

@@ -1,3 +1,3 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :clinical_patient, class: "Renalware::Clinical::Patient", parent: :patient
 end

data/spec/factories/clinics/appointments.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :appointment, class: "Renalware::Clinics::Appointment" do
     patient
     clinic

data/spec/factories/clinics/clinic_visits.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :clinic_visit, class: "Renalware::Clinics::ClinicVisit" do
     accountable
     patient

data/spec/factories/clinics/clinics.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :clinic, class: "Renalware::Clinics::Clinic" do
     name "Access"
     association :consultant, factory: :user

data/spec/factories/deaths/cause.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cause_of_death, class: "Renalware::Deaths::Cause" do
     code "12"
     description "Hyperkalaemia"

data/spec/factories/deaths/modality_descriptions.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :death_modality_description, class: "Renalware::Deaths::ModalityDescription" do
-    name "Death"
+    initialize_with { Renalware::Deaths::ModalityDescription.find_or_create_by(name: "Death") }
   end
 end

data/spec/factories/directory/people.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :directory_person, class: "Renalware::Directory::Person" do
     accountable
     given_name   { Faker::Name.first_name }

data/spec/factories/drugs/drug.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :drug, class: "Renalware::Drugs::Drug" do
     name "Blue Pill"
 

data/spec/factories/drugs/drug_types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :drug_type, class: "Renalware::Drugs::Type" do
     code "immuno"
     name "Immunosuppressant"

data/spec/factories/events/events.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :event, class: "Renalware::Events::Event" do
     accountable
     patient

data/spec/factories/events/events_types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :events_type, class: "Renalware::Events::Type" do
     name "Access--Clinic"
 

data/spec/factories/hd/cannulation_types.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :hd_cannulation_type, class: "Renalware::HD::CannulationType" do
     name "Buttonhole"
   end

data/spec/factories/hd/dialysates.rb

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :hd_dialysate, class: "Renalware::HD::Dialysate" do
+    initialize_with { Renalware::HD::Dialysate.find_or_create_by(name: name) }
+    name "Fresenius A7"
+    sodium_content 4
+    sodium_content_uom "mmol/L"
+    description nil
+    deleted_at nil
+  end
+end

data/spec/factories/hd/dialysers.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :hd_dialyser, class: "Renalware::HD::Dialyser" do
     group "FX"
     name "FX80"

data/spec/factories/hd/diaries.rb

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :hd_weekly_diary, class: "Renalware::HD::WeeklyDiary" do
+    year 2017
+    week_number 2
+    master false
+    association :master_diary, factory: :hd_master_diary
+  end
+
+  factory :hd_master_diary, class: "Renalware::HD::MasterDiary" do
+    master true
+  end
+end

data/spec/factories/hd/diurnal_period_codes.rb

@@ -0,0 +1,18 @@
+FactoryBot.define do
+  factory :hd_diurnal_period_code, class: "Renalware::HD::DiurnalPeriodCode" do
+    initialize_with { Renalware::HD::DiurnalPeriodCode.find_or_create_by(code: code) }
+    code "am"
+
+    trait :am do
+      code "am"
+    end
+
+    trait :pm do
+      code "pm"
+    end
+
+    trait :eve do
+      code "eve"
+    end
+  end
+end

data/spec/factories/hd/hd_session_document.rb

@@ -1,4 +1,4 @@
-# A word about using FactoryGirl to build document (jsonb) objects:
+# A word about using FactoryBot to build document (jsonb) objects:
 #
 # The best solution I can find is to use OpenStructs to build each
 # nested part, compose these in the top level document (e.g. SessionDocument)
@@ -11,9 +11,9 @@
 #     end
 #   end
 #
-# The support/factory_girl.rb for the definition of MarshalDumpStrategy
+# The support/factory_bot.rb for the definition of MarshalDumpStrategy
 #
-FactoryGirl.define do
+FactoryBot.define do
   factory :blood_pressure, class: OpenStruct do
     systolic 100
     diastolic 80
@@ -29,7 +29,6 @@ FactoryGirl.define do
     single_needle "no"
     lines_reversed "no"
     fistula_plus_line "no"
-    dialysis_fluid_used "a10"
     is_access_first_use "no"
   end