renalware-core 2.0.67 → 2.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf634cea697775671cc9b95511d93c3927bfaef385d14257daffa16ca86086bb
-  data.tar.gz: da6403cbe24ea79e5690cb0e767bf83fd3931495950ad2135ffc9b08cad32ce6
+  metadata.gz: c551c17f27d4ce7093dcacaa92bb5936b9d9131ecc452fabb288b11a409c42e8
+  data.tar.gz: ce9f5588b3f29e82f900ac88d89ace8e11e0535c113b3479edf3d0745dd6d578
 SHA512:
-  metadata.gz: d2d4668c9ce60c07e2d66bd2676270342c087292d32737a03a4a5db0f953b6f3339573f1815ba4e0efc939979c67b2de3e5f0192f5d3a4fd7250b9de10b95580
-  data.tar.gz: 51c70c6a5b0d163669a13f5c3674afabb6dbdfd22093951521210b80d42d860c248a438c13c994b1f4a4cb103ea3969e1d856fd79c5631fb6f73557bb763b160
+  metadata.gz: f0e617fd1c72cd5162a23f853647d568296a3dbeb32a023daeadc3b517abee63bc7fe30adc06d8a2328ab0099526afc06a0b98f2a5cc74d942a6db570cf4bce3
+  data.tar.gz: 3b90fa1559317b7a89d94b879b147723b2aa47f87d46b84a0360025e49765934b6462ccfe6655fc5f52b22aee5c022555dfd81632126622aeb872751e1880fdb

data/app/assets/stylesheets/renalware/partials/_forms.scss

@@ -3,8 +3,18 @@ textarea::placeholder {
   color: $form-hint-colour
 }
 
-.panel.compact {
-  padding: 0.5rem 1rem;
+.panel {
+  p {
+    padding-left: 0;
+  }
+
+  &.compact {
+    padding: 0.5rem 1rem;
+  }
+
+  .muted {
+    color: $dashboard-muted-color;
+  }
 }
 
 textarea.monospace {
@@ -434,3 +444,24 @@ fieldset {
     }
   }
 }
+
+.panel.danger-zone {
+  background-color: $white;
+  color: $nhs-red;
+
+  h4 {
+    color: inherit;
+  }
+
+  a {
+    color: inherit;
+    font-weight: bold;
+    background-color: $table-border-color;
+
+    &:hover,
+    &:active   {
+      background-color: $nhs-red;
+      color: $white;
+    }
+  }
+}

data/app/assets/stylesheets/renalware/partials/_navigation.scss

@@ -20,6 +20,10 @@
   dd {
     margin: 0;
     padding: 0;
+
+    i {
+      margin-right: .7rem;
+    }
   }
 }
 

data/app/controllers/renalware/hd/mdm_patients_controller.rb

@@ -6,12 +6,6 @@ module Renalware
   module HD
     class MDMPatientsController < Renalware::MDMPatientsController
       def index
-        filter_form = form_object_class.new(filter_form_params)
-
-        query = HD::MDMPatientsQuery.new(
-          params: filter_form.ransacked_parameters.merge(query_params).with_indifferent_access
-        )
-
         render_index(filter_form: filter_form,
                      query: query,
                      page_title: t(".page_title"),
@@ -21,6 +15,21 @@ module Renalware
 
       private
 
+      def query
+        @query ||= begin
+          MDMPatientsQuery.new(
+            params: filter_form.ransacked_parameters.merge(query_params).with_indifferent_access,
+            named_filter: named_filter
+          )
+        end
+      end
+
+      # Pass in the current path to the filter form so it can render the correct URI in form and
+      # reset links.
+      def filter_form
+        @filter_form ||= form_object_class.new(filter_form_params.merge(url: request.path))
+      end
+
       # Permit all attributes on the filter form object. Slightly messy
       def filter_form_params
         params.fetch(:filter, {}).permit(form_object_class.permittable_attributes)
@@ -35,6 +44,10 @@ module Renalware
         params.fetch(:q, {}).permit(:s)
       end
 
+      def named_filter
+        params[:named_filter]
+      end
+
       def render_index(filter_form:, **args)
         presenter = build_presenter(params: params, **args)
         authorize presenter.patients

data/app/controllers/renalware/pd/mdm_patients_controller.rb

@@ -6,10 +6,18 @@ module Renalware
   module PD
     class MDMPatientsController < Renalware::MDMPatientsController
       def index
-        render_index(query: MDMPatientsQuery.new(q: params[:q]),
+        render_index(query: query,
                      page_title: t(".page_title"),
                      view_proc: ->(patient) { patient_pd_mdm_path(patient) })
       end
+
+      def query
+        @query ||= MDMPatientsQuery.new(q: params[:q], named_filter: named_filter)
+      end
+
+      def named_filter
+        params[:named_filter]
+      end
     end
   end
 end

data/app/controllers/renalware/research/studies_controller.rb

@@ -14,6 +14,11 @@ module Renalware
         render locals: { studies: studies, query: query }
       end
 
+      def show
+        study = find_and_authorize_study
+        render locals: { study: study }
+      end
+
       def new
         study = Study.new
         authorize study
@@ -38,7 +43,7 @@ module Renalware
       def update
         study = find_and_authorize_study
         if study.update_by(current_user, study_params)
-          redirect_to research_studies_path, notice: success_msg_for("clinical study")
+          redirect_to research_study_path(study), notice: success_msg_for("clinical study")
         else
           render_edit(study)
         end

data/app/controllers/renalware/research/study_participants_controller.rb

@@ -9,7 +9,9 @@ module Renalware
 
       def index
         authorize StudyParticipant, :index?
-        render_current_action_with_locals
+        query = StudyParticipantsQuery.new(study: study, options: params[:q])
+        participants = query.call.page(page).per(per_page)
+        render locals: { study: study, participants: participants, query: query.search }
       end
 
       def show
@@ -23,7 +25,10 @@ module Renalware
         authorize participant
 
         if participant.save
-          render_current_action_with_locals
+          redirect_to(
+            research_study_participants_path(study),
+            notice: success_msg_for("participant")
+          )
         else
           render_new(participant)
         end
@@ -50,7 +55,10 @@ module Renalware
       def update
         participant = find_and_authorise_participant
         if participant.update(participant_params_for_update)
-          render_current_action_with_locals
+          redirect_to(
+            research_study_participants_path(study),
+            notice: success_msg_for("participant")
+          )
         else
           render_edit(participant)
         end
@@ -63,17 +71,11 @@ module Renalware
       end
 
       def render_edit(participant)
-        render :new, locals: { participant: participant }, layout: false
+        render :edit, locals: { participant: participant }
       end
 
       def render_new(participant)
-        render :new, locals: { participant: participant }, layout: false
-      end
-
-      def render_current_action_with_locals
-        query = StudyParticipantsQuery.new(study: study, options: params[:q])
-        participants = query.call.page(page).per(per_page)
-        render locals: { study: study, participants: participants, query: query.search }
+        render :new, locals: { participant: participant }
       end
 
       def study

data/app/models/renalware/hd/mdm_patients_form.rb

@@ -14,6 +14,7 @@ module Renalware
       attribute :hospital_unit_id, Integer
       attribute :named_nurse_id, Integer
       attribute :schedule_definition_ids, String # an Integer array in string form e.g. "[1 ,2]"
+      attribute :url
 
       # The hash returned here is passed into the Ransack #search method later i the ouery object.
       def ransacked_parameters

data/app/models/renalware/hd/mdm_patients_query.rb

@@ -9,18 +9,19 @@ module Renalware
       include PatientPathologyScopes
       MODALITY_NAMES = "HD"
       DEFAULT_SEARCH_PREDICATE = "hgb_date desc"
-      attr_reader :params
+      attr_reader :params, :named_filter
 
-      def initialize(params:)
+      def initialize(params:, named_filter:)
         @params = params || {}
         @params[:s] = DEFAULT_SEARCH_PREDICATE if @params[:s].blank?
+        @named_filter = named_filter || :none
       end
 
       def call
         search.result
       end
 
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def search
         @search ||= begin
           HD::Patient
@@ -31,13 +32,15 @@ module Renalware
             .eager_load(hd_profile: [:hospital_unit])
             .extending(ModalityScopes)
             .extending(PatientPathologyScopes)
+            .extending(NamedFilterScopes)
             .with_current_pathology
             .with_registration_statuses
             .with_current_modality_matching(MODALITY_NAMES)
+            .public_send(named_filter.to_s)
             .ransack(params)
         end
       end
-      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       # Module to allow us to mixin ransackers
       module QueryablePatient
@@ -63,5 +66,18 @@ module Renalware
         end
       end
     end
+
+    # Module to allow us to mixin named filters like on_worryboard which correspond to tabs
+    # on the UI for example.
+    module NamedFilterScopes
+      def none
+        self # NOOP - aka 'all'
+      end
+
+      def patients_on_the_worry_board
+        joins("RIGHT OUTER JOIN patient_worries ON patient_worries.patient_id = patients.id")
+      end
+      alias_method :on_worryboard, :patients_on_the_worry_board
+    end
   end
 end

data/app/models/renalware/patients/mdm_patients_query.rb

@@ -25,7 +25,7 @@ module Renalware
             .extending(PatientPathologyScopes)
             .with_current_pathology
             .with_current_modality_matching(modality_names)
-            .search(q)
+            .ransack(q)
         end
       end
     end

data/app/models/renalware/patients/search_query.rb

@@ -31,7 +31,7 @@ module Renalware
       def search
         @search ||= begin
           scope
-            .search(identity_match: term).tap do |search|
+            .ransack(identity_match: term).tap do |search|
               search.sorts = %w(family_name given_name)
             end
         end

data/app/models/renalware/pd/mdm_patients_query.rb

@@ -7,31 +7,47 @@ module Renalware
       include PatientPathologyScopes
       MODALITY_NAMES = "PD"
       DEFAULT_SEARCH_PREDICATE = "hgb_date desc"
-      attr_reader :q, :relation
+      attr_reader :q, :relation, :named_filter
 
-      def initialize(relation: PD::Patient.all, q:)
+      def initialize(relation: PD::Patient.all, q:, named_filter: nil)
         @q = q || {}
         @q[:s] = DEFAULT_SEARCH_PREDICATE if @q[:s].blank?
         @relation = relation
+        @named_filter = named_filter || :none
       end
 
       def call
         search.result
       end
 
+      # rubocop:disable Metrics/MethodLength
       def search
         @search ||= begin
           relation
             .extending(PatientTransplantScopes)
             .extending(ModalityScopes)
             .extending(PatientPathologyScopes)
+            .extending(NamedFilterScopes)
             .with_current_modality_matching(MODALITY_NAMES)
             .with_current_pathology
             .with_registration_statuses
             .left_outer_joins(:current_observation_set)
+            .public_send(named_filter.to_s)
             .ransack(q)
         end
       end
+      # rubocop:enable Metrics/MethodLength
+    end
+
+    module NamedFilterScopes
+      def none
+        self # NOOP
+      end
+
+      def patients_on_the_worry_board
+        joins("RIGHT OUTER JOIN patient_worries ON patient_worries.patient_id = patients.id")
+      end
+      alias_method :on_worryboard, :patients_on_the_worry_board
     end
   end
 end

data/app/models/renalware/transplants/mdm_patients_query.rb

@@ -9,7 +9,7 @@ module Renalware
     class MDMPatientsQuery
       include ModalityScopes
       include PatientPathologyScopes
-      MODALITY_NAMES = ["Transplant"].freeze
+      MODALITY_NAMES = "Transplant"
       DEFAULT_SEARCH_PREDICATE = "hgb_date DESC"
       attr_reader :q, :relation, :named_filter
 

data/app/views/renalware/clinics/appointments/new.html.slim

@@ -12,14 +12,15 @@
     / the blank option. Selecting index 1 fails silently if there is nothing there (no patient
     / selected yet) otherwise it will display the selected patient who will always be
     / at option index 1.
-    = f.input :patient_id,
-              wrapper: :horizontal_medium,
-              collection: [[appointment.patient&.to_s(:long), appointment.patient&.id]],
-              selected: 1,
-              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." } \
+    #patient-select2
+      = f.input :patient_id,
+                wrapper: :horizontal_medium,
+                collection: [[appointment.patient&.to_s(:long), appointment.patient&.id]],
+                selected: 1,
+                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 :clinic_id,

data/app/views/renalware/hd/mdm_patients/_filters.html.slim

@@ -1,6 +1,7 @@
+
 = simple_form_for filter_form,
                   as: :filter,
-                  url: hd_mdm_patients_path,
+                  url: filter_form.url,
                   method: :get,
                   html: { autocomplete: "off" },
                   wrapper: :horizontal_form do |f|
@@ -27,4 +28,4 @@
     .medium-2.columns.actions
       = f.submit t("helpers.submit.filter"), class: "button", name: nil
       span= " or "
-      = link_to t("helpers.reset"), hd_mdm_patients_path
+      = link_to t("helpers.reset"), filter_form.url

data/app/views/renalware/hd/mdm_patients/_tabs.html.slim

@@ -0,0 +1,8 @@
+- named_filter_param = params[:named_filter]
+
+dl.sub-nav
+  dd(class=("active" unless named_filter_param.present?))
+     = link_to t(".tab.all"), hd_mdm_patients_path
+  - %i(on_worryboard).each do |filter|
+    dd(class=("active" if named_filter_param == filter.to_s))
+      = link_to t(".tab.#{filter}"), hd_filtered_mdm_patients_path(named_filter: filter)

data/app/views/renalware/hd/mdm_patients/index.html.slim

@@ -1,6 +1,9 @@
 = content_for(:filters) do
   = render_if_exists "filters", presenter: presenter, filter_form: filter_form
 
+= content_for(:tabs) do
+  = render_if_exists "tabs", presenter: presenter
+
 = within_admin_layout(title: presenter.page_title)
   = render "table", presenter: presenter
   = paginate presenter.patients

data/app/views/renalware/letters/printable_letters/_recipient_address_cover_sheet.html.slim

@@ -20,7 +20,7 @@ scss:
   .address-in-window {
     position: absolute;
     left: 60px;
-    top: 75px;
+    top: 130px;
     width: 50%;
     height: 50%;
     line-height: 1.2em;

data/app/views/renalware/pd/mdm_patients/_tabs.html.slim

@@ -0,0 +1,8 @@
+- named_filter_param = params[:named_filter]
+
+dl.sub-nav
+  dd(class=("active" unless named_filter_param.present?))
+     = link_to t(".tab.all"), pd_mdm_patients_path
+  - %i(on_worryboard).each do |filter|
+    dd(class=("active" if named_filter_param == filter.to_s))
+      = link_to t(".tab.#{filter}"), pd_filtered_mdm_patients_path(named_filter: filter)

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

@@ -0,0 +1,12 @@
+dl.sub-nav
+  dd= link_to "Summary", research_study_path(study)
+  dd
+    = link_to edit_research_study_path(study) do
+      i.fas.fa-cogs
+      | Settings
+  dd
+    = link_to research_study_participants_path(study) do
+      i.fas.fa-users
+      | Participants
+  / dd(class=("active" if params.fetch(:q, {})[:expired]))
+  /   = link_to "Members", admin_expired_users_path

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

@@ -1,5 +1,29 @@
-= within_admin_layout(title: "Edit",
+= content_for(:tabs) do
+  = render "tabs", study: study
+
+= within_admin_layout(title: study.code,
                       breadcrumbs: breadcrumb_for("Clinical Studies",
                                    research_studies_path)) do
 
   = render "form", study: study
+
+  br
+  hr
+  br
+  .panel.danger-zone
+    h4 Danger zone
+    br
+    - super_admin = current_user.has_role?(:super_admin)
+    - if super_admin
+      p= link_to "Delete this study",
+              research_study_path(study),
+              method: :delete,
+              data: { confirm: "Are you sure you want to delete this study?", disable: true },
+              class: "button"
+    - else
+      p= link_to "Delete this study",
+              "#",
+              class: "button",
+              disabled: true
+      p
+        i You need to have the super_admin role to delete a study

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

@@ -8,30 +8,24 @@
   table
     thead
       tr
-        th.col-width-date= sort_link(query, :started_on, "Started")
-        th.col-width-date= sort_link(query, :terminated_on, "Terminated")
+        th
         th.col-width-small= sort_link(query, :code, "Code")
         th Description
         th= sort_link(query, :code, "Leader")
         th Participants
-        th
+        th.col-width-date= sort_link(query, :started_on, "Started")
+        th.col-width-date= sort_link(query, :terminated_on, "Terminated")
+
     tbody
       - studies.each do |study|
         tr
-          td= l(study.started_on)
-          td= l(study.terminated_on)
+          td.actions.left
+            = link_to "View", research_study_path(study)
           td= study.code
-          td= study.description
+          td= study.description.truncate(60)
           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)
+          td= l(study.started_on)
+          td= l(study.terminated_on)
 
   = paginate studies

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

@@ -1,18 +1,14 @@
-= content_for(:actions) do
-  = link_to("Add Participant", new_research_study_participant_path(study), class: :button)
+= content_for(:tabs) do
+  = render "tabs", study: study
 
 = 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
+  - if study.description.present?
+    p.panel.radius.compact
+      = "Description: #{study.description}"
+      br
+      = "Started on: #{l(study.started_on)}"
+      br
+      = "Leader: #{study.leader}"

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

@@ -8,6 +8,6 @@
         = f.input :identity_match, label: "Search by Hosp/NHS no or name"
 
       .columns.medium-4.actions.end
-        = f.submit t("helpers.submit.filter"), class: "button", name: nil
+        = f.submit t("helpers.submit.filter"), class: "button secondary", name: nil
         span= " or "
         = link_to t("helpers.reset"), research_study_participants_path(study)

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

@@ -1,44 +1,19 @@
-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"
+= simple_form_for(participant,
+                  url: url,
+                  html: { autocomplete: "off" },
+                  wrapper: :horizontal_form) do |f|
+  - if participant.persisted?
+    h5= participant.patient.to_s(:long)
+  - else
+    #patient-select2
+      = 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." } \
+                    }
 
-  .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);
+  = f.input :joined_on, as: :date_picker
+  = f.input :left_on, as: :date_picker
+  = save_or_cancel(form: f, back_path: research_study_participants_path(participant.study))

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

@@ -1 +1,7 @@
-= render "form", participant: participant
+= within_admin_layout(title: "Edit",
+                      breadcrumbs: breadcrumb_for("Clinical Studies",
+                                   research_studies_path)) do
+
+  = render "form",
+           participant: participant,
+           url: research_study_participant_path(participant.study, participant)

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

@@ -1,28 +1,14 @@
-= 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" })
-
 = content_for(:filters) do
+  = link_to(new_research_study_participant_path, class: :button) do
+    i.fas.fa-plus
+    | Add
   = render "filters", study: study, query: query
 
-= within_admin_layout(\
-  title: "Participants",
-  breadcrumbs: [\
-    breadcrumb_for("Clinical Studies", research_studies_path),
-    breadcrumb_for(study.code, edit_research_study_path(study))\
-  ]) do
+= content_for(:tabs) do
+  = render "renalware/research/studies/tabs", study: study
 
-  - if study.description.present?
-    p.panel.radius.compact
-      = "Description: #{study.description}"
-      br
-      = "Started on: #{l(study.started_on)}"
-      br
-      = "Leader: #{study.leader}"
+= within_admin_layout(\
+  title: study.code,
+  breadcrumbs: breadcrumb_for("Clinical Studies", research_studies_path)) do
 
   = render "table", study: study, participants: participants, query: query
-
-  #study-participant-modal.reveal-modal.small(data-reveal)

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

@@ -1 +1,7 @@
-= render "form", participant: participant
+= within_admin_layout(title: "Add Participant",
+                      breadcrumbs: breadcrumb_for("Clinical Studies",
+                                   research_studies_path)) do
+
+  = render "form",
+           participant: participant,
+           url: research_study_participants_path(participant.study)

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

@@ -37,3 +37,7 @@ en:
           cre: CRE
           cre_date: CRE Date
           egfr: EGFR
+        tabs:
+          tab:
+            all: All
+            on_worryboard: On Worryboard

data/config/locales/renalware/pd/mdm.en.yml

@@ -4,3 +4,7 @@ en:
       mdm_patients:
         index:
           page_title: PD MDM Patients
+        tabs:
+          tab:
+            all: All
+            on_worryboard: On Worryboard

data/config/routes.rb

@@ -95,7 +95,7 @@ Renalware::Engine.routes.draw do
   end
 
   namespace :research do
-    resources :studies, except: :show do
+    resources :studies do
       resources :participants, controller: :study_participants
     end
   end
@@ -162,6 +162,10 @@ Renalware::Engine.routes.draw do
     resources :dialysates, except: :show
     resource :ongoing_sessions, only: :show
     resources :mdm_patients, only: :index
+    resources :mdm_patients, only: :index
+    constraints(named_filter: /(on_worryboard)/) do
+      get "mdm_patients/:named_filter", to: "mdm_patients#index", as: :filtered_mdm_patients
+    end
     resources :unmet_preferences, only: :index
     resources :units, only: [] do
       resources :stations do
@@ -240,6 +244,9 @@ Renalware::Engine.routes.draw do
     resources :bag_types, except: [:show]
     resources :infection_organisms
     resources :mdm_patients, only: :index
+    constraints(named_filter: /(on_worryboard)/) do
+      get "mdm_patients/:named_filter", to: "mdm_patients#index", as: :filtered_mdm_patients
+    end
   end
 
   namespace :renal do

data/db/migrate/20190104095254_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,27 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,        null: false
+      t.string   :filename,   null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.bigint   :byte_size,  null: false
+      t.string   :checksum,   null: false
+      t.datetime :created_at, null: false
+
+      t.index [:key], unique: true
+    end
+
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+
+      t.datetime :created_at, null: false
+
+      t.index [:record_type, :record_id, :name, :blob_id], name: "index_active_storage_attachments_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end

data/lib/renalware/version.rb

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

data/spec/factories/hd/patients.rb

@@ -1,5 +1,27 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :hd_patient, class: "Renalware::HD::Patient", parent: :patient
+  factory :hd_patient, class: "Renalware::HD::Patient", parent: :patient do
+    trait :with_hd_modality do
+      after(:create) do |instance|
+        # This a rather clumsy approach to trying to re-use the set_modality helper
+        # in PatientsSpecHelper; we can't include the module here so I am creating
+        # a contrived class so I can mix in PatientsSpecHelper.
+        # Other options here
+        # https://github.com/thoughtbot/factory_bot/issues/564#issuecomment-157669866
+        class ModalityMaker
+          include PatientsSpecHelper
+
+          def call(patient)
+            set_modality(
+              patient: patient,
+              modality_description: FactoryBot.create(:hd_modality_description),
+              by: patient.created_by
+            )
+          end
+        end
+        ModalityMaker.new.call(instance)
+      end
+    end
+  end
 end

data/spec/factories/pd/modality_descriptions.rb

@@ -2,6 +2,9 @@
 
 FactoryBot.define do
   factory :pd_modality_description, class: "Renalware::PD::ModalityDescription" do
+    initialize_with do
+      Renalware::PD::ModalityDescription.find_or_create_by!(name: name)
+    end
     name { "PD" }
   end
 end

data/spec/factories/pd/patients.rb

@@ -1,5 +1,27 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :pd_patient, class: "Renalware::PD::Patient", parent: :patient
+  factory :pd_patient, class: "Renalware::PD::Patient", parent: :patient do
+    trait :with_pd_modality do
+      after(:create) do |instance|
+        # This a rather clumsy approach to trying to re-use the set_modality helper
+        # in PatientsSpecHelper; we can't include the module here so I am creating
+        # a contrived class so I can mix in PatientsSpecHelper.
+        # Other options here
+        # https://github.com/thoughtbot/factory_bot/issues/564#issuecomment-157669866
+        class ModalityMaker
+          include PatientsSpecHelper
+
+          def call(patient)
+            set_modality(
+              patient: patient,
+              modality_description: FactoryBot.create(:pd_modality_description),
+              by: patient.created_by
+            )
+          end
+        end
+        ModalityMaker.new.call(instance)
+      end
+    end
+  end
 end

data/spec/support/devise_spec_helper.rb

@@ -8,6 +8,9 @@ RSpec.configure do |config|
   config.include LoginMacros, type: :controller
 
   config.include Warden::Test::Helpers, type: :feature
+  config.include Warden::Test::Helpers, type: :system
+  config.include Devise::Test::IntegrationHelpers, type: :system
+  config.include LoginMacros, type: :system
   config.include LoginMacros, type: :feature
 
   config.include Warden::Test::Helpers, type: :request

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.67
+  version: 2.0.68
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +282,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: 5.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: 5.6.1
 - !ruby/object:Gem::Dependency
   name: foundation-rails
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 5.2.5
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -758,14 +758,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
@@ -986,7 +986,6 @@ files:
 - app/assets/javascripts/renalware/problems.js
 - app/assets/javascripts/renalware/renal.js
 - app/assets/javascripts/renalware/reporting.js.erb
-- app/assets/javascripts/renalware/research.js
 - app/assets/javascripts/renalware/searchables.js
 - app/assets/javascripts/renalware/select2-ajax-search.js
 - app/assets/javascripts/renalware/session_timeout_redirect.js.erb
@@ -2240,6 +2239,7 @@ files:
 - app/views/renalware/hd/mdm_patients/_filters.html.slim
 - app/views/renalware/hd/mdm_patients/_patient.html.slim
 - app/views/renalware/hd/mdm_patients/_table.html.slim
+- app/views/renalware/hd/mdm_patients/_tabs.html.slim
 - app/views/renalware/hd/mdm_patients/index.html.slim
 - app/views/renalware/hd/ongoing_sessions/_filters.html.slim
 - app/views/renalware/hd/ongoing_sessions/_session.html.slim
@@ -2587,6 +2587,7 @@ files:
 - app/views/renalware/pd/infection_organisms/update.js.erb
 - app/views/renalware/pd/mdm/_summary.html.slim
 - app/views/renalware/pd/mdm/_top.html.slim
+- app/views/renalware/pd/mdm_patients/_tabs.html.slim
 - app/views/renalware/pd/peritonitis_episodes/_details.html.slim
 - app/views/renalware/pd/peritonitis_episodes/_fields.html.slim
 - app/views/renalware/pd/peritonitis_episodes/_form.html.slim
@@ -2663,6 +2664,7 @@ files:
 - app/views/renalware/research/_alerts.html.slim
 - app/views/renalware/research/studies/_filters.html.slim
 - app/views/renalware/research/studies/_form.html.slim
+- app/views/renalware/research/studies/_tabs.html.slim
 - app/views/renalware/research/studies/edit.html.slim
 - app/views/renalware/research/studies/index.html.slim
 - app/views/renalware/research/studies/new.html.slim
@@ -2670,12 +2672,9 @@ files:
 - app/views/renalware/research/study_participants/_filters.html.slim
 - app/views/renalware/research/study_participants/_form.html.slim
 - app/views/renalware/research/study_participants/_table.html.slim
-- app/views/renalware/research/study_participants/create.js.erb
 - app/views/renalware/research/study_participants/edit.html.slim
 - app/views/renalware/research/study_participants/index.html.slim
 - app/views/renalware/research/study_participants/new.html.slim
-- app/views/renalware/research/study_participants/new.js.erb
-- app/views/renalware/research/study_participants/update.js.erb
 - app/views/renalware/shared/_attributes_group.html.slim
 - app/views/renalware/shared/_attributes_list.html.slim
 - app/views/renalware/shared/_error_messages.html.slim
@@ -3384,6 +3383,7 @@ files:
 - db/migrate/20181126090401_add_warnings_to_hd_transmission_logs.rb
 - db/migrate/20181126123745_refresh_hd_grouped_transmission_logs_view.rb
 - db/migrate/20181217124025_change_ukrdc_transmission_log_error_type.rb
+- db/migrate/20190104095254_create_active_storage_tables.active_storage.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3705,7 +3705,6 @@ files:
 - spec/factories/transplants/registrations.rb
 - spec/factories/virology/patients.rb
 - spec/factories/virology/vaccinations.rb
-- spec/support/capybara.rb
 - spec/support/capybara_helper.rb
 - spec/support/database_functions_spec_helper.rb
 - spec/support/date_helpers.rb
@@ -3726,7 +3725,6 @@ files:
 - spec/support/patients_spec_helper.rb
 - spec/support/pundit_matcher.rb
 - spec/support/roles_spec_helper.rb
-- spec/support/select2_spec_helper.rb
 - spec/support/select_date_spec_helper.rb
 - spec/support/shared_contexts/a_global_rule_set.rb
 - spec/support/shared_examples/accountable_examples.rb

data/app/assets/javascripts/renalware/research.js

@@ -1,18 +0,0 @@
-var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
-
-Renalware.Research = (function() {
-  var focusPatientInput = function() {
-    $('.patient-ajax-search').select2('open');
-    $('select2-patient-ajax-search-container .select2-search__field').focus();
-  };
-
-  return {
-    init: function () {
-      initDatepickersIn(".modal");
-      Renalware.PatientSearch.init();
-      focusPatientInput();
-    }
-  };
-}());
-
-$(document).on('opened.fndtn.reveal', '#study-participant-modal', Renalware.Research.init);

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

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

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

@@ -1,4 +0,0 @@
-// 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

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

data/spec/support/capybara.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-# # frozen_string_literal: true
-if defined?(Capybara)
-  Capybara.register_driver(:headless_chrome) do |app|
-    capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-      chromeOptions: { args: %w(headless disable-gpu window-size=1366,1768) }
-    )
-
-    Capybara::Selenium::Driver.new(
-      app,
-      browser: :chrome,
-      desired_capabilities: capabilities
-    )
-  end
-
-  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
-end

data/spec/support/select2_spec_helper.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Select2SpecHelper
-  def select2(value, opts)
-    scope = opts[:from]
-    select2_container = first("#{scope} + .select2-container")
-    select2_container.first(".select2-selection").click
-
-    first("input.select2-search__field").set(value)
-    page.execute_script(%|$("#{scope} ~ input.select2-search__field:visible").keyup();|)
-    body = find(:xpath, "//body")
-    matches = body.find_all(".select2-results li", text: value)
-    matches.last.click
-  end
-
-  # select2_ajax helper to make capybara work with ajax-enabled Select2 elements
-  # assumes 'placeholder' option is used in Select2 (if it is using ajax, it should be)
-  #
-  # usage:
-  #
-  #    it "should have a select2 field for searching by team name" do
-  #        @team = Factory :team
-  #        select2_ajax @team.name, from: "Select a Team", minlength: 4
-  #        click_button "Join"
-  #        page.should have_content "You are now on '#{@team.name}'."
-  #    end
-  # Thx to https://gist.github.com/sbeam/3849340
-  def select2_ajax(value, options = {})
-    if !options.is_a?(Hash) || !options.key?(:from)
-      raise "Must pass a hash containing 'from'"
-    end
-
-    placeholder = options[:from]
-    minlength = options[:minlength] || 4
-
-    # click_link placeholder
-
-    page.find(:xpath, "//*[text()='#{placeholder}']").click
-
-    js = %Q|container = $('.select2-container:contains("#{placeholder}")');
-            $('input[type=text]', container).val('#{value[0, minlength]}').trigger('keyup');
-            window.setTimeout( function() {
-              $('li:contains("#{value}")', container).click();
-            }, 5000);|
-    page.execute_script(js)
-  end
-end