fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
Richard Yujra
2015-02-19 19:14:25 -04:00
parent 23cc5574b2 f236137634
commit 84ab5a5267
10 changed files with 130 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.derivation.php
View File

@@ -182,6 +182,7 @@ class Derivation
if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) {
$arrayNextTaskDefault = $arrayRouteData;
continue;
}
$flagContinue = true;
@@ -194,7 +195,11 @@ class Derivation
$pmScript = new PMScript();
$pmScript->setFields($arrayApplicationData["APP_DATA"]);
$pmScript->setScript($arrayRouteData["ROU_CONDITION"]);
if(preg_match('/\b(or|and|xor)\b/i' , $arrayRouteData["ROU_CONDITION"])) {
$pmScript->setScript("( ".$arrayRouteData["ROU_CONDITION"]." )");
} else {
$pmScript->setScript($arrayRouteData["ROU_CONDITION"]);
}
$flagContinue = $pmScript->evaluate();
}

3
workflow/engine/classes/class.pmDynaform.php
View File

@@ -37,7 +37,8 @@ class pmDynaform
}
}
}
if(!empty($app_data)){
if(!empty($app_data) && isset($app_data["APPLICATION"])){
//data
$cases = new \ProcessMaker\BusinessModel\Cases();
$this->data = $cases->getCaseVariables($app_data["APPLICATION"]);

3
workflow/engine/classes/model/ListInbox.php
View File

@@ -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 {

29
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -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 );

32
workflow/engine/methods/cases/proxyCasesList.php
View File

@@ -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

35
workflow/engine/methods/processes/processes_Ajax.php
View File

@@ -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'];

2
workflow/engine/methods/processes/processes_Save.php
View File

@@ -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";

25
workflow/engine/templates/pmTables/editReport.js
View File

@@ -1667,6 +1667,31 @@ function mapPMFieldType(id)
sizeField='255';
break;
case 'string':
typeField='VARCHAR';
sizeField='255';
break;
case 'integer':
typeField='INTEGER';
sizeField='11';
break;
case 'float':
typeField='FLOAT';
sizeField='11';
break;
case 'boolean':
typeField='INTEGER';
sizeField='1';
break;
case 'date':
typeField='VARCHAR';
sizeField='255';
break;
case 'datetime':
typeField='VARCHAR';
sizeField='255';
break;
default:
typeField='TEXT';
sizeField='';

2
workflow/engine/templates/processes/main.js
View File

@@ -67,6 +67,7 @@ Ext.onReady(function(){
/*----------------------------------********---------------------------------*/
,{name : "PRO_TYPE_PROCESS", type: "string"}
/*----------------------------------********---------------------------------*/
,{name : "PRO_UPDATE_DATE"}
]
}),
@@ -226,6 +227,7 @@ Ext.onReady(function(){
/*----------------------------------********---------------------------------*/
,{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 75, align:"left"}
/*----------------------------------********---------------------------------*/
,{header: _("ID_LAN_UPDATE_DATE"), dataIndex: "PRO_UPDATE_DATE", width: 75, align:"left"}
]
}),
store: store,

27
workflow/engine/xmlform/dynaforms/fields/date.xml
View File

@@ -212,5 +212,32 @@ function validDate() {
return true;
}
leimnud.event.add(getField('PME_ENDDATE'), 'change', function() {
validDateRange(getField('PME_STARTDATE'), getField('PME_ENDDATE'))
});
leimnud.event.add(getField('PME_AFTERDATE'), 'change', function() {
validDateRange(getField('PME_BEFOREDATE'), getField('PME_AFTERDATE'))
});
function validDateRange(start, end) {
var startDate = Date.parse(start.value);
var endDate = Date.parse(end.value);
if (isNaN(startDate)) {
msgBox('@G::LoadTranslation(ID_START_DATE_NOT_VALID)', "alert");
return false;
}
if (isNaN(endDate)) {
msgBox('@G::LoadTranslation(ID_END_DATE_NOT_VALID)', "alert");
return false;
}
if (startDate >= endDate) {
msgBox('@G::LoadTranslation(ID_END_DATE_GREATER)', "alert");
end.value = "";
}
}
]]></PME_JS>
</dynaForm>