lib/generator/precondition.js.erb in hqmf2js-1.2.1 vs lib/generator/precondition.js.erb in hqmf2js-1.3.0

@@ -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 -%>
\ No newline at end of file