renalware-core 2.0.166 → 2.0.167

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac2d49cbce8125bf334c28dce8c0363c766aa0b4951509bab613eaf3c6c8cc10
-  data.tar.gz: 795e74e0004088a1506766f9e468b1c67be68783c664ff228ff2bd6e98f0aca4
+  metadata.gz: aa22cd0095f51d9bc225561fa2560b535a6e2c1af7afc9b6c831577b62f8fff9
+  data.tar.gz: 32cff2bcf9bd90f1f08f79716c8541601e8ef7ad09f2c35f4daefa14df89a711
 SHA512:
-  metadata.gz: 995cf6f9c31fc67b071e57a07f1235aeb2d86a357854a29bef6d794b9d2548a2ea485222af0bba4e6fae83cf0d8398f1b56026b9233a614c40c3a7d2e053ce3e
-  data.tar.gz: edbc6fdf11d7aad748f713669ccdf1a4c9a6fbe0ffc8f9f0cda3fec4e7a8c875593b4c98e9983e2db331bc617ab26bb5741d1de480bc761c43e1e68f4085f32d
+  metadata.gz: a40adc5547969171c58e7216f2e26ddad7b841a23c2a3e9710353639142b307007fbc6c98886e9c140a656e97a26fcbf39c9ef9091220b32ff1edfc92afd67c9
+  data.tar.gz: b05d494e9d5565979f7dbd9e755202cb227c1e895e065f3aa81e2de68070c36d24f79fb7e6e78b41acd84db767c2ad7069f34477c797bad968d10c8bc9348ef6

data/app/assets/stylesheets/renalware/lib/_foundation_and_overrides.scss

@@ -454,7 +454,7 @@ $form-spacing: rem-calc(12);
 // $input-border-radius: $global-radius;
 // $input-disabled-bg: $gainsboro;
 // $input-disabled-cursor: $cursor-default-value;
-// $input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
+$input-box-shadow: 0;
 
 // We use these to style the fieldset border and spacing.
 // $fieldset-border-style: solid;

data/app/assets/stylesheets/renalware/partials/_tables.scss

@@ -37,6 +37,15 @@ td.actions {
   padding-left: 0;
   white-space: nowrap;
 
+  /* If the action link is just an icon, make it quite subtle so it does not draw attention */
+  > a.icon-only {
+    color: $link-hover-colour;
+
+    &:hover {
+      color: $link-colour;
+    }
+  }
+
   > a, > span {
     &:after {
       color: $pipe-separator-colour;

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/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/renalware/clinics/appointments/index.html.slim

@@ -73,11 +73,10 @@
         - appointments.each do |appointment|
           tr
             td= check_box_tag nil, appointment.patient.id, true, class: "patient_checkbox"
-            td.nowrap
+            td.nowrap.actions
               = link_to("Toggle",
                        "#appointment-quick-preview-#{appointment.id}",
                        data: { behaviour: "toggler" })
-              = " | "
               - if appointment.becomes_visit_id.present?
                 = link_to edit_patient_clinic_visit_path(appointment.patient,
                                                          id: appointment.becomes_visit_id) do

data/app/views/renalware/directory/people/_person.html.slim

@@ -1,7 +1,6 @@
 tr
-  td
+  td.actions
     = link_to "View", directory_person_path(person)
-    = pipe_separator
     = link_to "Edit", edit_directory_person_path(person)
   td= person.title
   td= link_to person.family_name, directory_person_path(person)

data/app/views/renalware/events/events/_event.html.slim

@@ -1,9 +1,22 @@
 - row_id = "#{toggle_prefix}-quick-preview-#{event.id}"
 tr
   td.noprint= toggler("##{row_id}")
-  - if local_assigns[:edit_proc]
-    td.noprint
-      = link_to("Edit", edit_proc.call(event))
+  td.actions
+    / If the event supports editing (most don't as they are immuatble once created, to ensure a
+    / consistent clinical record), then use the supplied proc if passed (which will render a
+    / custom edit link (e.g. the Investigations event subclass, has its own slug, controllwe and
+    / and form) otherwise render a standard Event edit link.
+    - if policy(event).edit?
+      = link_to("Edit", local_assigns[:edit_proc] ? edit_proc.call(event) : edit_patient_event_path(event.patient, event))
+
+    - if policy(event).destroy?
+      - if local_assigns[:destroy_proc]
+        = link_to("Delete", destroy_proc.call(event))
+      - else
+        = link_to(patient_event_path(event.patient, event),
+                  method: :delete,
+                  data: { confirm: "Are you sure you want delete this event?\n" }) do
+          i.far.fa-trash-alt
 
   td.nowrap= l event.created_at.to_date
   - unless local_assigns[:exclude_type_column] == true

data/app/views/renalware/events/events/_form.html.slim

@@ -1,5 +1,5 @@
 = simple_form_for event,
-    url: patient_events_path(patient, event),
+    url: url,
     as: :events_event,
     html: { autocomplete: "off" },
     wrapper: "horizontal_form" do |f|

data/app/views/renalware/events/events/_table.html.slim

@@ -4,8 +4,7 @@ table.has-togglable-rows.events-table
   thead
     tr
       th.noprint.togglers= table_toggler
-      - if local_assigns[:edit_proc]
-        th.col-width-tiny
+      th.col-width-tiny
       th.col-width-date=t(".created_at")
       - unless local_assigns.fetch(:exclude_type_column, false)
         th.col-width-large= t(".type")

data/app/views/renalware/events/events/edit.html.slim

@@ -0,0 +1,10 @@
+= within_patient_layout(\
+    title: "Event / Edit",
+    breadcrumbs:  breadcrumb_for("Events", patient_events_path(patient)) \
+  ) do
+
+  = render "renalware/events/events/form",
+            event: event,
+            patient: patient,
+            event_types: event_types,
+            url: patient_event_path(patient, event)

data/app/views/renalware/events/events/new.html.slim

@@ -11,7 +11,7 @@
       wrapper: "horizontal_form" do |f|
 
     = render "form",
-             event: event,
-             patient: patient,
-             event_types: event_types,
-             f: f
+            event: event,
+            patient: patient,
+            event_types: event_types,
+            url: patient_events_path(patient)

data/app/views/renalware/events/investigations/edit.html.slim

@@ -1,13 +1,7 @@
 = within_patient_layout(title: "Investigations / Edit") do
 
-  = simple_form_for event,
-      url: patient_investigation_path(patient, event),
-      as: :events_event,
-      html: { autocomplete: "off" },
-      wrapper: "horizontal_form" do |f|
-
-    = render "renalware/events/events/form",
-             event: event,
-             patient: patient,
-             event_types: event_types,
-             f: f
+  = render "renalware/events/events/form",
+          event: event,
+          patient: patient,
+          event_types: event_types,
+          url: patient_investigation_path(patient, event)

data/app/views/renalware/events/swabs/edit.html.slim

@@ -3,14 +3,8 @@
     breadcrumbs:  breadcrumb_for("Clinical Profile", patient_clinical_profile_path(patient))\
   ) do
 
-  = simple_form_for event,
-      url: patient_swab_path(patient, event),
-      as: :events_event,
-      html: { autocomplete: "off" },
-      wrapper: "horizontal_form" do |f|
-
-    = render "renalware/events/events/form",
-             event: event,
-             patient: patient,
-             event_types: event_types,
-             f: f
+  = render "renalware/events/events/form",
+            event: event,
+            patient: patient,
+            event_types: event_types,
+            url: patient_swab_path(patient, event)

data/app/views/renalware/events/swabs/new.html.slim

@@ -1,13 +1,7 @@
 = within_patient_layout(title: "New Swab", breadcrumbs: clinical_profile_breadcrumb(patient)) do
 
-  = simple_form_for event,
-      url: patient_swabs_path(patient, event),
-      as: :events_event,
-      html: { autocomplete: "off" },
-      wrapper: "horizontal_form" do |f|
-
-    = render "renalware/events/events/form",
-             event: event,
-             patient: patient,
-             event_types: event_types,
-             f: f
+  = render "renalware/events/events/form",
+            event: event,
+            patient: patient,
+            event_types: event_types,
+            url: patient_swabs_path(patient, event)

data/app/views/renalware/hd/dialysers/index.html.slim

@@ -14,9 +14,8 @@
     tbody
       - dialysers.each do |dialyser|
         tr
-          td
+          td.actions
             = link_to "Edit", edit_hd_dialyser_path(dialyser.id)
-            = pipe_separator
             = link_to "Delete",
                       hd_dialyser_path(dialyser.id),
                       method: :delete,

data/app/views/renalware/hd/ongoing_sessions/_session.html.slim

@@ -1,7 +1,6 @@
 tr
-  td.noprint
+  td.noprint.actions
     = link_to "Sign-Off", edit_patient_hd_session_path(session.patient, session)
-    = pipe_separator
     = link_to "HD Summary".html_safe, patient_hd_dashboard_path(session.patient)
   td.full-name
     = link_to session.patient.to_s, patient_clinical_summary_path(session.patient)

data/app/views/renalware/hospitals/units/index.html.slim

@@ -19,10 +19,9 @@
     tbody
       - hospital_units.each do |unit|
         tr
-          td
+          td.actions
             - if policy(unit).edit?
               = link_to "Edit", edit_hospitals_unit_path(unit.id)
-              = pipe_separator
             - if policy(unit).destroy?
               = link_to "Delete",
                         hospitals_unit_path(unit.id),

data/app/views/renalware/pd/infection_organisms/_table.html.slim

@@ -8,9 +8,8 @@ table
   tbody
     - infection_organisms.each do |infection_organism|
       tr
-        td
+        td.noprint.actions
           = link_to "Edit", edit_pd_infection_organism_path(infection_organism), remote: true
-          = pipe_separator
           = link_to "Terminate", pd_infection_organism_path(infection_organism),
               method: :delete, remote: true, data: { confirm: "Are you sure?" }
         td= infection_organism

data/app/views/renalware/problems/notes/_table.html.slim

@@ -15,13 +15,12 @@
       - notes.each do |note|
         tr
           - unless problem.archived?
-            td
+            td.actions
               - if policy(note).edit?
                 = link_to "Edit",
                           edit_patient_problem_note_path(problem.patient, problem, note),
                           remote: true
               - if policy(note).destroy?
-                = pipe_separator
                 = link_to "Delete",
                           patient_problem_note_path(problem.patient, problem, note),
                           method: :delete,

data/app/views/renalware/problems/problems/_current_table.html.slim

@@ -9,9 +9,8 @@ table#current_problems.manual-stripes.auto-layout
   = content_tag(:tbody, class: "sortables", data: { rel: sort_patient_problems_path(@patient) }) do
     - problems.each do |problem|
       = content_tag_for(:tr, problem, class: "sortable") do
-        td
+        td.actions
           = link_to "Edit", patient_problem_path(@patient, problem)
-          = pipe_separator
           = link_to "Archive",
                     patient_problem_path(@patient, problem),
                     method: :delete,

data/app/views/renalware/research/study_participants/_table.html.slim

@@ -22,13 +22,13 @@
           td= participant.patient.age
           td= participant.patient.sex
           td= participant.external_id
-          td
+          td.actions
             = link_to "Delete",
                       research_study_participant_path(study, participant),
                       method: :delete,
                       data: { confirm: "Are you sure?" }
-            = " | "
             = link_to("Edit",
                       edit_research_study_participant_path(study, participant),
                       data: { "reveal-id" => "study-participant-modal", "reveal-ajax" => "true" })
+
   = paginate participants

data/app/views/renalware/transplants/donor_operations/_list.html.slim

@@ -20,10 +20,9 @@ article.status-history
           td= operation.nephrectomy_type.try(:text)
           - if operation.followup
             td= l operation.followup.last_seen_on
-            td
+            td.actions.text-left
               = link_to "View",
                   patient_transplants_donor_operation_followup_path(patient, operation)
-              = pipe_separator
               = link_to "Update",
                   edit_patient_transplants_donor_operation_followup_path(patient, operation)
           - else

data/app/views/renalware/transplants/recipient_operations/_list.html.slim

@@ -38,15 +38,14 @@ article.recipient-operations
           - if operation.followup
             td= l operation.followup.transplant_failed_on
             td= operation.followup.transplant_failure_cause_description
-            td
+            td.actions.text-left
               = link_to "View",
                         patient_transplants_recipient_operation_followup_path(patient, operation)
-              = pipe_separator
               = link_to "Update",
                         edit_patient_transplants_recipient_operation_followup_path(patient, operation)
           - else
             td
             td
-            td
+            td.actions.text-left
               - url = new_patient_transplants_recipient_operation_followup_path(patient, operation)
               = link_to "Enter details", url

data/config/routes/events.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 resources :patients, only: [] do
-  resources :events, only: [:new, :create, :index], controller: "events/events"
+  resources :events, except: :show, controller: "events/events"
   constraints(format: /(pdf)/) do
     resources :events, only: :show, controller: "events/events"
   end

data/lib/renalware/version_number.rb

@@ -5,6 +5,6 @@ module Renalware
   # to creat that class even though its not used. If we don't do this zeitwerk
   # complains that version.rb does export a constant called Version.
   class VersionNumber
-    VERSION = "2.0.166"
+    VERSION = "2.0.167"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.166
+  version: 2.0.167
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -742,14 +742,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: record_tag_helper
   requirement: !ruby/object:Gem::Requirement
@@ -792,20 +792,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -2588,6 +2574,7 @@ files:
 - app/views/renalware/events/events/cell/_investigation.html.slim
 - app/views/renalware/events/events/cell/_simple.html.slim
 - app/views/renalware/events/events/cell/_swab.html.slim
+- app/views/renalware/events/events/edit.html.slim
 - app/views/renalware/events/events/index.html.slim
 - app/views/renalware/events/events/inputs/_biopsy.html.slim
 - app/views/renalware/events/events/inputs/_investigation.html.slim