From 4ccf2c140a2f8e78aaaa941a024be70b64d38a2c Mon Sep 17 00:00:00 2001 From: safan Date: Sat, 12 Feb 2011 12:42:15 +0000 Subject: [PATCH] Pagination in process permission,process supervisor,and fixed issue with extjs --- .../engine/methods/bpmn/get-triggers-tree.php | 54 +- workflow/engine/methods/bpmn/proxyExtjs.php | 494 +++++++++++------- .../templates/bpmn/ProcessMapContext.js | 135 +++-- .../engine/templates/bpmn/ProcessOptions.js | 26 +- workflow/engine/templates/bpmn/TaskContext.js | 10 +- 5 files changed, 413 insertions(+), 306 deletions(-) diff --git a/workflow/engine/methods/bpmn/get-triggers-tree.php b/workflow/engine/methods/bpmn/get-triggers-tree.php index 37552e86e..7d27b9cce 100755 --- a/workflow/engine/methods/bpmn/get-triggers-tree.php +++ b/workflow/engine/methods/bpmn/get-triggers-tree.php @@ -4,9 +4,11 @@ try { G::LoadClass('processMap'); $oProcessMap = new processMap(new DBConnection); + $start = isset($_POST['start'])? $_POST['start']: 0; + $limit = isset($_POST['limit'])? $_POST['limit']: ''; if ( isset($_GET['tid'] ) ) { - $rows = $oProcessMap->getExtStepsCriteria($_GET['tid']); //Getting all assigned steps on a task + $rows = $oProcessMap->getExtStepsCriteria($start, $limit, $_GET['tid']); //Getting all assigned steps on a task array_shift($rows); } @@ -119,52 +121,4 @@ try 'children' => $assignTaskChildren ); -/* $nodes = "[{ - text: 'Step 1 - Triggers (0)', - cls: 'blank', - iconCls: 'blank', - children: [{ - text: 'Before - Triggers (0)', - cls: 'blank', - iconCls: 'blank', - children: [{ - text: 'Assign Before Trigger', - leaf: true, - }] - },{ - text: 'After - Triggers (0)', - leaf: true, - cls: 'blank', - iconCls: 'blank', - }] -},{ - text: 'Step 2 - Triggers (0)', - - children: [{ - text: 'Before - Triggers (0)', - leaf: true, - - },{ - text: 'After - Triggers (0)', - leaf: true, - - }] -},{ - text: 'Assign Task - Triggers(0)', - - children: [{ - text: 'Before Assigment - Triggers(0)', - leaf: true, - - },{ - text: 'Before Derivation - Triggers(0)', - leaf: true, - - },{ - text: 'After Derivation - Triggers(0)', - leaf: true, - - }] -}]";*/ -//echo $nodes; -echo json_encode($steps); \ No newline at end of file + echo json_encode($steps); \ No newline at end of file diff --git a/workflow/engine/methods/bpmn/proxyExtjs.php b/workflow/engine/methods/bpmn/proxyExtjs.php index 81003a67d..b2b73e7df 100644 --- a/workflow/engine/methods/bpmn/proxyExtjs.php +++ b/workflow/engine/methods/bpmn/proxyExtjs.php @@ -2,243 +2,347 @@ G::LoadClass('processMap'); $oProcessMap = new processMap(new DBConnection); //$_GET['sid'] gets STEP_UID and sTYPE(i.e BEFORE and AFTER) in format STEP_UID-sTYPE -if(isset($_GET['stepid'])) - { - $aStepTypeId = explode('|',$_GET['stepid']); - $_SESSION['stepUID'] = $_GET['stepid']; - //$aStepTypeId = explode('-','2517180104cd42c25cc39e4071099227-BEFORE'); - $sStep = $aStepTypeId[0]; - $sType = $aStepTypeId[1]; - } +if(isset($_GET['stepid'])){ + $aStepTypeId = explode('|',$_GET['stepid']); + $_SESSION['stepUID'] = $_GET['stepid']; + //$aStepTypeId = explode('-','2517180104cd42c25cc39e4071099227-BEFORE'); + $sStep = $aStepTypeId[0]; + $sType = $aStepTypeId[1]; +} - //$_GET['sid'] gets STEP_UID and sTYPE(i.e BEFORE and AFTER) in format STEP_UID-sTYPE - if(isset($_GET['stepid'])) - { - $aStepTypeId = explode('|',$_GET['stepid']); - $_SESSION['stepUID'] = $_GET['stepid']; - //$aStepTypeId = explode('-','2517180104cd42c25cc39e4071099227-BEFORE'); - $sStep = $aStepTypeId[0]; - $sType = $aStepTypeId[1]; - } +//$_GET['sid'] gets STEP_UID and sTYPE(i.e BEFORE and AFTER) in format STEP_UID-sTYPE +if(isset($_GET['stepid'])){ + $aStepTypeId = explode('|',$_GET['stepid']); + $_SESSION['stepUID'] = $_GET['stepid']; + //$aStepTypeId = explode('-','2517180104cd42c25cc39e4071099227-BEFORE'); + $sStep = $aStepTypeId[0]; + $sType = $aStepTypeId[1]; +} $start = isset($_POST['start'])? $_POST['start']: 0; $limit = isset($_POST['limit'])? $_POST['limit']: ''; switch($_GET['action']) - { - case 'getDynaformList': - $rows = $oProcessMap->getExtDynaformsList($start, $limit, $_GET['pid']); - $result['totalCount'] = $oProcessMap->getAllDynaformCount(); - array_shift($rows); - break; +{ + case 'getDynaformList': + $rows = $oProcessMap->getExtDynaformsList($start, $limit, $_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllDynaformCount(); + array_shift($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getPMTableDynaform': - $oAdditionalTables = new AdditionalTables(); - $aData = $oAdditionalTables->load($_GET['tabId'], true); - $addTabName = $aData['ADD_TAB_NAME']; - foreach ($aData['FIELDS'] as $iRow => $aRow) - { - if ($aRow['FLD_KEY'] == 1) - { - $rows[] = $aRow; - } - } - break; + case 'getPMTableDynaform': + $oAdditionalTables = new AdditionalTables(); + $aData = $oAdditionalTables->load($_GET['tabId'], true); + $addTabName = $aData['ADD_TAB_NAME']; + foreach ($aData['FIELDS'] as $iRow => $aRow) + { + if ($aRow['FLD_KEY'] == 1) + { + $rows[] = $aRow; + } + } + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getAdditionalTables': - $rows = $oProcessMap->getExtAdditionalTablesList(); - break; + case 'getAdditionalTables': + $rows = $oProcessMap->getExtAdditionalTablesList(); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getInputDocumentList': - $rows = $oProcessMap->getExtInputDocumentsCriteria($start, $limit,$_GET['pid']); - $result['totalCount'] = $oProcessMap->getAllInputDocumentCount(); - array_shift($rows); - break; + case 'getInputDocumentList': + $rows = $oProcessMap->getExtInputDocumentsCriteria($start, $limit,$_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllInputDocumentCount(); + array_shift($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'editInputDocument': - require_once 'classes/model/InputDocument.php'; - $oInputDocument = new InputDocument(); - $rows = $oInputDocument->load($_GET['INP_DOC_UID']); - break; + case 'editInputDocument': + require_once 'classes/model/InputDocument.php'; + $oInputDocument = new InputDocument(); + $rows = $oInputDocument->load($_GET['INP_DOC_UID']); + $tmpData = json_encode( $rows ) ; + $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes - case 'getOutputDocument': - $rows = $oProcessMap->getExtOutputDocumentsCriteria($start, $limit,$_GET['pid']); - $result['totalCount'] = $oProcessMap->getAllOutputDocumentCount(); - array_shift($rows); - break; + $result = $tmpData; + echo $result; + break; - case 'editObjectPermission': - $rows = $oProcessMap->editExtObjectPermission($_GET['op_uid'],$_GET['pid']); - array_shift($rows); - break; + case 'getOutputDocument': + $rows = $oProcessMap->getExtOutputDocumentsCriteria($start, $limit,$_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllOutputDocumentCount(); + array_shift($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'editOutputDocument': - require_once 'classes/model/OutputDocument.php'; - $oOutputDocument = new OutputDocument(); - $rows = $oOutputDocument->load($_GET['tid']); - break; + case 'editObjectPermission': + $rows = $oProcessMap->editExtObjectPermission($_GET['pid'],$_GET['op_uid']); + //array_shift($rows); + $tmpData = json_encode( $rows ) ; + $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes - case 'getReportTables': - $rows = $oProcessMap->getExtReportTables($start, $limit,$_GET['pid']); - $result['totalCount'] = $oProcessMap->getAllReportTableCount(); - break; + $result = $tmpData; + echo $result; + break; - case 'editReportTables': - require_once 'classes/model/ReportTable.php'; - $oReportTable = new ReportTable(); - $rows = $oReportTable->load($_GET['REP_TAB_UID']); - break; + case 'editOutputDocument': + require_once 'classes/model/OutputDocument.php'; + $oOutputDocument = new OutputDocument(); + $rows = $oOutputDocument->load($_GET['tid']); + $tmpData = json_encode( $rows ) ; + $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes - case 'getReportTableType': - if(isset($_GET['pid']) && $_GET['type'] == 'NORMAL') + $result = $tmpData; + echo $result; + break; + + case 'getReportTables': + $rows = $oProcessMap->getExtReportTables($start, $limit,$_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllReportTableCount(); + $result['data'] = $rows; + print json_encode( $result ) ; + break; + + case 'editReportTables': + require_once 'classes/model/ReportTable.php'; + $oReportTable = new ReportTable(); + $rows = $oReportTable->load($_GET['REP_TAB_UID']); + $tmpData = json_encode( $rows ) ; + $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes + + $result = $tmpData; + echo $result; + break; + + case 'getReportTableType': + if(isset($_GET['pid']) && $_GET['type'] == 'NORMAL') + { + $aTheFields = array(); + $aTheFields = getDynaformsVars($_GET['pid'], false); + foreach ($aTheFields as $aField) + { + $rows[] = array('FIELD_UID' => $aField['sName'] . '-' . $aField['sType'], + 'FIELD_NAME' => $aField['sName']); + } + } + + else if (isset($_GET['pid']) && $_GET['type'] == 'GRID') + { + $aTheFields = array(); + $aTheFields = getGridsVars($_GET['pid']); + foreach ($aTheFields as $aField) { - $aTheFields = array(); - $aTheFields = getDynaformsVars($_GET['pid'], false); - foreach ($aTheFields as $aField) - { - $rows[] = array('FIELD_UID' => $aField['sName'] . '-' . $aField['sType'], - 'FIELD_NAME' => $aField['sName']); - } + $rows[] = array('FIELD_UID' => $aField['sName'] . '-' . $aField['sXmlForm'], + 'FIELD_NAME' => $aField['sName']); } + } + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - else if (isset($_GET['pid']) && $_GET['type'] == 'GRID') - { - $aTheFields = array(); - $aTheFields = getGridsVars($_GET['pid']); - foreach ($aTheFields as $aField) - { - $rows[] = array('FIELD_UID' => $aField['sName'] . '-' . $aField['sXmlForm'], - 'FIELD_NAME' => $aField['sName']); - } - } - break; + case 'getDatabaseConnectionList': + $rows = $oProcessMap->getExtCriteriaDBSList($start, $limit,$_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllDbSourceCount(); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getDatabaseConnectionList': - $rows = $oProcessMap->getExtCriteriaDBSList($start, $limit,$_GET['pid']); - $result['totalCount'] = $oProcessMap->getAllDbSourceCount(); - break; + case 'editDatabaseConnection': + require_once 'classes/model/DbSource.php'; + $o = new DbSource(); + $rows = $o->load($_GET['dbs_uid'],$_GET['pid']); + $tmpData = json_encode( $rows ) ; + $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes - case 'editDatabaseConnection': - require_once 'classes/model/DbSource.php'; - $o = new DbSource(); - $rows = $o->load($_GET['dbs_uid'],$_GET['pid']); - break; + $result = $tmpData; + echo $result; + break; - case 'process_User': - $rows = $oProcessMap->listExtProcessesUser($_GET['pid']); - break; + case 'process_Supervisors': + $rows = $oProcessMap->listExtProcessesSupervisors($start, $limit, $_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllProcessSupervisorsCount(); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'availableProcessesUser': - $rows = $oProcessMap->listExtNoProcessesUser($_GET['pid']); - break; - case 'supervisorDynaforms': - $rows = $oProcessMap->getExtSupervisorDynaformsList($_GET['pid']); - break; - case 'availableSupervisorDynaforms': - $rows = $oProcessMap->getExtAvailableSupervisorDynaformsList($_GET['pid']); - break; - case 'supervisorInputDoc': - $rows = $oProcessMap->getExtSupervisorInputsList($_GET['pid']); - break; - case 'availableSupervisorInputDoc': - $rows = $oProcessMap->getExtAvailableSupervisorInputsList($_GET['pid']); - break; + case 'availableProcessesSupervisors': + $rows = $oProcessMap->listExtNoProcessesUser($_GET['pid']); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getAssignedCaseTrackerObjects': - $rows = $oProcessMap->getExtCaseTrackerObjectsCriteria($_GET['pid']); - array_shift($rows); - break; + case 'supervisorDynaforms': + $rows = $oProcessMap->getExtSupervisorDynaformsList($start, $limit,$_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllSupervisorDynaformsCount(); + $result['data'] = $rows; + print json_encode( $result ) ; + break; + case 'availableSupervisorDynaforms': + $rows = $oProcessMap->getExtAvailableSupervisorDynaformsList($_GET['pid']); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; + case 'supervisorInputDoc': + $rows = $oProcessMap->getExtSupervisorInputsList($start, $limit,$_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllSupervisorInputsCount(); + $result['data'] = $rows; + print json_encode( $result ) ; + break; + case 'availableSupervisorInputDoc': + $rows = $oProcessMap->getExtAvailableSupervisorInputsList($_GET['pid']); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getAvailableCaseTrackerObjects': - $rows = $oProcessMap->getAvailableExtCaseTrackerObjects($_GET['pid']); - array_shift($rows); - break; + case 'getAssignedCaseTrackerObjects': + $rows = $oProcessMap->getExtCaseTrackerObjectsCriteria($start, $limit, $_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllCaseTrackerObjectCount(); + array_shift($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getAvailableSteps': - $rows = $oProcessMap->getExtAvailableBBCriteria($_GET['pid'], $_GET['tid']); - array_shift($rows); - break; + case 'getAvailableCaseTrackerObjects': + $rows = $oProcessMap->getAvailableExtCaseTrackerObjects($_GET['pid']); + array_shift($rows); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getAssignedSteps': - $rows = $oProcessMap->getExtStepsCriteria($start, $limit,$_GET['tid']); - $result['totalCount'] = $oProcessMap->getAllStepCount(); - array_shift($rows); - break; + case 'getAvailableSteps': + $rows = $oProcessMap->getExtAvailableBBCriteria($_GET['pid'], $_GET['tid']); + array_shift($rows); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getAssignedUsersList': - $rows = $oProcessMap->usersExtList($start, $limit, $_GET['pid'], $_GET['tid']); - $result['totalCount'] = $oProcessMap->getAllTaskUserCount(); - array_shift($rows); - break; + case 'getAssignedSteps': + $rows = $oProcessMap->getExtStepsCriteria($start, $limit,$_GET['tid']); + $result['totalCount'] = $oProcessMap->getAllStepCount(); + array_shift($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getAvailableUsersList': - $rows = $oProcessMap->getAvailableExtUsersCriteria($_GET['tid']); - break; + case 'getAssignedUsersList': + $rows = $oProcessMap->usersExtList($start, $limit, $_GET['pid'], $_GET['tid']); + $result['totalCount'] = $oProcessMap->getAllTaskUserCount(); + array_shift($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getAvailableStepTriggers': - $aStepTypeId = explode('|',$_SESSION['stepUID']); - $sStep = $aStepTypeId[0]; - $sType = $aStepTypeId[1]; - //Getting available Steps Criteria that have been not selected for a particular task - $rows = $oProcessMap->getExtAvailableStepTriggersCriteria($_GET['pid'], $sStep, $_GET['tid'], $sType); - break; + case 'getAvailableUsersList': + $rows = $oProcessMap->getAvailableExtUsersCriteria($_GET['tid']); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getAssignedStepTriggers': - $rows = $oProcessMap->getExtStepTriggersCriteria($start, $limit,$sStep, $_GET['tid'], $sType); - $result['totalCount'] = $oProcessMap->getAllStepTriggerCount(); - break; + case 'getAvailableStepTriggers': + $aStepTypeId = explode('|',$_SESSION['stepUID']); + $sStep = $aStepTypeId[0]; + $sType = $aStepTypeId[1]; + //Getting available Steps Criteria that have been not selected for a particular task + $rows = $oProcessMap->getExtAvailableStepTriggersCriteria($_GET['pid'], $sStep, $_GET['tid'], $sType); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'availableUsers': - $rows = $oProcessMap->getExtAvailableUsersList($_GET['tid']); - array_shift($rows); - break; + case 'getAssignedStepTriggers': + $rows = $oProcessMap->getExtStepTriggersCriteria($start, $limit, $sStep, $_GET['tid'], $sType); + $result['totalCount'] = $oProcessMap->getAllStepTriggerCount(); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'assignedUsers': - $rows = $oProcessMap->getExtusersadhoc($start, $limit,$_GET['pid'], $_GET['tid']); - $result['totalCount'] = $oProcessMap->getAllTaskUserCount(); - array_shift($rows); - break; + case 'availableUsers': + $rows = $oProcessMap->getExtAvailableUsersList($_GET['tid']); + array_shift($rows); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - case 'getTaskPropertiesList': - require_once 'classes/model/Task.php'; - $oTask = new Task(); - $rows = $oTask->load($_GET['tid']); - while (list($key, $value) = each($rows)) { - if ($value == 'TRUE') - $rows[$key] = true; - else if($value == 'FALSE') - $rows[$key] = false; + case 'assignedUsers': + $rows = $oProcessMap->getExtusersadhoc($start, $limit,$_GET['pid'], $_GET['tid']); + $result['totalCount'] = $oProcessMap->getAllTaskUserCount(); + array_shift($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; - if($key == 'TAS_TYPE_DAY' && $value == '1') - $rows[$key] = 'Work Days'; - else if($key == 'TAS_TYPE_DAY' && $value == '2') - $rows[$key] = 'Calendar Days'; + case 'getTaskPropertiesList': + require_once 'classes/model/Task.php'; + $oTask = new Task(); + $rows = $oTask->load($_GET['tid']); + while (list($key, $value) = each($rows)) { + if ($value == 'TRUE') + $rows[$key] = true; + else if($value == 'FALSE') + $rows[$key] = false; - if($key == 'TAS_TYPE' && $value == 'NORMAL') - $rows[$key] = false; - else if($key == 'TAS_TYPE' && $value == 'ADHOC') - $rows[$key] = true; - } - break; + if($key == 'TAS_TYPE_DAY' && $value == '1') + $rows[$key] = 'Work Days'; + else if($key == 'TAS_TYPE_DAY' && $value == '2') + $rows[$key] = 'Calendar Days'; - case 'getObjectPermission': - $rows = $oProcessMap->getExtObjectsPermissions($_GET['pid']); - break; + if($key == 'TAS_TYPE' && $value == 'NORMAL') + $rows[$key] = false; + else if($key == 'TAS_TYPE' && $value == 'ADHOC') + $rows[$key] = true; + } + $tmpData = json_encode( $rows ) ; + $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes - case 'getObjectPermissionType': - $rows = $oProcessMap->newExtObjectPermission($_GET['pid'],$_GET['objectType']); - array_shift($rows); - break; + $result = $tmpData; + echo $result; + break; - case 'process_Edit': - $rows = $oProcessMap->editProcessNew($_GET['pid']); - } + case 'getObjectPermission': + $rows = $oProcessMap->getExtObjectsPermissions($start, $limit,$_GET['pid']); + $result['totalCount'] = $oProcessMap->getAllObjectPermissionCount(); + $result['data'] = $rows; + print json_encode( $result ) ; + break; + + case 'getObjectPermissionType': + $rows = $oProcessMap->newExtObjectPermission($_GET['pid'],$_GET['objectType']); + array_shift($rows); + $result['totalCount'] = count($rows); + $result['data'] = $rows; + print json_encode( $result ) ; + break; + + case 'process_Edit': + $rows = $oProcessMap->editProcessNew($_GET['pid']); + $tmpData = json_encode( $rows ) ; + $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes + + $result = $tmpData; + echo $result; + break; +} - $result['data'] = $rows; - print json_encode( $result ) ; + //$result['data'] = $rows; + //print json_encode( $result ) ; /*$tmpData = json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; echo $result;*/ - ?> +?> diff --git a/workflow/engine/templates/bpmn/ProcessMapContext.js b/workflow/engine/templates/bpmn/ProcessMapContext.js index b5d37e428..b219a4408 100755 --- a/workflow/engine/templates/bpmn/ProcessMapContext.js +++ b/workflow/engine/templates/bpmn/ProcessMapContext.js @@ -375,7 +375,7 @@ ProcessMapContext.prototype.processPermission= function() url: 'proxyExtjs.php?pid='+pro_uid+'&action=getObjectPermission' }) }); - PermissionStore.load(); + PermissionStore.load({params:{start:0, limit:10}}); var PermissionGridColumn = new Ext.grid.ColumnModel({ columns: [ @@ -551,7 +551,6 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ id : 'mygrid', loadMask: true, loadingText: 'Loading...', - //renderTo: 'cases-grid', frame: false, autoHeight:false, clicksToEdit: 1, @@ -562,6 +561,14 @@ var PermissionGridColumn = new Ext.grid.ColumnModel({ cm: PermissionGridColumn, stripeRows: true, tbar: tb, + bbar: new Ext.PagingToolbar({ + pageSize: 10, + store: PermissionStore, + displayInfo: true, + displayMsg: 'Displaying Process Permission {0} - {1} of {2}', + emptyMsg: "No Process Permission to display", + items:[] + }), viewConfig: {forceFit: true} }); @@ -1105,15 +1112,15 @@ ProcessMapContext.prototype.processSupervisors= function() remoteSort : true, fields : processUserFields, proxy: new Ext.data.HttpProxy({ - url: 'proxyProcessSupervisors?pid='+pro_uid+'&action=process_User' + url: 'proxyExtjs?pid='+pro_uid+'&action=process_Supervisors' }) }); - processUser.load(); + processUser.load({params:{start:0, limit:10}}); // create the Data Store of users that are not assigned to a process supervisor var availableProcessesUser = new Ext.data.JsonStore({ root : 'data', - url : 'proxyProcessSupervisors?pid='+pro_uid+'&action=availableProcessesUser', + url : 'proxyExtjs?pid='+pro_uid+'&action=availableProcessesSupervisors', totalProperty : 'totalCount', idProperty : 'gridIndex', remoteSort : false, //true, @@ -1184,6 +1191,14 @@ ProcessMapContext.prototype.processSupervisors= function() ], stripeRows: true, viewConfig: {forceFit: true}, + bbar: new Ext.PagingToolbar({ + pageSize: 10, + store: processUser, + displayInfo: true, + displayMsg: 'Displaying Process Supervisor {0} - {1} of {2}', + emptyMsg: "No Process Supervisor to display", + items:[] + }), tbar: tb }); @@ -1257,6 +1272,17 @@ ProcessMapContext.prototype.processDynaform= function() STEP_TYPE_OBJ: '', STEP_POSITION: '' }); + + if(availableSupervisorDynaforms.data.items.length == 0) + Ext.MessageBox.alert ('Status','No Dynaforms are available. All Dynaforms have been already assigned.'); + else + { + editor.stopEditing(); + supervisorDynaforms.insert(0, e); + grid.getView().refresh(); + //grid.getSelectionModel().selectRow(0); + editor.startEditing(0, 0); + } } }); @@ -1316,22 +1342,22 @@ ProcessMapContext.prototype.processDynaform= function() remoteSort : true, fields : supervisorDynaformsFields, proxy: new Ext.data.HttpProxy({ - url: 'proxyProcessSupervisors?pid='+pro_uid+'&action=supervisorDynaforms' + url: 'proxyExtjs?pid='+pro_uid+'&action=supervisorDynaforms' }) }); - supervisorDynaforms.load(); + supervisorDynaforms.load({params:{start : 0 , limit : 10 }}); // create the Data Store of users that are not assigned to a process supervisor var availableSupervisorDynaforms = new Ext.data.JsonStore({ - root : 'data', - url : 'proxyProcessSupervisors?pid='+pro_uid+'&action=availableSupervisorDynaforms', - totalProperty : 'totalCount', - idProperty : 'gridIndex', - remoteSort : false, //true, - autoLoad : true, - fields : supervisorDynaformsFields - }); - + root : 'data', + url : 'proxyExtjs?pid='+pro_uid+'&action=availableSupervisorDynaforms', + totalProperty : 'totalCount', + idProperty : 'gridIndex', + remoteSort : false, //true, + autoLoad : true, + fields : supervisorDynaformsFields + }); + availableSupervisorDynaforms.load(); var grid = new Ext.grid.GridPanel({ store: supervisorDynaforms, @@ -1345,6 +1371,7 @@ ProcessMapContext.prototype.processDynaform= function() clicksToEdit: 1, minHeight:400, height :400, + width :435, layout: 'fit', plugins: [editor], columns: [ @@ -1384,7 +1411,15 @@ ProcessMapContext.prototype.processDynaform= function() ], stripeRows: true, viewConfig: {forceFit: true}, - tbar: tb + tbar: tb, + bbar: new Ext.PagingToolbar({ + pageSize: 10, + store: supervisorDynaforms, + displayInfo: true, + displayMsg: 'Displaying Supervisor Dynaform {0} - {1} of {2}', + emptyMsg: "No Supervisor Dynaform to display", + items:[] + }) }); //availableSupervisorDynaforms.load(); @@ -1420,7 +1455,7 @@ ProcessMapContext.prototype.processDynaform= function() title: 'Dynaform', collapsible: false, maximizable: false, - width: 400, + width: 440, height: 350, minWidth: 200, minHeight: 150, @@ -1536,7 +1571,7 @@ ProcessMapContext.prototype.processIODoc = function() url: 'proxyProcessSupervisors?pid='+pro_uid+'&action=supervisorInputDoc' }) }); - supervisorInputDoc.load(); + supervisorInputDoc.load({params:{start : 0 , limit : 10 }}); // create the Data Store of users that are not assigned to a process supervisor var availableSupervisorInputDoc = new Ext.data.JsonStore({ @@ -1548,7 +1583,7 @@ ProcessMapContext.prototype.processIODoc = function() autoLoad : true, fields : supervisorInputDocFields }); - + availableSupervisorInputDoc.load(); var grid = new Ext.grid.GridPanel({ store: supervisorInputDoc, @@ -1562,6 +1597,7 @@ ProcessMapContext.prototype.processIODoc = function() clicksToEdit: 1, minHeight:400, height :400, + width :420, layout: 'fit', plugins: [editor], columns: [ @@ -1601,7 +1637,15 @@ ProcessMapContext.prototype.processIODoc = function() ], stripeRows: true, viewConfig: {forceFit: true}, - tbar: tb + tbar: tb, + bbar: new Ext.PagingToolbar({ + pageSize: 10, + store: supervisorInputDoc, + displayInfo: true, + displayMsg: 'Displaying Supervisor Input Doc {0} - {1} of {2}', + emptyMsg: "No Supervisor Input Doc to display", + items:[] + }) }); //availableSupervisorInputDoc.load(); @@ -1637,7 +1681,7 @@ ProcessMapContext.prototype.processIODoc = function() title: 'Input Documents', collapsible: false, maximizable: false, - width: 400, + width: 430, height: 350, minWidth: 200, minHeight: 150, @@ -1867,9 +1911,6 @@ ProcessMapContext.prototype.caseTrackerObjects= function() },{ name: 'CTO_TYPE_OBJ', type: 'string' - },{ - name:'CTO_UID_OBJ', - type:'string' },{ name:'CTO_CONDITION', type:'string' @@ -1885,6 +1926,9 @@ ProcessMapContext.prototype.caseTrackerObjects= function() },{ name:'OBJECT_TYPE', type:'string' + },{ + name:'CTO_UID_OBJ', + type:'string' } ]); var editor = new Ext.ux.grid.RowEditor({ @@ -1906,7 +1950,7 @@ ProcessMapContext.prototype.caseTrackerObjects= function() }); if(availableStore.data.items.length == 0) - Ext.MessageBox.alert ('Status','No users are available. All users have been already assigned.'); + Ext.MessageBox.alert ('Status','No Objects are available. All Objects have been already assigned.'); else { editor.stopEditing(); @@ -1915,9 +1959,7 @@ ProcessMapContext.prototype.caseTrackerObjects= function() //grid.getSelectionModel().selectRow(0); editor.startEditing(0, 0); } - } - }); var btnRemove = new Ext.Button({ @@ -1977,13 +2019,12 @@ ProcessMapContext.prototype.caseTrackerObjects= function() workflow.gridObjectRowSelected = rowSelected; var rowData = ProcMapObj.ExtVariables(); } - }) + }); var tb = new Ext.Toolbar({ items: [btnAdd, btnRemove,btnObjectsCondition] }); - var assignedStore = new Ext.data.JsonStore({ root : 'data', totalProperty : 'totalCount', @@ -1994,7 +2035,7 @@ ProcessMapContext.prototype.caseTrackerObjects= function() url : 'proxyExtjs?pid='+pro_uid+'&action=getAssignedCaseTrackerObjects' }) }); - assignedStore.load(); + assignedStore.load({params:{start : 0 , limit : 10 }}); var availableStore = new Ext.data.JsonStore({ root : 'data', @@ -2018,7 +2059,7 @@ ProcessMapContext.prototype.caseTrackerObjects= function() autoHeight:false, clicksToEdit: 1, minHeight:400, - height :400, + height :350, layout: 'fit', plugins: [editor], cm: new Ext.grid.ColumnModel({ @@ -2063,16 +2104,17 @@ ProcessMapContext.prototype.caseTrackerObjects= function() header : 'Condition', dataindex: 'CTO_CONDITION', name : 'CTO_CONDITION', - //xtype: 'textfield', - editable : true - },{ + editor: new Ext.form.TextField({ + editable : true + }) + }/*,{ sortable: false, renderer: function(val, meta, record) { - var recordData = Ext.util.JSON.encode(record); - return String.format("",recordData); + //var recordData = Ext.util.JSON.encode(record); + return String.format("",record.data.CTO_UID); } - }] + }*/] }), sm: new Ext.grid.RowSelectionModel({ singleSelect: true, @@ -2084,7 +2126,15 @@ ProcessMapContext.prototype.caseTrackerObjects= function() }), stripeRows: true, viewConfig: {forceFit: true}, - tbar: tb + tbar: tb, + bbar: new Ext.PagingToolbar({ + pageSize: 10, + store: assignedStore, + displayInfo: true, + displayMsg: 'Displaying Case Tracker Object {0} - {1} of {2}', + emptyMsg: "No Case Tracker Object to display", + items:[] + }) }); editor.on({ @@ -2096,7 +2146,6 @@ ProcessMapContext.prototype.caseTrackerObjects= function() var cto_uid = record.data.CTO_UID; var condition = record.data.CTO_CONDITION; - Ext.Ajax.request({ url : '../tracker/tracker_Ajax.php', method: 'POST', @@ -2156,7 +2205,6 @@ ProcessMapContext.prototype.caseTrackerObjects= function() availableStore.reload(); assignedStore.reload(); } - }); var gridObjectWindow = new Ext.Window({ @@ -2165,15 +2213,14 @@ ProcessMapContext.prototype.caseTrackerObjects= function() maximizable : false, width : 550, defaults :{ autoScroll:true }, - height : 400, + height : 380, minWidth : 200, minHeight : 150, - //layout : 'fit', plain : true, items : Objectsgrid, buttonAlign : 'center' }); - gridObjectWindow.show() + gridObjectWindow.show() } ProcessMapContext.prototype.ExtVariables = function() diff --git a/workflow/engine/templates/bpmn/ProcessOptions.js b/workflow/engine/templates/bpmn/ProcessOptions.js index e0ce3a8a1..fef95d4e2 100755 --- a/workflow/engine/templates/bpmn/ProcessOptions.js +++ b/workflow/engine/templates/bpmn/ProcessOptions.js @@ -278,7 +278,7 @@ var dynaformColumns = new Ext.grid.ColumnModel({ bodyStyle : 'padding:10px 0 0 10px;', //monitorValid : true, autoHeight: true, - autoScroll: true, + defaults :{autoScroll:true}, items: [{ xtype: 'fieldset', @@ -334,7 +334,7 @@ var dynaformColumns = new Ext.grid.ColumnModel({ items:[{ xtype : 'textfield', fieldLabel: _('ID_TITLE'), - name : 'DYN_TITLE', + name : 'DYN_TITLE1', width : 350, allowBlank: false },{ @@ -360,7 +360,7 @@ var dynaformColumns = new Ext.grid.ColumnModel({ },{ xtype : 'textarea', fieldLabel: _('ID_DESCRIPTION'), - name : 'DYN_DESCRIPTION', + name : 'DYN_DESCRIPTION1', height : 120, width : 350 } @@ -404,13 +404,13 @@ var dynaformColumns = new Ext.grid.ColumnModel({ { xtype : 'textfield', fieldLabel: _('ID_TITLE'), - name : 'DYN_TITLE', + name : 'DYN_TITLE2', allowBlank: false, width : 350 },{ xtype : 'textarea', fieldLabel: _('ID_DESCRIPTION'), - name : 'DYN_DESCRIPTION', + name : 'DYN_DESCRIPTION2', height : 120, width : 350 }, @@ -441,8 +441,8 @@ var dynaformColumns = new Ext.grid.ColumnModel({ if(getForm.DYN_SOURCE == 'blankDyna') { var sAction = getForm.ACTION; - var sTitle = getForm.DYN_TITLE[0]; - var sDesc = getForm.DYN_DESCRIPTION[0]; + var sTitle = getForm.DYN_TITLE1; + var sDesc = getForm.DYN_DESCRIPTION1; } else { @@ -457,8 +457,8 @@ var dynaformColumns = new Ext.grid.ColumnModel({ } var fieldname = Ext.util.JSON.encode(fName); var variable = Ext.util.JSON.encode(pVar); - sTitle = getForm.DYN_TITLE[1]; - sDesc = getForm.DYN_DESCRIPTION[1]; + sTitle = getForm.DYN_TITLE2; + sDesc = getForm.DYN_DESCRIPTION2; } if(sTitle == '' || sAction == '') @@ -517,6 +517,8 @@ var dynaformColumns = new Ext.grid.ColumnModel({ collapsible: false, maximizable: true, width: 550, + height: 300, + defaults :{autoScroll:true}, //autoHeight: true, //height: 500, layout: 'fit', @@ -666,7 +668,7 @@ ProcessOptions.prototype.dbConnection = function() id: 'DBS_DATABASE_NAME', header: 'Database Name', dataIndex: 'DBS_DATABASE_NAME', - //width: 100, + width: 150, sortable: true, editor: new Ext.form.TextField({ // allowBlank: false @@ -1901,7 +1903,7 @@ ProcessOptions.prototype.addOutputDoc= function(_5625) handler: function (s) { workflow.variablesAction = 'form'; workflow.fieldName = 'OUT_DOC_FILENAME' ; - workflow.variable = '@@', + workflow.variable = '@#', workflow.formSelected = outputDocForm; var rowData = ProcMapObj.ExtVariables(); console.log(rowData); @@ -2521,7 +2523,7 @@ var reportForm =new Ext.FormPanel({ align:'left', items:[{ xtype: 'combo', - width: 250, + width: 200, mode: 'local', editable:false, fieldLabel: 'Grid Fields', diff --git a/workflow/engine/templates/bpmn/TaskContext.js b/workflow/engine/templates/bpmn/TaskContext.js index 3099f80e6..e049649f9 100755 --- a/workflow/engine/templates/bpmn/TaskContext.js +++ b/workflow/engine/templates/bpmn/TaskContext.js @@ -440,7 +440,7 @@ TaskContext.prototype.editTaskSteps = function(_3252){ title: _('ID_STEPS_OF'), collapsible: false, maximizable: false, - width: 750, + width: 770, height: 365, minWidth: 200, minHeight: 150, @@ -1426,7 +1426,7 @@ TaskContext.prototype.stepTriggers = function() border : false, rootVisible : false, height : 320, - width : 200, + width : 230, useArrows : false, autoScroll : true, animate : true @@ -1572,7 +1572,7 @@ TaskContext.prototype.stepTriggers = function() fields : triggersFields }); //taskUsers.setDefaultSort('LABEL', 'asc'); - stepsTriggers.load({params:{start : 0 , limit : 10 }}); + stepsTriggers.load({params:{start : 0 , limit : 5 }}); var availableTriggers = new Ext.data.JsonStore({ root : 'data', @@ -1599,7 +1599,7 @@ TaskContext.prototype.stepTriggers = function() clicksToEdit: 1, width : 450, minHeight:400, - height :400, + height :320, layout: 'fit', plugins: [triggerEditor], columns: [ @@ -1676,7 +1676,7 @@ TaskContext.prototype.stepTriggers = function() stripeRows: true, viewConfig: {forceFit: true}, bbar: new Ext.PagingToolbar({ - pageSize: 10, + pageSize: 5, store: stepsTriggers, displayInfo: true, displayMsg: 'Displaying Step Tiggers {0} - {1} of {2}',