renalware-core 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64747fcbe0c225da4849524e902ca6e9a312e11d2275f15c981e9a9d1f2049d1
-  data.tar.gz: d35406e231ad5ecfe6e27ef6cc483a1d492830b7fda2532bbd0272f1fff39c8a
+  metadata.gz: 8f579d475315f2250e3bd086f651bcb9fc0c38838f74b649fb9f439fdb21b4db
+  data.tar.gz: 7ab7db9d4572a88eef14a8a0dd3ce0ed47c741c07f1838cb24cb856177aac239
 SHA512:
-  metadata.gz: 6e0dbb5fac278d6ee1e57f1c439508190213b39d295068cd7cefe19a5c0d9b449bda73cef380676ef9f04a29663599394afefd37fd1720b3aaa020582feab9c1
-  data.tar.gz: 67b85bed5851f4b40c930a3e11b996541b90c7aee8e9dff24a0965b1e3e92ebe2786284d64a8bb88054de7c0c90536984a9169238b5ab0edf2949eb18c29650e
+  metadata.gz: cc57a5702a16893bdd206b58ec3b124b947d0c0694a45fb1dd63069de8521e8900f3b2496cb055ec75defcbad3935f8bbb93d9ef382f8859a826efa8b738524b
+  data.tar.gz: f01dbf8296ec8c9e1df88862270393dd0a19de91db300a1c30483d906ff6a60d7de24808a7089806b86f124bd09126e1673853d0edf0b39402dfb03c1b4ad4e0

data/app/models/renalware/letters/letter.rb

@@ -92,7 +92,7 @@ module Renalware
       end
 
       def subject?(other_patient)
-        patient == other_patient
+        patient.id == other_patient.id
       end
 
       def find_cc_recipient_for_contact(contact)

data/app/models/renalware/letters/recipient.rb

@@ -32,11 +32,10 @@ module Renalware
       end
 
       def current_address
-        case
-        when patient?
+        if patient?
           letter.patient.current_address
-        when primary_care_physician?
-          letter.primary_care_physician.current_address
+        elsif primary_care_physician?
+          address_for_primary_care_physician
         else
           addressee.address
         end
@@ -49,6 +48,14 @@ module Renalware
 
       private
 
+      def address_for_primary_care_physician
+        address = letter.patient&.practice&.address
+        if address.present? && letter.primary_care_physician.present?
+          address.name = letter.primary_care_physician.salutation
+        end
+        address
+      end
+
       def patient_or_primary_care_physician?
         patient? || primary_care_physician?
       end

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

@@ -46,8 +46,14 @@ module Renalware
         [title, name].join(" ")
       end
 
+      class PrimaryCarePhysicianAddressAccessError < StandardError; end
       def current_address
-        address || practice_address
+        raise PrimaryCarePhysicianAddressAccessError,
+              "primary_care_physician#current_address should not be called: "\
+              "we always use the patient.practice.address when contacting the GP. "\
+              "In a sense the practice is more important that the GP, as the GP may have "\
+              "moved on"
+        # address || practice_address
       end
 
       def practice_address

data/app/presenters/renalware/letters/letter_form_presenter.rb

@@ -7,7 +7,9 @@ module Renalware
     class LetterFormPresenter < DumbDelegator
       def person_roles
         [].tap do |collection|
-          collection << primary_care_physician_role if patient.primary_care_physician.present?
+          if patient.primary_care_physician.present? && patient.practice.present?
+            collection << primary_care_physician_role
+          end
           collection << patient_role
           collection << other_role
         end
@@ -38,7 +40,7 @@ module Renalware
 
       def primary_care_physician_role
         label = "Primary Care Physician <address>#{primary_care_physician.name}, " \
-                "#{primary_care_physician.address}</address>".html_safe
+                "#{patient.practice&.address}</address>".html_safe
         [label, "primary_care_physician", primary_care_physician.salutation]
       end
 

data/app/views/renalware/letters/completed_letters/new.html.slim

@@ -1,7 +1,6 @@
 .modal
   .modal__header
     h2= "Was printing successful?"
-    /= render "renalware/shared/modal_close_link"
   .modal__body
     dl.dl-horizontal
       dt Patient

data/app/views/renalware/letters/letters/_main_recipient.html.slim

@@ -5,10 +5,12 @@ article
   = f.simple_fields_for :main_recipient do |fmr|
 
     .radio_buttons.row.optional.letter_main_recipient_person_role.field_with_hint
-      .columns.small-3
-        label.right.inline.radio_buttons.optional Recipient
-      .columns.small-9
-
+      .columns.small-12
+        .hint
+          - if patient.primary_care_physician.nil? || patient.practice.nil?
+            | No option to send to GP as patient has no Practice and/or GP
+            br
+          =f.object.patient_cc_hint
         = fmr.collection_radio_buttons(:person_role,
                                        f.object.person_roles,
                                        :second,
@@ -21,7 +23,6 @@ article
                              class: "radio_buttons recipient-person-role-picker has_salutation") \
                                     + b.text \
               }
-        .hint=f.object.patient_cc_hint
 
     = fmr.input :id, as: :hidden
 

data/app/views/renalware/letters/lists/show.html.slim

@@ -34,4 +34,4 @@
 / for the complete works. Using ujs for these sort of dialog -> -> post -> page refresh
 / cycles is a bit complex and we could move to using something like stimulus
 / to keep thing a bit simpler
-#letter-print-modal.reveal-modal.small(data-reveal data-refresh-url=request.original_fullpath)
+#letter-print-modal.reveal-modal.medium(data-reveal data-refresh-url=request.original_fullpath)

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.1".freeze
+  VERSION = "2.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-11 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails