renalware-core 2.0.116 → 2.0.117

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cb27774d18c6f2491947cf9a178521fc8516459efa8f1d9dd960a1b929cf7f2
-  data.tar.gz: 58de5e25e25319887f6727b360d666bffdb24ebdb6473db96be5079543b418a5
+  metadata.gz: 90a6805bb8cf3b390ced2cb486b99fcc5ffe4d422a191f93cd0db17d7ecd48d5
+  data.tar.gz: 8f1f5c571e429f2733916bc467bb4795c644bab6499c8d33827265847a3c06c9
 SHA512:
-  metadata.gz: cbc216e56c23b9f819a005591c03fe13c391bc5dbe9472b8efae867b297f4605c801703caee6003228942f816019648381893c1ba9f32aa49ad5ff272433affe
-  data.tar.gz: 755ea6f7935778b76627bd61047aaf798ebb0bcce1369dbf94b663e95d47251972f732cd04ee9135fd1cac77d3090c5a40e398f6deab38a4ffbbf977cfa6a51b
+  metadata.gz: 01a912fcb03003db4ab86ce2561dc66370548a0f37e00e90f97e2db932a66723f69d7db0d62c11ff1e2ef5cdd768dbd9d262894a7dcd7e504b13c271ea86e0e3
+  data.tar.gz: b3b0b0b66293404ff97e20c05bbc79598e999cdc5aa35ebc44eda9c902ba2adf465f76b20ea03932b4c392711b2aa4b82bf8bd69814c96884429f66184a169c6

data/app/controllers/renalware/feeds/hl7_test_messages_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/admin"
-require "ap"
 
 module Renalware
   module Feeds

data/app/controllers/renalware/problems/notes_controller.rb

@@ -3,51 +3,78 @@
 module Renalware
   module Problems
     class NotesController < BaseController
-      before_action :load_patient
-
       def index
-        load_problem
         render_index
       end
 
       def new
-        load_problem
-        note = @problem.notes.new
-        render_form(note, url: patient_problem_notes_path(patient, @problem))
+        note = problem.notes.new
+        authorize(note)
+        render_form(
+          note,
+          url: patient_problem_notes_path(patient, problem)
+        )
       end
 
       def create
-        load_problem
-        note = @problem.notes.create(notes_params)
-
+        note = problem.notes.create(notes_params)
+        authorize(note)
         if note.save
           render_index
         else
-          render_form(note, url: patient_problem_notes_path(patient, @problem))
+          render_form(
+            note,
+            url: patient_problem_notes_path(patient, problem)
+          )
+        end
+      end
+
+      def edit
+        authorize note
+        render_form(
+          note,
+          url: patient_problem_note_path(patient, problem, note)
+        )
+      end
+
+      def update
+        authorize note
+        if note.update_by(current_user, notes_params)
+          render_index
+        else
+          render_form(
+            note,
+            url: patient_problem_notes_path(patient, problem)
+          )
         end
       end
 
       private
 
-      def load_problem
-        @problem = patient.problems.find(params[:problem_id])
+      def problem
+        @problem ||= patient.problems.find(params[:problem_id])
+      end
+
+      def notes
+        @notes ||= problem.notes.includes(:updated_by).ordered
+      end
+
+      def note
+        notes.find(params[:id])
       end
 
       def render_index
-        render "index", locals: { problem: @problem, notes: notes }
+        authorize(notes)
+        render "index", locals: { problem: problem, notes: notes }
       end
 
       def render_form(note, url:)
-        render "form", locals: { problem: @problem, note: note, url: url }
+        render "form", locals: { problem: problem, note: note, url: url }
       end
 
       def notes_params
         params.require(:problems_note).permit(:description).merge(by: current_user)
       end
-
-      def notes
-        @notes ||= @problem.notes.ordered
-      end
     end
   end
 end

data/app/jobs/feed_job.rb

@@ -17,7 +17,7 @@ FeedJob = Struct.new(:raw_message) do
   end
 
   def max_attempts
-    4
+    2
   end
 
   def destroy_failed_jobs?
@@ -25,13 +25,12 @@ FeedJob = Struct.new(:raw_message) do
   end
 
   # Reschedule after an error. No point trying straight away, so try at these intervals:
-  # After attempt no.  Wait for hours
+  # After attempt no. Wait for hours
   # ---------------------------
   # 1                  2
   # 2                  17
-  # 3                  82
   # Then give up.
-  # Note e.g. attempts**4 == attempts to the power of 4 == 81
+  # Note e.g. attempts**4 == attempts to the power of 4
   def reschedule_at(current_time, attempts)
     current_time + ((attempts**4) + 1).hours
   end

data/app/models/renalware/feeds.rb

@@ -7,8 +7,6 @@ module Renalware
   module Feeds
     module_function
 
-    class DuplicateMessageReceivedError < StandardError; end
-
     def table_name_prefix
       "feed_"
     end

data/app/models/renalware/feeds/message_processor.rb

@@ -31,9 +31,9 @@ module Renalware
         end
 
         allow_listeners_to_post_process_the_message
-      rescue StandardError => exception
-        notify_exception(exception)
-        raise exception
+      rescue StandardError => e
+        notify_exception(e)
+        raise e
       end
 
       private
@@ -64,7 +64,7 @@ module Renalware
         # current job to retry.
         message_to_broadcast = "#{hl7_message.message_type.downcase}_message_processed"
         broadcast(message_to_broadcast.to_sym, feed_message: feed_message)
-      rescue Feeds::DuplicateMessageReceivedError => e
+      rescue Feeds::DuplicateMessageError => e
         Rails.logger.warn("Rejected duplicate HL7 message: #{e.message}")
       rescue StandardError => e
         notify_exception(e)

data/app/models/renalware/problems/note.rb

@@ -12,6 +12,10 @@ module Renalware
       scope :ordered, -> { order(created_at: :asc) }
 
       validates :description, presence: true
+
+      def self.policy_class
+        BasePolicy
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@
   = simple_form_for note, url: url,
       wrapper: :horizontal_form, remote: true do |f|
 
-    = f.input :description, as: :text, input_html: { cols: 50, rows: 3 }, autofocus: true
+    = f.input :description, as: :text, input_html: { cols: 50, rows: 2 }, autofocus: true
 
     .row
       .large-offset-3.large-7.columns

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

@@ -1,10 +1,12 @@
-- if notes.empty?
+- if notes.blank?
   #new-note-area
     spam No notes
 
 - else
   table.auto-layout
     thead
+      - unless problem.archived?
+        th.col-width-tiny
       th Description
       th.col-width-medium Recorded By
       th.col-width-date-time Recorded On
@@ -12,8 +14,12 @@
     tbody
       - notes.each do |note|
         tr
-          td= note.description
+          - unless problem.archived?
+            td= link_to "Edit",
+                        edit_patient_problem_note_path(problem.patient, problem, note),
+                        remote: true
+          td(class="problem-note-#{note.id}")= note.description
           td= note.updated_by
-          td= l note.updated_at
+          td= l(note.updated_at)
 
   #new-note-area

data/app/views/renalware/problems/notes/form.js.erb

@@ -1,2 +1,4 @@
-<%= refresh("#new-note-area", partial: "form", locals: local_assigns) %>
+<% div = note.persisted? ? ".problem-note-#{note.id}" : "#new-note-area" %>
+<%= refresh(div, partial: "form", locals: local_assigns) %>
+
 $("#problems_note_description").focus();

data/config/routes/patients.rb

@@ -36,7 +36,7 @@ resources :patients, except: [:destroy], controller: "patients/patients" do
   # Problems
   resources :problems, controller: "problems/problems" do
     post :sort, on: :collection
-    resources :notes, only: [:index, :new, :create], controller: "problems/notes"
+    resources :notes, only: [:index, :new, :create, :edit, :update], controller: "problems/notes"
   end
 
   namespace :surveys do

data/lib/renalware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.116
+  version: 2.0.117
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component