renalware-core 2.0.167 → 2.1.0

data/app/components/renalware/system/users_awaiting_approval_component.pt.yml

@@ -0,0 +1,7 @@
+---
+pt:
+  renalware:
+    system:
+      users_awaiting_approval_component:
+        title: Udministração do usuário
+        waiting_for_approval: "%{count} usuários à espera de aprovação"

data/app/components/renalware/system/users_awaiting_approval_component.rb

@@ -8,14 +8,6 @@ module Renalware
       def users_needing_approval_count
         @users_needing_approval_count ||= User.unapproved.count
       end
-
-      def users_needing_approval_title
-        [
-          users_needing_approval_count,
-          "user".pluralize(users_needing_approval_count),
-          "awaiting approval"
-        ].join(" ")
-      end
     end
   end
 end

data/app/components/renalware/users/last_signin_component.en.yml

@@ -0,0 +1,6 @@
+---
+en:
+  renalware:
+    users:
+      last_signin_component:
+        title: You last signed in at %{time} on %{date}

data/app/components/renalware/users/last_signin_component.html.slim

@@ -1,3 +1,3 @@
 - if effective_last_sign_in_at.present?
   p.last-login(style="position: absolute;top: -36px; right: 2px;")
-    = "You last signed in at #{effective_last_sign_in_at.strftime("%H:%M")} on #{effective_last_sign_in_at.strftime("%d-%b-%Y")}"
+    = t(".title", time: effective_last_sign_in_at.strftime("%H:%M"), date: effective_last_sign_in_at.strftime("%d-%b-%Y"))

data/app/components/renalware/users/last_signin_component.pt.yml

@@ -0,0 +1,6 @@
+---
+pt:
+  renalware:
+    users:
+      last_signin_component:
+        title: Seu último login foi às %{time} em %{date}

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

@@ -22,9 +22,9 @@ module Renalware
 
         if assessment.save_by(current_user)
           redirect_to patient_accesses_dashboard_path(patient),
-                      notice: t(".success", model_name: "Access assessment")
+                      notice: success_msg_for("Access assessment")
         else
-          flash.now[:error] = t(".failed", model_name: "Access assessment")
+          flash.now[:error] = failed_msg_for("Access assessment")
           render_new(assessment)
         end
       end
@@ -38,9 +38,9 @@ module Renalware
 
         if assessment.update_by(current_user, assessment_params)
           redirect_to patient_accesses_dashboard_path(patient),
-                      notice: t(".success", model_name: "Access assessment")
+                      notice: success_msg_for("Access assessment")
         else
-          flash.now[:error] = t(".failed", model_name: "Access assessment")
+          flash.now[:error] = failed_msg_for("Access assessment")
           render_edit(assessment)
         end
       end

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

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

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

@@ -21,9 +21,9 @@ module Renalware
 
         if profile.save
           redirect_to patient_accesses_dashboard_path(patient),
-                      notice: t(".success", model_name: "Access profile")
+                      notice: success_msg_for("Access profile")
         else
-          flash.now[:error] = t(".failed", model_name: "Access profile")
+          flash.now[:error] = failed_msg_for("Access profile")
           render :new, locals: { patient: patient, profile: profile }
         end
       end
@@ -38,9 +38,9 @@ module Renalware
 
         if profile.update(profile_params)
           redirect_to patient_accesses_dashboard_path(patient),
-                      notice: t(".success", model_name: "Access profile")
+                      notice: success_msg_for("Access profile")
         else
-          flash.now[:error] = t(".failed", model_name: "Access profile")
+          flash.now[:error] = failed_msg_for("Access profile")
           render :edit, locals: { patient: patient, profile: profile }
         end
       end

data/app/controllers/renalware/admin/users_controller.rb

@@ -24,9 +24,9 @@ module Renalware
       user = find_and_authorize_user
       if System::UpdateUser.new(user).call(update_params)
         redirect_to admin_users_path,
-                    notice: t(".success", model_name: "user")
+                    notice: success_msg_for("user")
       else
-        flash.now[:error] = t(".failed", model_name: "user")
+        flash.now[:error] = failed_msg_for("user")
         render :edit, locals: { user: user }
       end
     end

data/app/controllers/renalware/base_controller.rb

@@ -48,11 +48,11 @@ module Renalware
     end
 
     def success_msg_for(model_name)
-      t(".success", model_name: model_name)
+      t("#{action_name}.success", model_name: model_name)
     end
 
     def failed_msg_for(model_name)
-      t(".failed", model_name: model_name)
+      t("#{action_name}.failed", model_name: model_name)
     end
 
     def paginate(collection, default_per_page: 25)

data/app/controllers/renalware/clinical/body_compositions_controller.rb

@@ -32,9 +32,9 @@ module Renalware
         body_composition = build_body_composition
         if body_composition.save
           redirect_to patient_clinical_profile_path(patient),
-                      notice: t(".success", model_name: "body composition")
+                      notice: success_msg_for("body composition")
         else
-          flash.now[:error] = t(".failed", model_name: "body composition")
+          flash.now[:error] = failed_msg_for("body composition")
           render_new(body_composition)
         end
       end

data/app/controllers/renalware/clinical/dry_weights_controller.rb

@@ -40,10 +40,10 @@ module Renalware
         dry_weight.attributes = dry_weight_params
 
         if dry_weight.save
-          redirect_to return_url, notice: t(".success", model_name: "dry weight")
+          redirect_to return_url, notice: success_msg_for("dry weight")
           session.delete(:return_to)
         else
-          flash.now[:error] = t(".failed", model_name: "dry weight")
+          flash.now[:error] = failed_msg_for("dry weight")
           render_new(dry_weight)
         end
       end

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

@@ -23,7 +23,7 @@ module Renalware
         authorize patient
         if update_patient
           redirect_to patient_clinical_profile_path(patient),
-                      notice: t(".success", model_name: "clinical history")
+                      notice: success_msg_for("clinical history")
         else
           render :edit, locals: { patient: patient }
         end
@@ -33,6 +33,7 @@ module Renalware
 
       def update_patient
         patient.named_consultant_id = profile_params[:named_consultant_id]
+        patient.named_nurse_id = profile_params[:named_nurse_id]
         document = patient.document
 
         %i(diabetes history).each do |document_attribute|
@@ -48,7 +49,7 @@ module Renalware
         params
           .require(:clinical_profile)
           .permit(
-            :named_consultant_id,
+            :named_consultant_id, :named_nurse_id,
             document: {
               diabetes: %i(diagnosis diagnosed_on),
               history: %i(alcohol smoking)

data/app/controllers/renalware/clinics/appointments_controller.rb

@@ -29,7 +29,7 @@ module Renalware
         appointment = Appointment.new(appointment_params)
         authorize appointment
         if appointment.save_by(current_user)
-          redirect_to appointments_path, notice: t(".success", model_name: "Appointment")
+          redirect_to appointments_path, notice: success_msg_for("Appointment")
         else
           render_new(appointment)
         end

data/app/controllers/renalware/clinics/clinic_visits_controller.rb

@@ -47,9 +47,9 @@ module Renalware
       def update
         if @clinic_visit.update(visit_params)
           redirect_to patient_clinic_visits_path(@patient),
-                      notice: t(".success", model_name: "clinic visit")
+                      notice: success_msg_for("clinic visit")
         else
-          flash.now[:error] = t(".failed", model_name: "clinic visit")
+          flash.now[:error] = failed_msg_for("clinic visit")
           render :edit
         end
       end
@@ -57,7 +57,7 @@ module Renalware
       def destroy
         @clinic_visit.destroy
         redirect_to patient_clinic_visits_path(@patient),
-                    notice: t(".success", model_name: "clinic visit")
+                    notice: success_msg_for("clinic visit")
       end
 
       private

data/app/controllers/renalware/concerns/devise_controller_methods.rb

@@ -55,6 +55,7 @@ module Renalware
             :password_confirmation,
             :current_password,
             :professional_position,
+            :language,
             :signature,
             :with_extended_validation
           ]

data/app/controllers/renalware/deaths_controller.rb

@@ -25,9 +25,9 @@ module Renalware
       authorize patient
       if patient.update(death_params)
         redirect_to patient_clinical_profile_path(patient),
-                    notice: t(".success", model_name: "patient")
+                    notice: success_msg_for("patient")
       else
-        flash.now[:error] = t(".failed", model_name: "patient")
+        flash.now[:error] = failed_msg_for("patient")
         render_edit
       end
     end

data/app/controllers/renalware/directory/people_controller.rb

@@ -39,9 +39,9 @@ module Renalware
         authorize person
 
         if person.save
-          redirect_to directory_people_path, notice: t(".success", model_name: "Directory person")
+          redirect_to directory_people_path, notice: success_msg_for("Directory person")
         else
-          flash.now[:error] = t(".failed", model_name: "Directory person")
+          flash.now[:error] = failed_msg_for("Directory person")
           render_new(person)
         end
       end
@@ -56,9 +56,9 @@ module Renalware
         person = Person.find(params[:id])
         authorize person
         if person.update(person_params)
-          redirect_to directory_people_path, notice: t(".success", model_name: "Directory person")
+          redirect_to directory_people_path, notice: success_msg_for("Directory person")
         else
-          flash.now[:error] = t(".failed", model_name: "Directory person")
+          flash.now[:error] = failed_msg_for("Directory person")
           render_edit(person)
         end
       end

data/app/controllers/renalware/drugs/drugs_controller.rb

@@ -32,9 +32,9 @@ module Renalware
 
         if @drug.save
           redirect_to drugs_drugs_path,
-                      notice: t(".success", model_name: "drug")
+                      notice: success_msg_for("drug")
         else
-          flash.now[:error] = t(".failed", model_name: "drug")
+          flash.now[:error] = failed_msg_for("drug")
           render :new
         end
       end
@@ -60,16 +60,16 @@ module Renalware
         @drug = Drug.find(params[:id])
         authorize @drug
         if @drug.update(drug_params)
-          redirect_to drugs_drugs_path, notice: t(".success", model_name: "drug")
+          redirect_to drugs_drugs_path, notice: success_msg_for("drug")
         else
-          flash.now[:error] = t(".failed", model_name: "drug")
+          flash.now[:error] = failed_msg_for("drug")
           render :edit
         end
       end
 
       def destroy
         authorize Drug.destroy(params[:id])
-        redirect_to drugs_drugs_path, notice: t(".success", model_name: "drug")
+        redirect_to drugs_drugs_path, notice: success_msg_for("drug")
       end
 
       private

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

@@ -31,9 +31,9 @@ module Renalware
         event = new_event_for_patient(event_params)
 
         if CreateEvent.call(event: event, by: current_user)
-          redirect_to return_url, notice: t(".success", model_name: "event")
+          redirect_to return_url, notice: success_msg_for("event")
         else
-          flash.now[:error] = t(".failed", model_name: "event")
+          flash.now[:error] = failed_msg_for("event")
           render_new(event)
         end
       end
@@ -58,7 +58,7 @@ module Renalware
         event = load_and_authorize_event_for_edit_or_update
 
         if UpdateEvent.call(event: event, params: event_params, by: current_user)
-          redirect_to return_url, notice: t(".success", model_name: "event")
+          redirect_to return_url, notice: success_msg_for("event")
         else
           flash.now[:error] = failed_msg_for("event type")
           render_edit(event)

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

@@ -52,7 +52,7 @@ module Renalware
       private
 
       def event_params
-        params.require(:events_type).permit(:name, :deleted_at)
+        params.require(:events_type).permit(:name, :category_id, :deleted_at)
       end
 
       def load_and_authorize_event_type

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

@@ -17,9 +17,9 @@ module Renalware
 
         if cannulation_type.save
           redirect_to hd_cannulation_types_path,
-                      notice: t(".success", model_name: "cannulation type")
+                      notice: success_msg_for("cannulation type")
         else
-          flash.now[:error] = t(".failed", model_name: "cannulation type")
+          flash.now[:error] = failed_msg_for("cannulation type")
           render_new(cannulation_type)
         end
       end
@@ -39,9 +39,9 @@ module Renalware
         cannulation_type = find_and_authorize_cannulation_type
         if cannulation_type.update(cannulation_type_params)
           redirect_to hd_cannulation_types_path,
-                      notice: t(".success", model_name: "cannulation type")
+                      notice: success_msg_for("cannulation type")
         else
-          flash.now[:error] = t(".failed", model_name: "cannulation type")
+          flash.now[:error] = failed_msg_for("cannulation type")
           render_edit(cannulation_type)
         end
       end
@@ -49,7 +49,7 @@ module Renalware
       def destroy
         authorize CannulationType.destroy(params[:id])
         redirect_to hd_cannulation_types_path,
-                    notice: t(".success", model_name: "cannulation type")
+                    notice: success_msg_for("cannulation type")
       end
 
       private

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

@@ -19,9 +19,9 @@ module Renalware
       def update
         if update_profile
           redirect_to patient_hd_dashboard_path(patient),
-                      notice: t(".success", model_name: "HD profile")
+                      notice: success_msg_for("HD profile")
         else
-          flash.now[:error] = t(".failed", model_name: "HD profile")
+          flash.now[:error] = failed_msg_for("HD profile")
           render :edit, locals: locals
         end
       end
@@ -35,6 +35,8 @@ module Renalware
       end
 
       def update_profile
+        update_named_nurse_on_patient
+
         if profile.persisted?
           ReviseHDProfile.new(profile).call(profile_params)
         else
@@ -42,6 +44,13 @@ module Renalware
         end
       end
 
+      def update_named_nurse_on_patient
+        patient.update!(
+          named_nurse_id: profile_params[:named_nurse_id],
+          by: current_user
+        )
+      end
+
       def preference_set
         PreferenceSet.for_patient(patient).first_or_initialize
       end
@@ -51,7 +60,12 @@ module Renalware
       end
 
       def load_profile
-        @profile = Profile.for_patient(patient).first_or_initialize
+        @profile = begin
+          Profile
+            .for_patient(patient)
+            .first_or_initialize
+            .tap { |profile| profile.named_nurse_id = patient.named_nurse_id }
+        end
       end
 
       def profile_params
@@ -61,6 +75,8 @@ module Renalware
           .to_h.merge(by: current_user)
       end
 
+      # Note that named_nurse_id is a virtual attribute allowing us to update
+      # patient.named_nurse using the hd profile form.
       def attributes
         [
           :schedule_definition_id, :other_schedule, :hospital_unit_id, :dialysate_id,

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

@@ -17,9 +17,9 @@ module Renalware
 
         if preference_set.update(preference_set_params)
           redirect_to patient_hd_dashboard_path(patient),
-                      notice: t(".success", model_name: "HD preferences")
+                      notice: success_msg_for("HD preferences")
         else
-          flash.now[:error] = t(".failed", model_name: "HD preferences")
+          flash.now[:error] = failed_msg_for("HD preferences")
           render :edit, locals: { patient: patient, preference_set: preference_set }
         end
       end

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