renalware-core 2.0.0.pre.beta4 → 2.0.0.pre.beta5

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

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

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

@@ -19,7 +19,7 @@ module Renalware
         redirect_to admin_users_path,
           notice: t(".success", model_name: "user")
       else
-        flash[:error] = t(".failed", model_name: "user")
+        flash.now[:error] = t(".failed", model_name: "user")
         render :edit
       end
     end

data/app/controllers/renalware/base_controller.rb

@@ -27,7 +27,7 @@ module Renalware
     protected
 
     def patient_search
-      PatientSearch.call(params)
+      Patients::PatientSearch.call(params)
     end
 
     def success_msg_for(model_name)

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

@@ -6,20 +6,8 @@ module Renalware
     class BodyCompositionsController < Clinical::BaseController
       before_action :load_patient
 
-      def index
-        query = PatientBodyCompositionsQuery.new(patient: patient, search_params: params[:q])
-        body_compositions = query.call.page(params[:page]).per(15)
-
-        render locals: {
-          search: query.search,
-          body_compositions: CollectionPresenter.new(body_compositions, BodyCompositionPresenter),
-          patient: patient
-        }
-      end
-
       def show
         body_composition = find_body_composition
-        @body_composition = BodyCompositionPresenter.new(body_composition)
         render locals: { patient: patient, body_composition: body_composition }
       end
 
@@ -38,14 +26,13 @@ module Renalware
           redirect_to patient_clinical_profile_path(@patient),
           notice: t(".success", model_name: "body composition")
         else
-          flash[:error] = t(".failed", model_name: "body composition")
+          flash.now[:error] = t(".failed", model_name: "body composition")
           render_new(body_composition)
         end
       end
 
       def edit
         body_composition = find_body_composition
-        @body_composition = body_composition
         render locals: { patient: patient, body_composition: body_composition }
       end
 

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

@@ -41,7 +41,7 @@ module Renalware
           redirect_to return_url, notice: t(".success", model_name: "dry weight")
           session.delete(:return_to)
         else
-          flash[:error] = t(".failed", model_name: "dry weight")
+          flash.now[:error] = t(".failed", model_name: "dry weight")
           render_new(dry_weight)
         end
       end

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

@@ -8,7 +8,7 @@ module Renalware
       def index
         render locals: {
           patient: patient,
-          clinic_visits: patient.clinic_visits.ordered
+          clinic_visits: patient.clinic_visits.includes([:clinic, :created_by]).ordered
         }
       end
 
@@ -33,7 +33,7 @@ module Renalware
           notice = success_msg_for("clinic visit")
           redirect_to patient_clinic_visits_path(patient), notice: notice
         else
-          flash[:error] = failed_msg_for("clinic visit")
+          flash.now[:error] = failed_msg_for("clinic visit")
           render :new, locals: {
             patient: patient,
             clinic_visit: visit,
@@ -47,7 +47,7 @@ module Renalware
           redirect_to patient_clinic_visits_path(@patient),
             notice: t(".success", model_name: "clinic visit")
         else
-          flash[:error] = t(".failed", model_name: "clinic visit")
+          flash.now[:error] = t(".failed", model_name: "clinic visit")
           render :edit
         end
       end

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

@@ -20,7 +20,6 @@ module Renalware
           }
         end
 
-
         # Render a Liquid template loaded from the database.
         # The template may have variable place holders w.g. {{ patient.name }} and these
         # are resolved by passing instance of Liquid Drops (presenters) in the variables hash.

data/app/controllers/renalware/deaths_controller.rb

@@ -16,7 +16,7 @@ module Renalware
         redirect_to patient_clinical_profile_path(@patient),
           notice: t(".success", model_name: "patient")
       else
-        flash[:error] = t(".failed", model_name: "patient")
+        flash.now[:error] = t(".failed", model_name: "patient")
         render :edit
       end
     end

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

@@ -4,5 +4,29 @@ module Renalware
 
     layout "renalware/layouts/application"
 
+    # Define the path to go to after logging in:
+    # - if the user has never before logged-in, devise will take them to the root path (dashboard)
+    # - if the user's session timed-out less that 30 minutes ago, we take them back to the
+    #    last page they were on.
+    # - if the user's session timed-out more than 30 minutes ago, we take them back to the
+    #    their dashboard. See PR #1592 for rationale.
+    # - if the user has explicitly logged-out they will always go the the dashboard path on login,
+    #   regardless of how long ago they signed out, because in this instance devise removes it's
+    #   entries in the session cookie.
+    def after_sign_in_path_for(resource)
+      max_duration_of_url_memory = Renalware.config.duration_of_last_url_memory_after_session_expiry
+      max_duration_has_passed = last_sign_in_at <= max_duration_of_url_memory.ago
+      max_duration_has_passed ? dashboard_path : super
+    end
+
+    private
+
+    def last_sign_in_at
+      current_user.last_sign_in_at || epoch_start
+    end
+
+    def epoch_start
+      Date.new(0)
+    end
   end
 end

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

@@ -8,10 +8,9 @@ module Renalware
 
       def index
         query = PersonQuery.new(q: params[:q])
-        @people = call_query(query).page(page)
-        authorize @people
-
-        @q = query.search
+        people = call_query(query).page(page)
+        authorize people
+        render locals: { q: query.search, people: people }
       end
 
       def search
@@ -22,45 +21,56 @@ module Renalware
       end
 
       def show
-        @person = Person.find(params[:id])
-        authorize @person
+        person = Person.find(params[:id])
+        authorize person
+        render locals: { person: person }
       end
 
       def new
-        @person = Person.build
-        authorize @person
+        person = Person.build
+        authorize person
+        render_new(person)
       end
 
       def create
-        @person = Person.new(person_params)
-        authorize @person
+        person = Person.new(person_params)
+        authorize person
 
-        if @person.save
+        if person.save
           redirect_to directory_people_path, notice: t(".success", model_name: "Directory person")
         else
-          flash[:error] = t(".failed", model_name: "Directory person")
-          render :new
+          flash.now[:error] = t(".failed", model_name: "Directory person")
+          render_new(person)
         end
       end
 
       def edit
-        @person = Person.find(params[:id])
-        authorize @person
+        person = Person.find(params[:id])
+        authorize person
+        render_edit(person)
       end
 
       def update
-        @person = Person.find(params[:id])
-        authorize @person
-        if @person.update(person_params)
+        person = Person.find(params[:id])
+        authorize person
+        if person.update(person_params)
           redirect_to directory_people_path, notice: t(".success", model_name: "Directory person")
         else
-          flash[:error] = t(".failed", model_name: "Directory person")
-          render :edit
+          flash.now[:error] = t(".failed", model_name: "Directory person")
+          render_edit(person)
         end
       end
 
       private
 
+      def render_edit(person)
+        render :edit, locals: { person: person }
+      end
+
+      def render_new(person)
+        render :new, locals: { person: person }
+      end
+
       def call_query(query)
         query
           .call

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

@@ -28,7 +28,7 @@ module Renalware
           redirect_to drugs_drugs_path,
             notice: t(".success", model_name: "drug")
         else
-          flash[:error] = t(".failed", model_name: "drug")
+          flash.now[:error] = t(".failed", model_name: "drug")
           render :new
         end
       end
@@ -58,7 +58,7 @@ module Renalware
           redirect_to drugs_drugs_path,
             notice: t(".success", model_name: "drug")
         else
-          flash[:error] = t(".failed", model_name: "drug")
+          flash.now[:error] = t(".failed", model_name: "drug")
           render :edit
         end
       end

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

@@ -17,10 +17,11 @@ module Renalware
 
       def create
         event = new_event_for_patient(event_params)
+
         if event.save
           redirect_to return_url, notice: t(".success", model_name: "event")
         else
-          flash[:error] = t(".failed", model_name: "event")
+          flash.now[:error] = t(".failed", model_name: "event")
           render :new, locals: {
             patient: patient,
             event: event,
@@ -30,10 +31,14 @@ module Renalware
       end
 
       def index
+        events_query = EventQuery.new(patient: patient, query: query_params)
+        events = events_query.call
         authorize events
+        events = EventsPresenter.new(patient, events)
+
         render locals: {
-          patient: patient,
-          events: events
+          events: events,
+          query: events_query.search
         }
       end
 
@@ -50,7 +55,7 @@ module Renalware
         if event.update(event_params)
           redirect_to return_url, notice: t(".success", model_name: "event")
         else
-          flash[:error] = failed_msg_for("event type")
+          flash.now[:error] = failed_msg_for("event type")
           render :edit, locals: {
             patient: patient,
             event: event,
@@ -143,6 +148,10 @@ module Renalware
       def new_event_for_patient(params = {})
         event = event_class.new
         event.attributes = params
+        # Need to set disable_selection_of_event_type explicitly rather than relying on the value
+        # in the params which is a string eg "false" which actually evaluates to true!
+        # i.e. (!!"false" == true)
+        event.disable_selection_of_event_type = disable_selection_of_event_type?
         event.patient = patient
         authorize event
         event
@@ -161,6 +170,12 @@ module Renalware
           ]
         end
       end
+
+      def query_params
+        params
+          .fetch(:q, {})
+          .merge(page: page, per_page: per_page || 20)
+      end
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Renalware
         if event_type.save
           redirect_to events_types_path, notice: success_msg_for("event type")
         else
-          flash[:error] = failed_msg_for("event type")
+          flash.now[:error] = failed_msg_for("event type")
           render :new, locals: { event_type: event_type }
         end
       end
@@ -36,7 +36,7 @@ module Renalware
         if event_type.update(event_params)
           redirect_to events_types_path, notice: success_msg_for("event type")
         else
-          flash[:error] = failed_msg_for("event type")
+          flash.now[:error] = failed_msg_for("event type")
           render :edit, locals: { event_type: event_type }
         end
       end

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

@@ -18,7 +18,7 @@ module Renalware
           redirect_to hd_cannulation_types_path,
             notice: t(".success", model_name: "cannulation type")
         else
-          flash[:error] = t(".failed", model_name: "cannulation type")
+          flash.now[:error] = t(".failed", model_name: "cannulation type")
           render :new
         end
       end
@@ -33,7 +33,7 @@ module Renalware
           redirect_to hd_cannulation_types_path,
             notice: t(".success", model_name: "cannulation type")
         else
-          flash[:error] = t(".failed", model_name: "cannulation type")
+          flash.now[:error] = t(".failed", model_name: "cannulation type")
           render :edit
         end
       end

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

@@ -19,7 +19,7 @@ module Renalware
           redirect_to patient_hd_dashboard_path(patient),
             notice: t(".success", model_name: "HD profile")
         else
-          flash[:error] = t(".failed", model_name: "HD profile")
+          flash.now[:error] = t(".failed", model_name: "HD profile")
           render :edit, locals: locals
         end
       end

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

@@ -16,7 +16,7 @@ module Renalware
         if dialyser.save
           redirect_to hd_dialysers_path, notice: success_msg_for("dialyser")
         else
-          flash[:error] = failed_msg_for("dialyser")
+          flash.now[:error] = failed_msg_for("dialyser")
           render :new, locals: { dialyser: dialyser }
         end
       end
@@ -37,7 +37,7 @@ module Renalware
         if dialyser.update(dialyser_params)
           redirect_to hd_dialysers_path, notice: success_msg_for("dialyser")
         else
-          flash[:error] = failed_msg_for("dialyser")
+          flash.now[:error] = failed_msg_for("dialyser")
           render :edit, locals: { dialyser: dialyser }
         end
       end

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

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

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

@@ -74,7 +74,7 @@ module Renalware
       end
 
       def save_failure(session)
-        flash[:error] = t(".failed", model_name: "HD session")
+        flash.now[:error] = t(".failed", model_name: "HD session")
         action = action_name.to_sym == :create ? :new : :edit
         render action, locals: locals(session)
       end

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

@@ -0,0 +1,79 @@
+require_dependency "renalware/hd/base_controller"
+require "collection_presenter"
+
+module Renalware
+  module HD
+    class StationsController < BaseController
+      include PresenterHelper
+
+      def index
+        stations = Station.for_unit(unit_id).ordered
+        authorize stations
+        render locals: {
+          unit_id: unit_id,
+          stations: present(stations, StationPresenter)
+        }
+      end
+
+      def new
+        station = Station.new(hospital_unit_id: unit_id)
+        station.by = current_user
+        authorize station
+        render_new(station)
+      end
+
+      def create
+        station = Station.new(station_params.merge!(hospital_unit_id: unit_id))
+        authorize station
+        if station.save_by(current_user)
+          redirect_to hd_unit_stations_path(unit_id: unit_id), notice: success_msg_for("station")
+        else
+          render_new(station)
+        end
+      end
+
+      def edit
+        authorize station
+        render_edit(station)
+      end
+
+      def update
+        authorize station
+        if station.update_by(current_user, station_params)
+          redirect_to hd_unit_stations_path(unit_id: unit_id), notice: success_msg_for("station")
+        else
+          render_edit(station)
+        end
+      end
+
+      def sort
+        authorize Station, :sort?
+        ids = params["hd-station"]
+        Station.sort(ids)
+        render json: ids
+      end
+
+      private
+
+      def render_new(station)
+        render :new, locals: { unit_id: unit_id, station: station }
+      end
+
+      def render_edit(station)
+        render :edit, locals: { unit_id: unit_id, station: station }
+      end
+
+      def unit_id
+        params[:unit_id]
+      end
+
+      def station
+        @station ||= Station.find(params[:id])
+      end
+
+      def station_params
+        params.require(:hd_station).permit(:name, :location)
+      end
+    end
+  end
+end

data/app/controllers/renalware/hospitals/units_controller.rb

@@ -18,7 +18,7 @@ module Renalware
           redirect_to hospitals_units_path,
             notice: t(".success", model_name: "hospital unit")
         else
-          flash[:error] = t(".failed", model_name: "hospital unit")
+          flash.now[:error] = t(".failed", model_name: "hospital unit")
           render :new
         end
       end
@@ -33,7 +33,7 @@ module Renalware
           redirect_to hospitals_units_path,
             notice: t(".success", model_name: "hospital unit")
         else
-          flash[:error] = t(".failed", model_name: "hospital unit")
+          flash.now[:error] = t(".failed", model_name: "hospital unit")
           render :edit
         end
       end
@@ -48,7 +48,8 @@ module Renalware
 
       def hospital_unit_params
         params.require(:hospitals_unit).permit(
-          :name, :unit_code, :renal_registry_code, :unit_type, :is_hd_site, :hospital_centre_id
+          :name, :unit_code, :renal_registry_code, :unit_type, :hospital_centre_id,
+          :is_hd_site, :number_of_hd_stations
         )
       end
 

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

@@ -38,7 +38,7 @@ module Renalware
       end
 
       def find_contacts
-        CollectionPresenter.new(@patient.contacts.ordered, ContactPresenter)
+        CollectionPresenter.new(@patient.contacts.includes(:description).ordered, ContactPresenter)
       end
 
       def find_contact_descriptions
@@ -77,9 +77,9 @@ module Renalware
       # if we are creating the person for the contact at the same time.
       #
       def try_merge_person_creator(params)
-        return params unless params[:person_attributes].present?
+        return params if params[:person_attributes].blank?
 
-        params[:person_attributes].merge!(by: current_user)
+        params[:person_attributes][:by] = current_user
         params
       end
     end

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

@@ -56,7 +56,7 @@ module Renalware
       end
 
       def draft_letter_failed(letter)
-        flash[:error] = t(".failed", model_name: "Letter")
+        flash.now[:error] = t(".failed", model_name: "Letter")
         render_form(letter, :new)
       end
 
@@ -79,7 +79,7 @@ module Renalware
       end
 
       def revise_letter_failed(letter)
-        flash[:error] = t(".failed", model_name: "Letter")
+        flash.now[:error] = t(".failed", model_name: "Letter")
         render_form(letter, :edit)
       end
 

data/app/controllers/renalware/medications/drug_types/prescriptions_controller.rb

@@ -1,3 +1,6 @@
+#
+# E.g. medications/esa_prescriptions
+#
 module Renalware
   module Medications
     module DrugTypes

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

@@ -0,0 +1,73 @@
+require_dependency "renalware/messaging"
+
+module Renalware
+  module Messaging
+    class MessagesController < BaseController
+      include Renalware::Concerns::Pageable
+      include PresenterHelper
+
+      def sent
+        messages = author.messages.page(page).per(per_page)
+        authorize messages
+        render locals: { messages: present(messages, Messaging::InternalMessagePresenter) }
+      end
+
+      def new
+        authorize Message, :new?
+        form = MessageFormBuilder.new(patient: patient, params: params).call
+        render_new(form)
+      end
+
+      def create
+        authorize Message, :create?
+        form = MessageForm.new(message_params)
+
+        if form.valid?
+          message = SendMessage.call(author: author, patient: patient, form: form)
+          flash.now[:notice] = "Message was successfully sent"
+          render_create(message)
+        else
+          render_new(form)
+        end
+      end
+
+      private
+
+      def message_we_are_replying_to(message)
+        return if message.replying_to_message_id.blank?
+        InternalMessagePresenter.new(message.replying_to_message)
+      end
+
+      def render_new(form)
+        render :new,
+                locals: {
+                  form: form,
+                  recipient_options: RecipientOptions.new(patient, current_user).to_a,
+                  patient: patient
+                },
+                layout: false
+      end
+
+      def render_create(message)
+        render locals: {
+          message: InternalMessagePresenter.new(message),
+          original_message: message_we_are_replying_to(message)
+        }
+      end
+
+      def author
+        Messaging.cast_author(current_user)
+      end
+
+      def patient
+        Messaging.cast_patient(Patient.find(params[:patient_id]))
+      end
+
+      def message_params
+        params
+          .require(:messaging_message_form)
+          .permit(:subject, :body, :urgent, :replying_to_message_id, recipient_ids: [])
+      end
+    end
+  end
+end