Skip to content
This repository has been archived by the owner on Apr 18, 2024. It is now read-only.

Commit

Permalink
Merge pull request #304 from fhir-crucible/r4
Browse files Browse the repository at this point in the history 
R4 Updates
  • Loading branch information
@arscan
arscan authored Jun 10, 2019
2 parents 3f9874c + 5c821d3 commit ea1bcb5
Show file tree
Hide file tree
Showing 27 changed files with 248 additions and 132 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ before_script:
- bower install
- npm install -g istanbul
script:
- ./bin/rake test
- FHIR_LOG_LEVEL=fatal ./bin/rake test # lower log levels overwhelm travis
- ./bin/teaspoon
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc
# gem 'fhir_models', :git => 'https://github.com/fhir-crucible/fhir_models.git'
# gem 'fhir_client', :git => 'https://github.com/fhir-crucible/fhir_client.git'

gem 'plan_executor', :git => 'https://github.com/fhir-crucible/plan_executor.git'
gem 'plan_executor', :git => 'https://github.com/fhir-crucible/plan_executor.git', :branch => 'r4'
# gem 'plan_executor', :path => '../plan_executor'
gem 'fhir_scorecard', :git => 'https://github.com/fhir-crucible/fhir_scorecard.git'
#gem 'fhir_scorecard', :path => '../fhir_scorecard'
Expand Down
168 changes: 89 additions & 79 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ GIT

GIT
remote: https://github.com/fhir-crucible/plan_executor.git
revision: 4f1d2da69535d3a5978909d64dcd587f720b6156
revision: 2bd7047e1f35bc701995d512e45f890b81edd5d7
branch: r4
specs:
plan_executor (1.8.0)
bcp47
date_time_precision
fhir_client
fhir_dstu2_models
fhir_models
fhir_stu3_models
jsonpath
nokogiri (>= 1.8.2)
nokogiri-diff
Expand Down Expand Up @@ -47,41 +49,41 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
actionmailer (4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.10)
actionview (= 4.2.10)
activesupport (= 4.2.10)
actionpack (4.2.11.1)
actionview (= 4.2.11.1)
activesupport (= 4.2.11.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.10)
activesupport (= 4.2.10)
actionview (4.2.11.1)
activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_model_serializers (0.10.7)
active_model_serializers (0.10.9)
actionpack (>= 4.1, < 6)
activemodel (>= 4.1, < 6)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (4.2.10)
activesupport (= 4.2.10)
activejob (4.2.11.1)
activesupport (= 4.2.11.1)
globalid (>= 0.3.0)
activemodel (4.2.10)
activesupport (= 4.2.10)
activemodel (4.2.11.1)
activesupport (= 4.2.11.1)
builder (~> 3.1)
activerecord (4.2.10)
activemodel (= 4.2.10)
activesupport (= 4.2.10)
activerecord (4.2.11.1)
activemodel (= 4.2.11.1)
activesupport (= 4.2.11.1)
arel (~> 6.0)
activesupport (4.2.10)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
Expand All @@ -92,16 +94,16 @@ GEM
area (0.10.0)
fastercsv (~> 1.5)
arel (6.0.4)
autoprefixer-rails (9.1.3)
autoprefixer-rails (9.5.1)
execjs
bcp47 (0.3.3)
i18n
bson (3.2.7)
builder (3.2.3)
byebug (10.0.2)
byebug (11.0.1)
case_transform (0.2)
activesupport
chunky_png (1.3.10)
chunky_png (1.3.11)
coderay (1.1.2)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
Expand All @@ -115,13 +117,13 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
daemons (1.2.6)
daemons (1.3.1)
date_time_precision (0.8.1)
delayed_job (4.1.5)
activesupport (>= 3.0, < 5.3)
delayed_job_mongoid (2.3.0)
delayed_job_mongoid (2.3.1)
delayed_job (>= 3.0, < 5)
mongoid (>= 3.0, < 7)
mongoid (>= 3.0, < 8)
mongoid-compatibility (>= 0.4.0)
distribution (0.7.3)
docile (1.3.1)
Expand All @@ -134,37 +136,43 @@ GEM
erubis (2.7.0)
eventmachine (1.2.7)
execjs (2.7.0)
faker (1.9.1)
faker (1.9.3)
i18n (>= 0.7)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
fastercsv (1.5.5)
ffi (1.9.25)
fhir_client (3.1.2)
ffi (1.10.0)
fhir_client (4.0.0)
activesupport (>= 3)
addressable (>= 2.3)
fhir_dstu2_models (>= 1.0.4)
fhir_models (>= 3.0.3)
fhir_dstu2_models (>= 1.0.9)
fhir_models (>= 4.0.0)
fhir_stu3_models (>= 3.0.0)
nokogiri (>= 1.8.2)
oauth2 (~> 1.1)
rack (>= 1.5)
rest-client (~> 2.0)
tilt (>= 1.1)
fhir_dstu2_models (1.0.8)
fhir_dstu2_models (1.0.9)
bcp47 (>= 0.3)
date_time_precision (>= 0.8)
mime-types (>= 1.16, < 3)
mime-types (>= 3.0)
nokogiri (>= 1.8.5)
fhir_models (4.0.0)
bcp47 (>= 0.3)
date_time_precision (>= 0.8)
mime-types (>= 3.0)
nokogiri (>= 1.8.2)
fhir_models (3.0.3)
fhir_stu3_models (3.0.0)
bcp47 (>= 0.3)
date_time_precision (>= 0.8)
mime-types (>= 1.16, < 3)
mime-types (>= 3.0)
nokogiri (>= 1.8.2)
formatador (0.2.5)
georuby (2.5.2)
globalid (0.4.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
guard (2.14.2)
guard (2.15.0)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
Expand All @@ -184,43 +192,45 @@ GEM
multi_json
sprockets (>= 2.0.3)
tilt
hashdiff (0.3.7)
highline (2.0.0)
hashdiff (0.3.9)
highline (2.0.2)
hike (1.2.3)
http-cookie (1.0.3)
domain_name (~> 0.5)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
jbuilder (2.8.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
json (1.8.6)
jsonapi-renderer (0.2.0)
jsonpath (1.0.1)
jsonpath (1.0.4)
multi_json
to_regexp (~> 0.2.1)
jwt (2.1.0)
jwt (2.2.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
magic_lamp (1.8.1)
magic_lamp (1.9.0)
method_source
rails (>= 4.0.0)
rake
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mime-types (2.99.3)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest-reporters (1.3.3)
minitest-reporters (1.3.6)
ansi
builder
minitest (>= 5.0)
Expand All @@ -246,13 +256,13 @@ GEM
optionable (~> 0.2.0)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
multipart-post (2.1.1)
nenv (0.3.0)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (5.0.2)
net-ssh (5.2.0)
netrc (0.11.0)
nokogiri (1.10.2)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
nokogiri-diff (0.2.0)
nokogiri (~> 1.5)
Expand All @@ -271,26 +281,26 @@ GEM
optionable (0.2.0)
origin (2.3.1)
pickup (0.0.11)
pry (0.11.3)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry-byebug (3.7.0)
byebug (~> 11.0)
pry (~> 0.10)
public_suffix (3.0.3)
public_suffix (3.1.0)
rack (1.6.11)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.10)
actionmailer (= 4.2.10)
actionpack (= 4.2.10)
actionview (= 4.2.10)
activejob (= 4.2.10)
activemodel (= 4.2.10)
activerecord (= 4.2.10)
activesupport (= 4.2.10)
rails (4.2.11.1)
actionmailer (= 4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
activemodel (= 4.2.11.1)
activerecord (= 4.2.11.1)
activesupport (= 4.2.11.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.10)
railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -300,28 +310,28 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (4.2.10)
actionpack (= 4.2.10)
activesupport (= 4.2.10)
railties (4.2.11.1)
actionpack (= 4.2.11.1)
activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
rdoc (4.3.0)
recursive-open-struct (1.1.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
ruby-graphviz (1.2.3)
ruby-graphviz (1.2.4)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
safe_yaml (1.0.5)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
Expand Down Expand Up @@ -351,20 +361,20 @@ GEM
railties (>= 3.2.5, < 6)
teaspoon-jasmine (2.3.4)
teaspoon (>= 1.0.0)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
time_difference (0.5.0)
activesupport
to_regexp (0.2.1)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.18)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
webmock (3.4.2)
unf_ext (0.0.7.6)
webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
Expand Down Expand Up @@ -412,4 +422,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
1.16.2
1.17.3
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ If no refresh token is available, or the refresh attempt fails, the lock icon wi
# License
Copyright 2015-2018 The MITRE Corporation
Copyright 2015-2019 The MITRE Corporation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/views/component/conformance.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Crucible.Conformance
@removeConformanceSpinner()
@mismatch_alert_element.hide()
@server_fhir_version.html("#{data.fhir_sequence} (#{data.fhir_version})")
if data.fhir_sequence != 'DSTU2' && data.fhir_sequence != 'STU3'
if data.fhir_sequence != 'DSTU2' && data.fhir_sequence != 'STU3' && data.fhir_sequence != 'R4'
@mismatch_alert_element.html(@version_mismatch_template(data))
@mismatch_alert_element.show()
@element.trigger('conformanceInitialized') if data.conformance.updated
Expand Down
Loading

0 comments on commit ea1bcb5

Please sign in to comment.