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

data/app/views/renalware/research/studies/index.html.slim

@@ -0,0 +1,32 @@
+= content_for(:actions) do
+  = link_to("Add", new_research_study_path, class: :button)
+
+= within_admin_layout(title: "Clinical Studies") do
+  table
+    thead
+      tr
+        th.col-width-date Started
+        th.col-width-date Terminated
+        th.col-width-small Code
+        th Description
+        th Leader
+        th Participants
+        th
+    tbody
+      - studies.each do |study|
+        tr
+          td= l(study.started_on)
+          td= l(study.terminated_on)
+          td= study.code
+          td= study.description
+          td= study.leader
+          td= study.participants.count
+          td.actions
+            = link_to "Delete",
+                      research_study_path(study),
+                      method: :delete,
+                      data: { confirm: "Are you sure you want to delete this study?" }
+            = " | "
+            = link_to "Edit", edit_research_study_path(study)
+            = " | "
+            = link_to "View Participants", research_study_participants_path(study)

data/app/views/renalware/research/studies/new.html.slim

@@ -0,0 +1,5 @@
+= within_admin_layout(title: "New",
+                      breadcrumbs: breadcrumb_for("Clinical Studies",
+                                   research_studies_path)) do
+
+  = render "form", study: study

data/app/views/renalware/research/studies/show.html.slim

@@ -0,0 +1,19 @@
+= content_for(:actions) do
+  = link_to("Add Participant", new_research_study_participant_path(study), class: :button)
+
+= within_admin_layout(title: study.code,
+                      breadcrumbs: breadcrumb_for("Clinical Studies",
+                                   research_studies_path)) do
+
+  p= study.description
+
+  table
+    thead
+      tr
+        th Patient
+        th
+    tbody
+      - study.participants.each do |participant|
+        tr
+          td= participant
+

data/app/views/renalware/research/study_participants/_form.html.slim

@@ -0,0 +1,45 @@
+ruby:
+  url = if participant.new_record?
+          research_study_participants_path(participant.study)
+        else
+          research_study_participant_path(participant.study, participant)
+        end
+.modal
+  .modal__header
+    h2= participant.persisted? ? "Edit Patient" : "Add Patient"
+    = render "renalware/shared/modal_close_link"
+
+  .modal__body
+    = render "renalware/shared/errors", model: participant
+
+    = simple_form_for(participant,
+                      url: url,
+                      remote: true,
+                      html: { autocomplete: "off"},
+                      wrapper: :horizontal_form) do |f|
+      - if participant.persisted?
+        h5= participant.patient.to_s(:long)
+      - else
+        = f.input :participant_id,
+                      collection: [],
+                      input_html: {\
+                        class: "patient-id-select2 patient-ajax-search",
+                        data: { "ajax--url" => search_patients_path(format: :json),
+                                placeholder: "Search by patient name or hospital/NHS no." }\
+                      }
+
+      =f.input :joined_on, as: :date_picker
+      =f.input :left_on, as: :date_picker
+
+      = f.submit "Add", class: :button
+      span= " or "
+      =link_to "Cancel",
+               "#",
+               "aria-label" => "Close",
+                class: "reveal-modal-close"
+
+  .modal__footer
+
+javascript:
+  $(document).ready(Renalware.Research.init);
+

data/app/views/renalware/research/study_participants/_table.html.slim

@@ -0,0 +1,32 @@
+.study-participants-table
+  table
+    thead
+      tr
+        th.col-width-date Joined on
+        th.col-width-date Left on
+        th Patient
+        th.col-width-nhs-no NHS Number
+        th.col-width-reference-no Hosp no
+        th.col-width-tiny Age
+        th Sex
+        th.col-width-small
+    tbody
+      - participants.each do |participant|
+        tr
+          td= l(participant.joined_on)
+          td= l(participant.left_on)
+          td= default_patient_link(participant.patient)
+          td= participant.patient.nhs_number
+          td= participant.patient.hospital_identifiers
+          td= participant.patient.age
+          td= participant.patient.sex
+          td
+            = link_to "Delete",
+                      research_study_participant_path(study, participant),
+                      method: :delete,
+                      data: { confirm: "Are you sure?" }
+            = " | "
+            = link_to("Edit",
+                      edit_research_study_participant_path(study, participant),
+                      data: { "reveal-id" => "study-participant-modal", "reveal-ajax" => "true" })
+  = paginate participants

data/app/views/renalware/research/study_participants/create.js.erb

@@ -0,0 +1,3 @@
+<%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
+$(".study-participants-table").replaceWith("<%= j(render 'table', study: study, participants: participants) %>");
+$("#study-participant-modal").foundation('reveal', 'close');

data/app/views/renalware/research/study_participants/edit.html.slim

@@ -0,0 +1 @@
+= render "form", participant: participant

data/app/views/renalware/research/study_participants/index.html.slim

@@ -0,0 +1,25 @@
+= content_for(:actions) do
+  = link_to("Add",
+            new_research_study_participant_path,
+            id: "add-study-participants",
+            class: :button,
+            data: { "reveal-id" => "study-participant-modal", "reveal-ajax" => "true" })
+
+= within_admin_layout(\
+  title: "Participants",
+  breadcrumbs: [\
+    breadcrumb_for("Clinical Studies", research_studies_path),
+    breadcrumb_for(study.code, edit_research_study_path(study))\
+  ]) do
+
+  - if study.description.present?
+    p.panel.radius.compact
+      = "Description: #{study.description}"
+      br
+      = "Started on: #{l(study.started_on)}"
+      br
+      = "Leader: #{study.leader}"
+
+  = render "table", study: study, participants: participants
+
+  #study-participant-modal.reveal-modal.small(data-reveal)

data/app/views/renalware/research/study_participants/new.html.slim

@@ -0,0 +1 @@
+= render "form", participant: participant

data/app/views/renalware/research/study_participants/new.js.erb

@@ -0,0 +1,4 @@
+// We render this view if there was a validation error submitting the foundation reveal modal.
+// Replace the original content so that error messages are displayed.
+var modal = $("#study-participant-modal")
+$(modal).html("<%= j(render 'form', participant: participant) %>");

data/app/views/renalware/research/study_participants/update.js.erb

@@ -0,0 +1,3 @@
+<%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
+$(".study-participants-table").replaceWith("<%= j(render 'table', study: study, participants: participants) %>");
+$("#study-participant-modal").foundation('reveal', 'close');

data/app/views/renalware/shared/documents/_age.html.slim

@@ -1 +1 @@
-= age.to_s
+= age.to_s

data/app/views/renalware/shared/documents/_blood_group.html.slim

@@ -1 +1 @@
-= blood_group.to_s
+= blood_group.to_s

data/app/views/renalware/shared/documents/_blood_pressure.html.slim

@@ -1 +1 @@
-= blood_pressure.to_s
+= blood_pressure.to_s

data/app/views/renalware/shared/documents/_dated_test.html.slim

@@ -1 +1 @@
-= dated_test.to_s
+= dated_test.to_s

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

@@ -26,7 +26,6 @@
     li= link_to t(".add_operation"),
                 new_patient_transplants_donor_operation_path(patient)
 
-
 = within_patient_layout(title: "Transplant Donor Summary") do
   - unless donations.empty?
     = render "renalware/transplants/donations/list",

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

@@ -19,4 +19,3 @@
         models: { donor_followup => [:followed_up, :last_seen_on, :ukt_center_code,
           :lost_to_followup, :transferred_for_followup,
           :dead_on, :notes] }
-

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

@@ -46,7 +46,6 @@ ruby:
         = fcm.input :nb_months_to_return_to_previous_general_activity_level,
             input_html: { class: "small-input" }
 
-
 .row
   .large-12.columns
     = f.submit "Save", class: "button"

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

@@ -31,5 +31,3 @@ article.status-history
             td
               - url = new_patient_transplants_donor_operation_followup_path(patient, operation)
               = link_to "Enter details", url
-
-

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

@@ -23,4 +23,3 @@ article.donor-statuses
           td= stage.stage_position.name
           td= stage.stage_status.name
           td.col-width-large-with-ellipsis.css-toggle-container= stage.notes
-

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

@@ -29,7 +29,6 @@ ruby:
              locals: { legend: "Virology/Bacteriology/Cytology",
                        name: "infections" } do
 
-
       = fd.simple_fields_for :infections, fd.object.infections do |fcm|
         table.no-stripes.infections
           = render_input fcm, :hiv

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

@@ -9,15 +9,15 @@ ul.f-dropdown#tx-recip-options(data-dropdown-content aria-hidden="true")
 
   = dropdown_btn_item enabled: policy(recipient_workup).new?,
                       title: t(".add_recipient_workup"),
-                      path: edit_patient_transplants_recipient_workup_path(patient)
+                      url: edit_patient_transplants_recipient_workup_path(patient)
 
   = dropdown_btn_item enabled: policy(registration).new?,
                       title: t(".add_waitlist_registration"),
-                      path: edit_patient_transplants_registration_path(patient)
+                      url: edit_patient_transplants_registration_path(patient)
 
   = dropdown_btn_item enabled: patient.has_ever_been_a_recipient?,
                       title: t(".add_recipient_operation"),
-                      path: new_patient_transplants_recipient_operation_path(patient)
+                      url: new_patient_transplants_recipient_operation_path(patient)
 
 - unless patient.has_ever_been_a_recipient?
   = render "modality_missing_warning", message: t(".missing_modality_warning")

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

@@ -53,7 +53,6 @@ ruby:
               as: :text,
               input_html: { rows: 5 }
 
-
 .row
   .large-12.columns
     = f.submit "Save", class: "button"

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

@@ -68,7 +68,6 @@ ruby:
         = fcm.input :ukt_cause_of_death, wrapper: :horizontal_medium
         = fcm.input :ukt_cause_of_death_other, wrapper: :horizontal_large
 
-
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Donor Specific Antibodies", name: "donor_specific_antibodies" } do
       = fd.simple_fields_for :donor_specific_antibodies,

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

@@ -50,5 +50,3 @@ article
             td
               - url = new_patient_transplants_recipient_operation_followup_path(patient, operation)
               = link_to "Enter details", url
-
-

data/app/views/renalware/transplants/recipient_operations/_operation.html.slim

@@ -13,4 +13,3 @@ ruby:
 = render "renalware/shared/attributes_group",
     legend: "Operation", destination: "operation",
     models: models
-

data/config/initializers/application_controller_renderer.rb

@@ -9,5 +9,5 @@
 # Renalware::Engine.config.active_record.time_zone_aware_types = [:datetime]
 # Renalware::Engine.config.exceptions_app = Renalware::Engine.routes
 # Renalware::Engine.config.active_record.schema_format = :sql
-# Renalware::Engine.config.action_mailer.preview_path = Rails.root.join("app", "mailers", "previews")
+# Renalware::Engine.config.action_mailer.preview_path =Rails.root.join("app", "mailers", "previews")
 # Renalware::Engine.config.active_job.queue_adapter = :delayed_job

data/config/initializers/backtrace_silencers.rb

@@ -1,5 +1,5 @@
 SHOULDA_NOISE      = %w(shoulda).freeze
-FACTORY_GIRL_NOISE = %w(factory_girl).freeze
+FACTORY_GIRL_NOISE = %w(factory_bot).freeze
 RENALWARE_NOISE = SHOULDA_NOISE + FACTORY_GIRL_NOISE
 
 Rails.backtrace_cleaner.add_silencer do |line|

data/config/initializers/null_object.rb

@@ -3,5 +3,7 @@ module Renalware
     config.black_hole
     config.define_explicit_conversions
     config.singleton
+    # Note adding `predicates_return false` causes failures e.g. with I18n.l(<null>)
+    # config.predicates_return false
   end
 end

data/config/locales/renalware/admissions/consults.en.yml

@@ -0,0 +1,29 @@
+en:
+  activerecord:
+    attributes:
+      renalware/admissions/consult:
+        decided_on: Decision date
+        transferred_on: Transfer date
+        started_on: Consult date
+        referred_on: Referal date
+        hospital_unit: Unit
+        hospital_ward: Ward
+        consult_type: Type
+        contact_number: Bleep/Ext
+  enumerize:
+    renalware/admissions/consult:
+      transfer_priority:
+        unknown: Unknown (default)
+        necessary: Necessary
+        desirable: Desirable
+        potential: Potential
+        unnecessary: Unnecessary
+      aki_risk:
+        "yes": "Yes"
+        "no": "No"
+        unknown: Unknown
+  renalware:
+    admissions:
+      consults:
+        table:
+          delete_consult_warning_msg: "Mark this consult as done and remove it from the list?"

data/config/locales/renalware/dashboard/dashboard.yml

@@ -17,6 +17,7 @@ en:
         none: There are no patients bookmarked.
         table:
           patient_name: Name
+          nhs_number: NHS Number
           hospital_number: Hosp No
           born_on: DOB
           age: Age

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

@@ -0,0 +1,13 @@
+en:
+  renalware:
+    hd:
+      diary_slot:
+
+  activerecord:
+    errors:
+      models:
+        renalware/hd/diary_slot:
+          patient_id:
+            taken: has already been assigned to a station in this day and period
+          diurnal_period_code_id:
+            taken: There is already a patient in this slot

data/config/locales/renalware/hd/mdm_patients.yml

@@ -3,7 +3,7 @@ en:
     hd:
       mdm_patients:
         patient:
-          view: "View"
+          view: "MDM"
         table:
           page_title: HD MDM patients
           name: Name
@@ -18,7 +18,6 @@ en:
           access_plan: Access Plan
           access_plan_date: Plan Date
           registration_status: Tx Status
-          has_transport: Transport?
           transport_type: Transport
           dialysing_at: Dialysing at
           esrf: ESRF

data/config/locales/renalware/hd/preference_set.yml

@@ -4,16 +4,6 @@ en:
       renalware/hd/preference_set:
         schedule: Schedule
         other_schedule: Other Schedule
-  enumerize:
-    renalware/hd/preference_set:
-      schedule:
-        mon_wed_fri_am: "Mon, Wed, Fri AM"
-        mon_wed_fri_pm: "Mon, Wed, Fri PM"
-        mon_wed_fri_eve: "Mon, Wed, Fri Evening"
-        tue_thu_sat_am: "Tue, Thu, Sat AM"
-        tue_thu_sat_pm: "Tue, Thu, Sat PM"
-        tue_thu_sat_eve: "Tue, Thu, Sat Evening"
-        other: "Other (specify)"
   renalware:
     hd:
       preference_sets:

data/config/locales/renalware/hd/profile.yml

@@ -13,6 +13,7 @@ en:
         hospital_centre: Hospital Centre
         created_at: Started
         deactivated_at: Stopped
+        dialysate: Dialysis Solution
   activemodel:
     attributes:
       renalware/hd/profile_document/dialysis:
@@ -20,7 +21,6 @@ en:
         cannulation_type: Cannulation Type
         needle_size: Needle Size
         single_needle: Single Needle?
-        dialysate: Dialysis Solution
         flow_rate: Solution Flow Rate
         blood_flow: Blood Flow
         has_sodium_profiling: Has Sodium Profiling?
@@ -44,24 +44,12 @@ en:
         level: Level
   enumerize:
     renalware/hd/profile:
-      schedule:
-        mon_wed_fri_am: "Mon, Wed, Fri AM"
-        mon_wed_fri_pm: "Mon, Wed, Fri PM"
-        mon_wed_fri_eve: "Mon, Wed, Fri Evening"
-        tue_thu_sat_am: "Tue, Thu, Sat AM"
-        tue_thu_sat_pm: "Tue, Thu, Sat PM"
-        tue_thu_sat_eve: "Tue, Thu, Sat Evening"
-        other: "Other (specify)"
+
     renalware/hd/profile_document/dialysis:
       hd_type:
         hd: HD
         hdf_pre: HDF-PRE
         hdf_post: HDF-POST
-      dialysate:
-        a7: Fresenius A7
-        a10: Fresenius A10
-        a17: Fresenius A17
-        a27: Fresenius A27
 
     renalware/hd/profile_document/transport:
       type: