renalware-core 2.0.40 → 2.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c3d9338a0d4d5c869623f1f05fae525bb69315935feaa19bcb144a6816c2bd5
-  data.tar.gz: 6b0726dc261af4365e1fc62a01103e98d57c0569276b8269ccf547bdac0ece5b
+  metadata.gz: 4028a0511b757d40f892d8b53f96aad528c613903b72b565cdb3aaba0fb24475
+  data.tar.gz: 15c5b296ecf7ae47466c7e33480146b3cf00a6dfe88a4c3da0fc6e0dd1a40714
 SHA512:
-  metadata.gz: 169887f515113d57a0af78685994267dc4d64621b2d03fc6d8ea6661f6baf64f567cb147f9b76fa98d13d180450523fc68da58118b984574e3eac8e26b48481b
-  data.tar.gz: '0859821f1051c9cf0fe83f73c8e9fb5a691e819a0e1a9068a35a0bdd07d0910f354c007e7fa5fa9f848fe203c8b084f869d0bee8a398522bd11c8e492e2e9353'
+  metadata.gz: 4415c46fd5f27d2b770675aff7c2fe215605b3a538702a6ef605a0c89f62e15a02bd2cbf733333a3a2a4096450049b9b51e60caf0979c98d4c0d59c0df7e583f
+  data.tar.gz: fd3490bad516d1d04f5fb2c384537b83acc1d5c79fd8d4cc0aec949452dc3f62716ce7ce5839e780bf1c9e4efce7c70db365ba58d1c0a18a221be13ef0efa57d

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

@@ -21,8 +21,28 @@ module Renalware
         }
       end
 
+      def new
+        render_new(Appointment.new)
+      end
+
+      def create
+        appointment = Appointment.new(appointment_params)
+        appointment.user = current_user
+        authorize appointment
+        if appointment.save
+          redirect_to appointments_path, notice: t(".success", model_name: "Appointment")
+        else
+          render_new(appointment)
+        end
+      end
+
       private
 
+      def render_new(appointment)
+        authorize appointment
+        render :new, locals: { appointment: appointment }
+      end
+
       def build_params_for_html_form(appointments)
         OpenStruct.new(
           patient_ids: appointments.map(&:patient_id).uniq
@@ -34,6 +54,12 @@ module Renalware
           .fetch(:q, {})
           .merge(page: page, per_page: per_page)
       end
+
+      def appointment_params
+        params
+          .require(:clinics_appointment)
+          .permit(:patient_id, :clinic_id, :starts_at)
+      end
     end
   end
 end

data/app/models/renalware/clinics/appointment.rb

@@ -10,8 +10,8 @@ module Renalware
       belongs_to :user
 
       validates :starts_at, presence: true
-      validates :patient, presence: true
-      validates :clinic, presence: true
+      validates :patient_id, presence: true
+      validates :clinic_id, presence: true
       validates :user, presence: true
 
       validates :starts_at, timeliness: { type: :datetime }

data/app/models/renalware/medications/prescription.rb

@@ -13,7 +13,11 @@ module Renalware
       has_paper_trail class_name: "Renalware::Medications::PrescriptionVersion"
 
       belongs_to :patient, touch: true
-      belongs_to :drug, class_name: "Renalware::Drugs::Drug"
+
+      # A drug can be soft-deleted (its deleted_at set) so that it can no longer be prescribed.
+      # We need to be sure we can still display deleted drugs in the read-only context of an
+      # existing prescription, so we include deleted drugs in the relationship.
+      belongs_to :drug, -> { with_deleted }, class_name: "Renalware::Drugs::Drug"
       belongs_to :treatable, polymorphic: true
       belongs_to :medication_route
 

data/app/models/renalware/patients/patient_search.rb

@@ -6,7 +6,7 @@ module Renalware
       def self.call(params)
         Renalware::Patient
           .includes(current_modality: [:description])
-          .search(params[:q]).tap do |search|
+          .search(params[:patient_search]).tap do |search|
           search.sorts = %w(family_name given_name)
         end
       end

data/app/views/renalware/clinics/appointments/index.html.slim

@@ -1,3 +1,8 @@
+= content_for(:actions) do
+  = link_to "Add",
+          new_appointment_path,
+          class: "button"
+
 = within_admin_layout(title: "Upcoming Clinic Visit Appointments") do
 
   .search-form.filters
@@ -70,8 +75,7 @@
 
             td= I18n.l appointment.starts_on
             td= appointment.start_time
-            td= link_to appointment.patient.full_name,
-                        patient_clinical_summary_path(patient_id: appointment.patient)
+            td= default_patient_link(appointment.patient)
             td= appointment.patient.sex.code
             td= appointment.patient.age
             td= appointment.patient.current_modality

data/app/views/renalware/clinics/appointments/new.html.slim

@@ -0,0 +1,29 @@
+= within_admin_layout(title: "New",
+  breadcrumbs: breadcrumb_for("Clinic Appointments", appointments_path)) do
+
+  = simple_form_for appointment,
+      url: appointments_path,
+      method: :post,
+      html: { autocomplete: "off" },
+      wrapper: "horizontal_form" do |f|
+
+    / Note the shenanigans to get the select2 to redisplay the patient after a validation error
+    / or on an edit. Selected: 1 means just select the option at index 1 - option at index 0 is always
+    / the blank option. Selecting index 1 fails silently if there is nothing there (no patient
+    / selected yet) otherwise it will display the selected patient who will always be
+    / at option index 1.
+    = f.input :patient_id,
+              wrapper: :horizontal_medium,
+              collection: [[appointment.patient&.to_s(:long), appointment.patient&.id]],
+              selected: 1,
+              input_html: { \
+                class: "patient-id-select2 patient-ajax-search",
+                data: { "ajax--url" => search_patients_path(format: :json),
+                        placeholder: "Search by patient name or hospital/NHS no." } \
+              }
+
+    = f.input :clinic_id,
+              collection: Renalware::Clinics::Clinic.all,
+              wrapper: :horizontal_medium
+    = f.input :starts_at, as: :datetime_picker, wrapper: :horizontal_datepicker
+    = f.submit class: :button

data/app/views/renalware/navigation/_patient_search.html.slim

@@ -3,6 +3,7 @@
     li.has-form
       = search_form_for the_patient_search,
                         url: patients_path,
+                        as: :patient_search,
                         class: "patient-search-form" do |f|
         .row.collapse
           .columns.small-12

data/config/routes.rb

@@ -115,7 +115,7 @@ Renalware::Engine.routes.draw do
   resource :worryboard, only: :show, controller: "patients/worryboard"
 
   # Clinics
-  resources :appointments, controller: "clinics/appointments", only: [:index]
+  resources :appointments, controller: "clinics/appointments", only: [:new, :create, :index]
   resources :clinic_visits, only: :index, controller: "clinics/visits"
 
   resources :deaths, only: :index, as: :patient_deaths

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.40"
+  VERSION = "2.0.41"
 end

data/spec/support/select2_spec_helper.rb

@@ -12,4 +12,36 @@ module Select2SpecHelper
     matches = body.find_all(".select2-results li", text: value)
     matches.last.click
   end
+
+  # select2_ajax helper to make capybara work with ajax-enabled Select2 elements
+  # assumes 'placeholder' option is used in Select2 (if it is using ajax, it should be)
+  #
+  # usage:
+  #
+  #    it "should have a select2 field for searching by team name" do
+  #        @team = Factory :team
+  #        select2_ajax @team.name, from: "Select a Team", minlength: 4
+  #        click_button "Join"
+  #        page.should have_content "You are now on '#{@team.name}'."
+  #    end
+  # Thx to https://gist.github.com/sbeam/3849340
+  def select2_ajax(value, options = {})
+    if !options.is_a?(Hash) || !options.key?(:from)
+      raise "Must pass a hash containing 'from'"
+    end
+
+    placeholder = options[:from]
+    minlength = options[:minlength] || 4
+
+    # click_link placeholder
+
+    page.find(:xpath, "//*[text()='#{placeholder}']").click
+
+    js = %Q|container = $('.select2-container:contains("#{placeholder}")');
+            $('input[type=text]', container).val('#{value[0, minlength]}').trigger('keyup');
+            window.setTimeout( function() {
+              $('li:contains("#{value}")', container).click();
+            }, 5000);|
+    page.execute_script(js)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.40
+  version: 2.0.41
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -2058,6 +2058,7 @@ files:
 - app/views/renalware/clinical/profiles/edit.html.slim
 - app/views/renalware/clinical/profiles/show.html.slim
 - app/views/renalware/clinics/appointments/index.html.slim
+- app/views/renalware/clinics/appointments/new.html.slim
 - app/views/renalware/clinics/clinic_visits/_clinic_visit.html.slim
 - app/views/renalware/clinics/clinic_visits/_form.html.slim
 - app/views/renalware/clinics/clinic_visits/_table.html.slim