renalware-core 2.0.51 → 2.0.52

data/app/assets/stylesheets/renalware/watermark.scss

@@ -1,8 +1,8 @@
 .letter-wrapper {
-  &.draft, &.pendingreview {
+  &.draft,
+  &.pendingreview {
     background-image: image-url('renalware/draft.jpg');
-    background-repeat: no-repeat;
     background-position: center center;
+    background-repeat: no-repeat;
   }
 }
-

data/app/controllers/renalware/accesses/assessments_controller.rb

@@ -6,10 +6,9 @@ module Renalware
       before_action :load_patient
 
       def show
-        assessment = patient.assessments.find(params[:id])
         render locals: {
           patient: patient,
-          assessment: AssessmentPresenter.new(assessment)
+          assessment: AssessmentPresenter.new(find_assessement)
         }
       end
 
@@ -21,7 +20,7 @@ module Renalware
       def create
         assessment = patient.assessments.new(assessment_params)
 
-        if assessment.save
+        if assessment.save_by(current_user)
           redirect_to patient_accesses_dashboard_path(patient),
             notice: t(".success", model_name: "Access assessment")
         else
@@ -31,14 +30,13 @@ module Renalware
       end
 
       def edit
-        assessment = patient.assessments.find(params[:id])
-        render_edit(assessment)
+        render_edit(find_assessement)
       end
 
       def update
-        assessment = patient.assessments.find(params[:id])
+        assessment = find_assessement
 
-        if assessment.update(assessment_params)
+        if assessment.update_by(current_user, assessment_params)
           redirect_to patient_accesses_dashboard_path(patient),
             notice: t(".success", model_name: "Access assessment")
         else
@@ -49,6 +47,10 @@ module Renalware
 
       protected
 
+      def find_assessement
+        patient.assessments.find(params[:id])
+      end
+
       def render_new(assessment)
         render :new, locals: { patient: patient, assessment: assessment }
       end
@@ -58,10 +60,7 @@ module Renalware
       end
 
       def assessment_params
-        params
-          .require(:accesses_assessment)
-          .permit(attributes)
-          .merge(document: document_attributes, by: current_user)
+        params.require(:accesses_assessment).permit(attributes)
       end
 
       def attributes
@@ -69,16 +68,10 @@ module Renalware
           :performed_on, :first_used_on, :failed_on,
           :side, :type_id,
           :catheter_make, :catheter_lot_no,
-          :performed_by, :notes, :outcome,
-          document: []
+          :performed_by, :notes, :outcome, :comments,
+          document: {}
         ]
       end
-
-      def document_attributes
-        params
-          .require(:accesses_assessment)
-          .fetch(:document, nil).try(:permit!)
-      end
     end
   end
 end

data/app/controllers/renalware/base_controller.rb

@@ -9,6 +9,8 @@ module Renalware
 
     before_action :set_paper_trail_whodunnit
     after_action :verify_authorized
+    # has_user_timed_out is defined on SessionTimeoutController
+    # Perhaps we should define #has_user_timed_out here and override in SessionTimeoutController?
     after_action :track_action, except: [:has_user_timed_out]
 
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized

data/app/controllers/renalware/events/events_controller.rb

@@ -22,7 +22,7 @@ module Renalware
       def create
         event = new_event_for_patient(event_params)
 
-        if event.save
+        if event.save_by(current_user)
           redirect_to return_url, notice: t(".success", model_name: "event")
         else
           flash.now[:error] = t(".failed", model_name: "event")
@@ -56,7 +56,7 @@ module Renalware
 
       def update
         event = load_and_authorize_event_for_edit_or_update
-        if event.update(event_params)
+        if event.update_by(current_user, event_params)
           redirect_to return_url, notice: t(".success", model_name: "event")
         else
           flash.now[:error] = failed_msg_for("event type")
@@ -131,15 +131,16 @@ module Renalware
       end
 
       def event_params
-        params.require(:events_event)
-              .permit(:event_type_id, :date_time, :description, :notes,
-                      :disable_selection_of_event_type, document: [])
-              .merge!(document: document_attributes)
-              .merge!(by: current_user)
-      end
-
-      def document_attributes
-        params.require(:events_event).fetch(:document, nil).try(:permit!)
+        params
+          .require(:events_event)
+          .permit(
+            :event_type_id,
+            :date_time,
+            :description,
+            :notes,
+            :disable_selection_of_event_type,
+            document: {}
+          )
       end
 
       def new_event_for_patient(params = {})

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

@@ -58,7 +58,7 @@ module Renalware
         params
           .require(:hd_profile)
           .permit(attributes)
-          .merge(document: document_attributes, by: current_user)
+          .to_h.merge(by: current_user)
       end
 
       def attributes
@@ -66,15 +66,9 @@ module Renalware
           :schedule_definition_id, :other_schedule, :hospital_unit_id, :dialysate_id,
           :prescribed_time, :prescribed_on, :prescriber_id,
           :named_nurse_id, :transport_decider_id,
-          document: []
+          document: {}
         ]
       end
-
-      def document_attributes
-        params
-          .require(:hd_profile)
-          .fetch(:document, nil).try(:permit!)
-      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Renalware
   module HD
     class MDMPatientsController < Renalware::MDMPatientsController
       def index
-        filter_form = HD::MDMPatientsForm.new(filter_form_params)
+        filter_form = form_object_class.new(filter_form_params)
 
         query = HD::MDMPatientsQuery.new(
           params: filter_form.ransacked_parameters.merge(query_params).with_indifferent_access
@@ -21,12 +21,18 @@ module Renalware
 
       private
 
+      # Permit all attributes on the filter form object. Slightly messy
       def filter_form_params
-        params.fetch(:filter, {}).permit!
+        params.fetch(:filter, {}).permit(form_object_class.permittable_attributes)
       end
 
+      def form_object_class
+        Renalware::HD::MDMPatientsForm
+      end
+
+      # Ransack params use for column sorting
       def query_params
-        params.fetch(:q, {}).permit!
+        params.fetch(:q, {}).permit(:s)
       end
 
       def render_index(filter_form:, **args)

data/app/controllers/renalware/letters/electronic_receipts_controller.rb

@@ -54,11 +54,6 @@ module Renalware
         )
       end
 
-      # def filter_receipts(receipts, search_form)
-      #   matching_patients = Patients::SearchQuery.new(term: search_form.term).call
-      #   receipts.joins(letter: [:patient]).merge(matching_patients)
-      # end
-
       def search_term
         params.fetch(:patient_search, {}).fetch(:term, nil)
       end

data/app/controllers/renalware/letters/letters_controller.rb

@@ -210,12 +210,6 @@ module Renalware
         ]
       end
 
-      # def electronic_receipts_attributes
-      #   [
-      #     :recipient_id
-      #   ]
-      # end
-
       def address_attributes
         [
           :id, :name, :organisation_name, :street_1, :street_2, :street_3, :town, :county,

data/app/controllers/renalware/low_clearance/profiles_controller.rb

@@ -33,14 +33,7 @@ module Renalware
       end
 
       def profile_params
-        params
-          .require(:low_clearance_profile)
-          .permit(document: [])
-          .merge(document: document_attributes)
-      end
-
-      def document_attributes
-        params.require(:low_clearance_profile)[:document]&.permit!
+        params.require(:low_clearance_profile).permit(document: {})
       end
     end
   end

data/app/controllers/renalware/patients/patients_controller.rb

@@ -36,7 +36,7 @@ module Renalware
         patient = Patient.new(patient_params)
         authorize patient
 
-        if patient.save
+        if patient.save_by(current_user)
           # Reload in order to let pg generate the secure id
           redirect_to_patient_demographics(patient.reload)
         else
@@ -52,7 +52,7 @@ module Renalware
 
       def update
         authorize patient
-        if patient.update(patient_params)
+        if patient.update_by(current_user, patient_params)
           redirect_to_patient_demographics(patient)
         else
           flash.now[:error] = t(".failed", model_name: "patient")
@@ -81,11 +81,7 @@ module Renalware
       end
 
       def patient_params
-        params
-          .require(:patient)
-          .permit(patient_attributes)
-          .merge(document: document_attributes)
-          .merge(by: current_user)
+        params.require(:patient).permit(patient_attributes)
       end
 
       def patient_attributes
@@ -98,7 +94,8 @@ module Renalware
           :local_patient_id_4, :local_patient_id_5, :external_patient_id,
           :send_to_renalreg, :send_to_rpv, :renalreg_decision_on, :rpv_decision_on,
           :renalreg_recorded_by, :rpv_recorded_by,
-          current_address_attributes: address_params
+          current_address_attributes: address_params,
+          document: {}
         ]
       end
 
@@ -109,13 +106,6 @@ module Renalware
         ]
       end
 
-      def document_attributes
-        params
-          .require(:patient)
-          .fetch(:document, nil)
-          .try(:permit!)
-      end
-
       def redirect_to_patient_demographics(patient)
         redirect_to patient, notice: success_msg_for("patient")
       end

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

@@ -20,7 +20,7 @@ module Renalware
       def create
         assessment = PD::Assessment.for_patient(patient).new(assessment_params)
         authorize assessment
-        if assessment.save
+        if assessment.save_by(current_user)
           redirect_to patient_pd_dashboard_path(patient),
                       notice: success_msg_for("assessment")
         else
@@ -37,7 +37,7 @@ module Renalware
       def update
         assessment = find_assessment
         authorize assessment
-        if assessment.update(assessment_params)
+        if assessment.update_by(current_user, assessment_params)
           redirect_to patient_pd_dashboard_path(patient),
                       notice: success_msg_for("assessment")
         else
@@ -52,20 +52,7 @@ module Renalware
       end
 
       def assessment_params
-        params
-          .require(:assessment)
-          .permit(attributes)
-          .merge(document: document_attributes, by: current_user)
-      end
-
-      def attributes
-        [
-          document: []
-        ]
-      end
-
-      def document_attributes
-        params.require(:assessment).fetch(:document, nil).try(:permit!)
+        params.require(:assessment).permit(document: {})
       end
     end
   end

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

@@ -12,15 +12,15 @@ module Renalware
       end
 
       def new
-        training_session = PD::TrainingSession.for_patient(patient).new
+        training_session = TrainingSession.for_patient(patient).new
         authorize training_session
         render locals: { patient: patient, training_session: training_session }
       end
 
       def create
-        training_session = PD::TrainingSession.for_patient(patient).new(training_session_params)
+        training_session = TrainingSession.for_patient(patient).new(training_session_params)
         authorize training_session
-        if training_session.save
+        if training_session.save_by(current_user)
           redirect_to patient_pd_dashboard_path(patient),
             notice: success_msg_for("training_session")
         else
@@ -37,7 +37,7 @@ module Renalware
       def update
         training_session = find_training_session
         authorize training_session
-        if training_session.update(training_session_params)
+        if training_session.update_by(current_user, training_session_params)
           redirect_to patient_pd_dashboard_path(patient),
             notice: success_msg_for("training_session")
         else
@@ -48,27 +48,13 @@ module Renalware
       private
 
       def find_training_session
-        PD::TrainingSession.for_patient(patient).find(params[:id])
+        TrainingSession.for_patient(patient).find(params[:id])
       end
 
       def training_session_params
         params
           .require(:training_session)
-          .permit(training_session_attributes)
-          .merge(document: document_attributes, by: current_user)
-      end
-
-      def training_session_attributes
-        [
-          :training_site_id, :training_type_id
-        ]
-      end
-
-      def document_attributes
-        params
-          .require(:training_session)
-          .fetch(:document, nil)
-          .try(:permit!)
+          .permit(:training_site_id, :training_type_id, document: {})
       end
     end
   end

data/app/controllers/renalware/renal/profiles_controller.rb

@@ -44,9 +44,8 @@ module Renalware
           .permit(
             :esrf_on, :first_seen_on, :prd_description_id, :weight_at_esrf,
             :modality_at_esrf, :comorbidities_updated_on,
-            address_at_diagnosis_attributes: address_params
+            address_at_diagnosis_attributes: address_params, document: {}
           )
-          .merge(document: document_attributes)
       end
 
       def address_params
@@ -59,13 +58,6 @@ module Renalware
       def find_profile
         patient.profile || patient.build_profile
       end
-
-      def document_attributes
-        params
-          .require(:renal_profile)
-          .fetch(:document, nil)
-          .try(:permit!)
-      end
     end
   end
 end

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

@@ -8,9 +8,10 @@ module Renalware
       include Renalware::Concerns::Pageable
 
       def index
-        studies = Study.ordered.page(page).per(per_page)
+        query = Study.ordered.ransack(params[:q])
+        studies = query.result.page(page).per(per_page)
         authorize studies
-        render locals: { studies: studies }
+        render locals: { studies: studies, query: query }
       end
 
       def new

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

@@ -9,7 +9,7 @@ module Renalware
 
       def index
         authorize StudyParticipant, :index?
-        render locals: { study: study, participants: participants }
+        render_current_action_with_locals
       end
 
       def show
@@ -23,7 +23,7 @@ module Renalware
         authorize participant
 
         if participant.save
-          render locals: { study: study, participants: participants }
+          render_current_action_with_locals
         else
           render_new(participant)
         end
@@ -50,7 +50,7 @@ module Renalware
       def update
         participant = find_and_authorise_participant
         if participant.update(participant_params_for_update)
-          render locals: { study: study, participants: participants }
+          render_current_action_with_locals
         else
           render_edit(participant)
         end
@@ -70,6 +70,12 @@ module Renalware
         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 }
+      end
+
       def study
         @study ||= Study.find(params[:study_id])
       end