renalware-core 2.0.111 → 2.0.112

data/app/views/renalware/pathology/recent_observation_results/_table.html.slim

@@ -22,7 +22,7 @@ table#observations.column_hover
         th(title=desc.name)= code
         - table.rows.each do |row|
           - if row.comment_for(code).present?
-            td(class=code.downcase data-balloon=row.comment_for(code) data-balloon-pos="up")
+            td(class=code.downcase aria-label=row.comment_for(code) data-balloon-pos="up")
               .triangle-top-right
               = row.result_for(code)
           - else

data/app/views/renalware/pathology/requests/requests/create.pdf.slim

@@ -1,4 +1,5 @@
-= render partial: "renalware/pathology/requests/requests/pdf_header.html.slim"
+= content_for(:head2) do
+  = wicked_pdf_stylesheet_link_tag "renalware/print/pathology_request_forms.css"
 
 = render partial: "renalware/pathology/requests/requests/request_form/#{request_html_form_params.template}",
          locals: { requests: requests }

data/app/views/renalware/pathology/requests/requests/new.html.slim

@@ -1,19 +1,24 @@
-doctype html
-html lang="en"
-  head
-    meta charset="utf-8"
+/ doctype html
+/ html lang="en"
+/   head
+/     meta charset="utf-8"
 
-    title= content_for?(:title) ? yield(:title) : "Renalware v#{Renalware::VERSION}"
+/     title= content_for?(:title) ? yield(:title) : "Renalware v#{Renalware::VERSION}"
 
-    = stylesheet_link_tag "renalware/application", media: :all
-    = stylesheet_link_tag "renalware/print/pathology_request_forms", media: :all
-    = javascript_include_tag "renalware/modernizr"
+/     = stylesheet_link_tag "renalware/application", media: :all
+/     = stylesheet_link_tag "renalware/print/pathology_request_forms", media: :all
+/     = javascript_include_tag "renalware/modernizr"
 
-    = csrf_meta_tag
+/     = csrf_meta_tag
 
-  body.overflow
-    .row
-      h4 Pathology Request CRS Form Preview
+
+/  body.overflow
+
+= content_for(:css) do
+  = stylesheet_link_tag "renalware/print/pathology_request_forms", media: :all
+= within_admin_layout(title: "Pathology Request CRS Form Preview") do
+    / .row
+    /   h4 Pathology Request CRS Form Preview
 
     .row
       .large-4.columns
@@ -55,4 +60,4 @@ html lang="en"
     = render partial: "renalware/pathology/requests/requests/request_form/#{request_html_form_params.template}",
              locals: { requests: requests, format: :html }
 
-    = javascript_include_tag "renalware/application"
+    /= javascript_include_tag "renalware/application"

data/app/views/renalware/pathology/requests/requests/request_form/_crs.pdf.slim

@@ -3,3 +3,4 @@
     .alwaysbreak
       = render partial: "renalware/pathology/requests/requests/request_form/crs_form.html.slim",
         locals: { request_form: request_form }
+    /.page-break

data/app/views/renalware/pathology/requests/requests/request_form/_crs_form.html.slim

@@ -1,49 +1,50 @@
-.row data-role="form_summary" data-patient-id="#{request_form.patient.id}"
-  h4 Pathology Request Listing
+.path-request-form
+  .row data-role="form_summary" data-patient-id="#{request_form.patient.id}"
+    h3 Pathology Request Listing
 
-  table.with_border
-    tr
-      td.header_cell Patient Name:
-      td data-role="patient_name" = request_form.patient_name
-      td.header_cell Date:
-      td data-role="date"  = request_form.date
-    tr
-      td.header_cell DOB:
-      td data-role="date_of_birth" = request_form.date_of_birth
-      td.header_cell Consultant:
-      td data-role="consultant" = request_form.consultant
-    tr
-      td.header_cell Clinical Detail:
-      td data-role="clinical_detail" = request_form.clinical_detail
-      td.header_cell Contact:
-      td data-role="contact" = request_form.contact
-    tr
-      td.header_cell
-      td
-      td.header_cell Bleep/Tel No:
-      td data-role="telephone" = request_form.telephone
+    table.with_border
+      tr
+        td.header_cell Patient Name:
+        td data-role="patient_name" = request_form.patient_name
+        td.header_cell Date:
+        td data-role="date"  = request_form.date
+      tr
+        td.header_cell DOB:
+        td data-role="date_of_birth" = request_form.date_of_birth
+        td.header_cell Consultant:
+        td data-role="consultant" = request_form.consultant
+      tr
+        td.header_cell Clinical Detail:
+        td data-role="clinical_detail" = request_form.clinical_detail
+        td.header_cell Contact:
+        td data-role="contact" = request_form.contact
+      tr
+        td.header_cell
+        td
+        td.header_cell Bleep/Tel No:
+        td data-role="telephone" = request_form.telephone
 
-.row.full_height data-role="form_pathology" data-patient-id="#{request_form.patient.id}"
-  .border_box_half.columns.full_height
-    - if request_form.has_global_requests?
-      - request_form.global_requests_by_lab_and_bottle_type.each do |(lab_name, bottle_type), request_descriptions|
+  .row.full_height data-role="form_pathology" data-patient-id="#{request_form.patient.id}"
+    .border_box_half.columns.full_height.global_requests
+      - if request_form.has_global_requests?
+        - request_form.global_requests_by_lab_and_bottle_type.each do |(lab_name, bottle_type), request_descriptions|
+          p
+            | ==== #{lab_name} (#{bottle_type}) ====
+          - request_descriptions.each do |request_description|
+            p = request_description.name.downcase.titleize
+      - else
+        p No tests required.
+    .border_box_half.columns.patient_requests
+      - if request_form.high_risk
         p
-          | ==== #{lab_name} (#{bottle_type}) ====
-        - request_descriptions.each do |request_description|
-          p = request_description.name.downcase.titleize
-    - else
-      p No tests required.
-  .border_box_half.columns
-    - if request_form.high_risk
-      p
-        h3 HIGH RISK
+          h3 HIGH RISK
 
-    b Patient Specific Tests:
-    - if request_form.has_patient_requests?
-      - request_form.patient_requests_by_lab.each do |lab_name, patient_rules|
-        p
-          | ======== #{lab_name} ========
-        - patient_rules.each do |patient_rule|
-          = patient_rule
-    - else
-      p No tests required.
+      b Patient Specific Tests:
+      - if request_form.has_patient_requests?
+        - request_form.patient_requests_by_lab.each do |lab_name, patient_rules|
+          p
+            | ======== #{lab_name} ========
+          - patient_rules.each do |patient_rule|
+            = patient_rule
+      - else
+        p No tests required.

data/app/views/renalware/pathology/requests/requests/request_form/_manual_form_global.html.slim

@@ -1,9 +1,10 @@
-= render partial: "renalware/pathology/requests/requests/request_form/manual_header.html.slim",
-    locals: { request_form: request_form }
+.path-request-form
+  = render partial: "renalware/pathology/requests/requests/request_form/manual_header.html.slim",
+      locals: { request_form: request_form }
 
-.row
-  p
-    |
-    b #{lab_name} (#{bottle_type})
-  - request_descriptions.each do |request_description|
-    p = request_description.name.downcase.titleize
+  .row
+    p
+      |
+      b #{lab_name} (#{bottle_type})
+    - request_descriptions.each do |request_description|
+      p = request_description.name.downcase.titleize

data/app/views/renalware/pathology/requests/requests/request_form/_manual_form_patient.html.slim

@@ -1,9 +1,10 @@
-= render partial: "renalware/pathology/requests/requests/request_form/manual_header.html.slim",
-    locals: { request_form: request_form }
+.path-request-form
+  = render partial: "renalware/pathology/requests/requests/request_form/manual_header.html.slim",
+      locals: { request_form: request_form }
 
-.row
-  p
-    |
-    b #{lab_name}
-  - patient_rules.each do |patient_rule|
-    p = patient_rule
+  .row
+    p
+      |
+      b #{lab_name}
+    - patient_rules.each do |patient_rule|
+      p = patient_rule

data/app/views/renalware/pathology/requests/requests/show.pdf.slim

@@ -1,4 +1,5 @@
-= render partial: "renalware/pathology/requests/requests/pdf_header.html.slim"
+= content_for(:head2) do
+  = wicked_pdf_stylesheet_link_tag "renalware/print/pathology_request_forms.css"
 
 = render partial: "renalware/pathology/requests/requests/request_form/#{request.template}",
   locals: { requests: [request] }

data/app/views/renalware/patients/side_menu/_general.html.slim

@@ -61,3 +61,7 @@ li.heading= t(".heading")
 = patient_menu_item title: t(".inpatient_admissions", count: summary.admissions_count),
                     path: patient_admissions_path(patient),
                     active_when_controller_matches: %r{renalware/admissions}
+
+= patient_menu_item title: t(".proms"),
+                    path: patient_surveys_dashboard_path(patient),
+                    active_when_controller_matches: %r{renalware/surveys}

data/app/views/renalware/surveys/_eq5d_summary_part.html.slim

@@ -0,0 +1,26 @@
+.summary-part--eq5d
+  article
+    header
+      h2 EQ5D
+
+  / b Example WIP for charting one question over time
+  / = line_chart(eq5d_summary_part.data_for_question_code(1), curve: false)
+  / br
+  / br
+  / br
+
+  - return if eq5d_summary_part.rows.blank?
+
+  .xsss
+    table
+      thead
+        tr
+          th Date
+          - eq5d_summary_part.question_labels.each do |code, label|
+            th= label
+      tbody
+        - eq5d_summary_part.rows.each do |row|
+          tr
+            td= row.answered_on
+            - eq5d_summary_part.question_labels.each do |code, label|
+              td= row.send(code.to_sym)

data/app/views/renalware/surveys/_pos_s_summary_part.html.slim

@@ -0,0 +1,26 @@
+.summary-part--pos_s
+  article
+    header
+      h2 POS-S
+
+  / b Example WIP for charting one question over time
+  / = line_chart(eq5d_summary_part.data_for_question_code(1), curve: false)
+  / br
+  / br
+  / br
+
+  - return if pos_s_summary_part.rows.blank?
+
+  .xsss
+    table
+      thead
+        tr
+          th Date
+          - pos_s_summary_part.question_labels.each do |code, label|
+            th= label
+      tbody
+        - pos_s_summary_part.rows.each do |row|
+          tr
+            td= row.answered_on
+            - pos_s_summary_part.question_labels.each do |code, label|
+              td= row.send(code.to_sym)

data/app/views/renalware/surveys/dashboards/show.html.slim

@@ -0,0 +1,32 @@
+= within_patient_layout(title: "PROMS") do
+
+  = render Renalware::Surveys::EQ5DSummaryPart.new(patient, current_user)
+  = render Renalware::Surveys::POSSSummaryPart.new(patient, current_user)
+
+  / .summary-part--eq5d
+  /   article
+  /     header
+  /       h2 EQ5D
+
+
+  /   / b Example WIP for charting one question over time
+  /   / = line_chart(eq5d_summary_part.data_for_question_code(1), curve: false)
+  /   / br
+  /   / br
+  /   / br
+
+  /   / - return if eq5d_summary_part.rows.blank?
+
+  /   .xsss
+  /     table
+  /       thead
+  /         tr
+  /           th Date
+  /           - eq5d_responses.question_labels.each do |code, label|
+  /             th= label
+  /       tbody
+  /         - eq5d_responses.rows.each do |row|
+  /           tr
+  /             td= row.answered_on
+  /             - eq5d_summary_part.question_labels.each do |code, label|
+  /               td= row.send(code.to_sym)

data/config/initializers/chartkick.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Chartkick.options = {
+#   height: "400px",
+#   colors: ["pink", "#999"]
+# }

data/config/initializers/core_extensions.rb

@@ -11,8 +11,8 @@ require "core_extensions/hash"
 require "core_extensions/active_record/migration_helpers"
 
 I18n.extend CoreExtensions::I18n::HandleBlankValue
-I18n::Backend::Simple.send(:include, I18n::Backend::Cascade)
+I18n::Backend::Simple.include(I18n::Backend::Cascade)
 I18n.extend CoreExtensions::I18n::AlwaysCascade
-ActiveRecord::Base.send(:include, CoreExtensions::ActiveRecord::Sort)
-Date.include CoreExtensions::Date::Constants
-Hash.send(:include, CoreExtensions::Hash::OpenStructConversion)
+ActiveRecord::Base.include(CoreExtensions::ActiveRecord::Sort)
+Date.include(CoreExtensions::Date::Constants)
+Hash.include(CoreExtensions::Hash::OpenStructConversion)

data/config/initializers/inflections.rb

@@ -43,6 +43,9 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "TRUD"
   inflect.acronym "UKRDC"
   inflect.acronym "XHR"
+  inflect.acronym "EQ5D"
+  inflect.acronym "EQ5D5L"
+  inflect.acronym "POS"
   inflect.irregular "feedback", "feedback"
   inflect.acronym "NHS"
   inflect.uncountable %w(cache)

data/config/locales/renalware/patients/side_menu.en.yml

@@ -26,6 +26,7 @@ en:
           demographics: Demographics
           clinical_summary: Clinical Summary
           inpatient_admissions: Inpatient Admissions (%{count})
+          proms: PROMS
         modalities:
           heading: Modalities
           pd: PD

data/config/routes/hd.rb

@@ -6,7 +6,6 @@ resources :patients, only: [] do
     resource :dashboard, only: :show
     resource :protocol,
              only: :show,
-             constraints: { format: /(pdf)/ },
              defaults: { format: :pdf }
     resource :preference_set, only: [:edit, :update]
     resource :current_profile,
@@ -51,4 +50,9 @@ namespace :hd do
         to: "diary_slots#show",
         as: :refresh_slot
   end
+  namespace :session_forms do
+    resources :batches, only: [:create, :show] do
+      get :status, constraints: { format: :json }, defaults: { format: :json }
+    end
+  end
 end

data/config/routes/patients.rb

@@ -37,4 +37,8 @@ resources :patients, except: [:destroy], controller: "patients/patients" do
     post :sort, on: :collection
     resources :notes, only: [:index, :new, :create], controller: "problems/notes"
   end
+
+  namespace :surveys do
+    resource :dashboard, only: :show
+  end
 end

data/db/migrate/20190927124840_create_hd_session_form_batches.rb

@@ -0,0 +1,16 @@
+class CreateHDSessionFormBatches < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :hd_session_form_batches do |t|
+        t.integer :status, null: false, default: 0, index: true
+        t.jsonb :query_params, default: {}, null: false
+        t.references :created_by, foreign_key: { to_table: :users }, index: true, null: false
+        t.references :updated_by, foreign_key: { to_table: :users }, index: true, null: false
+        t.string :filepath
+        t.string :last_error
+        t.integer :batch_items_count
+        t.timestamps null: false
+      end
+    end
+  end
+end

data/db/migrate/20190927130911_create_hd_session_form_batch_items.rb

@@ -0,0 +1,17 @@
+# rubocop:disable Rails/CreateTableWithTimestamps
+class CreateHDSessionFormBatchItems < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :hd_session_form_batch_items do |t|
+        t.references :batch, foreign_key: { to_table: :hd_session_form_batches }, null: false, index: false
+        # As a precurosr to combining letter batches and session form batches into one table
+        # eg print_batches, use a generic reference here to something printable, rather than a
+        # t.references :patient etc
+        t.integer :printable_id, null: false, index: false
+        t.integer(:status, default: 0, null: false, limit: 2, index: true) # smallint
+      end
+      add_index :hd_session_form_batch_items, [:batch_id, :printable_id], unique: true
+    end
+  end
+end
+# rubocop:enable Rails/CreateTableWithTimestamps

data/db/migrate/20191008010839_create_surveys.rb

@@ -0,0 +1,70 @@
+class CreateSurveys < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :survey_surveys do |t|
+        t.string :name, null: false
+        t.string :code, null: false
+        t.string :description
+        t.datetime :deleted_at, index: true
+        t.timestamps null: false
+      end
+
+      # name must be unique among non-deleted surveys
+      add_index(
+        :survey_surveys,
+        :name,
+        unique: true,
+        where: "deleted_at is NULL"
+      )
+
+      # code must be unique among non-deleted surveys
+      add_index(
+        :survey_surveys,
+        :code,
+        unique: true,
+        where: "deleted_at is NULL"
+      )
+
+      create_table :survey_questions do |t|
+        t.references(
+          :survey,
+          foreign_key: { to_table: :survey_surveys },
+          index: true,
+          null: false
+        )
+        t.string :code, null: false
+        t.string :label
+        t.integer :position, null: false, default: 0, index: true
+        t.datetime :deleted_at, index: true
+        t.timestamps null: false
+      end
+
+      # Prevent a unique index on code within any survey, but exclusing deleted questions.
+      add_index(
+        :survey_questions,
+        [:code, :survey_id],
+        unique: true,
+        where: "deleted_at is NULL"
+      )
+
+      create_table :survey_responses do |t|
+        t.date :answered_on, null: false, index: true
+        t.references(:patient, null: false)
+        t.references(
+          :question,
+          foreign_key: { to_table: :survey_questions },
+          null: false
+        )
+        t.string :value
+        t.string :reference # for future use - possibly to tie responses together?
+        t.timestamps null: false
+      end
+
+      add_index(
+        :survey_responses,
+        [:answered_on, :patient_id, :question_id],
+        name: :survey_responses_compound_index
+      )
+    end
+  end
+end