renalware-core 2.0.0.pre.rc9 → 2.0.0.pre.rc10

data/app/views/renalware/letters/letters/index.html.slim

@@ -1,6 +1,6 @@
 = content_for(:actions) do
-  - if @patient.present?
-    = render "create_letter_button_dropdown", patient: @patient
+  - if patient.present?
+    = render "create_letter_button_dropdown", patient: patient
 
 = within_patient_layout(title: "Letters") do
-  = render "table", letters: letters
+  = render "table", letters: letters, patient: patient

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

@@ -3,7 +3,7 @@ table#patients.mdm-patients.columns
   thead
     tr
       th.col-width-large= sort_link(path, :family_name, t(".name"))
-      th.col-width-nhs-no= sort_link(path, :nhs_number, t(".hosp_no"))
+      th.col-width-nhs-no= sort_link(path, :nhs_number, t(".nhs_no"))
       th.col-width-reference-no= t(".hosp_no")
       th.col-width-tiny= t(".sex")
       th.col-width-tiny= t(".age")

data/app/views/renalware/medications/_summary_part.html.slim

@@ -0,0 +1,18 @@
+.columns.large-6
+  #current-prescriptions
+    article
+      header
+        h2
+          = link_to "Current Prescriptions (#{summary_part.current_prescriptions.length})",
+                    patient_prescriptions_path(summary_part.patient)
+
+        = link_to patient_prescriptions_path(summary_part.patient), class: "button" do
+          | Add
+
+      ul.no-bullet
+        - summary_part.current_prescriptions.each do |prescription|
+          li class="drug-#{drug_types_colour_tag(prescription.drug_types)}"
+            = "#{prescription.drug.name}, "
+            = "#{prescription.dose}, "
+            = "#{prescription.medication_route.code} #{prescription.frequency} - "
+            = l(prescription.prescribed_on)

data/app/views/renalware/patients/clinical_summaries/show.html.slim

@@ -1,35 +1,9 @@
 = within_patient_layout(title: "Clinical Summary") do
-  .row
-    .columns.large-6
-      #current-problems
-        = render "problems",
-                 problems: clinical_summary.current_problems,
-                 patient: patient
-
-    .columns.large-6
-      #current-prescriptions
-        = render "prescriptions",
-                 prescriptions: clinical_summary.current_prescriptions,
-                 patient: patient
 
   .row
-    .columns.large-12.xlarge-6
-      #letters
-        = render "letters",
-                 letters: clinical_summary.letters,
-                 letters_count: clinical_summary.letters_count,
-                 patient: patient
-
-    .columns.large-12.xlarge-6
-      #events
-        = render "events",
-                  events: clinical_summary.current_events,
-                  current_events_count: clinical_summary.current_events_count,
-                  patient: patient
-
-    .columns.large-12.xlarge-6
-      #admissions
-        = render "admissions",
-                 admissions: clinical_summary.admissions,
-                 admissions_count: clinical_summary.admissions_count,
-                 patient: patient
+    - patient = clinical_summary.patient
+    - summary_parts = clinical_summary.summary_parts.map{ |klass| klass.new(patient) }
+    / Cache each SummaryPart if it defined #cache_key
+    - summary_parts.select(&:render?).each do |summary_part|
+      - cache_if summary_part.cache?, summary_part do
+        = render summary_part

data/app/views/renalware/patients/patients/_form.html.slim

@@ -117,3 +117,16 @@
                              as: :text,
                              wrapper: :horizontal_large,
                              input_html: { rows: 3 }
+.columns.large-12
+  = field_set_tag do
+    legend Psychosocial
+
+    = f.simple_fields_for :document, patient.document do |patient_doc|
+      = patient_doc.simple_fields_for :psychosocial, patient.document.psychosocial do |psychosocial|
+        = psychosocial.input :housing, wrapper: :horizontal_medium
+        = psychosocial.input :social_network, wrapper: :horizontal_medium
+        = psychosocial.input :care_package, wrapper: :horizontal_medium
+        = psychosocial.input :other, as: :text,
+                             wrapper: :horizontal_large,
+                             input_html: { rows: 3 }
+        = psychosocial.input :updated_at, as: :date_picker, wrapper: :horizontal_datepicker

data/app/views/renalware/patients/patients/show.html.slim

@@ -24,3 +24,5 @@
           = render "renalware/patients/patients/show/contact_details", patient: patient
         .columns.medium-6.large-4.xlarge-3
           = render "renalware/patients/patients/show/referral", patient: patient
+        .columns.medium-6.large-4.xlarge-3
+          = render "renalware/patients/patients/show/psychosocial", patient: patient

data/app/views/renalware/patients/patients/show/_psychosocial.html.slim

@@ -0,0 +1,15 @@
+- psychosocial = patient.document.psychosocial
+article
+  header
+    h2 Psychosocial
+  dl.dl-horizontal
+    dt Housing:
+    dd= psychosocial.housing
+    dt Social Network:
+    dd= psychosocial.social_network
+    dt Care Package
+    dd= psychosocial.care_package
+    dt Other
+    dd= psychosocial.other
+    dt Updated at
+    dd= l(psychosocial.updated_at)

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

@@ -34,6 +34,10 @@ li.heading= t(".heading")
                     path: patient_pathology_historical_observations_path(patient),
                     active_when_controller_matches: %r{renalware/pathology}
 
+= patient_menu_item title: t(".virology", count: 0),
+                    path: patient_virology_dashboard_path(patient),
+                    active_when_controller_matches: %r{renalware/virology}
+
 = patient_menu_item title: t(".prescriptions", count: summary.prescriptions_count),
                     path: patient_prescriptions_path(patient),
                     active_when_controller_matches: %r{renalware/medications}

data/app/views/renalware/problems/problems/_summary_part.html.slim

@@ -0,0 +1,16 @@
+.columns.large-6
+  #current-problems
+    article
+      header
+        h2
+          = link_to "Problems (#{summary_part.current_problems.length})",
+                    patient_problems_path(summary_part.patient)
+
+        = link_to patient_problems_path(summary_part.patient), class: "button" do
+          | Add
+
+      ul.no-bullet
+        - summary_part.current_problems.each do |problem|
+          li
+            = problem.full_description
+            = " - #{l(problem.created_at.to_date)}"

data/app/views/renalware/virology/dashboards/_actions.html.slim

@@ -0,0 +1,10 @@
+a.button.dropdown(href="#"
+                  data-dropdown="virology-options"
+                  aria-controls="virology-options"
+                  aria-expanded="false")
+  | Add...
+br
+
+ul.f-dropdown#virology-options(data-dropdown-content aria-hidden="true")
+  = dropdown_btn_item title: t(".add_vaccination"),
+                      url: new_patient_virology_vaccination_path(patient)

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

@@ -0,0 +1,6 @@
+= content_for(:actions) do
+  = render "actions", patient: patient
+
+= within_patient_layout(title: "Virology") do
+
+  = render "renalware/virology/vaccinations/list", vaccinations: vaccinations, patient: patient

data/app/views/renalware/virology/vaccinations/_cell.html.slim

@@ -0,0 +1,2 @@
+/ See Vaccination.to_partial_path etc
+= event.document.type.text

data/app/views/renalware/virology/vaccinations/_inputs.html.slim

@@ -0,0 +1,4 @@
+/ See Vaccination.to_partial_path etc
+/ Pulled into the New Event form via a js get to EventsController#new
+= f.simple_fields_for :document, event.document do |fd|
+  = fd.input :type, wrapper: :horizontal_medium

data/app/views/renalware/virology/vaccinations/_list.html.slim

@@ -0,0 +1,14 @@
+article.vaccinations
+  header
+    h2= t(".title")
+
+    = link_to t(".add"),
+          new_patient_virology_vaccination_path(patient),
+          class: "button right"
+
+  - toggle_prefix ||= "investigation"
+
+  = render "renalware/events/events/table",
+           events: vaccinations,
+           exclude_type_column: true
+           / #edit_proc: ->(vaccination) { edit_patient_vaccination_path(patient, vaccination) },

data/app/views/renalware/virology/vaccinations/_toggled_cell.html.slim

@@ -0,0 +1,8 @@
+/ See Vaccination.to_partial_path etc
+- document = event.document
+
+dl.dl-horizontal
+  dt= attr_name(document, :type, suffix: ":")
+  dd= document.type&.text || t("unspecified")
+  dt= attr_name(event, :notes, suffix: ":")
+  dd= event.notes&.html_safe || t("unspecified")

data/config/locales/en-GB.yml

@@ -5,9 +5,7 @@ en-GB:
   :false: "No"
   updated_at: "Updated on"
   created_at: "Created on"
-
   unspecified: Not specified
-
   date:
     abbr_day_names:
     - Sun
@@ -43,6 +41,7 @@ en-GB:
       default: "%d-%b-%Y"
       long: "%a %e %b %Y"
       short: "%d %b"
+      compact: "%d-%b-%y"
     month_names:
     -
     - January
@@ -104,7 +103,6 @@ en-GB:
       month: Month
       second: Seconds
       year: Year
-
   number:
     currency:
       format:

data/config/locales/en.yml

@@ -1,28 +1,21 @@
 en:
   :true: "Yes"
   :false: "No"
-
   disable_with:
     save: Saving...
-
   new_record:
     link_title: Add
     page_title: New
-
   edit_record:
     link_title: Edit
     page_title: Edit
-
   links:
     view_all: View All
-
   modal:
     close: Close
-
   collection:
     blank_option: Please select
     blank_option_for_multiple: Please select one or more
-
   enums:
     letter:
       state:
@@ -30,12 +23,10 @@ en:
         pending_review: Pending Review
         approved: Approved
         completed: Completed
-
     provider:
       gp: GP
       hospital: Hospital
       home_delivery: Home Delivery
-
   helpers:
     label:
       patient:
@@ -48,7 +39,6 @@ en:
       update: Save
       filter: Filter
     reset: Reset
-
   activerecord:
     attributes:
       renalware/event_type:
@@ -85,7 +75,6 @@ en:
         bag_type_id: PD bag type
         volume: "PD bag volume (ml)"
         days: PD bag
-
   errors:
     format: "%{attribute} %{message}"
     messages:

data/config/locales/renalware/age.yml

@@ -6,7 +6,6 @@ en:
           attributes:
             unit:
               invalid_unit: Please enter age in amount of months
-
   enumerize:
     renalware/age:
       unit:

data/config/locales/renalware/clinical/allergies.en.yml

@@ -9,13 +9,11 @@ en:
           add: Add
           delete: Delete
           edit: Edit
-
         new:
           title: Add allergy
           description: Description
           save: Add
           save_disable_with: Saving...
-
         mini:
           title: Allergies
       allergy_statuses:
@@ -23,7 +21,6 @@ en:
           no_known_allergies: The patient reports no allergies
           save: Confirm
           save_disable_with: Saving...
-
   enumerize:
     renalware/patient:
       allergy_status:

data/config/locales/renalware/clinical/body_composition.yml

@@ -16,7 +16,6 @@ en:
         body_cell_mass: Body Cell Mass (BCM)
         quality_of_reading: Quality of Reading (Q)
         notes: Notes
-
   renalware:
     clinical:
       body_compositions:
@@ -44,4 +43,3 @@ en:
           view_all: View All
           recent:
             title: Recent Body Composition Measurements
-

data/config/locales/renalware/clinical/dry_weight.en.yml

@@ -11,7 +11,6 @@ en:
             weight:
               out_of_range: Must be between 5.0 and 300.0 kg
               invalid_number: Please enter a number with up to 1 decimal place, for example 100 or 100.1
-
   renalware:
     clinical:
       dry_weights:
@@ -25,4 +24,3 @@ en:
           view_all: View All
           recent:
             title: Recent Dry Weights
-

data/config/locales/renalware/clinics/visit.yml

@@ -21,7 +21,6 @@ en:
             height:
               out_of_range: Please enter a number between 0.05 and 2.5m
               invalid_number: Please enter a number with up to 2 decimal place
-
   enumerize:
     renalware/clinics/clinic_visit:
       urine_blood:
@@ -38,7 +37,6 @@ en:
         low: "++"
         medium: "+++"
         high: "++++"
-
   simple_form:
     hints:
       clinic_visit:

data/config/locales/renalware/feeds/file.en.yml

@@ -7,7 +7,6 @@ en:
         time_taken: Took
         result: Result
         status: Status
-
   enumerize:
     renalware/feeds/file:
       status:

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

@@ -2,7 +2,6 @@ en:
   renalware:
     hd:
       diary_slot:
-
   activerecord:
     errors:
       models:

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

@@ -19,4 +19,3 @@ en:
           frequency: Freq
           administered: Given
           notes: Notes
-

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

@@ -223,4 +223,3 @@ en:
             edit: Edit
           dna:
             edit: Edit
-

data/config/locales/renalware/hospitals/unit.yml

@@ -1,5 +1,3 @@
-# https://github.com/plataformatec/simple_form#i18n
-
 en:
   activerecord:
     attributes:

data/config/locales/renalware/letters/contact.en.yml

@@ -10,7 +10,6 @@ en:
             person:
               blank: "has to be selected from the list"
               taken: "is already a contact for the patient"
-
   renalware:
     letters:
       contacts:

data/config/locales/renalware/letters/letter.en.yml

@@ -10,12 +10,10 @@ en:
         body: Message
         state: State
         notes: Internal Notes
-
   simple_form:
     hints:
       letters_letter:
         notes: These notes will not appear on the letter
-
   renalware:
     letters:
       letters:

data/config/locales/renalware/low_clearance/profile.en.yml

@@ -21,7 +21,6 @@ en:
           home_hd_possible: Home HD
           self_care_possible: Self Care
           access_notes: Low Clearance access notes
-
   activemodel:
     attributes:
       renalware/low_clearance/profile_document:

data/config/locales/renalware/medications/prescription.yml

@@ -6,7 +6,6 @@ en:
     prompts:
       prescription:
         medication_route: Please select route of administration
-
   activerecord:
     attributes:
       renalware/medications/prescription:
@@ -22,7 +21,6 @@ en:
           attributes:
             route_description:
               not_other: can't be present when a route has been selected
-
   enumerize:
     renalware:
       medications: