renalware-core 2.0.149 → 2.0.151

data/app/components/renalware/patients/side_menu_component.rb

@@ -2,17 +2,8 @@
 
 module Renalware
   module Patients
-    # Experimental ActionView component
-    class SideMenuComponent < ActionView::Component::Base
-      validates :patient, presence: true
-
-      def initialize(patient:)
-        @patient = patient
-      end
-
-      private
-
-      attr_reader :patient
+    class SideMenuComponent < ApplicationComponent
+      pattr_initialize [:patient!]
     end
   end
 end

data/app/components/renalware/pd/adequacy_results_component.html.slim

@@ -0,0 +1,9 @@
+- if results.any?
+
+  article
+    header
+      h2= title
+      = link_to "Add", renalware.new_patient_pd_adequacy_result_path(patient), class: :button
+      = link_to "Show all", renalware.patient_pd_adequacy_results_path(patient), remote: true, class: "float-none button flex-initial secondary"
+    #adequacy-results-table
+      = render "renalware/pd/adequacy_results/table", results: results, current_user: current_user

data/app/components/renalware/pd/adequacy_results_component.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/surveys"
+
+module Renalware
+  module PD
+    class AdequacyResultsComponent < ApplicationComponent
+      include BooleanHelper
+      include Pagy::Backend
+      include Pagy::Frontend
+      include ToggleHelper
+      pattr_initialize [:patient!, :current_user!]
+      attr_reader :pagination
+
+      TITLE = "Adequacy Results"
+
+      def results
+        @results ||= begin
+          @pagination, @results = pagy(scope, items: 6) # , link_extra: "data-remote='true'")
+          @results
+        end
+      end
+
+      def title
+        if pagination.items < pagination.count
+          "#{TITLE} (#{pagination.items} of #{pagination.count})"
+        else
+          "#{TITLE} (#{pagination.items})"
+        end
+      end
+
+      private
+
+      def scope
+        AdequacyResult.for_patient(patient).ordered
+      end
+    end
+  end
+end

data/app/components/renalware/pd/pet_results_component.html.slim

@@ -0,0 +1,37 @@
+- if results.any?
+
+  article(data-controller="tabs" data-tabs-active-tab="opacity-100" data-tabs-index="0")
+    header
+      h2= title
+
+
+
+      /.flex.flex-row-reverse
+      .flex.justify-end
+
+        .inline-flex
+          a.reset.opacity-50.bg-white.m-05.pt-px.pb-0.px-1(href="#" data-target="tabs.tab"
+            data-action="click->tabs#change")
+            svg.h-6.w-6.fill-current.text-black xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"
+              path d="M1 4h2v2H1V4zm4 0h14v2H5V4zM1 9h2v2H1V9zm4 0h14v2H5V9zm-4 5h2v2H1v-2zm4 0h14v2H5v-2z"
+
+          a.reset.opacity-50.bg-white.m-0.pt-px.px-2(data-target="tabs.tab" href="#"
+            data-action="click->tabs#change")
+            svg.h-6.w-6.stroke-current.text-black viewBox="0 0 24 26"  stroke-width="3" stroke-linecap="round" stroke-linejoin="round"
+              path d="M12 20V10M18 20V4M6 20v-4"
+
+        = link_to "Show all", renalware.patient_pd_pet_results_path(patient), remote: true, class: "float-none button flex-initial secondary"
+        = link_to "Add", renalware.new_patient_pd_pet_result_path(patient), class: "float-none button flex-initial"
+    div#pet-results-table data-target="tabs.panel"
+
+      = render "renalware/pd/pet_results/table",
+               patient: patient,
+               results: results,
+               pagination: pagination,
+               current_user: current_user
+
+    .chart.hidden.mt-5 data-target="tabs.panel"
+      div(style="display:block; position:relative; height: 400px; width: 100%; text-align: center; margin-bottom: 20px")
+        #containerx(data-controller="pd-pet-chart"
+                    data-pd-pet-chart-url=renalware.patient_pd_pet_results_path(patient, format: :json)
+                    style="position: absolute; left: 0; top: 30px; max-width: 700px")

data/app/components/renalware/pd/pet_results_component.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/surveys"
+
+module Renalware
+  module PD
+    class PETResultsComponent < ApplicationComponent
+      include Pagy::Backend
+      include Pagy::Frontend
+      include ToggleHelper
+      include DropdownButtonHelper
+      attr_reader :patient, :pagination, :current_user
+
+      TITLE = "PET Results"
+
+      def initialize(patient:, current_user:)
+        @patient = PD.cast_patient(patient)
+        @current_user = current_user
+      end
+
+      def results
+        @results ||= begin
+          @pagination, @results = pagy(scope, items: 6)
+          @results
+        end
+      end
+
+      def title
+        if pagination.items < pagination.count
+          "#{TITLE} (#{pagination.items} of #{pagination.count})"
+        else
+          "#{TITLE} (#{pagination.items})"
+        end
+      end
+
+      def graph_data
+        patient
+          .pet_results
+          .where("d_pcr is not null and net_uf is not null")
+          .order(performed_on: :asc)
+          .pluck(:d_pcr, :net_uf)
+      end
+
+      # TODO: Finish adding plot bands and fix xaxis. Need to build this graph
+      # in codepen outside of the app so we can experiment - at the moment
+      # the x axis is built from the data series (pcr), which is not linear.
+      # So we need to specify the x axis and the series data separately.
+      # Best to use highcharts natively perhaps and skip the chartkick wrapper.
+      # rubocop:disable Metrics/MethodLength
+      def graph_options
+        {
+          xtitle: "D/Pcr",
+          ytitle: "net UF",
+          curve: false,
+          discrete: true, # required to allow points to double back on themselves
+          library: {
+            xAxis: {
+              plotBands: [
+                {
+                  from: 0.0,
+                  to: 0.5,
+                  color: "rgba(68, 170, 213, 0.1)",
+                  label: {
+                    text: "Low",
+                    style: {
+                      color: "#606060"
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      private
+
+      def scope
+        patient.pet_results.ordered
+      end
+    end
+  end
+end

data/app/{views/renalware/surveys/_eq5d_summary_part.html.slim → components/renalware/surveys/eq5d_component.html.slim}

@@ -4,23 +4,23 @@
       h2 EQ5D
 
     / b Example WIP for charting one question over time
-    / = line_chart(eq5d_summary_part.data_for_question_code(1), curve: false)
+    / = line_chart(data_for_question_code(1), curve: false)
     / br
     / br
     / br
 
-    - return if eq5d_summary_part.rows.blank?
+    - return if rows.blank?
 
     .xsss
       table
         thead
           tr
             th.col-width-date Date
-            - eq5d_summary_part.question_labels.each do |code, label|
+            - question_labels.each do |code, label|
               th= label
         tbody
-          - eq5d_summary_part.rows.each do |row|
+          - rows.each do |row|
             tr
               td= row.answered_on
-              - eq5d_summary_part.question_labels.each do |code, label|
+              - question_labels.each do |code, label|
                 td= row.send(code.to_sym)

data/app/{models/renalware/surveys/eq5d_summary_part.rb → components/renalware/surveys/eq5d_component.rb}

@@ -4,7 +4,13 @@ require_dependency "renalware/surveys"
 
 module Renalware
   module Surveys
-    class EQ5DSummaryPart < Renalware::SummaryPart
+    class EQ5DComponent < ApplicationComponent
+      attr_reader :patient
+
+      def initialize(patient:)
+        @patient = patient
+      end
+
       def rows
         @rows ||= EQ5DPivotedResponse.where(patient_id: patient.id)
       end
@@ -39,10 +45,6 @@ module Renalware
         end
       end
 
-      def to_partial_path
-        "renalware/surveys/eq5d_summary_part"
-      end
-
       def survey
         @survey ||= Renalware::Surveys::Survey.find_by!(code: "eq5d")
       end

data/app/{views/renalware/surveys/_pos_s_summary_part.html.slim → components/renalware/surveys/pos_s_component.html.slim}

@@ -1,6 +1,3 @@
-/
-/ TODO: this could do with refactoring to move the formatting code into a helper or presenter.
-/
 .summary-part--pos_s
   article
     header
@@ -12,7 +9,7 @@
     / br
     / br
 
-    - return if pos_s_summary_part.rows.blank?
+    - return if rows.blank?
 
     br
     br
@@ -25,19 +22,19 @@
             th.togglers= rows_toggler
             th.col-width-date.valign-bottom Date
             th.col-width-tiny.valign-bottom Total
-            - pos_s_summary_part.question_labels.each do |code, label|
+            - question_labels.each do |code, label|
               th.rotate
                 div
                   span= label
 
         - superscript_char = 97
-        - pos_s_summary_part.rows.each do |row|
+        - rows.each do |row|
           tbody
             tr
               td= row_toggler
               td= row.answered_on
               td= row.total_score
-              - pos_s_summary_part.question_labels.each do |code, label|
+              - question_labels.each do |code, label|
                 - value = row.send(code.to_sym)
                 - patient_question_text = row.try(:"#{code}_patient_question_text")
                 td(class="pos-s--#{value}")
@@ -52,9 +49,9 @@
                 |  
               td
               td
-              td(class="summary-part--pos_s-patient-question-text" colspan=(pos_s_summary_part.question_labels.count ))
+              td(class="summary-part--pos_s-patient-question-text" colspan=(question_labels.count ))
                 - superscript_char = 97
-                - pos_s_summary_part.question_labels.each do |code, label|
+                - question_labels.each do |code, label|
                   - patient_question_text = row.try(:"#{code}_patient_question_text")
                   - if patient_question_text
                     sup= superscript_char.chr

data/app/{models/renalware/surveys/pos_s_summary_part.rb → components/renalware/surveys/pos_s_component.rb}

@@ -4,7 +4,15 @@ require_dependency "renalware/surveys"
 
 module Renalware
   module Surveys
-    class POSSSummaryPart < Renalware::SummaryPart
+    class POSSComponent < ApplicationComponent
+      include ToggleHelper
+
+      attr_reader :patient
+
+      def initialize(patient:)
+        @patient = patient
+      end
+
       # Backed by a SQL view
       def rows
         @rows ||= POSSPivotedResponse.where(patient_id: patient.id)
@@ -43,10 +51,6 @@ module Renalware
         end
       end
 
-      def to_partial_path
-        "renalware/surveys/pos_s_summary_part"
-      end
-
       def survey
         @survey ||= Renalware::Surveys::Survey.find_by!(code: "prom")
       end

data/app/components/renalware/system/admin_menu_component.rb

@@ -35,11 +35,11 @@ module Renalware
       def menu_item(title, path, active_when_controller_matches, enabled = true)
         klasses = %w(link)
         klasses << "active" if current_controller_matches(active_when_controller_matches)
-        content_tag :li, class: klasses.join(" ") do
+        tag.li class: klasses.join(" ") do
           if enabled
             link_to(title, path)
           else
-            content_tag :span, title
+            tag.span title
           end
         end
       end

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

@@ -0,0 +1,3 @@
+article
+  header
+    h1= title

data/app/components/renalware/system/article_component.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Renalware
+  module System
+    # Experimental ActionView component
+    class AdminMenuComponent < ApplicationComponent
+    end
+  end
+end

data/app/controllers/renalware/admissions/consults_controller.rb

@@ -25,7 +25,7 @@ module Renalware
                 query: query.search
               }
             )
-            render options
+            render_with_wicked_pdf options
           end
           format.html do
             consults = query.call.page(page).per(per_page)

data/app/controllers/renalware/concerns/pdf_renderable.rb

@@ -36,7 +36,7 @@ module Renalware
           body = System::RenderLiquidTemplate.call(template_name: template_name,
                                                    variables: variables)
           options = default_pdf_options.merge!(pdf: filename, locals: { body: body })
-          render options
+          render_with_wicked_pdf options
         end
 
         private

data/app/controllers/renalware/hd/scheduling/diaries_controller.rb

@@ -36,7 +36,7 @@ module Renalware
                 pdf: pdf_filename,
                 locals: { unit: unit, diary: DiaryPresenter.new(current_user, diary) }
               )
-              render options
+              render_with_wicked_pdf options
             end
           end
         end

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

@@ -76,7 +76,7 @@ module Renalware
 
       # rubocop:disable Layout/LineLength, Metrics/MethodLength
       def render_prescriptions_list_to_hand_to_patient
-        render(
+        render_with_wicked_pdf(
           pdf_options.merge(
             pdf: pdf_filename,
             disposition: "inline",

data/app/controllers/renalware/pathology/charts_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/pathology"
+
+module Renalware
+  module Pathology
+    class ChartsController < Pathology::BaseController
+      # Returns HTML rendered by a view component for pulling into say a modal dialog
+      def show
+        authorize Patient, :show?
+        render(
+          locals: {
+            patient: patient,
+            observation_description: ObservationDescription.find(params[:id])
+          },
+          layout: false
+        )
+      end
+    end
+  end
+end

data/app/controllers/renalware/pathology/current_observation_results_controller.rb

@@ -10,7 +10,7 @@ module Renalware
         observation_set = ObservationSetPresenter.new(
           patient.fetch_current_observation_set
         )
-        render :index, locals: { observation_set: observation_set }
+        render :index, locals: { observation_set: observation_set, patient: patient }
       end
     end
   end

data/app/controllers/renalware/pathology/historical_observation_results_controller.rb

@@ -15,7 +15,7 @@ module Renalware
           page: page || 1,
           per_page: 25
         ).call
-        render :index, locals: { table: observations_table }
+        render :index, locals: { table: observations_table, patient: patient }
       end
     end
   end

data/app/controllers/renalware/pathology/nearest_observation_results_controller.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/pathology"
+
+module Renalware
+  module Pathology
+    class NearestObservationResultsController < Pathology::BaseController
+      def index
+        near_date
+        authorize Patient, :index?
+        render json: nearest_results
+      end
+
+      private
+
+      def code_group
+        @code_group ||= CodeGroup.find(params[:code_group_id])
+      end
+
+      def observation_description_ids
+        @observation_description_ids ||= code_group.memberships.pluck(:observation_description_id)
+      end
+
+      def near_date
+        Date.parse(params[:date])
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def nearest_results
+        Pathology
+          .cast_patient(Patient.find(params[:patient_id]))
+          .observations
+          .joins(:description)
+          .where(description_id: observation_description_ids)
+          .select(
+            :observed_at,
+            :result,
+            :description_id,
+            "pathology_observation_descriptions.code as code"
+          )
+          .map do |row|
+            {
+              code: row.code,
+              observed_on: row.observed_at.to_date,
+              result: row.result
+            }
+          end
+      end
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end