cql_qdm_patientapi 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90dd947bbcc35e52cd872156110582674021c47e
-  data.tar.gz: 1459f79347adb75bd22385cbe0cdd1e04f13c9bd
+  metadata.gz: 22f5731f75487f42ff6bba1c933877d14246d907
+  data.tar.gz: da61edb92afdf06618c06c51473077e13e4daa5e
 SHA512:
-  metadata.gz: '029890ec9d29f76de20513a6748f1350c982e70df4826d735a8337134d40047c4ea7ae44efacd08b16745dce625e53786e285016b618c59098dd91dc2e1478ee'
-  data.tar.gz: 5425b8705137d6d19aa3b4e7ecd19cdc7261ab154a4ff528257ff3b1c11e1a76ecfcacadabfc965c9d5027f21753763a4c738f4ab436d8e36c20b98a7eab41c5
+  metadata.gz: ad09b811319929d929f9d63248ca34c6483d29c967cf3ada905beb5058b8750ea592113ea04b7b798d8adb88a325ea8215fe909e29a5917e9998c930656ef230
+  data.tar.gz: 8ed424e626cf70a3ed1ecdebf31bf96339415bea40b568430253dc38a4abab1afac3340c12c6684886d7b363212376519640b63cf522e01980098d98c342da65

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cql_qdm_patientapi (1.1.3)
+    cql_qdm_patientapi (1.1.4)
       coffee-rails (~> 4.1)
       rails (~> 4.2)
       sprockets-rails (~> 2.3)
@@ -102,7 +102,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.2.1)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
@@ -128,4 +128,4 @@ DEPENDENCIES
   teaspoon-jasmine (= 2.3.4)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/app/assets/javascripts/datatypes/diagnosticstudy.js.coffee

@@ -85,7 +85,7 @@ class CQL_QDM.DiagnosticStudyPerformed extends CQL_QDM.QDMDatatype
     else
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
-    @_status = @entry.status
+    @_status = @entry.qdm_status
     @_components = @entry.components
 
 

data/app/assets/javascripts/datatypes/immunization.js.coffee

@@ -86,8 +86,14 @@ class CQL_QDM.ImmunizationOrder extends CQL_QDM.QDMDatatype
   ###
   constructor: (@entry) ->
     super @entry
-    @_activeDatetime = CQL_QDM.Helpers.convertDateTime(@entry.active_datetime)
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
+
+    # if activeDatetime is provided, use it, otherwise default to authorDatetime per QDM spec
+    if @entry.active_datetime?
+      @_activeDatetime = CQL_QDM.Helpers.convertDateTime(@entry.active_datetime)
+    else
+      @_activeDatetime = @_authorDatetime
+
     @_dosage = @entry.dose
     @_negationRationale = @entry.negationReason
     @_reason = @entry.reason

data/app/assets/javascripts/datatypes/intervention.js.coffee

@@ -67,7 +67,7 @@ class CQL_QDM.InterventionPerformed extends CQL_QDM.QDMDatatype
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
     if @entry.values? && @entry.values.length > 0
       @_result = @entry.values?[0]
-    @_status = @entry.status
+    @_status = @entry.qdm_status
 
   ###
   Author date time is only present when this data type has been negated.

data/app/assets/javascripts/datatypes/laboratorytest.js.coffee

@@ -53,7 +53,6 @@ class CQL_QDM.LaboratoryTestOrder extends CQL_QDM.QDMDatatype
   authorDatetime: ->
     @_authorDatetime
 
-
 ###
 Data elements that meet criteria using this datatype should document the
 laboratory test indicated by the QDM category and its corresponding value set
@@ -80,7 +79,7 @@ class CQL_QDM.LaboratoryTestPerformed extends CQL_QDM.QDMDatatype
     if @entry.values? && @entry.values.length > 0
       @_result = @entry.values?[0]
     @_resultDatetime = CQL_QDM.Helpers.convertDateTime(@entry.result_date_time)
-    @_status = @entry.status
+    @_status = @entry.qdm_status
     @_components = @entry.components
 
   ###

data/app/assets/javascripts/datatypes/medication.js.coffee

@@ -369,7 +369,6 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
   ###
   constructor: (@entry) ->
     super @entry
-    @_activeDatetime = CQL_QDM.Helpers.convertDateTime(@entry.active_datetime)
     @_authorDatetime = CQL_QDM.Helpers.convertDateTime(@entry.start_time)
     @_dosage = @entry.dose
     @_frequency = @entry.administrationTiming
@@ -386,12 +385,6 @@ class CQL_QDM.MedicationOrder extends CQL_QDM.QDMDatatype
       # No end time; high is set to infinity
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
 
-  ###
-  @returns {Date}
-  ###
-  activeDatetime: ->
-    @_activeDatetime
-
   ###
   @returns {Date}
   ###

data/app/assets/javascripts/datatypes/procedure.js.coffee

@@ -110,7 +110,7 @@ class CQL_QDM.ProcedurePerformed extends CQL_QDM.QDMDatatype
       @_relevantPeriodHigh = CQL_QDM.Helpers.infinityDateTime()
     if @entry.values? && @entry.values.length > 0
       @_result = @entry.values?[0]
-    @_status = @entry.status
+    @_status = @entry.qdm_status
     @_components = @entry.components
 
   ###

data/lib/cql_qdm_patientapi/version.rb

@@ -1,3 +1,3 @@
 module CqlQdmPatientapi
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/vendor/assets/javascripts/cql4browsers.js

@@ -551,7 +551,7 @@
 },{"./clinical":5,"./datetime":7,"./interval":9,"./logic":10,"./uncertainty":11}],7:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DateTime, Uncertainty, convertTimezoneOffset, cqlFormatStringToMomentFormatString, getTimezoneSeparatorFromString, isValidDateTimeStringFormat, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString;
+  var DateTime, Uncertainty, cqlFormatStringToMomentFormatString, getTimezoneSeparatorFromString, isValidDateTimeStringFormat, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString;
 
   Uncertainty = require('./uncertainty').Uncertainty;
 
@@ -1184,21 +1184,11 @@
     return momentString = momentString.replace(/f/g, 'S');
   };
 
-  convertTimezoneOffset = function(matches) {
-    var num;
-    num = parseInt(matches[17], 10) + (matches[19] != null ? parseInt(matches[19], 10) / 60 : 0);
-    if (matches[16] === '+') {
-      return num;
-    } else {
-      return num * -1;
-    }
-  };
-
   getTimezoneSeparatorFromString = function(string) {
     var ref, ref1, timezoneSeparator;
-    if ((typeof msAndAfter !== "undefined" && msAndAfter !== null ? (ref = msAndAfter.match(/-/)) != null ? ref.length : void 0 : void 0) === 1) {
+    if ((string != null ? (ref = string.match(/-/)) != null ? ref.length : void 0 : void 0) === 1) {
       return timezoneSeparator = '-';
-    } else if ((typeof msAndAfter !== "undefined" && msAndAfter !== null ? (ref1 = msAndAfter.match(/\+/)) != null ? ref1.length : void 0 : void 0) === 1) {
+    } else if ((string != null ? (ref1 = string.match(/\+/)) != null ? ref1.length : void 0 : void 0) === 1) {
       return timezoneSeparator = '+';
     } else {
       return timezoneSeparator = '';
@@ -43957,7 +43947,7 @@
 },{}],133:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var DateTime, Uncertainty, areDateTimesOrQuantities, areNumbers, classesEqual, codesAreEquivalent, compareEveryItemInArrays, compareObjects, deepCompareKeysAndValues, equals, equivalent, getClassOfObjects, getKeysFromObject, isCode, isUncertainty;
+  var DateTime, Uncertainty, areDateTimesOrQuantities, areNumbers, classesEqual, codesAreEquivalent, compareEveryItemInArrays, compareObjects, deepCompareKeysAndValues, equals, equivalent, getClassOfObjects, getKeysFromObject, isCode, isFunction, isUncertainty;
 
   DateTime = require('../datatypes/datetime').DateTime;
 
@@ -44108,19 +44098,30 @@
   };
 
   deepCompareKeysAndValues = function(a, b, comparisonFunction) {
-    var aKeys, bKeys;
+    var aKeys, bKeys, finalComparisonResult, shouldReturnNull;
     aKeys = getKeysFromObject(a);
     bKeys = getKeysFromObject(b);
-    return aKeys.length === bKeys.length && aKeys.every(function(key) {
-      return comparisonFunction(a[key], b[key]);
+    shouldReturnNull = false;
+    finalComparisonResult = aKeys.length === bKeys.length && aKeys.every(function(key) {
+      var comparisonResult;
+      comparisonResult = comparisonFunction(a[key], b[key]);
+      if (comparisonResult === null) {
+        shouldReturnNull = true;
+      }
+      return comparisonResult;
     });
+    if (shouldReturnNull) {
+      return null;
+    }
+    return finalComparisonResult;
   };
 
   getKeysFromObject = function(object) {
-    var key;
+    var key, objectClass;
+    objectClass = {}.toString.call(object);
     return ((function() {
       var results;
-      if (typeof key !== 'function') {
+      if (!isFunction(key)) {
         results = [];
         for (key in object) {
           results.push(key);
@@ -44130,6 +44131,10 @@
     })());
   };
 
+  isFunction = function(input) {
+    return input instanceof Function || {}.toString.call(input) === '[object Function]';
+  };
+
   module.exports.equals = equals = function(a, b) {
     var aClass, bClass, ref;
     if (!((a != null) && (b != null))) {
@@ -44146,8 +44151,8 @@
     if (typeof a.equals === 'function') {
       return a.equals(b);
     }
-    if (a === b) {
-      return true;
+    if (typeof a === typeof b && typeof a === 'string' || typeof a === 'number' || typeof a === 'boolean') {
+      return a === b;
     }
     ref = getClassOfObjects(a, b), aClass = ref[0], bClass = ref[1];
     if (aClass !== bClass) {
@@ -44167,6 +44172,8 @@
         return compareEveryItemInArrays(a, b, equals);
       case '[object Object]':
         return compareObjects(a, b, equals);
+      case '[object Function]':
+        return a === b;
     }
     return false;
   };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cql_qdm_patientapi
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails