renalware-core 2.0.112 → 2.0.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ca791105ad77524bc53a491d593ca9871363fdd5b3c3b874755f1a3898ca8c
-  data.tar.gz: 770c7beab9d9369f637cf067ff7fe9a068a579805690aeb76ef77a080be3bf6d
+  metadata.gz: 687a7e98c92f0c23e54e6f9bc7ea2022f2684a0ab834120b229ded600238c379
+  data.tar.gz: ec3be7afa54d14dce47cc4adf4b90fe6abc0fb2e672fbaf84b1612affc505749
 SHA512:
-  metadata.gz: a10238b66a41f3a73e924acf31ac1691194fefd2738764a52bc3bcef8a75872288f0dbb55835ceed2579a50f2357b214641c55cc5d37a89ffab289af065a8514
-  data.tar.gz: 1f17f033bd3a78c003e385500b4505bb3eb1ec452adcc6c8850a210f79d0a2a5616065581a5eb2f891553dcbc9cbc409abfcf2f2f95be707ce59ff8843ac1fb0
+  metadata.gz: ae657bd523863a435852cb121d625f5880d34187a655dc3b6d3a7e277a72cd09a118413256ea9347dcdb5b56c1064d012e7e826fda467e2fac9002a499dcefc5
+  data.tar.gz: 04e868337e7b680ee1306e322e48405f44db5defba53fd92ebbaf215c5436f889d6941b9a1eafe8f447ab6ab2f8d1e8354824213f9869022dcbe41996417d7e8

data/app/models/renalware/pathology/requests/global_rule_set/patient_rule_set_decision.rb

@@ -28,6 +28,7 @@ module Renalware
 
           private
 
+          # Will return false if request_description.required_observation_description_id is nil
           def last_observation_too_recent?
             return false if last_observation.nil?
 
@@ -41,6 +42,8 @@ module Renalware
             expiration_days = @rule_set.request_description.expiration_days
             return false if expiration_days == 0
 
+            # This subtraction works because ActiveSupport::TimeWithZone works in days
+            # e.g. TimeWithZone1 - TimeWithZone2 = 3 days
             requested_days_ago = @date - last_request.requested_on
             requested_days_ago < expiration_days
           end
@@ -52,6 +55,7 @@ module Renalware
               .all?
           end
 
+          # NB request.requested_on == request.created_at
           def last_request_has_an_observation_result?
             last_observation.present? &&
               last_observation.observed_on > last_request.requested_on

data/lib/renalware/version.rb

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

data/lib/tasks/renalware.rake

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+namespace :renalware do
+  desc "Install package.json dependencies with yarn for the renalware-core engine - "\
+       "without this <path to installed gem>/renalware-core/node_modules is not populated "\
+       "and assets:precompile in the host app will not work."
+  task :yarn_install do
+    puts "Installing renalware-core/package.json dependencies with yarn"
+    Dir.chdir(File.join(__dir__, "../..")) do
+      system "yarn install --no-progress --production"
+    end
+  end
+end
+
+def enhance_assets_precompile_with_engine_yarn_install
+  Rake::Task["assets:precompile"].enhance(["renalware:yarn_install"])
+end
+
+# When a host app runs rake assets:precompile, hook into this and enhance the
+# task so it runs yarn install for (and relative to) the engine, wherever it is installed.
+# Without that, assets:precompile will fail because the engine references various js and css files
+# in ./node_modules, and these are not included in the source, but need to be installed with yarn
+# at deploy time.
+if Rake::Task.task_defined?("assets:precompile")
+  enhance_assets_precompile_with_engine_yarn_install
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.112
+  version: 2.0.113
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -3814,6 +3814,7 @@ files:
 - lib/tasks/ods.rake
 - lib/tasks/pathology.rake
 - lib/tasks/pd.rake
+- lib/tasks/renalware.rake
 - lib/tasks/reporting.rake
 - lib/tasks/ukrdc.rake
 - lib/templates/slim/scaffold/_form.html.slim