renalware-core 2.0.148 → 2.0.155

data/spec/factories/accesses/profiles.rb

@@ -7,6 +7,7 @@ FactoryBot.define do
     type { create(:access_type) }
     side { :right }
     formed_on { Time.zone.today }
+    started_on { Time.zone.today }
 
     trait :current do
       started_on { 1.day.ago }

data/spec/factories/drugs/drug_types.rb

@@ -2,8 +2,12 @@
 
 FactoryBot.define do
   factory :drug_type, class: "Renalware::Drugs::Type" do
+    initialize_with do
+      Renalware::Drugs::Type.find_or_create_by!(code: code, name: name)
+    end
+
     code { "immuno" }
-    name { "Immunosuppressant" }
+    name { "immuno" }
 
     trait :immunosuppressant do
       code { "immunosuppressant" }

data/spec/factories/events/events_types.rb

@@ -36,5 +36,17 @@ FactoryBot.define do
       slug { "vaccinations" }
       event_class_name { "Renalware::Virology::Vaccination" }
     end
+
+    factory :advanced_care_plan do
+      name { "AdvancedCarePlan" }
+      slug { "advanced_care_plans" }
+      event_class_name { "Renalware::Events::AdvancedCarePlan" }
+    end
+
+    factory :clinical_frailty_score do
+      name { "Clinical Frailty Score" }
+      slug { "clinical_frailty_scores" }
+      event_class_name { "Renalware::Events::ClinicalFrailtyScore" }
+    end
   end
 end

data/spec/factories/messaging/internal/messages.rb

@@ -9,6 +9,7 @@ FactoryBot.define do
     association :author, factory: :author
     sent_at { Time.zone.now }
     association :patient
+    public { true }
     receipts { [] }
   end
 end

data/spec/factories/patients/patients.rb

@@ -2,7 +2,28 @@
 
 FactoryBot.define do
   sequence :nhs_number do |n|
-    n.to_s.rjust(10, "0000000000")
+    %w(
+      6393739592
+      4414733227
+      5552737601
+      4696133478
+      4904230000
+      5477425407
+      7465613493
+      9827026836
+      2132173117
+      2717073604
+      3477113764
+      7114008236
+      9660350961
+      2637392835
+      1833834704
+      9707196408
+      0676304567
+      0558366333
+      1573555126
+      5543098111
+    )[n]
   end
 
   sequence :local_patient_id do |n|

data/spec/factories/patients/practices.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   sequence :practice_code do |n|
-    "M" + n.to_s.rjust(5, "0")
+    "M#{n.to_s.rjust(5, '0')}"
   end
 
   factory :practice, class: "Renalware::Patients::Practice" do

data/spec/factories/patients/primary_care_physicians.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   sequence :gp_code do |n|
-    "G" + n.to_s.rjust(7, "0")
+    "G#{n.to_s.rjust(7, '0')}"
   end
 
   factory :primary_care_physician, class: "Renalware::Patients::PrimaryCarePhysician" do

data/spec/factories/pd/adequacy_results.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :pd_adequacy_result, class: "Renalware::PD::AdequacyResult" do
+    accountable
+    performed_on { I18n.l(Time.zone.today) }
+    urine_urea { 10 }
+    urine_creatinine { 10 }
+    urine_24_vol { 1000 }
+    dialysate_urea { 10 }
+    dialysate_creatinine { 10 }
+    dial_24_vol_out { 1500 }
+    serum_urea { 10 }
+    serum_creatinine { 10 }
+  end
+end

data/spec/factories/pd/pet_results.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :pd_pet_result, class: "Renalware::PD::PETResult" do
+    accountable
+    performed_on { I18n.l(Time.zone.today) }
+    test_type { :full }
+  end
+end

data/spec/factories/system/users.rb

@@ -18,6 +18,7 @@ FactoryBot.define do
     approved { true }
     professional_position { "Health Minister" }
     signature { Faker::Name.name }
+    prescriber { true }
 
     # By default a user has no roles.
     # If you want a use with a role, use a trait, e.g. create(:user, :clinical)

data/spec/factories/system/view_metadata.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :view_metadata, class: "Renalware::System::ViewMetadata" do
+    schema_name { "renalware" }
+    view_name { "transplant_mdm_patients" }
+    title { "Title" }
+    slug { "all" }
+    category { "mdm" }
+    scope { "transplant" }
+    columns { [] }
+    filters {
+      [
+        Renalware::System::FilterDefinition.new(code: :sex, type: :list),
+        Renalware::System::FilterDefinition.new(code: :age, type: :search)
+      ]
+    }
+    position { 1 }
+  end
+end

data/spec/support/capybara_helper.rb

@@ -9,9 +9,7 @@ module CapybaraHelper
     select_nth_option_from(selector)
   end
 
-  def within_article(title)
-    within(:css, "article", text: title) do
-      yield
-    end
+  def within_article(title, &block)
+    within(:css, "article", text: title, &block)
   end
 end

data/spec/support/letters_spec_helper.rb

@@ -2,7 +2,7 @@
 
 # rubocop:disable Metrics/MethodLength
 module LettersSpecHelper
-  def build_letter(state: :draft, to:, patient:, **args)
+  def build_letter(to:, patient:, state: :draft, **args)
     trait = "#{state}_letter".to_sym
     letter = build(trait, **args)
     letter.patient = patient

data/spec/support/matchers/validate_timeliness_of.rb

@@ -3,7 +3,7 @@
 RSpec::Matchers.define :validate_timeliness_of do |attribute|
   match do |model|
     model._validators[attribute.to_sym].detect do |validator|
-      validator.class == ActiveModel::Validations::TimelinessValidator &&
+      validator.instance_of?(ActiveModel::Validations::TimelinessValidator) &&
         validator.attributes.include?(attribute)
     end
   end

data/spec/support/pathology_spec_helper.rb

@@ -20,11 +20,10 @@ module PathologySpecHelper
   end
 
   # rubocop:disable Metrics/ParameterLists, Metrics/MethodLength
-  def create_request_with_observations(requestor_order_number: "123",
+  def create_request_with_observations(patient:, requestor_order_number: "123",
                                        obr_code: "OBR1",
                                        obx_codes: ["OBX1"],
                                        requested_at: 1.year.ago,
-                                       patient:,
                                        created_at: nil,
                                        count: 1,
                                        result: "1.1")

data/spec/support/policy_spec_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module PolicySpecHelper
+  def user_double_with_role(role)
+    instance_double(Renalware::User).tap do |user|
+      allow(user).to receive(:has_role?).and_return(false)
+      allow(user).to receive(:has_role?).with(role).and_return(true)
+      allow(user).to receive(:roles).and_return([role])
+      allow(user).to receive(:role_names).and_return([role.to_s])
+    end
+  end
+end

data/spec/support/shared_examples/supersedable_examples.rb

@@ -5,10 +5,10 @@ shared_examples_for "a Supersedable model" do
   it { is_expected.to have_db_index(:deactivated_at) }
 
   it "adds a deactivated_at where clause" do
-    expect(described_class.all.where_sql).to include(".\"deactivated_at\" IS NULL")
+    expect(described_class.all.to_sql).to include(".\"deactivated_at\" IS NULL")
   end
 
   it "skips adding the deactivated_at where clause when unscoped" do
-    expect(described_class.unscoped.where_sql.to_s).not_to include("\"deactivated_at\"")
+    expect(described_class.unscoped.to_sql.to_s).not_to include("\"deactivated_at\"")
   end
 end

data/vendor/assets/javascripts/foundation/foundation.alert.js

@@ -0,0 +1,43 @@
+;(function ($, window, document, undefined) {
+  'use strict';
+
+  Foundation.libs.alert = {
+    name : 'alert',
+
+    version : '5.5.3',
+
+    settings : {
+      callback : function () {}
+    },
+
+    init : function (scope, method, options) {
+      this.bindings(method, options);
+    },
+
+    events : function () {
+      var self = this,
+          S = this.S;
+
+      $(this.scope).off('.alert').on('click.fndtn.alert', '[' + this.attr_name() + '] .close', function (e) {
+        var alertBox = S(this).closest('[' + self.attr_name() + ']'),
+            settings = alertBox.data(self.attr_name(true) + '-init') || self.settings;
+
+        e.preventDefault();
+        if (Modernizr.csstransitions) {
+          alertBox.addClass('alert-close');
+          alertBox.on('transitionend webkitTransitionEnd oTransitionEnd', function (e) {
+            S(this).trigger('close.fndtn.alert').remove();
+            settings.callback();
+          });
+        } else {
+          alertBox.fadeOut(300, function () {
+            S(this).trigger('close.fndtn.alert').remove();
+            settings.callback();
+          });
+        }
+      });
+    },
+
+    reflow : function () {}
+  };
+}(jQuery, window, window.document));

data/vendor/assets/javascripts/foundation/foundation.dropdown.js

@@ -0,0 +1,468 @@
+;(function ($, window, document, undefined) {
+  'use strict';
+
+  Foundation.libs.dropdown = {
+    name : 'dropdown',
+
+    version : '5.5.3',
+
+    settings : {
+      active_class : 'open',
+      disabled_class : 'disabled',
+      mega_class : 'mega',
+      align : 'bottom',
+      is_hover : false,
+      hover_timeout : 150,
+      opened : function () {},
+      closed : function () {}
+    },
+
+    init : function (scope, method, options) {
+      Foundation.inherit(this, 'throttle');
+
+      $.extend(true, this.settings, method, options);
+      this.bindings(method, options);
+    },
+
+    events : function (scope) {
+      var self = this,
+          S = self.S;
+
+      S(this.scope)
+        .off('.dropdown')
+        .on('click.fndtn.dropdown', '[' + this.attr_name() + ']', function (e) {
+          var settings = S(this).data(self.attr_name(true) + '-init') || self.settings;
+          if (!settings.is_hover || Modernizr.touch) {
+            e.preventDefault();
+            if (S(this).parent('[data-reveal-id]').length) {
+              e.stopPropagation();
+            }
+            self.toggle($(this));
+          }
+        })
+        .on('mouseenter.fndtn.dropdown', '[' + this.attr_name() + '], [' + this.attr_name() + '-content]', function (e) {
+          var $this = S(this),
+              dropdown,
+              target;
+
+          clearTimeout(self.timeout);
+
+          if ($this.data(self.data_attr())) {
+            dropdown = S('#' + $this.data(self.data_attr()));
+            target = $this;
+          } else {
+            dropdown = $this;
+            target = S('[' + self.attr_name() + '="' + dropdown.attr('id') + '"]');
+          }
+
+          var settings = target.data(self.attr_name(true) + '-init') || self.settings;
+
+          if (S(e.currentTarget).data(self.data_attr()) && settings.is_hover) {
+            self.closeall.call(self);
+          }
+
+          if (settings.is_hover) {
+            self.open.apply(self, [dropdown, target]);
+          }
+        })
+        .on('mouseleave.fndtn.dropdown', '[' + this.attr_name() + '], [' + this.attr_name() + '-content]', function (e) {
+          var $this = S(this);
+          var settings;
+
+          if ($this.data(self.data_attr())) {
+              settings = $this.data(self.data_attr(true) + '-init') || self.settings;
+          } else {
+              var target   = S('[' + self.attr_name() + '="' + S(this).attr('id') + '"]'),
+                  settings = target.data(self.attr_name(true) + '-init') || self.settings;
+          }
+
+          self.timeout = setTimeout(function () {
+            if ($this.data(self.data_attr())) {
+              if (settings.is_hover) {
+                self.close.call(self, S('#' + $this.data(self.data_attr())));
+              }
+            } else {
+              if (settings.is_hover) {
+                self.close.call(self, $this);
+              }
+            }
+          }.bind(this), settings.hover_timeout);
+        })
+        .on('click.fndtn.dropdown', function (e) {
+          var parent = S(e.target).closest('[' + self.attr_name() + '-content]');
+          var links  = parent.find('a');
+
+          if (links.length > 0 && parent.attr('aria-autoclose') !== 'false') {
+              self.close.call(self, S('[' + self.attr_name() + '-content]'));
+          }
+
+          if (e.target !== document && !$.contains(document.documentElement, e.target)) {
+            return;
+          }
+
+          if (S(e.target).closest('[' + self.attr_name() + ']').length > 0) {
+            return;
+          }
+
+          if (!(S(e.target).data('revealId')) &&
+            (parent.length > 0 && (S(e.target).is('[' + self.attr_name() + '-content]') ||
+              $.contains(parent.first()[0], e.target)))) {
+            e.stopPropagation();
+            return;
+          }
+
+          self.close.call(self, S('[' + self.attr_name() + '-content]'));
+        })
+        .on('opened.fndtn.dropdown', '[' + self.attr_name() + '-content]', function () {
+          self.settings.opened.call(this);
+        })
+        .on('closed.fndtn.dropdown', '[' + self.attr_name() + '-content]', function () {
+          self.settings.closed.call(this);
+        });
+
+      S(window)
+        .off('.dropdown')
+        .on('resize.fndtn.dropdown', self.throttle(function () {
+          self.resize.call(self);
+        }, 50));
+
+      this.resize();
+    },
+
+    close : function (dropdown) {
+      var self = this;
+      dropdown.each(function (idx) {
+        var original_target = $('[' + self.attr_name() + '=' + dropdown[idx].id + ']') || $('aria-controls=' + dropdown[idx].id + ']');
+        original_target.attr('aria-expanded', 'false');
+        if (self.S(this).hasClass(self.settings.active_class)) {
+          self.S(this)
+            .css(Foundation.rtl ? 'right' : 'left', '-99999px')
+            .attr('aria-hidden', 'true')
+            .removeClass(self.settings.active_class)
+            .prev('[' + self.attr_name() + ']')
+            .removeClass(self.settings.active_class)
+            .removeData('target');
+
+          self.S(this).trigger('closed.fndtn.dropdown', [dropdown]);
+        }
+      });
+      dropdown.removeClass('f-open-' + this.attr_name(true));
+    },
+
+    closeall : function () {
+      var self = this;
+      $.each(self.S('.f-open-' + this.attr_name(true)), function () {
+        self.close.call(self, self.S(this));
+      });
+    },
+
+    open : function (dropdown, target) {
+      this
+        .css(dropdown
+        .addClass(this.settings.active_class), target);
+      dropdown.prev('[' + this.attr_name() + ']').addClass(this.settings.active_class);
+      dropdown.data('target', target.get(0)).trigger('opened.fndtn.dropdown', [dropdown, target]);
+      dropdown.attr('aria-hidden', 'false');
+      target.attr('aria-expanded', 'true');
+      dropdown.focus();
+      dropdown.addClass('f-open-' + this.attr_name(true));
+    },
+
+    data_attr : function () {
+      if (this.namespace.length > 0) {
+        return this.namespace + '-' + this.name;
+      }
+
+      return this.name;
+    },
+
+    toggle : function (target) {
+      if (target.hasClass(this.settings.disabled_class)) {
+        return;
+      }
+      var dropdown = this.S('#' + target.data(this.data_attr()));
+      if (dropdown.length === 0) {
+        // No dropdown found, not continuing
+        return;
+      }
+
+      this.close.call(this, this.S('[' + this.attr_name() + '-content]').not(dropdown));
+
+      if (dropdown.hasClass(this.settings.active_class)) {
+        this.close.call(this, dropdown);
+        if (dropdown.data('target') !== target.get(0)) {
+          this.open.call(this, dropdown, target);
+        }
+      } else {
+        this.open.call(this, dropdown, target);
+      }
+    },
+
+    resize : function () {
+      var dropdown = this.S('[' + this.attr_name() + '-content].open');
+      var target = $(dropdown.data("target"));
+
+      if (dropdown.length && target.length) {
+        this.css(dropdown, target);
+      }
+    },
+
+    css : function (dropdown, target) {
+      var left_offset = Math.max((target.width() - dropdown.width()) / 2, 8),
+          settings = target.data(this.attr_name(true) + '-init') || this.settings,
+          parentOverflow = dropdown.parent().css('overflow-y') || dropdown.parent().css('overflow');
+
+      this.clear_idx();
+
+
+
+      if (this.small()) {
+        var p = this.dirs.bottom.call(dropdown, target, settings);
+
+        dropdown.attr('style', '').removeClass('drop-left drop-right drop-top').css({
+          position : 'absolute',
+          width : '95%',
+          'max-width' : 'none',
+          top : p.top
+        });
+
+        dropdown.css(Foundation.rtl ? 'right' : 'left', left_offset);
+      }
+      // detect if dropdown is in an overflow container
+      else if (parentOverflow !== 'visible') {
+        var offset = target[0].offsetTop + target[0].offsetHeight;
+
+        dropdown.attr('style', '').css({
+          position : 'absolute',
+          top : offset
+        });
+
+        dropdown.css(Foundation.rtl ? 'right' : 'left', left_offset);
+      }
+      else {
+
+        this.style(dropdown, target, settings);
+      }
+
+      return dropdown;
+    },
+
+    style : function (dropdown, target, settings) {
+      var css = $.extend({position : 'absolute'},
+        this.dirs[settings.align].call(dropdown, target, settings));
+
+      dropdown.attr('style', '').css(css);
+    },
+
+    // return CSS property object
+    // `this` is the dropdown
+    dirs : {
+      // Calculate target offset
+      _base : function (t, s) {
+        var o_p = this.offsetParent(),
+            o = o_p.offset(),
+            p = t.offset();
+
+        p.top -= o.top;
+        p.left -= o.left;
+
+        //set some flags on the p object to pass along
+        p.missRight = false;
+        p.missTop = false;
+        p.missLeft = false;
+        p.leftRightFlag = false;
+
+        //lets see if the panel will be off the screen
+        //get the actual width of the page and store it
+        var actualBodyWidth;
+        var windowWidth = window.innerWidth;
+        
+        if (document.getElementsByClassName('row')[0]) {
+          actualBodyWidth = document.getElementsByClassName('row')[0].clientWidth;
+        } else {
+          actualBodyWidth = windowWidth;
+        }
+
+        var actualMarginWidth = (windowWidth - actualBodyWidth) / 2;
+        var actualBoundary = actualBodyWidth;
+
+        if (!this.hasClass('mega') && !s.ignore_repositioning) {
+          var outerWidth = this.outerWidth();
+          var o_left = t.offset().left;
+		  
+          //miss top
+          if (t.offset().top <= this.outerHeight()) {
+            p.missTop = true;
+            actualBoundary = windowWidth - actualMarginWidth;
+            p.leftRightFlag = true;
+          }
+
+          //miss right
+          if (o_left + outerWidth > o_left + actualMarginWidth && o_left - actualMarginWidth > outerWidth) {
+            p.missRight = true;
+            p.missLeft = false;
+          }
+
+          //miss left
+          if (o_left - outerWidth <= 0) {
+            p.missLeft = true;
+            p.missRight = false;
+          }
+        }
+
+        return p;
+      },
+
+      top : function (t, s) {
+        var self = Foundation.libs.dropdown,
+            p = self.dirs._base.call(this, t, s);
+
+        this.addClass('drop-top');
+
+        if (p.missTop == true) {
+          p.top = p.top + t.outerHeight() + this.outerHeight();
+          this.removeClass('drop-top');
+        }
+
+        if (p.missRight == true) {
+          p.left = p.left - this.outerWidth() + t.outerWidth();
+        }
+
+        if (t.outerWidth() < this.outerWidth() || self.small() || this.hasClass(s.mega_menu)) {
+          self.adjust_pip(this, t, s, p);
+        }
+
+        if (Foundation.rtl) {
+          return {left : p.left - this.outerWidth() + t.outerWidth(),
+            top : p.top - this.outerHeight()};
+        }
+
+        return {left : p.left, top : p.top - this.outerHeight()};
+      },
+
+      bottom : function (t, s) {
+        var self = Foundation.libs.dropdown,
+            p = self.dirs._base.call(this, t, s);
+
+        if (p.missRight == true) {
+          p.left = p.left - this.outerWidth() + t.outerWidth();
+        }
+
+        if (t.outerWidth() < this.outerWidth() || self.small() || this.hasClass(s.mega_menu)) {
+          self.adjust_pip(this, t, s, p);
+        }
+
+        if (self.rtl) {
+          return {left : p.left - this.outerWidth() + t.outerWidth(), top : p.top + t.outerHeight()};
+        }
+
+        return {left : p.left, top : p.top + t.outerHeight()};
+      },
+
+      left : function (t, s) {
+        var p = Foundation.libs.dropdown.dirs._base.call(this, t, s);
+
+        this.addClass('drop-left');
+
+        if (p.missLeft == true) {
+          p.left =  p.left + this.outerWidth();
+          p.top = p.top + t.outerHeight();
+          this.removeClass('drop-left');
+        }
+
+        return {left : p.left - this.outerWidth(), top : p.top};
+      },
+
+      right : function (t, s) {
+        var p = Foundation.libs.dropdown.dirs._base.call(this, t, s);
+
+        this.addClass('drop-right');
+
+        if (p.missRight == true) {
+          p.left = p.left - this.outerWidth();
+          p.top = p.top + t.outerHeight();
+          this.removeClass('drop-right');
+        } else {
+          p.triggeredRight = true;
+        }
+
+        var self = Foundation.libs.dropdown;
+
+        if (t.outerWidth() < this.outerWidth() || self.small() || this.hasClass(s.mega_menu)) {
+          self.adjust_pip(this, t, s, p);
+        }
+
+        return {left : p.left + t.outerWidth(), top : p.top};
+      }
+    },
+
+    // Insert rule to style psuedo elements
+    adjust_pip : function (dropdown, target, settings, position) {
+      var sheet = Foundation.stylesheet,
+          pip_offset_base = 8;
+
+      if (dropdown.hasClass(settings.mega_class)) {
+        pip_offset_base = position.left + (target.outerWidth() / 2) - 8;
+      } else if (this.small()) {
+        pip_offset_base += position.left - 8;
+      }
+
+      this.rule_idx = sheet.cssRules.length;
+
+      //default
+      var sel_before = '.f-dropdown.open:before',
+          sel_after  = '.f-dropdown.open:after',
+          css_before = 'left: ' + pip_offset_base + 'px;',
+          css_after  = 'left: ' + (pip_offset_base - 1) + 'px;';
+
+      if (position.missRight == true) {
+        pip_offset_base = dropdown.outerWidth() - 23;
+        sel_before = '.f-dropdown.open:before',
+        sel_after  = '.f-dropdown.open:after',
+        css_before = 'left: ' + pip_offset_base + 'px;',
+        css_after  = 'left: ' + (pip_offset_base - 1) + 'px;';
+      }
+
+      //just a case where right is fired, but its not missing right
+      if (position.triggeredRight == true) {
+        sel_before = '.f-dropdown.open:before',
+        sel_after  = '.f-dropdown.open:after',
+        css_before = 'left:-12px;',
+        css_after  = 'left:-14px;';
+      }
+
+      if (sheet.insertRule) {
+        sheet.insertRule([sel_before, '{', css_before, '}'].join(' '), this.rule_idx);
+        sheet.insertRule([sel_after, '{', css_after, '}'].join(' '), this.rule_idx + 1);
+      } else {
+        sheet.addRule(sel_before, css_before, this.rule_idx);
+        sheet.addRule(sel_after, css_after, this.rule_idx + 1);
+      }
+    },
+
+    // Remove old dropdown rule index
+    clear_idx : function () {
+      var sheet = Foundation.stylesheet;
+
+      if (typeof this.rule_idx !== 'undefined') {
+        sheet.deleteRule(this.rule_idx);
+        sheet.deleteRule(this.rule_idx);
+        delete this.rule_idx;
+      }
+    },
+
+    small : function () {
+      return matchMedia(Foundation.media_queries.small).matches &&
+        !matchMedia(Foundation.media_queries.medium).matches;
+    },
+
+    off : function () {
+      this.S(this.scope).off('.fndtn.dropdown');
+      this.S('html, body').off('.fndtn.dropdown');
+      this.S(window).off('.fndtn.dropdown');
+      this.S('[data-dropdown-content]').off('.fndtn.dropdown');
+    },
+
+    reflow : function () {}
+  };
+}(jQuery, window, window.document));