renalware-core 2.0.32 → 2.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0616c45358e54ea9da9260af10d1790d3cf1ac2d209d80cdab18f7696dbf572
-  data.tar.gz: be29d4c73b6dfb3679c4dc0306a5f9adb62aeddf9f57d78fa591286663c41b15
+  metadata.gz: 6cb83ec4abb560e829604647e54cc9ad09d82dc7a5505d8f5f07491995f5b23f
+  data.tar.gz: 2a2113a1fbfde978e756208df0c8bf73e3fb6634f0bcde25ba3d48d45dfb8907
 SHA512:
-  metadata.gz: 16371d75df1c3a0a85a89e607d7e1f7f3eada6ce54111ad6f9a30277c3f7df3b40d77be83a0c7d8c15729df6d626295f194738fc9056af9a321990839f2f7ad9
-  data.tar.gz: b230a562d38f8ed18c3bd2ae10d01f3981e2970cd4d99e68aba3db5ec8f92f8a57abb00b1364bf94a2591d423655f072727e0a107eee2fcadf70e85135e9e45e
+  metadata.gz: 1324b463a16ae76bbbcb00a1c23a071eec16fa95494f536ea2be996d4931720ccddd896a42f1c03557921e4efadeaae8c2f17b67dc29075f491c8545f3257ccb
+  data.tar.gz: a0de64f66ec38ee3b10f5cc9cbaee028d762cf5986364e2c50dfc521ff206c916abfdea83bb15127ff7b3f2d372b8369e01f422f589361d280a48e8469d37e11

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

@@ -182,7 +182,7 @@ table {
 
     &.col-width-date-time {
       width: 9.5rem;
-      min-width: 9.3rem;
+      min-width: 9.4rem;
     }
 
     &.col-width-reference-without-prefix {

data/app/controllers/renalware/hd/dialysates_controller.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd/base_controller"
+
+module Renalware
+  module HD
+    class DialysatesController < HD::BaseController
+      def index
+        dialysates = Dialysate.all
+        authorize dialysates
+        render locals: { dialysates: dialysates }
+      end
+
+      def new
+        dialysate = Dialysate.new
+        authorize dialysate
+        render_new(dialysate)
+      end
+
+      def create
+        dialysate = Dialysate.new(dialysate_params)
+        authorize dialysate
+
+        if dialysate.save
+          redirect_to hd_dialysates_path, notice: success_msg_for("dialysate")
+        else
+          flash.now[:error] = failed_msg_for("dialysate")
+          render_new(dialysate)
+        end
+      end
+
+      def edit
+        render_edit(find_and_authorize_dialysate)
+      end
+
+      def update
+        dialysate = find_and_authorize_dialysate
+        if dialysate.update(dialysate_params)
+          redirect_to hd_dialysates_path, notice: success_msg_for("dialysate")
+        else
+          flash.now[:error] = failed_msg_for("dialysate")
+          render_edit(dialysate)
+        end
+      end
+
+      def destroy
+        find_and_authorize_dialysate.destroy!
+        redirect_to hd_dialysates_path, notice: success_msg_for("dialysate")
+      end
+
+      private
+
+      def render_new(dialysate)
+        render :new, locals: { dialysate: dialysate }
+      end
+
+      def render_edit(dialysate)
+        render :edit, locals: { dialysate: dialysate }
+      end
+
+      def find_and_authorize_dialysate
+        Dialysate.find(params[:id]).tap { |dialysate| authorize(dialysate) }
+      end
+
+      def dialysate_params
+        params
+          .require(:dialysate)
+          .permit(
+            :name, :description,
+            :sodium_content, :sodium_content_uom,
+            :bicarbonate_content, :bicarbonate_content_uom,
+            :calcium_content, :calcium_content_uom,
+            :potassium_content, :potassium_content_uom
+          )
+      end
+    end
+  end
+end

data/app/controllers/renalware/hd/dialysers_controller.rb

@@ -53,7 +53,9 @@ module Renalware
       private
 
       def dialyser_params
-        params.require(:hd_dialyser).permit(:group, :name)
+        params
+          .require(:hd_dialyser)
+          .permit(:group, :name, :membrane_surface_area, :membrane_surface_area_coefficient_k0a)
       end
 
       def load_and_authorize_dialyser

data/app/models/renalware/hd/dialysate.rb

@@ -7,8 +7,12 @@ module Renalware
     class Dialysate < ApplicationRecord
       acts_as_paranoid
       validates :name, presence: true, uniqueness: true
-      validates :sodium_content, presence: true
+      validates :sodium_content, presence: true, numericality: true
       validates :sodium_content_uom, presence: true
+      validates :bicarbonate_content, numericality: true, allow_blank: true
+      validates :calcium_content, numericality: true, allow_blank: true
+      validates :glucose_content, numericality: true, allow_blank: true
+      validates :potassium_content, numericality: true, allow_blank: true
 
       def to_s
         name

data/app/models/renalware/hd/dialyser.rb

@@ -9,6 +9,8 @@ module Renalware
 
       validates :group, presence: true
       validates :name, presence: true
+      validates :membrane_surface_area, numericality: true, allow_blank: true
+      validates :membrane_surface_area_coefficient_k0a, numericality: true, allow_blank: true
 
       scope :ordered, -> { order(:group, :name) }
 

data/app/models/renalware/letters/letter_query.rb

@@ -21,7 +21,7 @@ module Renalware
     class LetterQuery
       def initialize(q: nil)
         @q = q || {}
-        @q[:s] ||= ["issued_on desc"]
+        @q[:s] ||= ["updated_at desc"]
       end
 
       def call

data/app/policies/renalware/hd/dialysate_policy.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Renalware
+  module HD
+    class DialysatePolicy < BasePolicy
+    end
+  end
+end

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

@@ -21,13 +21,15 @@ module Renalware
         end
       end
 
+      # Note we want oldest letters ordered first on the dashboard - elsewhere letters
+      # are newest first
       def letters_in_progress
         @letters_in_progress ||= begin
           present_letters(
             Letters::Letter
               .where("author_id = ? or created_by_id = ?", user.id, user.id)
               .in_progress
-              .reverse
+              .order(updated_at: :asc)
           )
           # Renalware::Letters.cast_author(user)
         end

data/app/presenters/renalware/ukrdc/patient_presenter.rb

@@ -26,6 +26,11 @@ module Renalware
         super(patient)
       end
 
+      def language
+        return if super.nil? || super.name == "Unknown"
+        super
+      end
+
       def dead?
         current_modality_death?
       end

data/app/views/renalware/api/ukrdc/patients/_patient.xml.builder

@@ -58,7 +58,7 @@ xml.Patient do
 
   if patient.language.present?
     xml.PrimaryLanguage do
-      xml.CodingStandard "NHS_DATA_DICTIONARY_LANGUAGE_CODE" # ISO 639-1 plus braille an sign
+      xml.CodingStandard "NHS_DATA_DICTIONARY_LANGUAGE_CODE" # ISO 639-1 plus braille and sign
       xml.Code patient.language&.code
       xml.Description patient.language
     end

data/app/views/renalware/dashboard/letters/_letter.html.slim

@@ -1,7 +1,7 @@
 tr(class=letter.state.dasherize)
   td.state
     span= letter.state_description
-  td= l letter.issued_on
+  td= l letter.updated_at
   td= letter.author
   td= link_to letter.patient, patient_clinical_summary_path(letter.patient)
   td= letter.description

data/app/views/renalware/dashboard/letters/_table.html.slim

@@ -2,7 +2,7 @@ table.auto-layout.letters
   thead
     tr
       th.col-width-tiny State
-      th.col-width-date Date
+      th.col-width-date-time Date
       th.col-width-medium Author
       th.col-width-large Patient
       th Description

data/app/views/renalware/hd/dialysates/_form.html.slim

@@ -0,0 +1,12 @@
+= render "renalware/shared/errors", model: dialysate
+
+= simple_form_for dialysate, as: :dialysate, html: { autocomplete: "off" } do |f|
+  = f.input :name, autofocus: true, wrapper: :horizontal_medium
+  = f.input :description, wrapper: :horizontal_large
+  - %i(sodium bicarbonate potassium calcium glucose).each do |element|
+    = f.input :"#{element}_content", wrapper: :horizontal_small
+    = f.input :"#{element}_content_uom", wrapper: :horizontal_small
+
+  = f.button :submit
+  span= " or "
+  = link_to "cancel", hd_dialysates_path

data/app/views/renalware/hd/dialysates/edit.html.slim

@@ -0,0 +1,2 @@
+= within_admin_layout(title: "Edit HD Disalysate") do
+  = render "form", dialysate: dialysate

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

@@ -0,0 +1,35 @@
+= content_for(:actions) do
+  = link_to "Add",
+          new_hd_dialysate_path,
+          class: "button"
+
+= within_admin_layout(title: "HD Dialysates") do
+
+  table.hd-dialysates
+    thead
+      th.col-width-tiny
+      th.col-width-medium Name
+      th.col-width-medium Description
+      - %i(sodium bicarbonate potassium calcium glocose).each do |element|
+        th.col-width-tiny= element.to_s.capitalize
+    tbody
+      - dialysates.each do |dialysate|
+        tr
+          td
+            - if policy(dialysate).edit?
+              = link_to "Edit", edit_hd_dialysate_path(dialysate)
+            / Disabling destroy for now as it seems to let you delete a dialysate that is in use
+            / Need to add a FK first
+            / - if policy(dialysate).destroy?
+            /   = pipe_separator
+            /   = link_to "Delete",
+            /             hd_dialysate_path(dialysate),
+            /             method: :delete,
+            /             data: { confirm: "Are you sure?" }
+          td= dialysate.name
+          td= dialysate.description
+          - %i(sodium bicarbonate potassium calcium glucose).each do |element|
+            - line = [ \
+              dialysate.public_send(:"#{element}_content"), \
+              dialysate.public_send(:"#{element}_content_uom")].compact.join(" ")
+            td= line

data/app/views/renalware/hd/dialysates/new.html.slim

@@ -0,0 +1,2 @@
+= within_admin_layout(title: "New HD Disalysate") do
+  = render "form", dialysate: dialysate

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

@@ -4,6 +4,8 @@
 = simple_form_for dialyser, html: { autocomplete: "off" } do |f|
   = f.input :group, autofocus: true, wrapper: :horizontal_small
   = f.input :name, wrapper: :horizontal_small
+  = f.input :membrane_surface_area, wrapper: :horizontal_small
+  = f.input :membrane_surface_area_coefficient_k0a, wrapper: :horizontal_small
 
   = f.button :submit
   span= " or "

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

@@ -8,16 +8,20 @@
       tr
         th.col-width-small
         th.col-width-small Group
-        th Name
+        th.col-width-large Name
+        th.col-width-small Membrane Surface Area
+        th Membrane Surface Area (K0A)
     tbody
-      - dialysers.each do |t|
+      - dialysers.each do |dialyser|
         tr
           td
-            = link_to "Edit", edit_hd_dialyser_path(t.id)
+            = link_to "Edit", edit_hd_dialyser_path(dialyser.id)
             = pipe_separator
             = link_to "Delete",
-                      hd_dialyser_path(t.id),
+                      hd_dialyser_path(dialyser.id),
                       method: :delete,
                       data: { confirm: I18n.t("prompts.confirm_delete") }
-          td= t.group
-          td= t.name
+          td= dialyser.group
+          td= dialyser.name
+          td= dialyser.membrane_surface_area
+          td= dialyser.membrane_surface_area_coefficient_k0a

data/app/views/renalware/letters/letters/_letter.html.slim

@@ -17,7 +17,7 @@
 
     td.state
       span= letter.state_description
-    td= l(letter.issued_on)
+    td= l(letter.updated_at)
     - if columns.include?(:author)
       td.col-width-medium-with-ellipsis= letter.author
     - if columns.include?(:patient)

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

@@ -5,7 +5,7 @@ table.auto-layout.letters.has-togglable-rows
     tr
       th.col-width-small
       th.col-width-tiny State
-      th.col-width-date Date
+      th.col-width-date-time Date
       - if columns.include?(:author)
         th.col-width-medium Author
       - if columns.include?(:patient)

data/app/views/renalware/letters/lists/_letter.html.slim

@@ -29,7 +29,7 @@ tr(class=letter.state.dasherize)
   td.full-name= default_patient_link(letter.patient)
   td= letter.patient.nhs_number
   td= letter.enclosures&.truncate(6)
-  td= l letter.issued_on
+  td= l letter.updated_at
   td= letter.author
   td= letter.typist
   td.col-width-medium-with-ellipsis= letter.main_recipient.address

data/app/views/renalware/letters/lists/_table.html.slim

@@ -8,7 +8,7 @@
         th.col-width-medium= sort_link([:renalware, q], :patient_family_name, "Patient")
         th.col-width-nhs-no= sort_link([:renalware, q], :patient_nhs_number, "NHS No")
         th= sort_link([:renalware, q], :enclosures, "Enc.")
-        th.col-width-date = sort_link([:renalware, q], :issued_on, "Date", default_order: :desc)
+        th.col-width-date-time = sort_link([:renalware, q], :updated_at, "Date", default_order: :desc)
         th= sort_link([:renalware, q], :author_family_name, "Author")
         th= sort_link([:renalware, q], :created_by_family_name, "Typist")
         th.col-width-small Recipient

data/app/views/renalware/navigation/_super_admin.html.slim

@@ -10,3 +10,4 @@ li.has-dropdown
     li= link_to "File Imports", admin_feeds_files_path
     li= link_to "User Feedback", system_user_feedback_index_path
     li= link_to "System Messages", system_messages_path
+    li= link_to "HD Dialysates", hd_dialysates_path

data/app/views/renalware/research/_alerts.html.slim

@@ -1,6 +1,4 @@
-/ Note the caching here relies on study_participant edit/create/destroy touching patient
-- cache(patient)
-  - participations = Renalware::Research::StudyParticipant.where(participant_id: patient.id).where("joined_on <= ?", Time.zone.now).where("left_on is null or left_on > ?", Time.zone.now)
-  = render partial: "renalware/research/alert",
-           collection: participations,
-           as: :participation
+- participations = Renalware::Research::StudyParticipant.where(participant_id: patient.id).where("joined_on <= ?", Time.zone.now).where("left_on is null or left_on > ?", Time.zone.now)
+= render partial: "renalware/research/alert",
+          collection: participations,
+          as: :participation

data/config/permissions.yml

@@ -1,6 +1,7 @@
 super_admin:
   - Renalware::Role
   - Renalware::Hospitals::Ward
+  - Renalware::HD::Dialysate
 admin:
   - Renalware::User
   - Renalware::BagType

data/config/routes.rb

@@ -158,6 +158,7 @@ Renalware::Engine.routes.draw do
 
     resources :cannulation_types, except: :show
     resources :dialysers, except: :show
+    resources :dialysates, except: :show
     resource :ongoing_sessions, only: :show
     resources :mdm_patients, only: :index
     resources :unmet_preferences, only: :index

data/db/migrate/20180524072633_add_columns_to_dialysates.rb

@@ -0,0 +1,15 @@
+class AddColumnsToDialysates < ActiveRecord::Migration[5.1]
+  def change
+    add_column :hd_dialysates, :bicarbonate_content, :decimal, precision: 10, scale: 2
+    add_column :hd_dialysates, :bicarbonate_content_uom, :string, default: "mmol/L"
+
+    add_column :hd_dialysates, :calcium_content, :decimal, precision: 10, scale: 2
+    add_column :hd_dialysates, :calcium_content_uom, :string, default: "mmol/L"
+
+    add_column :hd_dialysates, :glucose_content, :decimal, precision: 10, scale: 2
+    add_column :hd_dialysates, :glucose_content_uom, :string, default: "g/L"
+
+    add_column :hd_dialysates, :potassium_content, :decimal, precision: 10, scale: 2
+    add_column :hd_dialysates, :potassium_content_uom, :string, default: "mmol/L"
+  end
+end

data/db/migrate/20180524074320_add_columns_to_hd_dialysers.rb

@@ -0,0 +1,10 @@
+class AddColumnsToHDDialysers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :hd_dialysers,
+               :membrane_surface_area,
+               :decimal, precision: 10, scale: 2
+    add_column :hd_dialysers,
+               :membrane_surface_area_coefficient_k0a,
+               :decimal, precision: 10, scale: 2
+  end
+end

data/lib/renalware/version.rb

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

data/spec/factories/hd/dialysers.rb

@@ -4,5 +4,7 @@ FactoryBot.define do
   factory :hd_dialyser, class: "Renalware::HD::Dialyser" do
     group "FX"
     name "FX80"
+    membrane_surface_area 234.12
+    membrane_surface_area_coefficient_k0a 999.99
   end
 end

data/spec/factories/patients/languages.rb

@@ -10,9 +10,14 @@ FactoryBot.define do
       code "en"
     end
 
-    trait :aftrikaans do
+    trait :afrikaans do
       name "Afrikaans"
       code "af"
     end
+
+    trait :unknown do
+      name "Unknown"
+      code "un"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.32
+  version: 2.0.33
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -1080,6 +1080,7 @@ files:
 - app/controllers/renalware/hd/cannulation_types_controller.rb
 - app/controllers/renalware/hd/current_profile_controller.rb
 - app/controllers/renalware/hd/dashboards_controller.rb
+- app/controllers/renalware/hd/dialysates_controller.rb
 - app/controllers/renalware/hd/dialysers_controller.rb
 - app/controllers/renalware/hd/diaries_controller.rb
 - app/controllers/renalware/hd/diary_slots_controller.rb
@@ -1766,6 +1767,7 @@ files:
 - app/policies/renalware/events/swab_policy.rb
 - app/policies/renalware/feeds/file_policy.rb
 - app/policies/renalware/hd/closed_session_policy.rb
+- app/policies/renalware/hd/dialysate_policy.rb
 - app/policies/renalware/hd/diary_policy.rb
 - app/policies/renalware/hd/dna_session_policy.rb
 - app/policies/renalware/hd/open_session_policy.rb
@@ -2140,6 +2142,10 @@ files:
 - app/views/renalware/hd/current_profile/show.html.slim
 - app/views/renalware/hd/dashboards/_page_actions.html.slim
 - app/views/renalware/hd/dashboards/show.html.slim
+- app/views/renalware/hd/dialysates/_form.html.slim
+- app/views/renalware/hd/dialysates/edit.html.slim
+- app/views/renalware/hd/dialysates/index.html.slim
+- app/views/renalware/hd/dialysates/new.html.slim
 - app/views/renalware/hd/dialysers/_form.html.slim
 - app/views/renalware/hd/dialysers/edit.html.slim
 - app/views/renalware/hd/dialysers/index.html.slim
@@ -3264,6 +3270,8 @@ files:
 - db/migrate/20180511171835_create_unique_indexes_on_obr_obr_codes.rb
 - db/migrate/20180514151627_create_system_messages.rb
 - db/migrate/20180516111411_create_view_patient_current_modalities.rb
+- db/migrate/20180524072633_add_columns_to_dialysates.rb
+- db/migrate/20180524074320_add_columns_to_hd_dialysers.rb
 - db/migrate/20180605114332_create_pseudo_encrypt_function.rb
 - db/migrate/20180605141806_add_external_id_to_research_study_participants.rb
 - db/migrate/20180605175211_add_application_url_to_research_studies.rb