renalware-core 2.0.68 → 2.0.69
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/renalware/hd/diaries_controller.rb +3 -3
- data/app/controllers/renalware/hd/sessions_controller.rb +1 -2
- data/app/controllers/renalware/pd/regimes_controller.rb +2 -1
- data/app/controllers/renalware/snippets/snippets_controller.rb +1 -1
- data/app/models/renalware/letters/recipient_params_processor.rb +1 -1
- data/app/models/renalware/pathology/observations_grouped_by_date_query.rb +2 -2
- data/app/models/renalware/transplants/donor_operation.rb +2 -1
- data/app/models/renalware/ukrdc/xml_renderer.rb +2 -2
- data/app/policies/renalware/events/event_policy.rb +1 -1
- data/app/policies/renalware/events/swab_policy.rb +1 -1
- data/lib/core_extensions/active_record/migration_helpers.rb +1 -3
- data/lib/core_extensions/i18n/always_cascade.rb +1 -1
- data/lib/core_extensions/i18n/handle_blank_value.rb +1 -1
- data/lib/renalware/engine.rb +2 -6
- data/lib/renalware/version.rb +1 -1
- data/lib/renalware/week_period.rb +1 -3
- data/spec/factories/feeds/file.rb +2 -2
- data/spec/factories/system/users.rb +1 -3
- data/spec/support/database_functions_spec_helper.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 163a7c7878bbd1480f5900ac489915e6f6b9616d3e5c7bbe70f3b0df53d103da
|
4
|
+
data.tar.gz: 29b152cce1ee8bd3948ab72ea17ae5c09b0bbeb8885d2b1a805c3d2be2334b56
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f8eecf19c3c134d811c20990f3a91e718242fd98a82ead06628ddb50075a84e522d8724eee3723b785c045d89fced233a41c0a13d8c0490bb9455d22337361c8
|
7
|
+
data.tar.gz: 929e42ec1986252c87388dc0367d289d02061aeb87a003ebfd08b7bf4b570878e57cc1c4976d5c6c6cec2ccda5b70687dd63583f8449402fd0c18a22f3bc5357
|
@@ -51,9 +51,9 @@ module Renalware
|
|
51
51
|
@weekly_diary ||= begin
|
52
52
|
FindOrCreateDiaryByWeekQuery.new(
|
53
53
|
relation: WeeklyDiary.eager_load(
|
54
|
-
|
55
|
-
|
56
|
-
|
54
|
+
slots: [:patient, :station, :diurnal_period_code],
|
55
|
+
master_diary: { slots: [:patient, :station, :diurnal_period_code] }
|
56
|
+
),
|
57
57
|
unit_id: unit_id,
|
58
58
|
week_period: week_period,
|
59
59
|
by: current_user
|
@@ -86,7 +86,8 @@ module Renalware
|
|
86
86
|
:system_id, :last_fill_volume, :additional_manual_exchange_volume,
|
87
87
|
bags_attributes: [
|
88
88
|
:id, :regime_id, :bag_type_id, :volume, :role, :capd_overnight_bag, :per_week,
|
89
|
-
:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday, :_destroy
|
89
|
+
:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday, :_destroy
|
90
|
+
]
|
90
91
|
)
|
91
92
|
end
|
92
93
|
|
@@ -48,7 +48,7 @@ module Renalware
|
|
48
48
|
# In our form, we need to use to "check" the contacts to be
|
49
49
|
# assigned as CC's (not to destroy them). So we therefore convert
|
50
50
|
# the "_keep" flag to a "_destroy" one.
|
51
|
-
params[:_destroy] =
|
51
|
+
params[:_destroy] = params[:_keep] == "1" ? "0" : "1"
|
52
52
|
params.except(:_keep)
|
53
53
|
end
|
54
54
|
|
@@ -33,8 +33,8 @@ module Renalware
|
|
33
33
|
#
|
34
34
|
class ObservationsGroupedByDateQuery
|
35
35
|
attr_reader :patient, :observation_descriptions, :page, :limit
|
36
|
-
alias
|
37
|
-
alias
|
36
|
+
alias current_page page
|
37
|
+
alias limit_value limit
|
38
38
|
|
39
39
|
def initialize(patient:, observation_descriptions:, page: 1, per_page: 50)
|
40
40
|
@patient = patient
|
@@ -28,7 +28,8 @@ module Renalware
|
|
28
28
|
enumerize :anaesthetist, in: %i(consultant fellow_senior_registrar other)
|
29
29
|
enumerize :nephrectomy_type, in: %i(
|
30
30
|
open_transperitoneal open_loin_with_resection open_loin_without_resection
|
31
|
-
open_extraperitoneal laparoscropic_intra laparoscropic_extra other
|
31
|
+
open_extraperitoneal laparoscropic_intra laparoscropic_extra other
|
32
|
+
)
|
32
33
|
enumerize :donor_splenectomy_peri_or_post_operatively, in: %i(yes no unknown)
|
33
34
|
|
34
35
|
validates :performed_on, presence: true
|
@@ -9,11 +9,11 @@ module Renalware
|
|
9
9
|
attr_reader :template, :xsd_path, :locals, :errors
|
10
10
|
|
11
11
|
class Success < Renalware::Success
|
12
|
-
|
12
|
+
alias xml object
|
13
13
|
end
|
14
14
|
|
15
15
|
class Failure < Renalware::Failure
|
16
|
-
|
16
|
+
alias validation_errors object
|
17
17
|
end
|
18
18
|
|
19
19
|
def initialize(template: nil, xsd_path: nil, locals: {})
|
@@ -74,9 +74,7 @@ module CoreExtensions
|
|
74
74
|
found = true
|
75
75
|
end
|
76
76
|
end
|
77
|
-
unless found
|
78
|
-
raise "Cannot file #{filename} in #{paths.join(', ')}"
|
79
|
-
end
|
77
|
+
raise "Cannot file #{filename} in #{paths.join(', ')}" unless found
|
80
78
|
end
|
81
79
|
|
82
80
|
# Make sure to look in the host Rails app as well as in the engine
|
data/lib/renalware/engine.rb
CHANGED
@@ -56,9 +56,7 @@ require "rails-assets-foundation-datepicker"
|
|
56
56
|
require "rails-assets-select2"
|
57
57
|
require "rails-assets-moment"
|
58
58
|
require "rails-assets-mousetrap"
|
59
|
-
if ENV["RAILS_ENV"] == "development"
|
60
|
-
require "byebug"
|
61
|
-
end
|
59
|
+
require "byebug" if ENV["RAILS_ENV"] == "development"
|
62
60
|
|
63
61
|
module Renalware
|
64
62
|
# Don't have prefix method return anything.
|
@@ -181,9 +179,7 @@ module Renalware
|
|
181
179
|
app.config.time_zone = "London"
|
182
180
|
app.config.active_record.time_zone_aware_types = [:datetime]
|
183
181
|
app.config.active_record.dump_schemas = :all
|
184
|
-
unless Rails.env.development?
|
185
|
-
app.config.exceptions_app = Engine.routes
|
186
|
-
end
|
182
|
+
app.config.exceptions_app = Engine.routes unless Rails.env.development?
|
187
183
|
app.config.action_mailer.preview_path = Engine.root.join("app", "mailers", "renalware")
|
188
184
|
app.config.action_mailer.deliver_later_queue_name = "mailers"
|
189
185
|
app.config.active_job.queue_adapter = :delayed_job
|
data/lib/renalware/version.rb
CHANGED
@@ -6,11 +6,11 @@ FactoryBot.define do
|
|
6
6
|
accountable
|
7
7
|
|
8
8
|
trait :practices do
|
9
|
-
association :file_type, factory:
|
9
|
+
association :file_type, factory: %i(feed_file_type practices)
|
10
10
|
end
|
11
11
|
|
12
12
|
trait :primary_care_physicians do
|
13
|
-
association :file_type, factory:
|
13
|
+
association :file_type, factory: %i(feed_file_type primary_care_physicians)
|
14
14
|
end
|
15
15
|
end
|
16
16
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: renalware-core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.69
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Airslie
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-01-
|
11
|
+
date: 2019-01-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: active_type
|