renalware-core 2.0.0.pre.rc6 → 2.0.0.pre.rc7

data/app/presenters/renalware/transplants/mdm_presenter.rb

@@ -1,3 +1,5 @@
+require_dependency "renalware/transplants"
+
 module Renalware
   module Transplants
     class MDMPresenter < Renalware::MDMPresenter

data/app/presenters/renalware/transplants/patient_presenter.rb

@@ -1,3 +1,5 @@
+require_dependency "renalware/transplants"
+
 module Renalware
   module Transplants
     class PatientPresenter < SimpleDelegator

data/app/presenters/renalware/transplants/recipient_dashboard_presenter.rb

@@ -0,0 +1,39 @@
+require_dependency "renalware/transplants"
+require "attr_extras"
+
+module Renalware
+  module Transplants
+    class RecipientDashboardPresenter
+      attr_reader_initialize :patient
+
+      def recipient_workup
+        @recipient_workup ||= RecipientWorkup.for_patient(patient).first_or_initialize
+      end
+
+      def registration
+        @registration ||= begin
+          WaitListRegistrationPresenter.new(
+            Registration.for_patient(patient).first_or_initialize
+          )
+        end
+      end
+
+      def recipient_operations
+        @recipient_operations ||= RecipientOperation.for_patient(patient).reversed
+      end
+
+      def donations
+        @donations ||= Donation.for_recipient(patient).reversed
+      end
+
+      def investigations
+        @investigations ||= begin
+          Events::Investigation
+            .for_patient(patient)
+            .transplant_recipients
+            .ordered
+        end
+      end
+    end
+  end
+end

data/app/presenters/renalware/transplants/wait_list_registration_presenter.rb

@@ -1,3 +1,5 @@
+require_dependency "renalware/transplants"
+
 module Renalware
   module Transplants
     class WaitListRegistrationPresenter < SimpleDelegator

data/app/views/renalware/api/ukrdc/patients/_documents.xml.builder

@@ -3,27 +3,30 @@ xml = builder
 xml.Documents do
   patient.letters.each do |letter|
     xml.Document do
-      xml.DocumentTime letter.created_at.iso8601
-      xml.DocumentName letter.title
+      xml.DocumentTime letter.issued_on.to_time.iso8601
       xml.Clinician do
-        xml.Description
-      end
-      xml.Location do
-        xml.Code letter.hospital_unit_code
+        xml.CodingStandard "LOCAL"
+        xml.Code letter.author.username
+        xml.Description letter.author.to_s
       end
+      xml.DocumentName letter.title
       xml.Status do
         xml.Code "ACTIVE"
       end
       xml.EnteredBy do
+        xml.CodingStandard "LOCAL"
+        xml.Code letter.updated_by&.username
         xml.Description letter.updated_by
       end
       xml.EnteredAt do
+        xml.CodingStandard "ODS"
         xml.Code letter.hospital_unit_code
+        xml.Description ""
       end
-      xml.FileType do
-        xml.Code "application/pdf"
-      end
+      xml.FileType "application/pdf"
+      xml.FileName "tbc"
       xml.Stream Base64.encode64(Renalware::Letters::PdfRenderer.call(letter))
+      xml.DocumentURL
     end
   end
 end

data/app/views/renalware/api/ukrdc/patients/_sending_facility.xml.builder

@@ -1,7 +1,7 @@
 xml = builder
 
-xml.SendingFacility(
-  channelName: "Renalware",
-  time: Time.zone.now.to_datetime) do
-end
+xml.SendingFacility Renalware.config.ukrdc_sending_facility_name,
+                    channelName: "Renalware",
+                    time: Time.zone.now.to_datetime
+
 xml.SendingExtract "UKRDC"

data/app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder

@@ -20,7 +20,7 @@ xml.LabOrder do
   xml.OrderCategory do
     xml.Code request.description.code
   end
-  # xml.SpecimenCollectedTime "TODO"
+  xml.SpecimenCollectedTime request.requested_at.iso8601
   # xml.SpecimenReceivedTime "TODO"
   # xml.Priority do
   #   xml.Code "TODO: Probably n/a"

data/app/views/renalware/api/ukrdc/patients/lab_orders/_result_item.xml.builder

@@ -8,7 +8,7 @@ xml.ResultItem do
   xml.PrePost observation.pre_post(patient_is_on_hd: patient.current_modality_hd?)
   xml.ServiceId do
     xml.CodingStandard "LOCAL"
-    xml.Code observation.description_code
+    xml.Code(observation.description_loinc_code || observation.description_code)
     xml.Description observation.description_name
   end
   # xml.SubId

data/app/views/renalware/api/ukrdc/patients/show.xml.builder

@@ -5,11 +5,7 @@ xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
 
 namespace_and_schema = {
   "xmlns:ukrdc" => "http://www.rixg.org.uk/",
-  "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
-  "xsi:schemaLocation" => [
-    "http://www.rixg.org.uk/",
-    "https://github.com/renalreg/ukrdc/blob/master/Schema/UKRDC.xsd"
-  ].join(" ")
+  "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance"
 }
 
 # Start of <ukrdc:Patient>

data/app/views/renalware/events/events/_event.html.slim

@@ -1,7 +1,13 @@
 tr
-  td= link_to("Toggle",
+  td
+    = link_to("Toggle",
               "##{toggle_prefix}-quick-preview-#{event.id}",
               data: { behaviour: "toggler" })
+
+    - if local_assigns[:edit_proc]
+      = pipe_separator
+      = link_to("Edit", edit_proc.call(event))
+
   td.nowrap= l event.created_at.to_date
   - unless local_assigns.fetch(:exclude_type_column, false)
     td= event.event_type

data/app/views/renalware/events/events/_table.html.slim

@@ -1,6 +1,6 @@
 - toggle_prefix ||= "event"
 
-table.has-togglable-rows
+table.has-togglable-rows.events-table
   thead
     tr
       th.col-width-tiny
@@ -14,4 +14,5 @@ table.has-togglable-rows
     = render partial: "renalware/events/events/event",
              collection: events,
              locals: { exclude_type_column: local_assigns[:exclude_type_column],
+                       edit_proc: local_assigns[:edit_proc],
                        toggle_prefix: toggle_prefix }

data/app/views/renalware/events/events/cell/_investigation.html.slim

@@ -0,0 +1,9 @@
+- document = event.document
+
+| Type:
+| 
+= document.type&.text || t("unspecified")
+|   
+| Result:
+| 
+= document.result

data/app/views/renalware/events/events/inputs/_investigation.html.slim

@@ -0,0 +1,4 @@
+= f.simple_fields_for :document, event.document do |fd|
+  = fd.input :modality, as: :inline_radio_buttons, wrapper: :horizontal_medium
+  = fd.input :type, wrapper: :horizontal_medium
+  = fd.input :result, wrapper: :horizontal_medium

data/app/views/renalware/events/events/toggled_cell/_investigation.html.slim

@@ -0,0 +1,11 @@
+- document = event.document
+
+dl.dl-horizontal
+  dt= attr_name(document, :modality, suffix: ":")
+  dd= document.modality&.text || t("unspecified")
+  dt= attr_name(document, :type, suffix: ":")
+  dd= document.type&.text || t("unspecified")
+  dt= attr_name(document, :result, suffix: ":")
+  dd= document.result || t("unspecified")
+  dt= attr_name(event, :notes, suffix: ":")
+  dd= event.notes&.html_safe || t("unspecified")

data/app/views/renalware/events/investigations/_list.html.slim

@@ -0,0 +1,12 @@
+- toggle_prefix ||= "investigation"
+
+article.investigations
+  header
+    h2= t(".title")
+    = link_to t(".add"),
+              new_patient_investigation_path(patient),
+              class: "button right"
+  = render "renalware/events/events/table",
+           events: investigations,
+           edit_proc: ->(investigation) { edit_patient_investigation_path(patient, investigation) },
+           exclude_type_column: true

data/app/views/renalware/events/investigations/edit.html.slim

@@ -0,0 +1,13 @@
+= within_patient_layout(title: "Investigations / Edit") do
+
+  = simple_form_for event,
+      url: patient_investigation_path(patient, event),
+      as: :events_event,
+      html: { autocomplete: "off" },
+      wrapper: "horizontal_form" do |f|
+
+    = render "renalware/events/events/form",
+             event: event,
+             patient: patient,
+             event_types: event_types,
+             f: f

data/app/views/renalware/transplants/donor_dashboards/show.html.slim

@@ -8,38 +8,45 @@
 
   ul.f-dropdown#donor-options(data-dropdown-content aria-hidden="true")
     li
-      - if donations.empty?
+      - if dashboard.donations.empty?
         = link_to t(".add_donation"),
-                  new_patient_transplants_donation_path(patient)
+                  new_patient_transplants_donation_path(dashboard.patient)
       - else
         = link_to "Donor (identify a new recipient)",
-                  new_patient_transplants_donation_path(patient)
+                  new_patient_transplants_donation_path(dashboard.patient)
 
-    li(class="#{'disabled' unless donor_workup.new_record?}")
-       = link_to_if donor_workup.new_record?,
+    li(class="#{'disabled' unless dashboard.donor_workup.new_record?}")
+       = link_to_if dashboard.donor_workup.new_record?,
                    t(".add_workup"),
-                   edit_patient_transplants_donor_workup_path(patient)
+                   edit_patient_transplants_donor_workup_path(dashboard.patient)
 
     li= link_to t(".add_status_update"),
-                new_patient_transplants_donor_stage_path(patient)
+                new_patient_transplants_donor_stage_path(dashboard.patient)
 
     li= link_to t(".add_operation"),
-                new_patient_transplants_donor_operation_path(patient)
+                new_patient_transplants_donor_operation_path(dashboard.patient)
+
+    li= link_to t(".add_investigation"),
+                new_patient_investigation_path(dashboard.patient)
 
 = within_patient_layout(title: "Transplant Donor Summary") do
-  - unless donations.empty?
+  - unless dashboard.donations.empty?
     = render "renalware/transplants/donations/list",
-             donations: donations,
-             patient: patient
-  - unless donor_workup.new_record?
+             donations: dashboard.donations,
+             patient: dashboard.patient
+  - unless dashboard.donor_workup.new_record?
     = render "renalware/transplants/donor_workups/summary",
-             donor_workup: donor_workup,
-             patient: patient
-  - unless donor_stages.empty?
+             donor_workup: dashboard.donor_workup,
+             patient: dashboard.patient
+  - unless dashboard.donor_stages.empty?
     = render "renalware/transplants/donor_stages/list",
-             donor_stages: donor_stages,
-             patient: patient
-  - unless donor_operations.empty?
+             donor_stages: dashboard.donor_stages,
+             patient: dashboard.patient
+  - unless dashboard.donor_operations.empty?
     = render "renalware/transplants/donor_operations/list",
-             donor_operations: donor_operations,
-             patient: patient
+             donor_operations: dashboard.donor_operations,
+             patient: dashboard.patient
+  - if dashboard.investigations.any?
+    = render "renalware/events/investigations/list",
+             patient: dashboard.patient,
+             investigations: dashboard.investigations

data/app/views/renalware/transplants/recipient_dashboards/_page_actions.html.slim

@@ -23,5 +23,9 @@ ul.f-dropdown#tx-recip-options(data-dropdown-content aria-hidden="true")
                       title: t(".add_recipient_operation"),
                       url: new_patient_transplants_recipient_operation_path(patient)
 
+  = dropdown_btn_item enabled: true,
+                      title: t(".add_investigation"),
+                      url: new_patient_investigation_path(patient)
+
 - unless patient.has_ever_been_a_recipient?
   = render "modality_missing_warning", message: t(".missing_modality_warning")

data/app/views/renalware/transplants/recipient_dashboards/show.html.slim

@@ -1,31 +1,36 @@
 = content_for(:actions) do
   = render "page_actions",
-           patient: patient,
-           recipient_workup: recipient_workup,
-           registration: registration
+           patient: dashboard.patient,
+           recipient_workup: dashboard.recipient_workup,
+           registration: dashboard.registration
 
 = within_patient_layout(title: "Transplant Recipient Summary") do
 
-  - unless recipient_workup.new_record?
+  - unless dashboard.recipient_workup.new_record?
     = render "renalware/transplants/recipient_workups/summary",
-              patient: patient,
-              recipient_workup: recipient_workup
+              patient: dashboard.patient,
+              recipient_workup: dashboard.recipient_workup
 
-  - unless registration.new_record?
+  - unless dashboard.registration.new_record?
     = render "renalware/transplants/registrations/summary",
-             patient: patient,
-             registration: registration
+             patient: dashboard.patient,
+             registration: dashboard.registration
 
-  - unless registration.new_record?
+  - unless dashboard.registration.new_record?
     = render "renalware/transplants/registration_statuses/list",
-             patient: patient,
-             registration: registration
+             patient: dashboard.patient,
+             registration: dashboard.registration
 
-  - if donations.any?
+  - if dashboard.donations.any?
     = render "renalware/transplants/donations/recipient_list",
-             donations: donations
+             donations: dashboard.donations
 
-  - if recipient_operations.any?
+  - if dashboard.recipient_operations.any?
     = render "renalware/transplants/recipient_operations/list",
-             patient: patient,
-             recipient_operations: recipient_operations
+             patient: dashboard.patient,
+             recipient_operations: dashboard.recipient_operations
+
+  - if dashboard.investigations.any?
+    = render "renalware/events/investigations/list",
+             patient: dashboard.patient,
+             investigations: dashboard.investigations

data/config/locales/renalware/events/investigation.en.yml

@@ -0,0 +1,58 @@
+en:
+  renalware:
+    events:
+      investigations:
+        list:
+          title: Investigations
+          add: Add
+          date_time: Date taken
+          type: Type
+          result: Result
+          notes: Notes
+  activemodel:
+    attributes:
+      renalware/events/investigation/document:
+        result1: "Rejection"
+        result2: "IFTA"
+  enumerize:
+    renalware/events/investigation/document:
+      type:
+        blood_group: "Blood Group"
+        cardiac_24_hour_abpm: "Cardiac - 24 hour ABPM"
+        cardiac_24_hour_ecg: "Cardiac - 24 hr ECG"
+        cardiac_coronary_angio: "Cardiac - Coronary Angio"
+        cardiac_cpet: "Cardiac - CPET"
+        cardiac_ecg: "Cardiac - ECG"
+        cardiac_echo: "Cardiac - Echo"
+        cardiac_exercise_ecg: "Cardiac - Exercise ECG"
+        cardiac_myoview_scan: "Cardiac - Myoview Scan"
+        cardiac_stress_echo: "Cardiac - Stress Echo"
+        cervical_smear: "Cervical Smear"
+        colonoscopy: "Colonoscopy"
+        gastroscopy: "Gastroscopy"
+        bowel_screening: "Bowel Screening"
+        cystoscopy: "Cystoscopy"
+        urodynamics: "Urodynamics"
+        24_hr_urinary_stone_screen: "24 hr Urinary Stone Screen"
+        dental_check: "Dental Check"
+        psa: "PSA"
+        isotopic_gfr: "Isotopic GFR"
+        lung_function_tests: "Lung Function Tests"
+        imaging_bone Scan: "Imaging - Bone Scan"
+        imaging_ct_abdomen: "Imaging - CT Abdomen"
+        imaging_ct_chest: "Imaging - CT Chest"
+        imaging_ct_pulm_angio: "Imaging - CT Pulm Angio"
+        imaging_ct_renal_angio: "Imaging - CT Renal Angio"
+        imaging_cxr: "Imaging - CXR"
+        imaging_doppler_carotids: "Imaging - Doppler Carotids"
+        imaging_doppler_legs: "Imaging - Doppler Legs"
+        imaging_liver_us: "Imaging - Liver US"
+        imaging_mammography: "Imaging - Mammography"
+        imaging_post_mict_bladder_us: "Imaging - Post mict bladder US"
+        imaging_renal_us: "Imaging - Renal US"
+        imaging_static_dmsa: "Imaging - Static DMSA"
+        imaging_mag3_scan: "Imaging - MAG3 Scan"
+        opinion_cardiology: "Opinion - Cardiology"
+        opinion_haematology: "Opinion - Haematology"
+        opinion_specialist: "Opinion - Specialist"
+        other: "Other"

data/config/locales/renalware/transplants/donor_dashboard.en.yml

@@ -7,3 +7,4 @@ en:
           add_workup: Donor Workup
           add_operation: Donor Transplant Operation
           add_status_update: Update Donor Stage
+          add_investigation: Add Investigation

data/config/locales/renalware/transplants/recipient_dashboards.en.yml

@@ -7,5 +7,6 @@ en:
           add_recipient_workup: Recipient Workup
           add_waitlist_registration: Wait List Registration
           add_recipient_operation: Recipient Operation
+          add_investigation: Add Investigation
           missing_modality_warning: >
             Some actions will be unavailable until you add the Transplant modality