jsharmony-workflow 1.1.0 → 1.1.2

package/jsHarmonyWorkflowProcessor.js

@@ -183,7 +183,7 @@ module.exports = exports = function jsHarmonyWorkflowProcessor(module){
             row.wkflow_def_state_type = (row.wkflow_def_state_type||'').toString().toUpperCase();
             if(row.wkflow_def_sts!='ACTIVE'){ hasInvalidWorkflows = true; return; }
             if(row.wkflow_def_state_sts!='ACTIVE'){ hasInvalidWorkflows = true; return; }
-            if((row.wkflow_def_state_type=='TERIMNAL') && (row.wkflow_tran_sts=='COMPLETE')){ hasTerminalWorkflows = true; return; }
+            if((row.wkflow_def_state_type=='TERMINAL') && (row.wkflow_tran_sts=='COMPLETE')){ hasTerminalWorkflows = true; return; }
             if(!wkflows[row.wkflow_id]){
               wkflows[row.wkflow_id] = _.extend(row, {
                 tran: {},
@@ -211,7 +211,7 @@ module.exports = exports = function jsHarmonyWorkflowProcessor(module){
           for(var i=0;i<rs_wkflow_var.length;i++){
             let row = rs_wkflow_var[i];
             let wkflow = wkflows[row.wkflow_id];
-            if(!wkflow) return process_cb(new Error('Workflow '+row.wkflow_id+' missing from recordset'));
+            if(!wkflow) continue;
             var wkflow_var_name_ucase = (row.wkflow_var_name||'').toString().toUpperCase();
             wkflow.var[wkflow_var_name_ucase] = row.wkflow_var_val;
           }
@@ -240,7 +240,7 @@ module.exports = exports = function jsHarmonyWorkflowProcessor(module){
           for(let i=0;i<rs_wkflow_tran.length;i++){
             let row = rs_wkflow_tran[i];
             let wkflow = wkflows[row.wkflow_id];
-            if(!wkflow) return process_cb(new Error('Workflow '+row.wkflow_id+' missing from recordset'));
+            if(!wkflow) continue;
             if(row.wkflow_def_state_id_dst){
               if(!wkflow.tran[row.wkflow_def_state_id_dst]){
                 wkflow.tran[row.wkflow_def_state_id_dst] = [];
@@ -299,7 +299,7 @@ module.exports = exports = function jsHarmonyWorkflowProcessor(module){
           '      from {schema}.wkflow w',
           '        left outer join {schema}.wkflow_def wd on wd.wkflow_def_id = w.wkflow_def_id',
           '        left outer join {schema}.wkflow_def_state wsd on wsd.wkflow_def_state_id = w.wkflow_def_state_id',
-          "    where wkflow_sts='ACTIVE' and wkflow_state_def_type = 'TERMINAL'",
+          "    where wkflow_sts='ACTIVE' and wkflow_def_state_type = 'TERMINAL'",
           '  )',
         ].join(' ');
         appsrv.ExecCommand('wkflow', module.replaceSchema(sql), [], {}, function (err) {

package/models/Reports/Task_Perf.json

@@ -50,7 +50,7 @@
           " where wkflow.wkflow_def_id = isnull((select wkflow_def_id from wkflow.wkflow_def where wkflow_def.wkflow_def_code=@wkflow_def_code),wkflow.wkflow_def_id) ", 
           "   and task.task_sts = 'COMPLETE' ",
           "   and isnull(@dt_from, task.task_etstmp) <= task.task_etstmp ",
-          "   and isnull(@dt_to, task.task_etstmp) >= task.task_etstmp ",
+          "   and isnull($addDays(@dt_to,1), task.task_etstmp) > task.task_etstmp ",
           "   ) x group by wkflow_def_name, task_def_name ",
           " order by wkflow_def_name, task_def_name "
         ]

package/models/Reports/WkflowState_Perf.json

@@ -41,7 +41,7 @@
           " inner join wkflow.wkflow_def_state on wkflow_def_state.wkflow_def_state_id = wkflow_state.wkflow_def_state_id ",
           " where wkflow.wkflow_def_id = isnull((select wkflow_def_id from wkflow.wkflow_def where wkflow_def.wkflow_def_code=@wkflow_def_code),wkflow.wkflow_def_id) ", 
           "   and isnull(@dt_from, wkflow_state.wkflow_state_start_tstmp) <= wkflow_state.wkflow_state_start_tstmp ",
-          "   and isnull(@dt_to, wkflow_state.wkflow_state_start_tstmp) >= wkflow_state.wkflow_state_start_tstmp ",
+          "   and isnull($addDays(@dt_to,1), wkflow_state.wkflow_state_start_tstmp) > wkflow_state.wkflow_state_start_tstmp ",
           " group by wkflow_state.wkflow_id, wkflow_def.wkflow_def_name, wkflow_def_state.wkflow_def_state_name ",
           "   ) x group by wkflow_def_name, wkflow_def_state_name ", 
           "  order by wkflow_def_name, wkflow_def_state_name "

package/models/Reports/Wkflow_Perf.json

@@ -44,7 +44,7 @@
           " where wkflow.wkflow_def_id = isnull((select wkflow_def_id from wkflow.wkflow_def where wkflow_def.wkflow_def_code=@wkflow_def_code),wkflow.wkflow_def_id) ", 
           "   and wkflow.wkflow_sts = 'COMPLETE' ",
           "   and isnull(@dt_from, wkflow.wkflow_etstmp) <= wkflow.wkflow_etstmp ",
-          "   and isnull(@dt_to, wkflow.wkflow_etstmp) >= wkflow.wkflow_etstmp ",
+          "   and isnull($addDays(@dt_to,1), wkflow.wkflow_etstmp) > wkflow.wkflow_etstmp ",
           "   ) x group by wkflow_def_name ",
           " order by wkflow_def_name "
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony-workflow",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "jsHarmony Workflow",
   "main": "index.js",
   "keywords": [