cqm-models 1.1.1.0 → 2.0.0

data/lib/generate_types.rb

@@ -20,7 +20,7 @@ module QDM
 
     def self.generate_code_field
       # TODO: use code with all parameters, possibly randomize parameter values and optional information
-      QDM::Code.new('1234', 'SNOMEDCT')
+      QDM::Code.new('1234', '2.16.840.1.113883.6.96')
     end
 
     def self.generate_datetime

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "1.1.1.0",
+  "version": "2.0.0",
   "description": "This library contains auto generated Mongo (Mongoose.js) models that correspond to the QDM (Quality Data Model) specification.",
   "main": "app/assets/javascripts/index.js",
   "browser": {
@@ -16,7 +16,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "cql-execution": "https://github.com/cqframework/cql-execution.git",
+    "cql-execution": "^1.3.3",
     "mongoose": "^5.4.14"
   },
   "devDependencies": {

data/templates/index_template.js.erb

@@ -20,5 +20,9 @@ module.exports.ValueSet = require('./cqm/ValueSet.js').ValueSet;
 module.exports.ValueSetSchema = require('./cqm/ValueSet.js').ValueSetSchema;
 module.exports.Concept = require('./cqm/Concept.js').Concept;
 module.exports.ConceptSchema = require('./cqm/Concept.js').ConceptSchema;
-module.exports.IndividualResult = require('./IndividualResult').IndividualResult;
-module.exports.IndividualResultSchema = require('./IndividualResult').IndividualResultSchema;
+module.exports.IndividualResult = require('./cqm/IndividualResult.js').IndividualResult;
+module.exports.IndividualResultSchema = require('./cqm/IndividualResult.js').IndividualResultSchema;
+module.exports.ClauseResult = require('./cqm/ClauseResult.js').ClauseResult;
+module.exports.ClauseResultSchema = require('./cqm/ClauseResult.js').ClauseResultSchema;
+module.exports.StatementResult = require('./cqm/StatementResult.js').StatementResult;
+module.exports.StatementResultSchema = require('./cqm/StatementResult.js').StatementResultchema;

data/templates/models_template.rb.erb

@@ -29,7 +29,9 @@ require_relative 'cqm/cql_library'
 require_relative 'cqm/population_set'
 require_relative 'cqm/patient'
 require_relative 'cqm/provider'
-require_relative 'qdm/tacoma/individual_result'
+require_relative 'cqm/individual_result'
+require_relative 'cqm/statement_result'
+require_relative 'cqm/clause_result'
 
 # Make Patient Generation Available
 require_relative '../../lib/generate_patients'

data/templates/patient_extension.rb.erb

@@ -1,4 +1,4 @@
-  embedded_in :tacomaPatient, class_name: 'CQM::Patient'
+  embedded_in :cqmPatient, class_name: 'CQM::Patient'
 
   # These are the "data criteria", or QDM datatype elements that exist on a
   # patient.

data/yarn.lock

@@ -502,9 +502,10 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-"cql-execution@https://github.com/cqframework/cql-execution.git":
-  version "1.3.2"
-  resolved "https://github.com/cqframework/cql-execution.git#17fb61f4be9b917d5e8ba5cde131d2845bc45d8a"
+cql-execution@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-1.3.3.tgz#fae49e0dba8e32e10e259257e7377dd7944f06fc"
+  integrity sha512-FihPewB7HeHWZLs/r2qzu60l+bn+CjAaifN34MQHZH9+Xko7sRExp9e48f1qvboWZdKC98N3QV1WUx1NFpt2vA==
   dependencies:
     moment "^2.20.1"
     ucum "0.0.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cqm-models
 version: !ruby/object:Gem::Version
-  version: 1.1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - aholmes@mitre.org
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundle-audit
@@ -192,7 +192,6 @@ files:
 - app/assets/javascripts/Id.js
 - app/assets/javascripts/ImmunizationAdministered.js
 - app/assets/javascripts/ImmunizationOrder.js
-- app/assets/javascripts/IndividualResult.js
 - app/assets/javascripts/InterventionOrder.js
 - app/assets/javascripts/InterventionPerformed.js
 - app/assets/javascripts/InterventionRecommended.js
@@ -242,22 +241,28 @@ files:
 - app/assets/javascripts/cqm/AllCQMModels.js
 - app/assets/javascripts/cqm/CQLLibrary.js
 - app/assets/javascripts/cqm/CQLStatementDependency.js
+- app/assets/javascripts/cqm/ClauseResult.js
 - app/assets/javascripts/cqm/Concept.js
+- app/assets/javascripts/cqm/IndividualResult.js
 - app/assets/javascripts/cqm/Measure.js
 - app/assets/javascripts/cqm/MeasurePackage.js
 - app/assets/javascripts/cqm/Patient.js
 - app/assets/javascripts/cqm/PopulationSet.js
 - app/assets/javascripts/cqm/Provider.js
+- app/assets/javascripts/cqm/StatementResult.js
 - app/assets/javascripts/cqm/ValueSet.js
 - app/assets/javascripts/index.js
+- app/models/cqm/clause_result.rb
 - app/models/cqm/concept.rb
 - app/models/cqm/cql_library.rb
 - app/models/cqm/cql_statement_dependency.rb
+- app/models/cqm/individual_result.rb
 - app/models/cqm/measure.rb
 - app/models/cqm/measure_package.rb
 - app/models/cqm/patient.rb
 - app/models/cqm/population_set.rb
 - app/models/cqm/provider.rb
+- app/models/cqm/statement_result.rb
 - app/models/cqm/valueset.rb
 - app/models/hqmfOid_to_datatype_map.json
 - app/models/model_finder.rb
@@ -326,7 +331,6 @@ files:
 - app/models/qdm/substance_order.rb
 - app/models/qdm/substance_recommended.rb
 - app/models/qdm/symptom.rb
-- app/models/qdm/tacoma/individual_result.rb
 - bin/build_cql_execution.sh
 - bin/console
 - bin/setup
@@ -382,8 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mongo models that correspond to the QDM specification.