renalware-core 2.0.164 → 2.1.1

data/app/models/renalware/ukrdc/outgoing/rendering/document.rb

@@ -16,7 +16,7 @@ module Renalware
           # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           def document_element
             create_node("Document") do |elem|
-              elem << create_node("DocumentTime", letter.issued_on.to_time.iso8601)
+              elem << create_node("DocumentTime", letter.datetime.iso8601)
               elem << Clinician.new(user: letter.author).xml
               elem << create_node("DocumentName", letter.title)
               elem << create_node("Status") do |status|

data/app/models/renalware/ukrdc/outgoing/rendering/patient.rb

@@ -24,7 +24,7 @@ module Renalware
                 patient_elem << addresses_element
                 patient_elem << family_doctor_element
                 patient_elem << ethnic_group_element
-                patient_elem << primary_langauge_element # test
+                patient_elem << primary_language_element # test
                 patient_elem << death_element
                 patient_elem << create_node("UpdatedOn", patient.updated_at&.to_datetime)
                 patient_elem << create_node("ActionCode", "A")
@@ -100,7 +100,7 @@ module Renalware
             Rendering::FamilyDoctor.new(patient: patient).xml
           end
 
-          def primary_langauge_element
+          def primary_language_element
             Rendering::PrimaryLanguage.new(patient: patient).xml
           end
 

data/app/models/renalware/ukrdc/outgoing/rendering/primary_language.rb

@@ -10,7 +10,7 @@ module Renalware
           def xml
             return unless render_primary_language?
 
-            primary_langauge_element
+            primary_language_element
           end
 
           private
@@ -21,7 +21,7 @@ module Renalware
           end
 
           # NB NHS_DATA_DICTIONARY_LANGUAGE_CODE is ISO 639-1 plus braille and sign
-          def primary_langauge_element
+          def primary_language_element
             create_node("PrimaryLanguage") do |lang|
               lang << create_node("CodingStandard", "NHS_DATA_DICTIONARY_LANGUAGE_CODE")
               lang << create_node("Code", patient.language&.code)

data/app/models/renalware/virology/vaccination_type.rb

@@ -5,12 +5,34 @@ require_dependency "renalware/virology"
 module Renalware
   module Virology
     class VaccinationType < ApplicationRecord
-      validates :name, presence: true, uniqueness: true
-      validates :code, presence: true, uniqueness: true
+      include Sortable
+
+      class UniquenessIncludingDeletedValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          return unless record.send(:"#{attribute}_changed?")
+
+          if record.class.with_deleted.exists?(attribute => value)
+            record.errors.add attribute, (options[:message] || "already used")
+          end
+        end
+      end
+      validates :name, presence: true, uniqueness_including_deleted: true
+      validates :code, presence: true, uniqueness_including_deleted: true
+      before_create :underscore_code
 
       acts_as_paranoid
 
-      scope :ordered, -> { order(position: :asc, name: :asc) }
+      scope :ordered, -> { order(deleted_at: :desc, position: :asc, name: :asc) }
+
+      def self.policy_class
+        BasePolicy
+      end
+
+      def underscore_code
+        return if code.blank?
+
+        self.code = code.downcase.tr("  ", " ").tr(" ", "_")
+      end
     end
   end
 end

data/app/policies/renalware/events/advanced_care_plan_policy.rb

@@ -4,7 +4,7 @@ require_dependency "renalware/messaging"
 
 module Renalware
   module Events
-    class AdvancedCarePlanPolicy < BasePolicy
+    class AdvancedCarePlanPolicy < EventPolicy
     end
   end
 end

data/app/policies/renalware/events/clinical_frailty_score_policy.rb

@@ -4,7 +4,7 @@ require_dependency "renalware/messaging"
 
 module Renalware
   module Events
-    class ClinicalFrailtyScorePolicy < BasePolicy
+    class ClinicalFrailtyScorePolicy < EventPolicy
     end
   end
 end

data/app/policies/renalware/events/event_policy.rb

@@ -10,6 +10,10 @@ module Renalware
         false
       end
       alias update? edit?
+
+      def destroy?
+        false
+      end
     end
   end
 end

data/app/policies/renalware/events/investigation_policy.rb

@@ -4,7 +4,11 @@ require_dependency "renalware/events"
 
 module Renalware
   module Events
-    class InvestigationPolicy < BasePolicy
+    class InvestigationPolicy < EventPolicy
+      def edit?
+        true
+      end
+      alias update? edit?
     end
   end
 end

data/app/policies/renalware/virology/vaccination_policy.rb

@@ -4,7 +4,12 @@ require_dependency "renalware/virology"
 
 module Renalware
   module Virology
-    class VaccinationPolicy < BasePolicy
+    class VaccinationPolicy < Events::EventPolicy
+      def edit?
+        user_is_super_admin?
+      end
+      alias update? edit?
+      alias destroy? edit?
     end
   end
 end

data/app/presenters/renalware/events/events_presenter.rb

@@ -9,7 +9,7 @@ module Renalware
 
       def initialize(patient, events)
         @patient = patient
-        super(events)
+        super(CollectionPresenter.new(events, Events::EventPresenter))
       end
 
       def users_for_filtering
@@ -19,10 +19,15 @@ module Renalware
       end
 
       def event_types_for_filtering
-        Events::Type
-          .where(id: all_event_type_ids_in_use_for_this_patient)
-          .distinct
-          .order(name: :asc)
+        Events::Category
+          .eager_load(:types)
+          .order(position: :asc)
+          .merge(
+            Events::Type
+              .where(id: all_event_type_ids_in_use_for_this_patient)
+              .distinct
+              .order(name: :asc)
+          )
       end
 
       private

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

@@ -57,7 +57,7 @@ module Renalware
           letter_description,
           letter_id,
           author,
-          letter_issued_on,
+          letter_date,
           primary_care_physician.code,
           care_group_name || config_letter_default_care_group_name,
           author.signature
@@ -65,8 +65,8 @@ module Renalware
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-      def letter_issued_on
-        format_date(letter.issued_on)
+      def letter_date
+        format_date(letter.date)
       end
 
       def format_date(date)
@@ -74,7 +74,7 @@ module Renalware
       end
 
       def visit_or_letter_date
-        date = letter_event&.send(:date) || letter.issued_on
+        date = letter_event&.send(:date) || letter.date
         format_date(date)
       end
 

data/app/presenters/renalware/virology/dashboard_presenter.rb

@@ -26,7 +26,7 @@ module Renalware
       end
 
       def vaccinations
-        Vaccination.for_patient(patient)
+        Vaccination.for_patient(patient).order(date_time: :desc)
       end
     end
   end

data/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p><%= t('.greeting', recipient: @email) %></p>
+
+<p><%= t('.instruction') %></p>
+
+<p><%= link_to t('.action'), confirmation_url(@resource, confirmation_token: @token) %></p>

data/app/views/devise/mailer/email_changed.html.erb

@@ -0,0 +1,7 @@
+<p><%= t('.greeting', recipient: @email) %></p>
+
+<% if @resource.try(:unconfirmed_email?) %>
+  <p><%= t('.message', email: @resource.unconfirmed_email) %></p>
+<% else %>
+  <p><%= t('.message', email: @resource.email) %></p>
+<% end %>

data/app/views/devise/mailer/password_change.html.erb

@@ -0,0 +1,3 @@
+<p><%= t('.greeting', recipient: @resource.email) %></p>
+
+<p><%= t('.message') %></p>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p><%= t('.greeting', recipient: @resource.email) %></p>
+
+<p><%= t('.instruction') %></p>
+
+<p><%= link_to t('.action'), edit_password_url(@resource, reset_password_token: @token) %></p>
+
+<p><%= t('.instruction_2') %></p>
+<p><%= t('.instruction_3') %></p>

data/app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p><%= t('.greeting', recipient: @resource.email) %></p>
+
+<p><%= t('.message') %></p>
+
+<p><%= t('.instruction') %></p>
+
+<p><%= link_to t('.action'), unlock_url(@resource, unlock_token: @token) %></p>

data/app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,27 @@
+<h2><%= t(".change_your_password") %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+  <%= f.error_notification %>
+
+  <%= f.input :reset_password_token, as: :hidden %>
+  <%= f.full_error :reset_password_token %>
+
+  <div class="form-inputs">
+    <%= f.input :password,
+                label: t(".new_password"),
+                required: true,
+                autofocus: true,
+                hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                label: t(".confirm_new_password"),
+                required: true,
+                input_html: { autocomplete: "new-password" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".change_my_password") %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/{renalware/devise → devise}/passwords/new.html.erb

@@ -1,4 +1,4 @@
-<%= within_admin_layout(title: "Forgot your password?") do %>
+<%= within_admin_layout(title: t(".forgot_your_password")) do %>
   <%= simple_form_for(resource,
                       as: resource_name,
                       url: password_path(resource_name),
@@ -12,7 +12,7 @@
       </div>
     </div>
 
-    <%= f.button :submit, "Send me reset password instructions" %>
+    <%= f.button :submit, t("devise.passwords.new.send_me_reset_password_instructions", cascade: true)  %>
   <% end %>
   <%= render "devise/shared/links" %>
 <% end %>

data/app/views/devise/passwords/new.html.erb.new

@@ -0,0 +1,18 @@
+<h2><%= t(".forgot_your_password") %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :email,
+                required: true,
+                autofocus: true,
+                input_html: { autocomplete: "email" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".send_me_reset_password_instructions") %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/devise/registrations/edit.html.erb.pt

@@ -0,0 +1,35 @@
+<h2><%= t(".title", resource: resource.model_name.human) %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :email, required: true, autofocus: true %>
+
+    <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+      <p><%= t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email) %></p>
+    <% end %>
+
+    <%= f.input :password,
+                hint: t(".leave_blank_if_you_don_t_want_to_change_it"),
+                required: false,
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                required: false,
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :current_password,
+                hint: t(".we_need_your_current_password_to_confirm_your_changes"),
+                required: true,
+                input_html: { autocomplete: "current-password" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".update") %>
+  </div>
+<% end %>
+
+<h3><%= t(".cancel_my_account") %></h3>
+
+<p><%= t(".unhappy") %> <%= link_to t(".cancel_my_account"), registration_path(resource_name), data: { confirm: t(".are_you_sure") }, method: :delete %></p>
+
+<%= link_to t("devise.shared.links.back"), :back %>

data/app/views/{renalware/devise → devise}/registrations/edit.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "Update Profile")
+= within_admin_layout(title: "")
 
   .document
     h4 #{resource}'s Profile
@@ -6,7 +6,7 @@
     = form_for(resource,
       as: resource_name,
       url: registration_path(resource_name),
-      html: { method: :put }) do |f|
+      html: { class: "fn-form", method: :put }) do |f|
 
       = custom_devise_error_messages!
 
@@ -17,11 +17,11 @@
         = f.email_field :email, autofocus: true
 
       - if devise_mapping.confirmable? && resource.pending_reconfirmation?
-        div Currently waiting confirmation for: #{resource.unconfirmed_email}
+        div= t("devise.registrations.edit.currently_waiting_confirmation_for_email", email: resource.unconfirmed_email)
 
       .field.large-8.small-6
         = f.label :password
-        <i>(leave blank if you don't want to change it)</i>
+        i = t("devise.registrations.edit.leave_blank_if_you_don_t_want_to_change_it")
         = f.password_field :password, autocomplete: "off"
 
       .field.large-8.small-6
@@ -30,7 +30,7 @@
 
       .field.large-8.small-6
         = f.label :current_password
-        <i>(we need your current password to confirm your changes)</i>
+        i= t("devise.registrations.edit.we_need_your_current_password_to_confirm_your_changes")
         = f.password_field :current_password, autocomplete: "off"
 
       .field.large-8.small-6
@@ -42,7 +42,14 @@
         <i>(appears in letters, e.g. "Dr Jane Smith, MRCP")</i>
         = f.text_field :signature
 
+      / For now, disallow Portuguese as an option. While there are some Portuguese translations
+      / in the app, added as a proof-of-concept, these have not been sanity-checked!
+      / ["Portuguese", "pt"]
+      / .field.large-8.small-6
+      /   = f.label :language
+      /   = f.collection_select(:language, [["English", "en-GB"]], :last, :first, prompt: true)
+
       .actions
-        = f.submit "Update", class: "button save"
+        = f.submit t("devise.registrations.edit.update"), class: "button save"
 
-      = link_to "Back", :back
+      = link_to t("devise.shared.links.back"), :back

data/app/views/devise/registrations/new.html.erb.pt

@@ -0,0 +1,25 @@
+<h2><%= t(".sign_up") %></h2>
+
+<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :email,
+                required: true,
+                autofocus: true ,
+                input_html: { autocomplete: "email" }%>
+    <%= f.input :password,
+                required: true,
+                hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
+                input_html: { autocomplete: "new-password" } %>
+    <%= f.input :password_confirmation,
+                required: true,
+                input_html: { autocomplete: "new-password" } %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, t(".sign_up") %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/{renalware/devise → devise}/registrations/new.html.slim

@@ -1,4 +1,4 @@
- = within_admin_layout(title: "Register") do
+ = within_admin_layout(title: t("devise.registrations.new.sign_up")) do
   = simple_form_for(resource,
                     as: resource_name,
                     url: registration_path(resource_name),
@@ -13,7 +13,7 @@
     = f.input :password,
               as: :password,
               input_html: { autocomplete: "off" },
-              hint: "#{@minimum_password_length} characters minimum",
+              hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
               wrapper: :horizontal_small
     = f.input :password_confirmation,
               as: :password,
@@ -30,6 +30,6 @@
 
       = f.input :asked_for_write_access, label: "Write access required"
 
-    = f.submit "Sign up", class: "button save"
+    = f.submit t("devise.registrations.new.sign_up"), class: "button save"
 
   = render "devise/shared/links"