Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: scoophealth/hqmf2js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pophealth/hqmf2js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on May 13, 2013

  1. updated version number

    andrequina committed May 13, 2013
    Copy the full SHA
    aa64295 View commit details
  2. added ability to force source data critiera inclusion, used for ADE s…

    …ince INR is no longer a specific occurrence
    andrequina committed May 13, 2013
    Copy the full SHA
    589d204 View commit details
  3. added ability to force source data critiera inclusion, used for ADE s…

    …ince INR is no longer a specific occurrence
    andrequina committed May 13, 2013
    Copy the full SHA
    344e2a8 View commit details

Commits on Jun 11, 2013

  1. fixed issue with specific context getting over written with identity …

    …for derived data criteria that had an already valid specific context
    andrequina committed Jun 11, 2013
    Copy the full SHA
    ce5ecd7 View commit details

Commits on Jul 30, 2013

  1. merging develop branch

    rdingwell committed Jul 30, 2013
    Copy the full SHA
    f6fb5a6 View commit details

Commits on Aug 2, 2013

  1. Copy the full SHA
    5335767 View commit details

Commits on Aug 5, 2013

  1. reverting Gemfile

    rdingwell committed Aug 5, 2013
    Copy the full SHA
    3368163 View commit details

Commits on Aug 7, 2013

  1. Copy the full SHA
    902ee51 View commit details

Commits on Aug 12, 2013

  1. updated tesing rake tasks to include simplecov and to make more consi…

    …stent with other projects
    andrequina committed Aug 12, 2013
    Copy the full SHA
    a10295a View commit details

Commits on Aug 16, 2013

  1. updated episode of care counting to eliminate counting of rows with m…

    …ultiple episodes of care in different columns
    andrequina committed Aug 16, 2013
    Copy the full SHA
    3376329 View commit details

Commits on Aug 20, 2013

  1. Add new utility function (getEvents) to patient API in preparation fo…

    …r simplifying the code egnerated for each HQMF data criteria.
    hadleynet committed Aug 20, 2013
    Copy the full SHA
    233dbf4 View commit details
  2. Rework JS code generator to use new getEvents method rather than inli…

    …ning the code for that function. Tidy up generated code a little to get better indentation on characteristic criteria and eliminate empty lines in generated functions.
    hadleynet committed Aug 20, 2013
    Copy the full SHA
    2052e0b View commit details

Commits on Aug 21, 2013

  1. Copy the full SHA
    f34a5c8 View commit details
  2. Copy the full SHA
    eed04fc View commit details
  3. fixed issue with bad reference to negated variable that doesn't exist…

    …... should be criteria.negation
    andrequina committed Aug 21, 2013
    Copy the full SHA
    4b1620f View commit details

Commits on Aug 23, 2013

  1. Copy the full SHA
    a865b3b View commit details
  2. Copy the full SHA
    2caaa23 View commit details

Commits on Aug 27, 2013

  1. Move invocation of data criteria functions from generated code into t…

    …he library conjunction functions. This is a pre-step for optimizing AllTrue and AllFalse.
    hadleynet committed Aug 27, 2013
    Copy the full SHA
    c56c604 View commit details

Commits on Aug 29, 2013

  1. Copy the full SHA
    974a27d View commit details
  2. Optimize allTrue and atLeastOneFalse, both quit checking values once …

    …the condition is proven false|true respectively.
    hadleynet committed Aug 29, 2013
    Copy the full SHA
    e6bea7c View commit details
  3. Copy the full SHA
    f186011 View commit details

Commits on Aug 30, 2013

  1. Copy the full SHA
    e7a5dfb View commit details

Commits on Sep 4, 2013

  1. Copy the full SHA
    9d011b1 View commit details

Commits on Sep 16, 2013

  1. Copy the full SHA
    e5d755a View commit details

Commits on Sep 20, 2013

  1. removed finalize function

    andrequina committed Sep 20, 2013
    Copy the full SHA
    ab2bf38 View commit details

Commits on Sep 27, 2013

  1. Copy the full SHA
    b8f2e5d View commit details

Commits on Nov 5, 2013

  1. added in an option to turn off the short circuit performance improvem…

    …ent for rationale generation
    andrequina committed Nov 5, 2013
    Copy the full SHA
    334547e View commit details

Commits on Nov 8, 2013

  1. Copy the full SHA
    49b2485 View commit details

Commits on Nov 12, 2013

  1. Copy the full SHA
    461a503 View commit details

Commits on Nov 14, 2013

  1. added final specifics as part of calculate to the results and allowed…

    … allTrue to not short circuit calculation
    andrequina committed Nov 14, 2013
    Copy the full SHA
    da8d5f7 View commit details

Commits on Nov 21, 2013

  1. Copy the full SHA
    957c011 View commit details

Commits on Nov 25, 2013

  1. Copy the full SHA
    a66dfd4 View commit details

Commits on Jan 3, 2014

  1. changed finalSpecifics for denominator to leave exclusions in the spe…

    …cifics since the exclusions should be a subset of the denominator
    andrequina committed Jan 3, 2014
    Copy the full SHA
    1628a8b View commit details
  2. Copy the full SHA
    70ece60 View commit details

Commits on Jan 27, 2014

  1. fix issue with subset operators when there are two elements at the id…

    …entical time that fire for the subset operator
    andrequina committed Jan 27, 2014
    Copy the full SHA
    1a1f15b View commit details

Commits on Feb 28, 2014

  1. Copy the full SHA
    5b640ae View commit details
  2. removing puts statement

    rdingwell committed Feb 28, 2014
    Copy the full SHA
    564f30e View commit details
  3. Copy the full SHA
    7b5f782 View commit details

Commits on Mar 3, 2014

  1. Merge pull request pophealth#2 from pophealth/expired

    Adding expired date calculations
    rdingwell committed Mar 3, 2014
    Copy the full SHA
    032f94e View commit details
  2. Copy the full SHA
    b43409c View commit details

Commits on Mar 10, 2014

  1. Copy the full SHA
    a980db5 View commit details

Commits on Mar 14, 2014

  1. allows a measure without an IPP to calcualte. Missing an IPP should d…

    …efault to false since there is nothing to evaluate
    andrequina committed Mar 14, 2014
    Copy the full SHA
    c58e8fa View commit details
  2. Copy the full SHA
    b11f96d View commit details

Commits on Mar 18, 2014

  1. Copy the full SHA
    6be9528 View commit details

Commits on Mar 19, 2014

  1. Copy the full SHA
    bada263 View commit details

Commits on Mar 21, 2014

  1. Merge pull request pophealth#4 from pophealth/vs_mapping_fix

    fixing issue that caused performance issues generating measure logic
    andrequina committed Mar 21, 2014
    Copy the full SHA
    7b6c768 View commit details

Commits on Mar 25, 2014

  1. Copy the full SHA
    13bf191 View commit details
  2. cleaned up gemfile

    andrequina committed Mar 25, 2014
    Copy the full SHA
    016ca62 View commit details
  3. cleaned up whitespace

    andrequina committed Mar 25, 2014
    Copy the full SHA
    7874eae View commit details
  4. Copy the full SHA
    3fbd5dd View commit details
Showing with 4,716 additions and 1,030 deletions.
  1. +2 −5 .travis.yml
  2. +7 −5 Gemfile
  3. +134 −131 Gemfile.lock
  4. +9 −5 Rakefile
  5. +17 −19 app/assets/javascripts/crosswalk.js.coffee
  6. +228 −47 app/assets/javascripts/hqmf_util.js.coffee
  7. +25 −16 app/assets/javascripts/logging_utils.js.coffee
  8. +86 −0 app/assets/javascripts/patient_api_extension.js.coffee
  9. +61 −15 app/assets/javascripts/specifics.js.coffee
  10. +8 −8 hqmf2js.gemspec
  11. +172 −0 lib/assets/javascripts/libraries/map_reduce_utils.js
  12. +28 −17 lib/generator/characteristic.js.erb
  13. +5 −5 lib/generator/codes_to_json.rb
  14. +8 −5 lib/generator/data_criteria.js.erb
  15. +4 −0 lib/generator/derived_data.js.erb
  16. +150 −0 lib/generator/execution.rb
  17. +54 −21 lib/generator/js.rb
  18. +1 −1 lib/generator/observation_criteria.js.erb
  19. +22 −19 lib/generator/patient_data.js.erb
  20. +6 −1 lib/generator/population_criteria.js.erb
  21. +5 −7 lib/generator/precondition.js.erb
  22. +1 −0 lib/hqmf2js.rb
  23. +7 −2 lib/tasks/convert.rake
  24. +0 −8 lib/tasks/cover_me.rake
  25. +1,423 −0 test/fixtures/NQF59New.json
  26. +54 −0 test/fixtures/codes/codes.json
  27. +1,014 −0 test/fixtures/json/0495.json
  28. +148 −0 test/fixtures/json/59New.json
  29. +27 −0 test/fixtures/json/data_criteria/specific_occurrence.json
  30. +27 −0 test/fixtures/json/data_criteria/temporals_with_anynonnull.json
  31. +573 −654 test/fixtures/patients/larry_vanderman.json
  32. +19 −0 test/simplecov.rb
  33. +1 −1 test/test_helper.rb
  34. +95 −0 test/unit/cmd_test.rb
  35. +32 −0 test/unit/codes_to_json_test.rb
  36. +2 −3 test/unit/effective_date_test.rb
  37. +64 −0 test/unit/erb_context_test.rb
  38. +37 −2 test/unit/hqmf_from_json_javascript_test.rb
  39. +23 −6 test/unit/hqmf_javascript_test.rb
  40. +27 −0 test/unit/js_object_test.rb
  41. +103 −25 test/unit/library_function_test.rb
  42. +7 −2 test/unit/specifics_test.rb
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
language: ruby

rvm:
- 1.9.3

script: bundle exec rake

script: bundle exec rake test
notifications:
email:
recipients:
- healthcare-ci@googlegroups.com
on_failure: change

branches:
branches:
only:
- master
- develop
12 changes: 7 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
source "http://rubygems.org"

gem 'rails', '3.2.9'
gem 'rails', '>= 4.0.0'

group :assets do
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end

gemspec
gem 'hquery-patient-api', '1.0.4'
gem 'health-data-standards', :git => 'https://github.com/projectcypress/health-data-standards.git', :branch => 'master'
#gem 'health-data-standards', :path => '../health-data-standards'

gem 'nokogiri'
gem 'sprockets', '~> 2.2.2'
gem 'sprockets'
gem 'coffee-script'
gem 'uglifier'
gem 'tilt'
gem 'rake'
gem 'pry'

group :test do
gem 'simplecov', :require => false

gem 'minitest'
gem 'turn', :require => false
gem 'cover_me', '~> 1.2.0'
gem 'awesome_print', :require => 'ap'

platforms :ruby do
265 changes: 134 additions & 131 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,163 +1,165 @@
PATH
remote: .
GIT
remote: https://github.com/projectcypress/health-data-standards.git
revision: f75230c736cbb53208a68889438c12b02af885a5
branch: master
specs:
hqmf2js (1.2.1)
coffee-script (~> 2.2.0)
health-data-standards (~> 3.1.1)
hquery-patient-api (~> 1.0.2)
nokogiri (~> 1.5.5)
sprockets (~> 2.2.2)
tilt (~> 1.3.3)
health-data-standards (3.4.6)
activesupport (~> 4.0.0)
builder (~> 3.1)
erubis (~> 2.7.0)
log4r (~> 1.1.10)
memoist (~> 0.9.1)
mongoid (~> 4.0.0.rc2)
mongoid-tree (~> 1.0.4)
nokogiri (= 1.6.0)
protected_attributes (~> 1.0.5)
rest-client (~> 1.6.7)
rubyzip (= 0.9.9)
uuid (~> 2.3.7)

GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.9)
actionpack (= 3.2.9)
mail (~> 2.4.4)
actionpack (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
builder (~> 3.0.0)
actionmailer (4.0.5)
actionpack (= 4.0.5)
mail (~> 2.5.4)
actionpack (4.0.5)
activesupport (= 4.0.5)
builder (~> 3.1.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.9)
activesupport (= 3.2.9)
builder (~> 3.0.0)
activerecord (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.5)
activesupport (= 4.0.5)
builder (~> 3.1.0)
activerecord (4.0.5)
activemodel (= 4.0.5)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.5)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.5)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
ansi (1.4.3)
arel (3.0.2)
awesome_print (1.1.0)
builder (3.0.4)
coderay (1.0.8)
coffee-rails (3.2.2)
arel (4.0.2)
awesome_print (1.2.0)
bson (2.3.0)
builder (3.1.4)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.4.0)
configatron (2.9.1)
yamler (>= 0.1.0)
cover_me (1.2.0)
configatron
hashie
coffee-script-source (1.7.0)
connection_pool (2.0.0)
docile (1.1.3)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
hashie (1.2.0)
health-data-standards (3.1.1)
activesupport (~> 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
log4r (~> 1.1.10)
memoist (~> 0.9.0)
mongoid (~> 3.1.0)
nokogiri (~> 1.5.5)
rest-client (~> 1.6.7)
rubyzip
uuid (~> 2.3.5)
hike (1.2.1)
hquery-patient-api (1.0.2)
i18n (0.6.1)
journey (1.0.4)
json (1.7.5)
libv8 (3.3.10.4)
execjs (2.1.0)
hike (1.2.3)
hquery-patient-api (1.0.4)
i18n (0.6.9)
json (1.8.1)
libv8 (3.16.14.3)
log4r (1.1.10)
macaddr (1.6.1)
systemu (~> 2.5.0)
mail (2.4.4)
i18n (>= 0.4.0)
macaddr (1.7.1)
systemu (~> 2.6.2)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
memoist (0.9.0)
method_source (0.8.1)
mime-types (1.20.1)
minitest (4.3.2)
mongoid (3.1.3)
activemodel (~> 3.2)
moped (~> 1.4.2)
origin (~> 1.0)
tzinfo (~> 0.3.22)
moped (1.4.5)
multi_json (1.5.0)
nokogiri (1.5.6)
origin (1.0.11)
polyglot (0.3.3)
pry (0.9.10)
coderay (~> 1.0.5)
memoist (0.9.3)
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.3)
minitest (4.7.5)
mongoid (4.0.0.rc2)
activemodel (~> 4.0)
moped (~> 2.0.0.rc2)
origin (~> 2.1)
tzinfo (>= 0.3.37)
mongoid-tree (1.0.4)
mongoid (>= 3.0, <= 4.0)
moped (2.0.0.rc2)
bson (~> 2.2)
connection_pool (~> 2.0)
optionable (~> 0.2.0)
multi_json (1.10.1)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
optionable (0.2.0)
origin (2.1.1)
polyglot (0.3.5)
protected_attributes (1.0.8)
activemodel (>= 4.0.1, < 5.0)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.3.1)
rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
slop (~> 3.4)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.9)
actionmailer (= 3.2.9)
actionpack (= 3.2.9)
activerecord (= 3.2.9)
activeresource (= 3.2.9)
activesupport (= 3.2.9)
bundler (~> 1.0)
railties (= 3.2.9)
railties (3.2.9)
actionpack (= 3.2.9)
activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rails (4.0.5)
actionmailer (= 4.0.5)
actionpack (= 4.0.5)
activerecord (= 4.0.5)
activesupport (= 4.0.5)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.5)
sprockets-rails (~> 2.0.0)
railties (4.0.5)
actionpack (= 4.0.5)
activesupport (= 4.0.5)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.2)
rdoc (3.12)
json (~> 1.4)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
ref (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rubyzip (0.9.9)
sass (3.2.3)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (3.3.8)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
tilt (~> 1.3)
slop (3.3.3)
sprockets (2.2.2)
sprockets-rails (~> 2.0.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.5.0)
sprockets (2.12.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
systemu (2.5.2)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
thor (0.16.0)
tilt (1.3.3)
treetop (1.4.12)
sprockets-rails (2.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
systemu (2.6.4)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turn (0.9.6)
turn (0.9.7)
ansi
tzinfo (0.3.35)
uglifier (1.3.0)
minitest (~> 4)
tzinfo (0.3.39)
uglifier (2.5.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
json (>= 1.8.0)
uuid (2.3.7)
macaddr (~> 1.0)
yamler (0.1.0)

PLATFORMS
ruby
@@ -166,15 +168,16 @@ DEPENDENCIES
awesome_print
coffee-rails
coffee-script
cover_me (~> 1.2.0)
hqmf2js!
health-data-standards!
hquery-patient-api (= 1.0.4)
minitest
nokogiri
pry
rails (= 3.2.9)
rails (>= 4.0.0)
rake
sass-rails
sprockets (~> 2.2.2)
simplecov
sprockets
therubyracer
therubyrhino
tilt
14 changes: 9 additions & 5 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -11,12 +11,16 @@ Dir['lib/tasks/*.rake'].sort.each do |ext|
load ext
end

$LOAD_PATH << File.expand_path("../test",__FILE__)
desc "Run basic tests"
Rake::TestTask.new("test_units") { |t|
t.pattern = 'test/unit/*_test.rb'
Rake::TestTask.new(:test_unit) do |t|
t.libs << "test"
t.test_files = FileList['test/**/*_test.rb']
t.verbose = true
t.warning = false
}
end

task :test => [:test_unit] do
system("open coverage/index.html")
end

task :default => [:test_units,'cover_me:report']
task :default => [:test]
Loading