renalware-core 2.0.146 → 2.0.147

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea66f0da3fb417c2ff7f515964db415e68e61f447fdf742c97906d635aecb7a6
-  data.tar.gz: a1f6203e5b3f637bd9a85413ddbfe25739916e1ac33dc1f44e080acb4303f533
+  metadata.gz: a0a85e291938153f0f3d994195230457b6550239d0e8dde9e7d4a0b8a72f7819
+  data.tar.gz: 34d8b8b3b54731448ec32c05c136e3f371e4725a5a7efc2f7946264d041153d0
 SHA512:
-  metadata.gz: d0269f2b3d9fdda86ea868fdf074314cce11f647030768d922ebfe1650eaf67fcd8f22bf321bd4f409daf2e4c1f991934b1e817e4ef213ccf37d873ced1fe797
-  data.tar.gz: 740773f49f38ab01bfea92f1a06dc0c1cc83af18ccc8a7d483bb1ea01aaff2a71501df866f28de44c21d178b81d59e204660dc7c9d7a7a085b33b7b9fbfc2eb9
+  metadata.gz: 2da7dbc33f709e9effcb837f78c0678bbe375d977e8c276aa70dbcb2f94366f5df7c518f554ccd9f8611a3b801a2e74c4a11ffb21a08356d6fcd77e15b0015ed
+  data.tar.gz: a1d6d42f2adf772b8201e982fd8cb850403ce6cd70c87820b96a581356f7dab2efdc826db6bc96ba628b8ae44a39790c236f725bfee3a68170cc75ca91941bd4

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

@@ -1,2 +1,2 @@
 //= require chartkick
-//= require Chart.bundle
+//= require highcharts

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

@@ -3923,6 +3923,87 @@ var _default$4 = function(_Controller) {
 
 _defineProperty(_default$4, "targets", [ "trix" ]);
 
+var _default$5 = function(_Controller) {
+  _inherits(_default, _Controller);
+  function _default() {
+    _classCallCheck(this, _default);
+    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+  }
+  _createClass(_default, [ {
+    key: "connect",
+    value: function connect() {
+      var radio_value = this.providersTarget.querySelector("input:checked").value;
+      this.toggleDeliveryDatesVisibility(radio_value);
+    }
+  }, {
+    key: "toggleDeliveryDates",
+    value: function toggleDeliveryDates(event) {
+      this.toggleDeliveryDatesVisibility(event.target.value);
+    }
+  }, {
+    key: "toggleDeliveryDatesVisibility",
+    value: function toggleDeliveryDatesVisibility(radio_value) {
+      if (radio_value == "home_delivery") {
+        this.homeDeliveryDatesTarget.style.display = "block";
+      } else {
+        this.homeDeliveryDatesTarget.style.display = "none";
+      }
+    }
+  } ]);
+  return _default;
+}(Controller);
+
+_defineProperty(_default$5, "targets", [ "homeDeliveryDates", "providers" ]);
+
+var Chartkick = window.Chartkick;
+
+var _default$6 = function(_Controller) {
+  _inherits(_default, _Controller);
+  function _default() {
+    _classCallCheck(this, _default);
+    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+  }
+  _createClass(_default, [ {
+    key: "redisplay",
+    value: function redisplay(event) {
+      var json = event.detail[0];
+      if (this.chartCreated()) {
+        this.chartTarget.getChartObject().updateData(json);
+      } else {
+        new Chartkick.LineChart("chart1", json, this.chartOptions);
+      }
+    }
+  }, {
+    key: "chartCreated",
+    value: function chartCreated() {
+      return Object.prototype.hasOwnProperty.call(this.chartTarget, "getChartObject");
+    }
+  }, {
+    key: "chartOptions",
+    get: function get() {
+      return {
+        curve: false,
+        library: {
+          chart: {
+            zoomType: "x"
+          },
+          plotOptions: {
+            series: {
+              animation: {
+                duration: 400
+              }
+            }
+          },
+          colors: [ "#005eb8", "#009639", "#434348", "#90ed7d", "#f7a35c", "#8085e9", "#f15c80", "#e4d354" ]
+        }
+      };
+    }
+  } ]);
+  return _default;
+}(Controller);
+
+_defineProperty(_default$6, "targets", [ "chart" ]);
+
 var application = Application.start();
 
 application.register("toggle", _default);
@@ -3934,3 +4015,9 @@ application.register("home-delivery-modal", _default$2);
 application.register("snippets", _default$3);
 
 application.register("letters-form", _default$4);
+
+application.register("prescriptions", _default$5);
+
+application.register("charts", _default$6);
+
+window.Chartkick.use(window.Highcharts);

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

@@ -207,6 +207,11 @@ article {
       float: right;
       padding: 0.3rem 0.4rem;
       text-decoration: none;
+      margin-left: 0.5rem;
+
+      &.button-danger {
+        background-color: $nhs-red;
+      }
     }
 
     .button:hover {

data/app/components/renalware/system/admin_menu_component.html.slim

@@ -23,4 +23,5 @@ ul.side-nav.side-nav--admin
   = super_admin_menu_item "HD Cannulation Types", renalware.hd_cannulation_types_path, %r{hd/cannulation_types}
   = super_admin_menu_item "Print batches", renalware.letters_batches_path, %r{letters/batches}
   = admin_menu_item "Mailshots", renalware.letters_mailshots_path, %r{letters/mailshots}
+  = super_admin_menu_item "Playground", renalware.admin_playground_path, %r{admin/playground}
   = developer_menu_item "HL7 Test", renalware.new_feeds_hl7_test_message_path

data/app/controllers/renalware/admin/playgrounds_controller.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Renalware
+  class Admin::PlaygroundsController < BaseController
+    def show
+      authorize User, :index?
+      render locals: { form: ChartForm.new(obx_code: "CRE", period: "all") }
+    end
+
+    # Returns test json to display a chart of one obx code over time for a patient
+    def pathology_chart_data
+      authorize User, :index?
+      form = ChartForm.new(chart_params)
+      chart = Chart.new(form)
+      render json: chart.json
+    end
+
+    class ChartForm
+      include ActiveModel::Model
+      include Virtus::Model
+
+      attribute :patient_id, Integer
+      attribute :obx_code, String
+      attribute :period, String
+
+      # Map a period string to a date, eg 6m = 6 months ago
+      def start_date
+        time = case period
+               when "yr" then 1.year.ago
+               when "6m" then 6.months.ago
+               when "3m" then 3.months.ago
+               when "1m" then 1.month.ago
+               when "1wk" then 1.week.ago
+               else 100.years.ago
+               end
+        time.to_date.to_s
+      end
+    end
+
+    def chart_params
+      return {} unless params.key?(:chart)
+
+      params.require(:chart).permit!
+    end
+
+    class Chart
+      pattr_initialize :form
+
+      def json
+        return {} if form.patient_id.blank?
+
+        ActiveRecord::Base.connection.execute(
+          Arel.sql(<<-SQL)
+            select
+              observed_on as x,
+              result as y
+              from renalware.pathology_chart_data(#{form.patient_id},
+                '#{form.obx_code}',
+                '#{form.start_date}')
+          SQL
+        ).to_a.each_with_object({}) { |h, hash| hash[Date.parse(h["x"])] = h["y"] }
+      end
+    end
+  end
+end

data/app/controllers/renalware/deaths_controller.rb

@@ -3,15 +3,16 @@
 module Renalware
   class DeathsController < BaseController
     include PresenterHelper
-    include Renalware::Concerns::Pageable
+    include Pagy::Backend
 
     def index
-      patients = Patient.dead.page(page).per(per_page)
-      search = patients.ransack(params[:q])
+      query = Patients::DeceasedPatientsQuery.new(params[:q])
+      pagy, patients = pagy(query.call.includes(previous_modality: :description))
       authorize patients
       render locals: {
-        patients: present(search.result, PatientPresenter),
-        q: search
+        patients: present(patients, PatientPresenter),
+        q: query.search,
+        pagy: pagy
       }
     end
 

data/app/controllers/renalware/medications/home_delivery/events_controller.rb

@@ -31,9 +31,7 @@ module Renalware
           authorize event
 
           event.prescriptions = prescriptions_for(event)
-
           event.valid?
-          # byebug
           render(:edit, layout: false, locals: { event: event })
         end
 
@@ -64,7 +62,6 @@ module Renalware
                   last_delivery_date: last_delivery_date,
                   next_delivery_date: next_delivery_date
                 )
-
               end
               render :update, locals: { event: event }
             else

data/app/controllers/renalware/medications/home_delivery/prescriptions_controller.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/medications"
+
+module Renalware
+  module Medications
+    module HomeDelivery
+      class PrescriptionsController < BaseController
+        include Pagy::Backend
+
+        def index
+          form = SearchForm.new(search_params)
+          query = Medications::Delivery::PrescriptionsDueForDeliveryQuery.new(
+            drug_type_code: params[:named_filter],
+            modality_description_id: form.modality_description_id,
+            query: params[:q]
+          )
+          pagy, prescriptions = pagy(query.call)
+          authorize prescriptions
+          render :index, locals: {
+            prescriptions: prescriptions,
+            pagy: pagy,
+            query: query.search,
+            form: form
+          }
+        end
+
+        class SearchForm
+          include ActiveModel::Model
+          include Virtus::Model
+
+          attribute :modality_description_id, Integer
+        end
+
+        def search_params
+          return {} unless params.key?(:search)
+
+          params.require(:search).permit(:modality_description_id)
+        end
+      end
+    end
+  end
+end

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

@@ -26,6 +26,12 @@ module Renalware
         end
       end
 
+      def destroy
+        authorize patient
+        patient.update_by(current_user, primary_care_physician_id: nil, practice_id: nil)
+        render locals: { patient: patient }
+      end
+
       private
 
       # There maybe times (for instance after migration from a previous system) where the

data/app/javascript/renalware/controllers/charts_controller.js

@@ -0,0 +1,52 @@
+// NB Chartkick and Highcharts are defined as global in rollup
+const Chartkick = window.Chartkick
+
+import { Controller } from "stimulus"
+
+export default class extends Controller {
+  static targets = [ "chart" ]
+
+  // Called on ajax:success
+  redisplay(event) {
+    // let [json, status, xhr] = event.detail
+    let json = event.detail[0]
+    if (this.chartCreated()) {
+      this.chartTarget.getChartObject().updateData(json)
+    } else {
+      new Chartkick.LineChart("chart1", json, this.chartOptions)
+    }
+  }
+
+  // Returns true if the chart target has already been initialised
+  chartCreated() {
+    return Object.prototype.hasOwnProperty.call(this.chartTarget, "getChartObject")
+  }
+
+  get chartOptions() {
+    return {
+      curve: false,
+      library: {
+        chart: {
+          zoomType: "x"
+        },
+        plotOptions: {
+          series: {
+            animation: {
+              duration: 400
+            }
+          }
+        },
+        colors: [
+          "#005eb8",
+          "#009639",
+          "#434348",
+          "#90ed7d",
+          "#f7a35c",
+          "#8085e9",
+          "#f15c80",
+          "#e4d354"
+        ]
+      }
+    }
+  }
+}

data/app/javascript/renalware/controllers/medications/prescriptions_controller.js

@@ -0,0 +1,24 @@
+import { Controller } from "stimulus"
+
+// Handles the modal dialog used for presenting Home Delivery print options to
+// the user. Used on the prescrptions page.
+export default class extends Controller {
+  static targets = [ "homeDeliveryDates", "providers" ]
+
+  connect() {
+    let radio_value = this.providersTarget.querySelector("input:checked").value
+    this.toggleDeliveryDatesVisibility(radio_value)
+  }
+
+  toggleDeliveryDates(event) {
+    this.toggleDeliveryDatesVisibility(event.target.value)
+  }
+
+  toggleDeliveryDatesVisibility(radio_value) {
+    if (radio_value == "home_delivery") {
+      this.homeDeliveryDatesTarget.style.display = "block"
+    } else {
+      this.homeDeliveryDatesTarget.style.display = "none"
+    }
+  }
+}

data/app/javascript/renalware/index.js

@@ -18,6 +18,8 @@ import HDPrescriptionController from "./controllers/hd/prescription_administrati
 import MedicationsHomeDeliveryModalController from "./controllers/medications/home_delivery_modal_controller"
 import SnippetsController from "./controllers/snippets_controller"
 import LettersFormController from "./controllers/letters/form_controller"
+import PrescriptionsController from "./controllers/medications/prescriptions_controller"
+import ChartsController from "./controllers/charts_controller"
 
 const application = Application.start()
 application.register("toggle", ToggleController)
@@ -25,3 +27,7 @@ application.register("hd-prescription-administration", HDPrescriptionController)
 application.register("home-delivery-modal", MedicationsHomeDeliveryModalController)
 application.register("snippets", SnippetsController)
 application.register("letters-form", LettersFormController)
+application.register("prescriptions", PrescriptionsController)
+application.register("charts", ChartsController)
+
+window.Chartkick.use(window.Highcharts)

data/app/models/renalware/medications.rb

@@ -9,6 +9,8 @@ module Renalware
     end
 
     module Delivery
+      DRUG_TYPE_FILTERS = %i(esa immunosuppressant).freeze
+
       def self.table_name_prefix
         "medication_delivery_"
       end

data/app/models/renalware/medications/delivery/prescriptions_due_for_delivery_query.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/medications"
+
+module Renalware
+  module Medications
+    module Delivery
+      # Find current home delivery prescriptions with a next_delivery_date falling
+      # within the specified range.
+      class PrescriptionsDueForDeliveryQuery
+        attr_reader :drug_type_code, :from, :to, :query, :modality_description_id
+
+        def initialize(
+          drug_type_code: nil,
+          from: nil,
+          to: nil,
+          modality_description_id: nil,
+          query: {}
+        )
+          @from = (from || 4.weeks.ago).beginning_of_day
+          @to = (to || 2.weeks.since).end_of_day
+          @drug_type_code = drug_type_code
+          @query = query
+          @modality_description_id = modality_description_id
+        end
+
+        def call
+          query = search.result
+            .current
+            .includes(:patient)
+            .eager_load(drug: [:classifications, :drug_types])
+            .joins("inner join patient_current_modalities pcm on pcm.patient_id = patients.id")
+            .where(provider: :home_delivery)
+            .where(next_delivery_date: (from..to))
+            .order(next_delivery_date: :asc)
+
+          if drug_type_code.present?
+            query = query.where("lower(drug_types.code) = ?", drug_type_code)
+          end
+
+          if modality_description_id.present?
+            query = query.where("pcm.modality_description_id = ?", modality_description_id)
+          end
+          query
+        end
+
+        def search
+          @search ||= Medications::Prescription.ransack(query)
+        end
+      end
+    end
+  end
+end