renalware-core 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ac09f0c3708048edefc8c1040650e7efee4de9209837d547e97bdf06e30ae38
-  data.tar.gz: 1029728c82c3f5cfe5c782fcebae7247fb5401815c2e2afbe8fb9ab35c230b15
+  metadata.gz: 144398e98d896ad11911bf67c7d3c41532a7e7d599d8e753f3ea07fa5cdd1335
+  data.tar.gz: 36f8a5016b94cfa5c67c2b79e3043e97515fb996bfb1ddacb6d960b0aac35bc5
 SHA512:
-  metadata.gz: 48522cd5f0e8569574ea14b1933169821b1768c548b139cf14935a8c26839dd476a397cc2ba397291ba049091f9118e12f4ad32310741089da6a4a942eed8de7
-  data.tar.gz: fdff52784eba369df4e5dc806e9c083302372bdb327ba4c9df3adf057cee64396421e962d217a7b9593947a56f80ac8c1f3148c6de4cec2d46017a24f42ba0bc
+  metadata.gz: 29eb437d433f724352b58695f23453d273270c5aa4e0a3309f6509e39c76ca0589d52000fff1d417787375f353798e658c37f6fb61deb4399b995034389e948b
+  data.tar.gz: 7efd9963d89407778f3ce6d20541824a45845aaf494a3e8c43f0d89392429cb4cb42212599dc12e5acb33e46db9008e8815cf7b8a191022643042bfa04ed8c37

data/app/assets/javascripts/renalware/primary_care_physician_search.js

@@ -46,9 +46,9 @@ Renalware.PrimaryCarePhysicianSearch = (function() {
 
     // When a Practice is selected from the autocomplete list,
     // Do an ajax replace on the <form> in this modal by sending a .js request
-    // to the url the modal was loaded from (this is in a data attribute on the pratice-search
+    // to the url the modal was loaded from (this is in a data attribute on the practice-search
     // select). This will load in just the form under the practice-search select, bringing
-    // with it a list of pcps associated with this practice.
+    // with it a list of PCPs associated with this practice.
     $(practiceDropDown).on("select2:select", function(e) {
       var selectedPracticeOption = $("option:selected", this);
       var praticeId = $(selectedPracticeOption).val();
@@ -61,7 +61,7 @@ Renalware.PrimaryCarePhysicianSearch = (function() {
           practice_id: praticeId
         },
         error: function(jqXHR, textStatus, errorThrown) {
-          console.log(errorThrown, textStatus ,jqXHR)
+          // console.log(errorThrown, textStatus ,jqXHR)
         },
         success: function(data, textStatus, jqXHR) {
           // console.log("OK!")

data/app/controllers/renalware/api/token_authenticated_api_controller.rb

@@ -3,6 +3,8 @@
 #
 # From https://gist.github.com/josevalim/fb706b1e933ef01e4fb6
 #
+require "devise"
+
 module Renalware
   module API
     class TokenAuthenticatedApiController < ApplicationController
@@ -18,7 +20,7 @@ module Renalware
         # Notice how we use Devise.secure_compare to compare the token
         # in the database with the token given in the params, mitigating
         # timing attacks.
-        if user && Devise.secure_compare(user.authentication_token, params[:token])
+        if user && ::Devise.secure_compare(user.authentication_token, params[:token])
           sign_in user, store: false
         end
       end

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

@@ -7,6 +7,10 @@ require_dependency "renalware/patients"
 module Renalware
   module Patients
     class PrimaryCarePhysicianController < BaseController
+      # We come in here when
+      # 1. We render the Add GP modal form the first time (html)
+      # 2. After a practice has been selected and we refresh the modal form so it has
+      #    the correct list of GPs in it (js)
       def edit
         authorize patient
         render_form
@@ -24,11 +28,19 @@ module Renalware
 
       private
 
+      # There maybe times (for instance after migration from a previous system) where the
+      # patient is not `valid` (going into Demographics and just saving them would produce a
+      # validation error) because for instance they have no Sex option selected. In these instances
+      # if we tried to update the Practice and GP here using an `update` call, it would fail.
+      # So to allow the Practice and GP to be assigned to such a patient we have to skip validation
+      # callbacks by using update_columns.
       def update_patient
         return false unless selected_pyhsician
-        patient.update(primary_care_physician: selected_pyhsician,
-                       practice_id: patient_params[:practice_id],
-                       by: current_user)
+        patient.update_columns(
+          primary_care_physician_id: selected_pyhsician.id,
+          practice_id: patient_params[:practice_id],
+          updated_by_id: current_user.id
+        )
       end
 
       def render_form

data/app/views/renalware/patients/primary_care_physician/_form.html.slim

@@ -7,7 +7,7 @@
 
   = f.input :primary_care_physician_id,
             collection: available_primary_care_physicians,
-            prompt: "Select a GP",
+            include_blank: false,
             label: "Now choose a GP",
             input_html: { class: "searchable_select", required: :required, tabindex: 2001 }
   br

data/lib/renalware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type