diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index e39589493..4950006a9 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -142,6 +142,7 @@ class Derivation $arrayNextTask = array(); $arrayNextTaskDefault = array(); + $i = 0; //SELECT * //FROM APP_DELEGATION AS A @@ -210,17 +211,18 @@ class Derivation } if ($flagContinue) { - $arrayNextTask[] = $this->prepareInformationTask($arrayRouteData); + $arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData); } } if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) { - $arrayNextTask[] = $this->prepareInformationTask($arrayNextTaskDefault); + $arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault); } //Check Task GATEWAYTOGATEWAY $arrayNextTaskBk = $arrayNextTask; $arrayNextTask = array(); + $i = 0; foreach ($arrayNextTaskBk as $value) { $arrayNextTaskData = $value; @@ -229,10 +231,10 @@ class Derivation $arrayAux = $this->prepareInformation($arrayData, $arrayNextTaskData["NEXT_TASK"]["TAS_UID"]); foreach ($arrayAux as $value2) { - $arrayNextTask[] = $value2; + $arrayNextTask[++$i] = $value2; } } else { - $arrayNextTask[] = $arrayNextTaskData; + $arrayNextTask[++$i] = $arrayNextTaskData; } } diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index f04aefe5c..e2901d40e 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -324,7 +324,10 @@ class ListInbox extends BaseListInbox if ($filters['action'] == 'draft') { $criteria->add( ListInboxPeer::DEL_INDEX, 1, Criteria::EQUAL ); + } else { + $criteria->add( ListInboxPeer::DEL_INDEX, 1, Criteria::NOT_EQUAL ); } + if ($dir == "DESC") { $criteria->addDescendingOrderByColumn($sort); } else { diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php index 3d4728ef0..147d3d131 100755 --- a/workflow/engine/controllers/pmTablesProxy.php +++ b/workflow/engine/controllers/pmTablesProxy.php @@ -1611,6 +1611,35 @@ class pmTablesProxy extends HttpProxyController } $oDataset->next(); } + + // getting bpmn projects + $oCriteria = new Criteria('workflow'); + $oCriteria->addSelectColumn(BpmnProcessPeer::PRJ_UID); + $oCriteria->add(BpmnProcessPeer::PRJ_UID, $proUid); + $oDataset = BpmnProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $oDataset->next(); + $row = $oDataset->getRow(); + if (isset($row["PRJ_UID"])) { + $oCriteria = new Criteria('workflow'); + $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_UID); + $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_NAME); + $oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_TYPE); + $oCriteria->add(ProcessVariablesPeer::PRJ_UID, $row["PRJ_UID"]); + $oDataset = ProcessVariablesPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $index = 0; + while ($oDataset->next()) { + $row = $oDataset->getRow(); + array_push($fields, array( + "FIELD_UID" => $row["VAR_NAME"] . "-" . $row["VAR_FIELD_TYPE"], + "FIELD_NAME" => $row["VAR_NAME"], + "FIELD_VALIDATE" => "any", + "_index" => $index ++, + "_isset" => true + )); + } + } sort( $fields ); diff --git a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js index 0f6af810f..8595a60b6 100644 --- a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js +++ b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js @@ -22,10 +22,10 @@ function dynaFormChanged(frm) { return false; } $(window).load(function () { - if ((navigator.userAgent.indexOf("MSIE") !== -1) || (navigator.userAgent.indexOf("Trident") !== -1)) { + /*if ((navigator.userAgent.indexOf("MSIE") !== -1) || (navigator.userAgent.indexOf("Trident") !== -1)) { document.body.innerHTML = "
Responsive Dynaforms are not supported in this browser.
"; return; - } + }*/ if (pm_run_outside_main_app === 'true') { if (parent.showCaseNavigatorPanel) { parent.showCaseNavigatorPanel('DRAFT'); diff --git a/workflow/engine/js/cases/core/webentry_pmdynaform.js b/workflow/engine/js/cases/core/webentry_pmdynaform.js index 3fb7228f5..65b358f90 100644 --- a/workflow/engine/js/cases/core/webentry_pmdynaform.js +++ b/workflow/engine/js/cases/core/webentry_pmdynaform.js @@ -22,10 +22,10 @@ function dynaFormChanged(frm) { return false; } $(window).load(function () { - if ((navigator.userAgent.indexOf("MSIE") !== -1) || (navigator.userAgent.indexOf("Trident") !== -1)) { + /*if ((navigator.userAgent.indexOf("MSIE") !== -1) || (navigator.userAgent.indexOf("Trident") !== -1)) { document.body.innerHTML = "
Responsive Dynaforms are not supported in this browser.
"; return; - } + }*/ var data = jsondata; window.project = new PMDynaform.core.Project({ data: data, diff --git a/workflow/engine/methods/cases/proxyCasesList.php b/workflow/engine/methods/cases/proxyCasesList.php index 83b296a87..cab3ed544 100755 --- a/workflow/engine/methods/cases/proxyCasesList.php +++ b/workflow/engine/methods/cases/proxyCasesList.php @@ -9,22 +9,22 @@ if (!isset($_SESSION['USER_LOGGED'])) { } //Getting the extJs parameters -$callback = isset( $_POST["callback"] ) ? $_POST["callback"] : "stcCallback1001"; -$dir = isset( $_POST["dir"] ) ? $_POST["dir"] : "DESC"; -$sort = isset( $_POST["sort"] ) ? $_POST["sort"] : ""; -$start = isset( $_POST["start"] ) ? $_POST["start"] : "0"; -$limit = isset( $_POST["limit"] ) ? $_POST["limit"] : "25"; -$filter = isset( $_POST["filter"] ) ? $_POST["filter"] : ""; -$process = isset( $_POST["process"] ) ? $_POST["process"] : ""; -$category = isset( $_POST["category"] ) ? $_POST["category"] : ""; -$status = isset( $_POST["status"] ) ? strtoupper( $_POST["status"] ) : ""; -$user = isset( $_POST["user"] ) ? $_POST["user"] : ""; -$search = isset( $_POST["search"] ) ? $_POST["search"] : ""; -$action = isset( $_GET["action"] ) ? $_GET["action"] : (isset( $_POST["action"] ) ? $_POST["action"] : "todo"); -$type = isset( $_GET["type"] ) ? $_GET["type"] : (isset( $_POST["type"] ) ? $_POST["type"] : "extjs"); -$dateFrom = isset( $_POST["dateFrom"] ) ? substr( $_POST["dateFrom"], 0, 10 ) : ""; -$dateTo = isset( $_POST["dateTo"] ) ? substr( $_POST["dateTo"], 0, 10 ) : ""; -$first = isset( $_POST["first"] ) ? true :false; +$callback = isset( $_REQUEST["callback"] ) ? $_REQUEST["callback"] : "stcCallback1001"; +$dir = isset( $_REQUEST["dir"] ) ? $_REQUEST["dir"] : "DESC"; +$sort = isset( $_REQUEST["sort"] ) ? $_REQUEST["sort"] : ""; +$start = isset( $_REQUEST["start"] ) ? $_REQUEST["start"] : "0"; +$limit = isset( $_REQUEST["limit"] ) ? $_REQUEST["limit"] : "25"; +$filter = isset( $_REQUEST["filter"] ) ? $_REQUEST["filter"] : ""; +$process = isset( $_REQUEST["process"] ) ? $_REQUEST["process"] : ""; +$category = isset( $_REQUEST["category"] ) ? $_REQUEST["category"] : ""; +$status = isset( $_REQUEST["status"] ) ? strtoupper( $_REQUEST["status"] ) : ""; +$user = isset( $_REQUEST["user"] ) ? $_REQUEST["user"] : ""; +$search = isset( $_REQUEST["search"] ) ? $_REQUEST["search"] : ""; +$action = isset( $_GET["action"] ) ? $_GET["action"] : (isset( $_REQUEST["action"] ) ? $_REQUEST["action"] : "todo"); +$type = isset( $_GET["type"] ) ? $_GET["type"] : (isset( $_REQUEST["type"] ) ? $_REQUEST["type"] : "extjs"); +$dateFrom = isset( $_REQUEST["dateFrom"] ) ? substr( $_REQUEST["dateFrom"], 0, 10 ) : ""; +$dateTo = isset( $_REQUEST["dateTo"] ) ? substr( $_REQUEST["dateTo"], 0, 10 ) : ""; +$first = isset( $_REQUEST["first"] ) ? true :false; if ($sort == 'CASE_SUMMARY' || $sort == 'CASE_NOTES_COUNT') { $sort = 'APP_NUMBER';//DEFAULT VALUE diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php index d5b56d99c..13f9324d2 100755 --- a/workflow/engine/methods/processes/processes_Ajax.php +++ b/workflow/engine/methods/processes/processes_Ajax.php @@ -161,7 +161,7 @@ try { break; case 'process_Export': include (PATH_METHODS . 'processes/processes_Export.php'); - G::auditLog('ExportProcess','Export Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('ExportProcess','Export process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'process_User': include (PATH_METHODS . 'processes/processes_User.php'); @@ -195,7 +195,7 @@ try { G::LoadClass('processMap'); $oProcessMap = new ProcessMap(); $oProcessMap->listProcessesUser($oData->PRO_UID); - G::auditLog('AssignRole','Assign new supervisor ('.$oData->USR_UID.') in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('AssignRole','Assign new supervisor ('.$oData->USR_UID.') in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'removeProcessUser': $oProcessMap->removeProcessUser($oData->PU_UID); @@ -205,8 +205,7 @@ try { break; } } - - G::auditLog('RemoveUser','Remove supervisor ('.$userSupervisor.') in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('RemoveUser','Remove supervisor ('.$userSupervisor.') in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'supervisorDynaforms': $oProcessMap->supervisorDynaforms($oData->pro_uid); @@ -244,11 +243,15 @@ try { break; case 'addTask': $sOutput = $oProcessMap->addTask($oData->uid, $oData->position->x, $oData->position->y); - G::auditLog('AddTask','Add new task in process "'.$resultProcess['PRO_TITLE'].'"'); + $sOutputAux = G::json_decode($sOutput); + $sOutputAux = (array)$sOutputAux; + G::auditLog('AddTask','Add new task ('.$sOutputAux['uid'].') in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'addSubProcess': $sOutput = $oProcessMap->addSubProcess($oData->uid, $oData->position->x, $oData->position->y); - G::auditLog('AddSubProcess','Add new sub process in Process "'.$resultProcess['PRO_TITLE'].'"'); + $sOutputAux = G::json_decode($sOutput); + $sOutputAux = (array)$sOutputAux; + G::auditLog('AddSubProcess','Add new sub process ('.$sOutputAux['uid'].') in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'taskColor': $oTask->taskColor($oData->pro_uid, $oData->tas_uid); @@ -276,7 +279,7 @@ try { break; case 'saveGuidePosition': $sOutput = $oProcessMap->saveGuidePosition($oData->uid, $oData->position, $oData->direction); - G::auditLog('SaveGuidePosition','Change '.$oData->direction.' line position in process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('SaveGuidePosition','Change '.$oData->direction.' line position ('.$oData->uid.') in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'deleteGuide': $sOutput = $oProcessMap->deleteGuide($oData->uid); @@ -290,19 +293,19 @@ try { $sOutput = $oProcessMap->addText($oData->uid, $oData->label, $oData->position->x, $oData->position->y); $sOutputAux = G::json_decode($sOutput); $sOutputAux = (array)$sOutputAux; - G::auditLog('AddText','Add new text ('.$sOutputAux['uid'].') in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('AddText','Add new text ('.$sOutputAux['uid'].') in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'updateText': $sOutput = $oProcessMap->updateText($oData->uid, $oData->label); - G::auditLog('UpdateText','Edit text ('.$oData->uid.' ) in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('UpdateText','Edit text ('.$oData->uid.' ) in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'saveTextPosition': $sOutput = $oProcessMap->saveTextPosition($oData->uid, $oData->position->x, $oData->position->y); - G::auditLog('SaveTextPosition','Change text position ('.$oData->uid.' ) in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('SaveTextPosition','Change text position ('.$oData->uid.' ) in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'deleteText': $sOutput = $oProcessMap->deleteText($oData->uid); - G::auditLog('DeleteText','Delete text ('.$oData->uid.' ) in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('DeleteText','Delete text ('.$oData->uid.' ) in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'dynaforms': $oProcessMap->dynaformsList($oData->pro_uid); @@ -428,7 +431,7 @@ try { case 'exploreDirectory': $_SESSION["PFMDirectory"] = $oData->main_directory; $oProcessMap->exploreDirectory($oData->pro_uid, $oData->main_directory, $oData->directory); - G::auditLog('ProcessFileManager','Upload template ('.$oData->main_directory.') in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('ProcessFileManager','Upload template ('.$oData->main_directory.') in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'deleteFile': $oProcessMap->deleteFile($oData->pro_uid, $oData->main_directory, $oData->directory, $oData->file); @@ -544,11 +547,11 @@ try { switch ($sDir) { case 'mailTemplates': $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename']; - G::auditLog('ProcessFileManager','Edit template ('.$_REQUEST['filename'].') in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('ProcessFileManager','Edit template ('.$_REQUEST['filename'].') in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'public': $sDirectory = PATH_DATA_PUBLIC . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename']; - G::auditLog('ProcessFileManager','Edit public template ('.$_REQUEST['filename'].') in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('ProcessFileManager','Edit public template ('.$_REQUEST['filename'].') in process "'.$resultProcess['PRO_TITLE'].'"'); break; default: $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename']; @@ -636,11 +639,11 @@ try { switch ($sDir) { case 'mailTemplates': $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename']; - G::auditLog('ProcessFileManager','Save template ('.$_REQUEST['filename'].') in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('ProcessFileManager','Save template ('.$_REQUEST['filename'].') in process "'.$resultProcess['PRO_TITLE'].'"'); break; case 'public': $sDirectory = PATH_DATA_PUBLIC . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename']; - G::auditLog('ProcessFileManager','Save public template ('.$_REQUEST['filename'].') in Process "'.$resultProcess['PRO_TITLE'].'"'); + G::auditLog('ProcessFileManager','Save public template ('.$_REQUEST['filename'].') in process "'.$resultProcess['PRO_TITLE'].'"'); break; default: $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename']; diff --git a/workflow/engine/methods/processes/processes_Save.php b/workflow/engine/methods/processes/processes_Save.php index 6678ce79e..ed4eed37f 100755 --- a/workflow/engine/methods/processes/processes_Save.php +++ b/workflow/engine/methods/processes/processes_Save.php @@ -134,7 +134,7 @@ if(array_key_exists('PRO_TRI_PAUSED', $newFields)) { $fields[] = "Execute a trigger when a case is paused"; } if(array_key_exists('PRO_TRI_REASSIGNED', $newFields)) { - $fields[] = "Execute a trigger when a case is reassigned"; G + $fields[] = "Execute a trigger when a case is reassigned"; } if(array_key_exists('PRO_TRI_UNPAUSED', $newFields)) { $fields[] = "Execute a trigger when a case is unpaused"; diff --git a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html index 8fabe6c67..d0e8be781 100644 --- a/workflow/engine/templates/cases/cases_Step_Pmdynaform.html +++ b/workflow/engine/templates/cases/cases_Step_Pmdynaform.html @@ -13,10 +13,13 @@ + +
###TEMPLATES### + + +
###TEMPLATES### + diff --git a/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html b/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html index 9be9e56f3..0a5e455b7 100644 --- a/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html +++ b/workflow/engine/templates/cases/cases_Step_Pmdynaform_View.html @@ -13,10 +13,13 @@ + +
###TEMPLATES### +