hqmf2js 1.2.1 → 1.3.0

data/lib/generator/js.rb

@@ -166,8 +166,12 @@ module HQMF2JS
       def initialize(doc)
         @doc = doc
       end
+
+      def self.map_reduce_utils
+        File.read(File.expand_path(File.join('..', '..', "assets",'javascripts','libraries','map_reduce_utils.js'), __FILE__))
+      end
       
-      def to_js(population_index=0, codes=nil)
+      def to_js(population_index=0, codes=nil, force_sources=nil)
         population_index ||= 0
         population = @doc.populations[population_index]
         
@@ -177,14 +181,23 @@ module HQMF2JS
           oid_dictionary = "<%= oid_dictionary %>"
         end
         
+        sub_ids = ('a'..'zz').to_a
+        sub_id = @doc.populations.size > 1 ? "'#{sub_ids[population_index]}'" : "null";
+
+
         "
         // #########################
         // ##### DATA ELEMENTS #####
         // #########################
 
+        hqmfjs.nqf_id = '#{@doc.id}';
+        hqmfjs.hqmf_id = '#{@doc.hqmf_id}';
+        hqmfjs.sub_id = #{sub_id};
+        if (typeof(test_id) == 'undefined') hqmfjs.test_id = null;
+
         OidDictionary = #{oid_dictionary};
         
-        #{js_for_data_criteria()}
+        #{js_for_data_criteria(force_sources)}
 
         // #########################
         // ##### MEASURE LOGIC #####
@@ -193,7 +206,7 @@ module HQMF2JS
         #{js_initialize_specifics(@doc.source_data_criteria)}
 
         // INITIAL PATIENT POPULATION
-        #{js_for(population[HQMF::PopulationCriteria::IPP], HQMF::PopulationCriteria::IPP, true)}
+        #{js_for(population[HQMF::PopulationCriteria::IPP], HQMF::PopulationCriteria::IPP)}
         // DENOMINATOR
         #{js_for(population[HQMF::PopulationCriteria::DENOM], HQMF::PopulationCriteria::DENOM, true)}
         // NUMERATOR
@@ -236,29 +249,34 @@ module HQMF2JS
       end
       
       # Generate JS for a HQMF2::DataCriteria
-      def js_for_data_criteria
-        HQMF2JS::Generator.render_template('data_criteria', {'all_criteria' => @doc.specific_occurrence_source_data_criteria.concat(@doc.all_data_criteria), 'measure_period' => @doc.measure_period})
+      def js_for_data_criteria(force_sources=nil)
+        HQMF2JS::Generator.render_template('data_criteria', {'all_criteria' => @doc.specific_occurrence_source_data_criteria(force_sources).concat(@doc.all_data_criteria), 'measure_period' => @doc.measure_period})
       end
       
-      def self.library_functions(check_crosswalk=false)
+      def self.library_functions(check_crosswalk=false, include_underscore=true)
         ctx = Sprockets::Environment.new(File.expand_path("../../..", __FILE__))
         Tilt::CoffeeScriptTemplate.default_bare = true 
         ctx.append_path "app/assets/javascripts"
         
-        libraries = ["// #########################\n// ###### Underscore.js #######\n// #######################\n",
-                     ctx.find_asset('underscore').to_s,
-                     "// #########################\n// ###### PATIENT API #######\n// #########################\n",
-                     HqueryPatientApi::Generator.patient_api_javascript.to_s,
-                     "// #########################\n// ## SPECIFIC OCCURRENCES ##\n// #########################\n",
-                     ctx.find_asset('specifics').to_s,
-                     "// #########################\n// ### LIBRARY FUNCTIONS ####\n// #########################\n",
-                     ctx.find_asset('hqmf_util').to_s, 
-                     "// #########################\n// ### PATIENT EXTENSION ####\n// #########################\n",
-                     ctx.find_asset('patient_api_extension').to_s,
-                     "// #########################\n// ## CUSTOM CALCULATIONS ###\n// #########################\n",
-                     ctx.find_asset('custom_calculations').to_s,
-                     "// #########################\n// ##### LOGGING UTILS ######\n// #########################\n",
-                     ctx.find_asset('logging_utils').to_s]
+        libraries = []
+
+        if include_underscore
+          libraries += ["// #########################\n// ###### Underscore.js #######\n// #######################\n",
+                        ctx.find_asset('underscore').to_s]
+        end
+
+        libraries += ["// #########################\n// ###### PATIENT API #######\n// #########################\n",
+                      HqueryPatientApi::Generator.patient_api_javascript.to_s,
+                      "// #########################\n// ## SPECIFIC OCCURRENCES ##\n// #########################\n",
+                      ctx.find_asset('specifics').to_s,
+                      "// #########################\n// ### LIBRARY FUNCTIONS ####\n// #########################\n",
+                      ctx.find_asset('hqmf_util').to_s, 
+                      "// #########################\n// ### PATIENT EXTENSION ####\n// #########################\n",
+                      ctx.find_asset('patient_api_extension').to_s,
+                      "// #########################\n// ## CUSTOM CALCULATIONS ###\n// #########################\n",
+                      ctx.find_asset('custom_calculations').to_s,
+                      "// #########################\n// ##### LOGGING UTILS ######\n// #########################\n",
+                      ctx.find_asset('logging_utils').to_s]
 
         # check for code set crosswalks
         if (check_crosswalk)
@@ -270,6 +288,13 @@ module HQMF2JS
 
       end
   
+      # Allow crosswalk functionality to be loaded separately from main JS libraries
+      def self.crosswalk_functions
+        ctx = Sprockets::Environment.new(File.expand_path("../../..", __FILE__))
+        Tilt::CoffeeScriptTemplate.default_bare = true
+        ctx.append_path "app/assets/javascripts"
+        ctx.find_asset('crosswalk').to_s
+      end
     end
   
     # Simple class to issue monotonically increasing integer identifiers
@@ -293,4 +318,4 @@ module HQMF2JS
       include Singleton
     end
   end
-end
+end

data/lib/generator/observation_criteria.js.erb

@@ -1,4 +1,4 @@
 hqmfjs.<%= type %> = function(patient, initialSpecificContext) {
-  return <%= js_for_precondition(criteria.preconditions()[0], 0, true) -%>;
+  return <%= js_for_precondition(criteria.preconditions()[0], 0, true) -%>(patient, initialSpecificContext);
 };
 

data/lib/generator/patient_data.js.erb

@@ -1,22 +1,25 @@
-  var events = patient.<%= patient_api_method(criteria) %>();
-  <%- if criteria.specific_occurrence -%>
-  events.specific_occurrence = '<%= criteria.source_data_criteria %>'
-  <%- end -%>
-<%- if criteria.status -%>
-  events = events.withStatuses(["<%= criteria.status %>"]<%= ", false" if criteria.hard_status %>);
-<%- end -%>
-<%- if criteria.negation -%>
-  events = events.withNegation(<%= "getCodes(\"#{criteria.negation_code_list_id}\")" if criteria.negation_code_list_id %>);
-<%- else -%>
-  events = events.withoutNegation();
-<%- end -%>
-  var codes = <%= js_for_code_list(criteria) %>;
-  var start = null;
-  var end = null;
+<%- eventType = patient_api_method(criteria) -%>
+<%- valueSetId = criteria.code_list_id -%>
+<%- valueSet = criteria.inline_code_list ? js_for_code_list(criteria) : nil -%>
+<%- negationValueSetId = criteria.negation_code_list_id -%>
+<%- statuses = criteria.status ? "[\"#{criteria.status}\"]" : nil -%>
+<%- includeEventsWithoutStatus = criteria.hard_status ? false : true -%>
+<%- start = nil -%>
+<%- stop = nil -%>
 <%- if criteria.effective_time -%>
   <%- startExp = js_for_value(criteria.effective_time.low) -%>
-  start = <%= startExp %><%= '.asDate()' if startExp != 'null' %>;
-  <%- endExp = js_for_value(criteria.effective_time.high) -%>
-  end = <%= endExp %><%= '.asDate()' if endExp != 'null' %>;
+  <%- start = startExp+'.asDate()' if startExp != 'null' -%>
+  <%- stopExp = js_for_value(criteria.effective_time.high) -%>
+  <%- stop = stopExp+'.asDate()' if stopExp != 'null' -%>
 <%- end -%>
-  events = events.match(codes, start, end, true);
+  var eventCriteria = {"type": "<%= eventType %>"<%- -%>
+<%= ", \"statuses\": #{statuses}" if statuses %> <%- -%>
+<%= ", \"includeEventsWithoutStatus\": #{includeEventsWithoutStatus}" if includeEventsWithoutStatus %> <%- -%>
+<%= ", \"negated\": #{criteria.negation}" if criteria.negation %> <%- -%>
+<%= ", \"negationValueSetId\": \"#{negationValueSetId}\"" if criteria.negation && negationValueSetId %> <%- -%>
+<%= ", \"valueSetId\": \"#{valueSetId}\"" if valueSetId %> <%- -%>
+<%= ", \"valueSet\": #{valueSet}" if valueSet %> <%- -%>
+<%= ", \"start\": #{start}" if start %> <%- -%>
+<%= ", \"stop\": #{stop}" if stop %> <%- -%>
+<%= ", \"specificOccurrence\": \"#{criteria.source_data_criteria}\"" if criteria.specific_occurrence %>};
+  var events = patient.getEvents(eventCriteria);

data/lib/generator/population_criteria.js.erb

@@ -1,4 +1,9 @@
 hqmfjs.<%= type %> = function(patient, initialSpecificContext) {
-  return <%= js_for_precondition(criteria, 0, true) -%>;
+  population_criteria_fn = <%= js_for_precondition(criteria, 0, true) -%>;
+  if (typeof(population_criteria_fn) == 'function') {
+  	return population_criteria_fn();
+  } else {
+  	return population_criteria_fn;
+  }
 };
 

data/lib/generator/precondition.js.erb

@@ -1,16 +1,14 @@
 <%- if precondition.conjunction? -%>
 <%- if indent>0 -%>
-<%= "\n#{'  '*(indent+1)}#{conjunction_code_for(precondition)}('#{precondition.id}'," -%>
+<%= "\n#{'  '*(indent+1)}#{conjunction_code_for(precondition)}('#{precondition.id}', patient, initialSpecificContext," -%>
 <%- else -%>
-<%= "#{conjunction_code_for(precondition)}('#{precondition.id}'," -%>
+<%= "#{conjunction_code_for(precondition)}('#{precondition.id}', patient, initialSpecificContext," -%>
 <%- end -%>
 <%- precondition.preconditions.each_with_index do |child, index| -%>
-<%= "#{'  '*(indent+1)}#{js_for_precondition(child, indent+1, context)}" -%>
+<%= "#{js_for_precondition(child, indent+1, context)}" -%>
 <%= "," if index < precondition.preconditions.length-1 -%>
 <%- end -%>
 <%= "\n#{'  '*(indent+1)})" -%>
-<%- elsif context -%>
-<%= " hqmfjs.#{js_name(precondition.reference)}(patient, initialSpecificContext)" -%>
-<%- else -%>
-<%= "\n#{'  '*(indent+1)}hqmfjs.#{js_name(precondition.reference)}(patient)" -%>
+<%- else # !precondition.conjunction? -%>
+<%= " hqmfjs.#{js_name(precondition.reference)}" -%>
 <%- end -%>

data/lib/hqmf2js.rb

@@ -16,5 +16,6 @@ require 'hqmf-parser'
 require_relative 'generator/js'
 require_relative 'generator/codes_to_json'
 require_relative 'generator/converter'
+require_relative 'generator/execution'
 
 Tilt::CoffeeScriptTemplate.default_bare = true

data/test/fixtures/codes/codes.json

@@ -0,0 +1,54 @@
+[{
+  "concepts": [
+    {
+      "code": "123A",
+      "code_system_name": "SNOMED-CT"
+    },
+    {
+      "code": "124B",
+      "code_system_name": "SNOMED-CT"
+    },
+    {
+      "code": "125C",
+      "code_system_name": "CPT"
+    },
+    {
+      "code": "126D",
+      "code_system_name": "CPT"
+    },
+    {
+      "code": "127E",
+      "code_system_name": "CPT"
+    }
+  ],
+  "display_name": "ABD-XYZ",
+  "oid": "1.2.3.4.6",
+  "version": "20130614"
+},
+{
+  "concepts": [
+    {
+      "code": "123",
+      "code_system_name": "SNOMED-CT"
+    },
+    {
+      "code": "124",
+      "code_system_name": "SNOMED-CT"
+    },
+    {
+      "code": "125",
+      "code_system_name": "SNOMED-CT"
+    },
+    {
+      "code": "126",
+      "code_system_name": "ICD-9-CM"
+    },
+    {
+      "code": "127",
+      "code_system_name": "ICD-9-CM"
+    }
+  ],
+  "display_name": "ABC-XYZ",
+  "oid": "1.2.3.4.5",
+  "version": "20130614"
+}]