Merge remote-tracking branch 'origin/apache_hop_mapping_new' into feature/SUPPORT-8925_query_optimization

* origin/apache_hop_mapping_new:
  fix_future
  future_is_now
  fix
  fix
  predictive_metrics
  convicts

# Conflicts:
#	v1_apache-hop dash mapping/job_general.hwf
#	v1_apache-hop dash mapping/mil_com/total_registered.age(m_c).hpl
#	v1_apache-hop dash mapping/mil_com/total_registered.driver_license(m_c).hpl
#	v1_apache-hop dash mapping/mil_com/total_registered.marital_status(m_c).hpl

v1_apache-hop dash mapping/job_general.hwf

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <workflow>
   <name>job_general</name>
   <name_sync_with_filename>Y</name_sync_with_filename>
@@ -26,7 +26,7 @@
       <schedulerType>0</schedulerType>
       <weekDay>1</weekDay>
       <parallel>N</parallel>
-      <xloc>144</xloc>
+      <xloc>320</xloc>
       <yloc>240</yloc>
       <attributes_hac/>
     </action>
@@ -36,7 +36,7 @@
       <type>SUCCESS</type>
       <attributes/>
       <parallel>N</parallel>
-      <xloc>1344</xloc>
+      <xloc>1440</xloc>
       <yloc>240</yloc>
       <attributes_hac/>
     </action>
@@ -60,8 +60,8 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>560</xloc>
-      <yloc>368</yloc>
+      <xloc>512</xloc>
+      <yloc>240</yloc>
       <attributes_hac/>
     </action>
     <action>
@@ -86,8 +86,8 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>768</xloc>
-      <yloc>368</yloc>
+      <xloc>720</xloc>
+      <yloc>240</yloc>
       <attributes_hac/>
     </action>
     <action>
@@ -110,7 +110,7 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>336</xloc>
+      <xloc>1264</xloc>
       <yloc>240</yloc>
       <attributes_hac/>
     </action>
@@ -134,26 +134,32 @@
       <set_logfile>N</set_logfile>
       <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>944</xloc>
+      <xloc>896</xloc>
       <yloc>368</yloc>
       <attributes_hac/>
     </action>
     <action>
-      <name>SQL.update_last_recording_date</name>
+      <name>job_predictive.hwf</name>
       <description/>
-      <type>SQL</type>
+      <type>WORKFLOW</type>
       <attributes/>
-      <connection>ervu-dashboard</connection>
-      <sendOneStatement>N</sendOneStatement>
-      <sql>update public.last_recording_date
-set last_recording_date = start_time
-where entry = '1'</sql>
-      <sqlfilename/>
-      <sqlfromfile>N</sqlfromfile>
-      <useVariableSubstitution>N</useVariableSubstitution>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <create_parent_folder>N</create_parent_folder>
+      <exec_per_row>N</exec_per_row>
+      <filename>${PROJECT_HOME}/predictive/job_predictive.hwf</filename>
+      <loglevel>Nothing</loglevel>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <params_from_previous>N</params_from_previous>
+      <run_configuration>local</run_configuration>
+      <set_append_logfile>N</set_append_logfile>
+      <set_logfile>N</set_logfile>
+      <wait_until_finished>Y</wait_until_finished>
       <parallel>N</parallel>
-      <xloc>1152</xloc>
-      <yloc>240</yloc>
+      <xloc>1072</xloc>
+      <yloc>128</yloc>
       <attributes_hac/>
     </action>
   </actions>
@@ -161,48 +167,48 @@ where entry = '1'</sql>
     <hop>
       <from>job_pack.pub_recruitment</from>
       <to>job_recruitments_all</to>
-      <enabled>N</enabled>
+      <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>job_recruitments_all</from>
-      <to>job_info_recruits.hwf</to>
-      <enabled>N</enabled>
+      <from>Start</from>
+      <to>job_pack.pub_recruitment</to>
+      <enabled>Y</enabled>
       <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
+      <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>job_info_recruits.hwf</from>
-      <to>SQL.update_last_recording_date</to>
-      <enabled>N</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>SQL.update_last_recording_date</from>
+      <from>job_last_recording_date</from>
       <to>Success</to>
       <enabled>Y</enabled>
       <evaluation>N</evaluation>
       <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>job_last_recording_date</from>
-      <to>job_pack.pub_recruitment</to>
+      <from>job_recruitments_all</from>
+      <to>job_info_recruits.hwf</to>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
+    <hop>
+      <from>job_info_recruits.hwf</from>
+      <to>job_predictive.hwf</to>
       <enabled>N</enabled>
       <evaluation>N</evaluation>
       <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>Start</from>
+      <from>job_predictive.hwf</from>
       <to>job_last_recording_date</to>
-      <enabled>Y</enabled>
+      <enabled>N</enabled>
       <evaluation>Y</evaluation>
       <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>job_last_recording_date</from>
-      <to>SQL.update_last_recording_date</to>
+      <from>job_info_recruits.hwf</from>
+      <to>job_last_recording_date</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>