renalware-core 2.0.0.pre.beta11 → 2.0.0.pre.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: add23de0754afe7a5878efba8148446407a8c08e
-  data.tar.gz: e4faf2ab20f8cbd735f6e0c171cf1e942b01f4ac
+  metadata.gz: f78f8b04fdc0bc1abadea1b1dd957ef5914a4326
+  data.tar.gz: e70a195bee170e116535ffc15520675353257afd
 SHA512:
-  metadata.gz: 8649642807aa6ca7b610b60275bd6e5fb0507b665e22892fdf0809e515329388a16d35b603dcc4adb581b47016e38f18d45fc1e1787fdd70148728d712d89e35
-  data.tar.gz: 632b054b573eca5ced759aa6837ab6c98f6325bd470ef8cb06ba2b6a39da952fbffb61c0ae81267915c0eb5968176120940b87481fbd09f86ff4acd9d666b479
+  metadata.gz: 33b16df842b119915bb7e86192af1ccc9073862e417d179869c1a31592b977f22064bfc0b705480c546ad4b4ef3a268498e45a7ba254e58e4c6e4c1877998f08
+  data.tar.gz: 7f30681a3bbd4dab9e2f3a4dc0956e3990a117c2b4b85eb7ac7fdb3bfa67ed4d1142a19df46cf0a2e3b643983e3c83ccbedf9214327c911ef23634327580d132

data/README.md

@@ -101,6 +101,20 @@ They all share the password `renalware`
     bundle exec foreman start
     tail -f spec/dummy/log/developments.log
 
+## Running background jobs
+
+Some work goes on in the background, for example the processing of HL7 messages.
+
+To start background job processing in development:
+
+    bin/delayed_job run
+
+Run `bin/delayed_job` for other options.
+
+delayed_job logs to its own log. To see the output:
+
+    tail -f spec/dummy/log/delayed_job.log
+
 ## Running tests
 
 Install PhantomJS if you don't have it already (check with `phantomjs -v`).

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

@@ -1,7 +1,6 @@
 module Renalware
   module Accesses
     class BaseController < Renalware::BaseController
-
       protected
 
       def patient

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

@@ -3,7 +3,6 @@ require_dependency "renalware/clinical"
 module Renalware
   module Clinical
     class AllergiesController < Clinical::BaseController
-
       def create
         result = CreateAllergy.new(patient, current_user).call(allergy_params) do |allergy|
           authorize allergy

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

@@ -3,7 +3,6 @@ require_dependency "renalware/clinical"
 module Renalware
   module Clinical
     class AllergyStatusesController < Clinical::BaseController
-
       def update
         authorize patient
         form = AllergyStatusForm.new(allergy_status_params)

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

@@ -1,7 +1,6 @@
 module Renalware
   module Clinics
     class ClinicVisitsController < BaseController
-
       before_action :load_patient
       before_action :load_clinic_visit, only: [:edit, :update, :destroy]
 

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

@@ -19,15 +19,18 @@ module Renalware
       end
 
       def configure_sign_up_parameters
-        devise_parameter_sanitizer.permit(:sign_up, keys: [
-                                            :given_name,
-          :family_name,
-          :username,
-          :email,
-          :password,
-          :password_confirmation,
-          :remember_me
-                                          ])
+        devise_parameter_sanitizer.permit(
+          :sign_up,
+          keys: [
+            :given_name,
+            :family_name,
+            :username,
+            :email,
+            :password,
+            :password_confirmation,
+            :remember_me
+          ]
+        )
       end
 
       def configure_sign_in_parameters
@@ -35,11 +38,20 @@ module Renalware
       end
 
       def configure_account_update_parameters
-        devise_parameter_sanitizer.permit(:account_update, keys: [
-                                            :given_name, :family_name, :username, :email, :password,
-          :password_confirmation, :current_password,
-          :professional_position, :signature
-                                          ])
+        devise_parameter_sanitizer.permit(
+          :account_update,
+          keys: [
+              :given_name,
+              :family_name,
+              :username,
+              :email,
+              :password,
+              :password_confirmation,
+              :current_password,
+              :professional_position,
+              :signature
+          ]
+        )
       end
     end
   end

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

@@ -6,7 +6,6 @@ module Renalware
       extend ActiveSupport::Concern
 
       included do
-
         def default_pdf_options
           {
             page_size: "A4",

data/app/controllers/renalware/deaths_controller.rb

@@ -3,26 +3,34 @@ module Renalware
     include PresenterHelper
     include Renalware::Concerns::Pageable
 
-    before_action :load_patient, only: [:edit, :update]
-
     def index
       patients = Patient.dead.page(page).per(per_page)
       authorize patients
-      @patients = present(patients, PatientPresenter)
+      render locals: { patients: present(patients, PatientPresenter) }
+    end
+
+    def edit
+      authorize patient
+      render_edit
     end
 
     def update
-      if @patient.update(death_params)
-        redirect_to patient_clinical_profile_path(@patient),
+      authorize patient
+      if patient.update(death_params)
+        redirect_to patient_clinical_profile_path(patient),
           notice: t(".success", model_name: "patient")
       else
         flash.now[:error] = t(".failed", model_name: "patient")
-        render :edit
+        render_edit
       end
     end
 
     private
 
+    def render_edit
+      render :edit, locals: { patient: patient }
+    end
+
     def death_params
       params
         .require(:patient)

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

@@ -5,7 +5,6 @@ require_dependency "renalware/events"
 module Renalware
   module Events
     class SwabsController < EventsController
-
       private
 
       # Override this because as we probably originated from the clinical profile we want to

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

@@ -3,7 +3,6 @@ require_dependency "renalware/hd"
 module Renalware
   module HD
     class BaseController < Renalware::BaseController
-
       private
 
       def load_patient

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

@@ -3,38 +3,44 @@ require_dependency "renalware/hd/base_controller"
 module Renalware
   module HD
     class CannulationTypesController < BaseController
-      before_action :load_cannulation_type, only: [:edit, :update]
-
       def new
-        @cannulation_type = CannulationType.new
-        authorize @cannulation_type
+        cannulation_type = CannulationType.new
+        authorize cannulation_type
+        render_new(cannulation_type)
       end
 
       def create
-        @cannulation_type = CannulationType.new(cannulation_type_params)
-        authorize @cannulation_type
+        cannulation_type = CannulationType.new(cannulation_type_params)
+        authorize cannulation_type
 
-        if @cannulation_type.save
+        if cannulation_type.save
           redirect_to hd_cannulation_types_path,
             notice: t(".success", model_name: "cannulation type")
         else
           flash.now[:error] = t(".failed", model_name: "cannulation type")
-          render :new
+          render_new(cannulation_type)
         end
       end
 
       def index
-        @cannulation_types = CannulationType.all
-        authorize @cannulation_types
+        cannulation_types = CannulationType.all
+        authorize cannulation_types
+        render locals: { cannulation_types: cannulation_types }
+      end
+
+      def edit
+        cannulation_type = find_and_authorize_cannulation_type
+        render_edit(cannulation_type)
       end
 
       def update
-        if @cannulation_type.update(cannulation_type_params)
+        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")
         else
           flash.now[:error] = t(".failed", model_name: "cannulation type")
-          render :edit
+          render_edit(cannulation_type)
         end
       end
 
@@ -46,13 +52,22 @@ module Renalware
 
       private
 
+      def render_new(cannulation_type)
+        render :new, locals: { cannulation_type: cannulation_type }
+      end
+
+      def render_edit(cannulation_type)
+        render :edit, locals: { cannulation_type: cannulation_type }
+      end
+
       def cannulation_type_params
         params.require(:hd_cannulation_type).permit(:name)
       end
 
-      def load_cannulation_type
-        @cannulation_type = CannulationType.find(params[:id])
-        authorize @cannulation_type
+      def find_and_authorize_cannulation_type
+        CannulationType.find(params[:id]).tap do |cannulation_type|
+          authorize cannulation_type
+        end
       end
     end
   end

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

@@ -51,7 +51,7 @@ module Renalware
             relation: WeeklyDiary.eager_load(
                 slots: [:patient, :station, :diurnal_period_code],
                 master_diary: { slots: [:patient, :station, :diurnal_period_code] }
-                ),
+            ),
             unit_id: unit_id,
             week_period: week_period,
             by: current_user

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

@@ -4,7 +4,6 @@ require_dependency "renalware/hd/base_controller"
 module Renalware
   module HD
     class DiarySlotsController < BaseController
-
       # GET html -  renders a form
       # Here we will have been passed in the query string:
       # - the unit id
@@ -165,7 +164,7 @@ module Renalware
             :target_diary_id,
             :change_type,
             patient_id: []
-            )
+          )
       end
     end
   end

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

@@ -1,7 +1,6 @@
 module Renalware
   module HD
     class MDMPatientsController < Renalware::MDMPatientsController
-
       def render_index(**args)
         presenter = build_presenter(params: params, **args)
         authorize presenter.patients

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

@@ -7,10 +7,9 @@ module Renalware
 
       def show
         query = Sessions::OngoingQuery.new(q: params[:q])
-        @sessions = query.call.page(page).per(per_page || 15)
-        authorize @sessions
-
-        @q = query.search
+        sessions = query.call.page(page).per(per_page || 15)
+        authorize sessions
+        render locals: { query: query.search, sessions: sessions }
       end
     end
   end

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

@@ -3,7 +3,6 @@ require_dependency "renalware/hd/base_controller"
 module Renalware
   module HD
     class PatientsController < BaseController
-
       def dialysing_at_unit
         skip_authorization
         unit_id = params.fetch(:unit_id)

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

@@ -25,7 +25,8 @@ module Renalware
             locals: {
               protocol: ProtocolPresenter.new(patient, view_context)
             }
-        ))
+          )
+        )
       end
 
       # Other options to consider:

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

@@ -1,7 +1,6 @@
 module Renalware
   module Letters
     class BaseController < Renalware::BaseController
-
       private
 
       def load_patient

data/app/controllers/renalware/mdm_controller.rb

@@ -2,7 +2,6 @@ require_dependency "renalware/hd/base_controller"
 
 module Renalware
   class MDMController < BaseController
-
     def render_show(mdm_presenter:)
       render :show, locals: {
         mdm: mdm_presenter

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

@@ -71,7 +71,6 @@ module Renalware
       end
 
       # rubocop:disable Metrics/LineLength
-      # rubocop:disable Metrics/MethodLength
       def render_prescriptions_list_to_hand_to_patient
         render(
           pdf_options.merge(
@@ -84,7 +83,8 @@ module Renalware
               recently_stopped_prescriptions: present(recently_stopped_prescriptions, PrescriptionPresenter),
               recently_changed_prescriptions: present(recently_changed_current_prescriptions, PrescriptionPresenter)
             }
-        ))
+          )
+        )
       end
       # rubocop:enable Metrics/LineLength
       # rubocop:enable Metrics/MethodLength

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

@@ -3,7 +3,6 @@ require_dependency "renalware/modalities"
 module Renalware
   module Modalities
     class DescriptionsController < BaseController
-
       def new
         modality_description = Description.new
         authorize modality_description

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

@@ -3,7 +3,6 @@ require_dependency "renalware/deaths"
 module Renalware
   module Modalities
     class ModalitiesController < BaseController
-
       before_action :load_patient
 
       def new

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

@@ -21,7 +21,6 @@ module Renalware
           }
         end
       end
-
     end
   end
 end

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

@@ -3,7 +3,6 @@ require_dependency "renalware/pathology"
 module Renalware
   module Pathology
     class BaseController < Renalware::BaseController
-
       private
 
       def load_patient

data/app/controllers/renalware/pathology/requests/requests_controller.rb

@@ -21,30 +21,36 @@ module Renalware
             Request.find(params[:id])
           )
           authorize request
-          render pdf: "show",
+          render(
+            pdf: "show",
             layout: false,
             locals: { request: request },
             extra: "--no-print-media-type" # NOTE: Foundation CSS does not work well in print mode
+          )
         end
 
         # NOTE: This needs to be POST since params[:patient_ids] may exceed url char limit in GET
         def new
-          render :new,
+          render(
+            :new,
             layout: false,
             locals: local_vars.merge(
               all_clinics: Renalware::Pathology::Clinic.for_algorithm,
               all_consultants: Renalware::Pathology::Consultant.ordered,
               all_templates: Renalware::Pathology::Requests::Request::TEMPLATES
             )
+          )
         end
 
         def create
           requests.each(&:print_form)
 
-          render pdf: "create",
+          render(
+            pdf: "create",
             layout: false,
             locals: local_vars,
             extra: "--no-print-media-type" # NOTE: Foundation CSS does not work well in print mode
+          )
         end
 
         private