renalware-core 2.0.164 → 2.1.1

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

@@ -61,7 +61,7 @@ module Renalware
         authorize session
         session.destroy!
         regenerate_rolling_hd_statistics
-        message = t(".success", model_name: "HD session")
+        message = success_msg_for("HD session")
         redirect_to patient_hd_dashboard_path(patient), notice: message
       end
 
@@ -75,12 +75,12 @@ module Renalware
 
       def save_success(_session)
         url = patient_hd_dashboard_path(patient)
-        message = t(".success", model_name: "HD session")
+        message = success_msg_for("HD session")
         redirect_to url, notice: message
       end
 
       def save_failure(session)
-        flash.now[:error] = t(".failed", model_name: "HD session")
+        flash.now[:error] = failed_msg_for("HD session")
         action = action_name.to_sym == :create ? :new : :edit
         render action, locals: locals(session)
       end

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

@@ -94,6 +94,7 @@ module Renalware
           .require(:batch)
           .permit(
             :enclosures_present,
+            :notes_present,
             :state_eq,
             :author_id_eq,
             :created_by_id_eq,

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

@@ -61,7 +61,7 @@ module Renalware
       end
 
       def draft_letter_failed(letter)
-        flash.now[:error] = t(".failed", model_name: "Letter")
+        flash.now[:error] = failed_msg_for("Letter")
         render_form(letter, :new)
       end
 
@@ -84,7 +84,7 @@ module Renalware
       end
 
       def revise_letter_failed(letter)
-        flash.now[:error] = t(".failed", model_name: "Letter")
+        flash.now[:error] = failed_msg_for("Letter")
         render_form(letter, :edit)
       end
 
@@ -191,7 +191,7 @@ module Renalware
       def attributes
         [
           :event_type, :event_id, :clinical,
-          :letterhead_id, :author_id, :description, :issued_on, :enclosures,
+          :letterhead_id, :author_id, :description, :enclosures,
           :salutation, :body, :notes, :pathology_timestamp,
           main_recipient_attributes: main_recipient_attributes,
           cc_recipients_attributes: cc_recipients_attributes,

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

@@ -61,6 +61,7 @@ module Renalware
       end
 
       # These are used also when creating a batch.
+      # rubocop:disable Metrics/MethodLength
       def filter_parameters
         return {} unless params.key?(:q)
 
@@ -68,6 +69,7 @@ module Renalware
           .require(:q)
           .permit(
             :enclosures_present,
+            :notes_present,
             :state_eq,
             :author_id_eq,
             :created_by_id_eq,
@@ -76,6 +78,7 @@ module Renalware
             :s
           )
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Renalware
         profile = find_and_authorize_profile
         if profile.update_by(current_user, profile_params)
           redirect_to patient_low_clearance_dashboard_path,
-                      notice: t(".success", model_name: "profile")
+                      notice: success_msg_for("profile")
         else
           flash.now[:error] = failed_msg_for("profile")
           render_edit(profile)

data/app/controllers/renalware/messaging/internal/messages_controller.rb

@@ -11,13 +11,13 @@ module Renalware
         include Pagy::Backend
 
         def new
-          authorize Message, :new?
+          authorize Messaging::Internal::Message, :new?
           form = MessageFormBuilder.new(patient: patient, params: params).call
           render_new(form)
         end
 
         def create
-          authorize Message, :create?
+          authorize Messaging::Internal::Message, :create?
           form = MessageForm.new(message_params)
 
           if form.valid?
@@ -31,7 +31,7 @@ module Renalware
 
         # Display all public message for a patient
         def index
-          authorize Message, :index?
+          authorize Messaging::Internal::Message, :index?
           scope = patient.messages.where(public: true).order(created_at: :desc)
           pagination, messages = pagy(scope, items: 20)
           render locals: { patient: patient, messages: messages, pagination: pagination }

data/app/controllers/renalware/modalities/descriptions_controller.rb

@@ -17,9 +17,9 @@ module Renalware
 
         if modality_description.save
           redirect_to modalities_descriptions_path,
-                      notice: t(".success", model_name: "modality description")
+                      notice: success_msg_for("modality description")
         else
-          flash.now[:error] = t(".failed", model_name: "modality description")
+          flash.now[:error] = failed_msg_for("modality description")
           render_new(modality_description)
         end
       end
@@ -38,9 +38,9 @@ module Renalware
         modality_description = find_and_authorize_modality_description
         if modality_description.update(modality_description_params)
           redirect_to modalities_descriptions_path,
-                      notice: t(".success", model_name: "modality description")
+                      notice: success_msg_for("modality description")
         else
-          flash.now[:error] = t(".failed", model_name: "modality description")
+          flash.now[:error] = failed_msg_for("modality description")
           render_edit(modality_description)
         end
       end
@@ -48,7 +48,7 @@ module Renalware
       def destroy
         authorize Description.destroy(params[:id])
         redirect_to modalities_descriptions_path,
-                    notice: t(".success", model_name: "modality description")
+                    notice: success_msg_for("modality description")
       end
 
       private

data/app/controllers/renalware/modalities/modalities_controller.rb

@@ -25,7 +25,7 @@ module Renalware
         if result.success?
           handle_valid_modality
         else
-          flash.now[:error] = t(".failed", model_name: "modality")
+          flash.now[:error] = failed_msg_for("modality")
           render :new, locals: { patient: patient, modality: result.object }
         end
       end
@@ -62,7 +62,7 @@ module Renalware
           }
         else
           redirect_to patient_modalities_path(patient),
-                      notice: t(".success", model_name: "modality")
+                      notice: success_msg_for("modality")
         end
       end
       # rubocop:enable Metrics/MethodLength

data/app/controllers/renalware/pathology/observation_descriptions_controller.rb

@@ -26,7 +26,7 @@ module Renalware
         if description.update(description_params)
           redirect_to(
             pathology_observation_descriptions_path,
-            notice: t(".success", model_name: "observation descrition")
+            notice: success_msg_for("observation descrition")
           )
         else
           render_edit(description)

data/app/controllers/renalware/pathology/patient_rules_controller.rb

@@ -18,9 +18,9 @@ module Renalware
 
         if patient_rule.save
           redirect_to patient_pathology_required_observations_path(@patient),
-                      notice: t(".success", model_name: "Patient Rule")
+                      notice: success_msg_for("Patient Rule")
         else
-          flash.now[:error] = t(".failed", model_name: "Patient Rule")
+          flash.now[:error] = failed_msg_for("Patient Rule")
           render_new(patient_rule)
         end
       end
@@ -36,9 +36,9 @@ module Renalware
 
         if patient_rule.update(patient_rule_params)
           redirect_to patient_pathology_required_observations_path(@patient),
-                      notice: t(".success", model_name: "patient rule")
+                      notice: success_msg_for("patient rule")
         else
-          flash.now[:error] = t(".failed", model_name: "patient rule")
+          flash.now[:error] = failed_msg_for("patient rule")
           render_edit(patient_rule)
         end
       end
@@ -47,7 +47,7 @@ module Renalware
         Requests::PatientRule.destroy(params[:id])
 
         redirect_to patient_pathology_required_observations_path(@patient),
-                    notice: t(".success", model_name: "patient rule")
+                    notice: success_msg_for("patient rule")
       end
 
       private

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

@@ -55,7 +55,7 @@ module Renalware
         if patient.update_by(current_user, patient_params)
           redirect_to_patient_demographics(patient)
         else
-          flash.now[:error] = t(".failed", model_name: "patient")
+          flash.now[:error] = failed_msg_for("patient")
           render :edit, locals: { patient: patient }
         end
       end

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

@@ -37,10 +37,10 @@ module Renalware
 
         if @primary_care_physician.save
           redirect_to patients_primary_care_physicians_path,
-                      notice: t(".success", model_name: "primary_care_physician")
+                      notice: success_msg_for("primary_care_physician")
         else
           @alternative_address = alternative_address
-          flash.now[:error] = t(".failed", model_name: "primary_care_physician")
+          flash.now[:error] = failed_msg_for("primary_care_physician")
           render :new
         end
       end
@@ -57,7 +57,7 @@ module Renalware
         authorize PrimaryCarePhysician.destroy(params[:id])
 
         redirect_to patients_primary_care_physicians_path,
-                    notice: t(".success", model_name: "primary_care_physician")
+                    notice: success_msg_for("primary_care_physician")
       end
 
       private
@@ -72,13 +72,13 @@ module Renalware
       end
 
       def update_primary_care_physician_failed(primary_care_physician)
-        flash.now[:error] = t(".failed", model_name: "primary_care_physician")
+        flash.now[:error] = failed_msg_for("primary_care_physician")
         render_form(primary_care_physician, :edit)
       end
 
       def redirect_to_primary_care_physicians_list
         redirect_to patients_primary_care_physicians_path,
-                    notice: t(".success", model_name: "primary_care_physician")
+                    notice: success_msg_for("primary_care_physician")
       end
 
       def render_form(primary_care_physician, action)

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

@@ -17,9 +17,9 @@ module Renalware
 
         if bag_type.save
           redirect_to pd_bag_types_path,
-                      notice: t(".success", model_name: "bag type")
+                      notice: success_msg_for("bag type")
         else
-          flash.now[:error] = t(".failed", model_name: "bag type")
+          flash.now[:error] = failed_msg_for("bag type")
           render :new, locals: { bag_type: bag_type }
         end
       end
@@ -38,9 +38,9 @@ module Renalware
         bag_type = load_and_authorize_bag_type
         if bag_type.update(bag_type_params)
           redirect_to pd_bag_types_path,
-                      notice: t(".success", model_name: "bag type")
+                      notice: success_msg_for("bag type")
         else
-          flash.now[:error] = t(".failed", model_name: "bag type")
+          flash.now[:error] = failed_msg_for("bag type")
           render :edit, locals: { bag_type: bag_type }
         end
       end
@@ -48,7 +48,7 @@ module Renalware
       def destroy
         bag_type = load_and_authorize_bag_type
         bag_type.destroy!
-        redirect_to pd_bag_types_path, notice: t(".success", model_name: "bag type")
+        redirect_to pd_bag_types_path, notice: success_msg_for("bag type")
       end
 
       private

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

@@ -28,9 +28,9 @@ module Renalware
         authorize esi
         if esi.save
           redirect_to patient_pd_exit_site_infection_path(patient, esi),
-                      notice: t(".success", model_name: "exit site infection")
+                      notice: success_msg_for("exit site infection")
         else
-          flash.now[:error] = t(".failed", model_name: "exit site infection")
+          flash.now[:error] = failed_msg_for("exit site infection")
           render_new(esi)
         end
       end
@@ -44,9 +44,9 @@ module Renalware
         authorize exit_site_infection
         if exit_site_infection.update(exit_site_infection_params)
           redirect_to patient_pd_exit_site_infection_path(patient, exit_site_infection),
-                      notice: t(".success", model_name: "exit site infection")
+                      notice: success_msg_for("exit site infection")
         else
-          flash.now[:error] = t(".failed", model_name: "exit site infection")
+          flash.now[:error] = failed_msg_for("exit site infection")
           render_edit
         end
       end

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

@@ -56,7 +56,7 @@ module Renalware
       end
 
       def save_failure(episode)
-        flash.now[:error] = t(".failed", model_name: "peritonitis episode")
+        flash.now[:error] = failed_msg_for("peritonitis episode")
         action = action_name.to_sym == :create ? :new : :edit
         render action, locals: {
           peritonitis_episode: episode,
@@ -98,7 +98,7 @@ module Renalware
 
       def redirect_after_successful_save(episode)
         url = patient_pd_peritonitis_episode_path(patient, episode)
-        message = t(".success", model_name: "peritonitis episode")
+        message = success_msg_for("peritonitis episode")
         redirect_to url, notice: message
       end
 

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

@@ -61,9 +61,9 @@ module Renalware
 
         if result.success?
           redirect_to patient_pd_dashboard_path(patient),
-                      notice: t(".success", model_name: "PD regime")
+                      notice: success_msg_for("PD regime")
         else
-          flash.now[:error] = t(".failed", model_name: "PD regime")
+          flash.now[:error] = failed_msg_for("PD regime")
           render :edit, locals: {
             regime: result.object,
             patient: patient

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

@@ -27,7 +27,7 @@ module Renalware
 
         if profile.update(profile_params)
           redirect_to patient_renal_profile_path(patient),
-                      notice: t(".success", model_name: "profile")
+                      notice: success_msg_for("profile")
         else
           render :edit, locals: {
             patient: patient,

data/app/controllers/renalware/snippets/snippets_controller.rb

@@ -25,7 +25,7 @@ module Renalware
         authorize snippet
 
         if snippet.save
-          redirect_to snippets_path, notice: t(".success", model_name: "snippet")
+          redirect_to snippets_path, notice: success_msg_for("snippet")
         else
           render :new, locals: { snippet: snippet }
         end
@@ -39,7 +39,7 @@ module Renalware
       def update
         snippet = find_and_authorize_snippet
         if snippet.update(snippet_params)
-          redirect_to snippets_path, notice: t(".success", model_name: "snippet")
+          redirect_to snippets_path, notice: success_msg_for("snippet")
         else
           render :edit, locals: { snippet: snippet }
         end

data/app/controllers/renalware/system/downloads_controller.rb

@@ -75,7 +75,7 @@ module Renalware
       end
 
       def notice
-        t(".success", model_name: "download")
+        success_msg_for("download")
       end
 
       def update_view_count_for(download)

data/app/controllers/renalware/transplants/donations_controller.rb

@@ -22,9 +22,9 @@ module Renalware
 
         if donation.save
           redirect_to patient_transplants_donor_dashboard_path(patient),
-                      notice: t(".success", model_name: "donation")
+                      notice: success_msg_for("donation")
         else
-          flash.now[:error] = t(".failed", model_name: "donation")
+          flash.now[:error] = failed_msg_for("donation")
           render :new, locals: { patient: patient, donation: donation }
         end
       end
@@ -40,9 +40,9 @@ module Renalware
 
         if donation.save
           redirect_to patient_transplants_donor_dashboard_path(patient),
-                      notice: t(".success", model_name: "donation")
+                      notice: success_msg_for("donation")
         else
-          flash.now[:error] = t(".failed", model_name: "donation")
+          flash.now[:error] = failed_msg_for("donation")
           render :edit, locals: { patient: patient, donation: donation }
         end
       end

data/app/controllers/renalware/transplants/donor_operations_controller.rb

@@ -22,9 +22,9 @@ module Renalware
 
         if operation.save
           redirect_to patient_transplants_donor_dashboard_path(patient),
-                      notice: t(".success", model_name: "donor operation")
+                      notice: success_msg_for("donor operation")
         else
-          flash.now[:error] = t(".failed", model_name: "donor operation")
+          flash.now[:error] = failed_msg_for("donor operation")
           render :new, locals: { operation: operation, patient: patient }
         end
       end
@@ -40,9 +40,9 @@ module Renalware
 
         if operation.save
           redirect_to patient_transplants_donor_dashboard_path(patient),
-                      notice: t(".success", model_name: "donor operation")
+                      notice: success_msg_for("donor operation")
         else
-          flash.now[:error] = t(".failed", model_name: "donor operation")
+          flash.now[:error] = failed_msg_for("donor operation")
           render :edit, locals: { operation: operation, patient: patient }
         end
       end

data/app/controllers/renalware/transplants/donor_stages_controller.rb

@@ -20,7 +20,7 @@ module Renalware
         result = CreateDonorStage.new(patient: patient, options: donor_stage_params).call
         if result.success?
           redirect_to patient_transplants_donor_dashboard_path(patient),
-                      notice: t(".success", model_name: "donor stage")
+                      notice: success_msg_for("donor stage")
         else
           render :new, locals: {
             patient: patient,