renalware-core 2.0.24 → 2.0.25

data/app/views/renalware/shared/_please_print_using_print_button_warning.html.slim

@@ -0,0 +1,18 @@
+/ This is displayed in pages printed using the browser (i.e. File -> Print), when we want instead to
+/ direct the user to print using the provided Print button on the page, which will provide a better
+/ printed output (usually via PDF).
+/ While its possible of course to format all pages for printing using CSS, there are times when
+/ generating a PDF from a custom HTML view guarantees a better experience, for example:
+/ - we need a very different layout
+/ - we want to control headers and footers
+/ - there are table rows which are not displaying correctly in html (perhaps creating orphaned rows)
+/   and we need to use for example nested tables to get an acceptable printable page.
+/ - its useful for the user to be able to save a hard-copy PDF of the printed output
+/
+/ Think of custom HTML views turned into PDF using wkhtmltopdf as a pragmatic and quicker half-way
+/ house towards creating more sophisticated and controllable printable PDF output using Prawn etc.
+.panel.print-only
+  h2
+    | For best results please print by clicking on the Print button rather than printing
+    |  this page directly.
+    = image_tag "renalware/print-button-example.png"

data/app/views/renalware/transplants/donor_followups/_form.html.slim

@@ -10,10 +10,10 @@ ruby:
 .form-content
   = render layout: "renalware/shared/fieldset",
       locals: { legend: "Admin", name: "admin" } do
-    = f.input :followed_up, as: :inline_radio_buttons
+    = f.input :followed_up, as: :inline_radio_buttons, readonly: nil
     = f.input :last_seen_on, as: :date_picker
     = f.input :ukt_center_code
-    = f.input :lost_to_followup, as: :inline_radio_buttons
+    = f.input :lost_to_followup, as: :inline_radio_buttons, readonly: nil
     = f.input :transferred_for_followup, as: :inline_radio_buttons
     = f.input :dead_on, as: :date_picker
 

data/app/views/renalware/transplants/recipient_followups/_form.html.slim

@@ -13,7 +13,12 @@ ruby:
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Transplant Failure", name: "transplant_failure" } do
       = f.input :stent_removed_on, as: :date_picker, wrapper: :horizontal_datepicker
-      = f.input :transplant_failed, as: :inline_radio_buttons, wrapper: :horizontal_small
+      / readonly: nil here is required to prevent the No option being created with readonly=readonly
+      / which causes Capybara to fail because it cannot change the value of read-only element
+      = f.input :transplant_failed,
+                as: :inline_radio_buttons,
+                wrapper: :horizontal_small,
+                readonly: nil
       = f.input :transplant_failed_on, as: :date_picker, wrapper: :horizontal_datepicker
       = f.input :transplant_failure_cause_description_id,
                 as: :grouped_select,

data/app/views/renalware/transplants/registration_statuses/_inputs.html.slim

@@ -6,3 +6,7 @@
 = f.input :started_on,
           as: :date_picker,
           wrapper: :horizontal_datepicker
+= f.input :notes,
+          as: :text,
+          wrapper: :horizontal_large,
+          input_html: { rows: 6 }

data/app/views/renalware/transplants/registration_statuses/_list.html.slim

@@ -9,11 +9,12 @@ article.status-history.secondary
 
   table
     thead
-      th
-      th Start Date
+      th.col-width-medium
+      th.col-width-date Start Date
+      th.col-width-date End Date
       th Status
       th By
-      th Termination Date
+
     tbody
       - registration.statuses.reversed.each do |status|
         tr
@@ -25,7 +26,19 @@ article.status-history.secondary
                 patient_transplants_registration_status_path(patient, status),
                 method: :delete,
                 data: { confirm: I18n.t("prompts.confirm_delete") }
-          td= l status.started_on
+            = pipe_separator
+            = link_to("Toggle",
+                      "#status-quick-preview-#{status.id}",
+                      data: { behaviour: "toggler" })
+          td= l(status.started_on)
+          td= l(status.terminated_on) if status.terminated_on
           td= status.description
           td= status.updated_by.to_s
-          td= l status.terminated_on if status.terminated_on
+
+        = content_tag(:tr, id: "status-quick-preview-#{status.id}", style: "display: none")
+          td(colspan=5)
+            .quick-preview
+              dl.dl-horizontal
+                dt Notes
+                dd= simple_format status.notes
+

data/config/locales/custom.yml

@@ -1,9 +1,8 @@
 en:
   renalware:
     beta_message:
-      title: |
-         Important notice:
-      body: |
+      title: "Important notice: "
+      body: >
         This is the Renalware 2.0 test system.
         Not for clinical use. Any data entered will not be retained.
       feedback_button: Provide feedback or report a bug

data/config/locales/renalware/hd/session.en.yml

@@ -194,6 +194,9 @@ en:
           pre: Pre
           post: Post
           post_with_changed: Post (chg)
+          user: User
+          put_on_by: Putting on
+          taken_off_by: Taking off
         form_actions:
           signoff: Save and Sign-Off
           signoff_disable_with: Saving and Signing-Off...

data/db/migrate/20180510151959_update_hd_overall_audit_to_version_7.rb

@@ -0,0 +1,6 @@
+class UpdateHDOverallAuditToVersion7 < ActiveRecord::Migration[5.1]
+  update_view :reporting_hd_overall_audit,
+              materialized: true,
+              version: 7,
+              revert_to_version: 6
+end

data/db/migrate/20180511100345_add_notes_to_transplant_registration_statuses.rb

@@ -0,0 +1,5 @@
+class AddNotesToTransplantRegistrationStatuses < ActiveRecord::Migration[5.1]
+  def change
+    add_column :transplant_registration_statuses, :notes, :text
+  end
+end

data/db/migrate/20180511140415_add_message_hash_messaging_messages.rb

@@ -0,0 +1,6 @@
+class AddMessageHashMessagingMessages < ActiveRecord::Migration[5.1]
+  def change
+    add_column :feed_messages, :body_hash, :text, null: true
+    add_index :feed_messages, :body_hash, unique: true
+  end
+end

data/db/seeds/default/deaths/death_causes.rb

@@ -2,13 +2,13 @@
 
 module Renalware
   log "Adding Renal Reg Cause of Death codes" do
+    return if Deaths::Cause.count > 0
 
     file_path = File.join(File.dirname(__FILE__), "death_causes.csv")
-
+    causes = []
     CSV.foreach(file_path, headers: true) do |row|
-      Deaths::Cause.find_or_create_by!(code: row["code"]) do |code|
-        code.description = row["description"]
-      end
+      causes << Deaths::Cause.new(code: row["code"], description: row["description"])
     end
+    Deaths::Cause.import! causes
   end
 end

data/db/seeds/default/patients/patients_languages.rb

@@ -2,11 +2,12 @@
 
 module Renalware
   log "Adding Languages" do
-
+    return if Patients::Language.count > 0
     file_path = File.join(File.dirname(__FILE__), "patients_languages.csv")
-
+    languages = []
     CSV.foreach(file_path, headers: true) do |row|
-      Patients::Language.find_or_create_by!(code: row["code"], name: row["name"])
+      languages << Patients::Language.new(code: row["code"], name: row["name"])
     end
+    Patients::Language.import! languages
   end
 end

data/db/seeds/default/renal/prd_descriptions.rb

@@ -2,13 +2,15 @@
 
 module Renalware
   log "Adding Primary Renal Diagnosis (PRD) Codes" do
-
+    return if Renal::PRDDescription.count > 0
     file_path = File.join(File.dirname(__FILE__), "prd_descriptions.csv")
-
+    descriptions = []
     CSV.foreach(file_path, headers: true) do |row|
-      Renal::PRDDescription.find_or_create_by!(code: row["code"]) do |code|
-        code.term = row["term"]
-      end
+      descriptions << Renal::PRDDescription.new(
+        code: row["code"],
+        term: row["term"]
+      )
     end
+    Renal::PRDDescription.import! descriptions
   end
 end

data/db/seeds/default/system/countries.rb

@@ -2,13 +2,17 @@
 
 module Renalware
   log "Adding Countries" do
+    return if System::Country.count > 0
     file_path = File.join(File.dirname(__FILE__), "countries.csv")
-      CSV.foreach(file_path, headers: true) do |row, index|
-        System::Country.find_or_create_by!(
-          name: row["name"],
-          alpha2: row["alpha2"],
-          alpha3: row["alpha3"]
-        ).tap{ |country| country.position = index }
+    countries = []
+    CSV.foreach(file_path, headers: true) do |row, index|
+      countries << System::Country.new(
+        name: row["name"],
+        alpha2: row["alpha2"],
+        alpha3: row["alpha3"],
+        position: index
+      )
     end
+    System::Country.import! countries
   end
 end

data/db/views/reporting_hd_overall_audit_v07.sql

@@ -0,0 +1,44 @@
+with fistula_or_graft_access_types as (
+  select id
+  from access_types
+  where name ilike '%fistula%' or name ilike '%graft%'
+),
+stats as (
+  select
+  s.patient_id,
+  s.hospital_unit_id,
+  s.month,
+  s.year,
+  s.session_count,
+  s.number_of_missed_sessions,
+  s.number_of_sessions_with_dialysis_minutes_shortfall_gt_5_pct,
+  ((number_of_missed_sessions::float / NULLIF(session_count::float, 0)) * 100.0) > 10.0 as missed_sessions_gt_10_pct,
+  s.dialysis_minutes_shortfall::float,
+  convert_to_float(s.pathology_snapshot -> 'HGB' ->> 'result') > 100 as hgb_gt_100,
+  convert_to_float(s.pathology_snapshot -> 'HGB' ->> 'result') > 130 as hgb_gt_130,
+  convert_to_float(s.pathology_snapshot -> 'PTH' ->> 'result') < 300 as pth_lt_300,
+  convert_to_float(s.pathology_snapshot -> 'URR' ->> 'result') > 64 as urr_gt_64,
+  convert_to_float(s.pathology_snapshot -> 'URR' ->> 'result') > 69 as urr_gt_69,
+  convert_to_float(s.pathology_snapshot -> 'PHOS' ->> 'result') < 1.8 as phos_lt_1_8
+  from hd_patient_statistics s
+  where s.rolling is null
+)
+select
+  hu.name,
+  stats.year,
+  stats.month,
+  count(*) as patient_count,
+  round(avg(stats.dialysis_minutes_shortfall)::decimal, 2) as avg_missed_hd_time,
+  round(avg(number_of_sessions_with_dialysis_minutes_shortfall_gt_5_pct),2) as pct_shortfall_gt_5_pct,
+  round(((count(*) filter(where missed_sessions_gt_10_pct = true))::float / count(*)::float * 100)::decimal, 2) as pct_missed_sessions_gt_10_pct,
+  round(((count(*) filter(where hgb_gt_100 = true))::float / count(*)::float * 100)::decimal, 2) as percentage_hgb_gt_100,
+  round(((count(*) filter(where hgb_gt_130 = true))::float / count(*)::float * 100)::decimal, 2) as percentage_hgb_gt_130,
+  round(((count(*) filter(where pth_lt_300 = true))::float / count(*)::float * 100)::decimal, 2) as percentage_pth_lt_300,
+  round(((count(*) filter(where urr_gt_64 = true))::float / count(*)::float * 100)::decimal, 2) as percentage_urr_gt_64,
+  round(((count(*) filter(where urr_gt_69 = true))::float / count(*)::float * 100)::decimal, 2) as percentage_urr_gt_69,
+  round(((count(*) filter(where phos_lt_1_8 = true))::float / count(*)::float * 100)::decimal, 2) as percentage_phosphate_lt_1_8,
+  'TBC' as percentage_access_fistula_or_graft
+  from stats
+inner join hospital_units hu on hu.id = stats.hospital_unit_id
+group by hu.name, stats.year, stats.month
+order by hu.name, stats.year asc, stats.month asc;

data/lib/renalware/configuration.rb

@@ -54,6 +54,10 @@ module Renalware
     end
     config_accessor(:ukrdc_sending_facility_name) { ENV["UKRDC_SENDING_FACILITY_NAME"] }
 
+    # We override this in some tests as a means of getting wicked_Pdf to generate an HTML version
+    # of the PDF so we can examine its content
+    config_accessor(:render_pdf_as_html_for_debugging) { false }
+
     # A host app can override this to add/remove/re-order the clinical summary display
     # Note these have to be strings - they mapped to constants in ClinicalSummaryPresenter.
     config_accessor(:page_layouts) {

data/lib/renalware/engine.rb

@@ -126,6 +126,7 @@ module Renalware
       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/table_pdf.css)
       app.config.assets.precompile += %w(
         renalware/nhs_a4_letter_logo_blue.png
         renalware/nhs_a4_letter_logo_black.png
@@ -140,6 +141,7 @@ module Renalware
         renalware/favicon/mstile-150x150.png
         renalware/favicon/safari-pinned-tab.svg
         renalware/clippy.svg
+        renalware/print-button-example.png
       )
       app.config.assets.paths <<
         Rails.root.join(config.root, "vendor", "assets", "javascripts", "renalware")

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.24"
+  VERSION = "2.0.25"
 end

data/spec/factories/admissions/consults.rb

@@ -5,5 +5,17 @@ FactoryBot.define do
     accountable
     patient { create(:patient, by: accountable_actor) }
     association :consult_site, factory: :admissions_consult_site
+    consult_type "x"
+    started_on { Time.zone.now - 2.days }
+    ended_on nil
+    description "Lorem ipsum dolor"
+
+    trait :active do
+      ended_on nil
+    end
+
+    trait :inactive do
+      ended_on { Time.zone.now - 1.day }
+    end
   end
 end

data/spec/support/capybara.rb

@@ -1,25 +1,20 @@
-# frozen_string_literal: true
+# # frozen_string_literal: true
 
-if defined?(Capybara)
-  # When this option is enabled, you can insert page.driver.debug into your tests
-  # to pause the test and launch a browser which gives you the WebKit inspector
-  # to view your test run with.
-  Capybara.register_driver :poltergeist_debug do |app|
-    Capybara::Poltergeist::Driver.new(
-      app,
-      inspector: "open",
-      debug: false
-    )
-  end
+Capybara.register_driver(:headless_chrome) do |app|
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+    chromeOptions: { args: %w(headless disable-gpu window-size=1366,1768) }
+  )
 
-  Capybara.register_driver :poltergeist do |app|
-    Capybara::Poltergeist::Driver.new(
-      app,
-      window_size: [1366, 1768],
-      js_errors: true
-    )
-  end
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :chrome,
+    desired_capabilities: capabilities
+  )
+end
 
-  # Capybara.javascript_driver = :poltergeist_debug
-  Capybara.javascript_driver = :poltergeist
+if RUBY_PLATFORM.match?(/darwin/)
+  Capybara::Screenshot.register_driver(:headless_chrome) do |driver, path|
+    driver.browser.save_screenshot(path)
+  end
 end
+Capybara.javascript_driver = :headless_chrome

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.24
+  version: 2.0.25
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -925,6 +925,7 @@ files:
 - app/assets/images/renalware/kidney.png
 - app/assets/images/renalware/nhs_a4_letter_logo_black.png
 - app/assets/images/renalware/nhs_a4_letter_logo_blue.png
+- app/assets/images/renalware/print-button-example.png
 - app/assets/javascripts/renalware/ajax_errors.js
 - app/assets/javascripts/renalware/application.js.erb
 - app/assets/javascripts/renalware/appointments.js
@@ -1028,6 +1029,7 @@ files:
 - app/assets/stylesheets/renalware/pdf.scss
 - app/assets/stylesheets/renalware/print/pathology_request_forms.scss
 - app/assets/stylesheets/renalware/protocol_pdf.scss
+- app/assets/stylesheets/renalware/table_pdf.scss
 - app/assets/stylesheets/renalware/watermark.scss
 - app/controllers/renalware/accesses/assessments_controller.rb
 - app/controllers/renalware/accesses/base_controller.rb
@@ -1975,10 +1977,13 @@ files:
 - app/views/renalware/admissions/admissions/index.html.slim
 - app/views/renalware/admissions/admissions/new.html.slim
 - app/views/renalware/admissions/consults/_filters.html.slim
+- app/views/renalware/admissions/consults/_filters.pdf.slim
 - app/views/renalware/admissions/consults/_form.html.slim
 - app/views/renalware/admissions/consults/_table.html.slim
+- app/views/renalware/admissions/consults/_table.pdf.slim
 - app/views/renalware/admissions/consults/edit.html.slim
 - app/views/renalware/admissions/consults/index.html.slim
+- app/views/renalware/admissions/consults/index.pdf.slim
 - app/views/renalware/admissions/consults/new.html.slim
 - app/views/renalware/admissions/patient_admissions/index.html.slim
 - app/views/renalware/admissions/requests/_create_request_link.html.slim
@@ -2547,9 +2552,12 @@ files:
 - app/views/renalware/problems/problems/show.html.slim
 - app/views/renalware/renal/aki_alerts/_aki_alert.html.slim
 - app/views/renalware/renal/aki_alerts/_filters.html.slim
+- app/views/renalware/renal/aki_alerts/_filters.pdf.slim
 - app/views/renalware/renal/aki_alerts/_table.html.slim
+- app/views/renalware/renal/aki_alerts/_table.pdf.slim
 - app/views/renalware/renal/aki_alerts/edit.html.slim
 - app/views/renalware/renal/aki_alerts/index.html.slim
+- app/views/renalware/renal/aki_alerts/index.pdf.slim
 - app/views/renalware/renal/prd_descriptions/search.json.jbuilder
 - app/views/renalware/renal/profiles/_form.html.slim
 - app/views/renalware/renal/profiles/_mini.html.slim
@@ -2587,6 +2595,7 @@ files:
 - app/views/renalware/shared/_last_update.html.slim
 - app/views/renalware/shared/_magellan_block.html.slim
 - app/views/renalware/shared/_modal_close_link.html.slim
+- app/views/renalware/shared/_please_print_using_print_button_warning.html.slim
 - app/views/renalware/shared/documents/_age.html.slim
 - app/views/renalware/shared/documents/_age_input.html.slim
 - app/views/renalware/shared/documents/_attributes_group.html.slim
@@ -3232,6 +3241,9 @@ files:
 - db/migrate/20180427133558_add_code_to_hospitals_wards.rb
 - db/migrate/20180502093256_add_document_to_virology_profiles.rb
 - db/migrate/20180502110638_create_virology_versions.rb
+- db/migrate/20180510151959_update_hd_overall_audit_to_version_7.rb
+- db/migrate/20180511100345_add_notes_to_transplant_registration_statuses.rb
+- db/migrate/20180511140415_add_message_hash_messaging_messages.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3335,6 +3347,7 @@ files:
 - db/views/reporting_hd_overall_audit_v04.sql
 - db/views/reporting_hd_overall_audit_v05.sql
 - db/views/reporting_hd_overall_audit_v06.sql
+- db/views/reporting_hd_overall_audit_v07.sql
 - db/views/reporting_main_authors_audit_v01.sql
 - db/views/reporting_main_authors_audit_v02.sql
 - db/views/reporting_pd_audit_v01.sql
@@ -3550,7 +3563,6 @@ files:
 - spec/support/matchers/validate_timeliness_of.rb
 - spec/support/pathology_spec_helper.rb
 - spec/support/patients_spec_helper.rb
-- spec/support/poltergeist.rb
 - spec/support/pundit_matcher.rb
 - spec/support/roles_spec_helper.rb
 - spec/support/select2_spec_helper.rb