fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'upstream/master' into BUG-8038

Browse Source
This commit is contained in:
Marco Antonio Nina
2012-08-16 17:56:32 -04:00
parent 66a3f4a446 03fbc6cbb7
commit 5dc4e6bb28
22 changed files with 807 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
workflow/engine/classes/class.applications.php
View File

@@ -19,7 +19,7 @@ class Applications
$type = isset($type) ? $type: 'extjs';
$dateFrom = isset($dateFrom)? $dateFrom : '';
$dateTo = isset($dateTo) ? $dateTo : '';
G::LoadClass("BasePeer" );
G::LoadClass ( 'configuration' );
require_once ( "classes/model/AppCacheView.php" );
@@ -31,7 +31,7 @@ class Applications
//$userUid = ( isset($_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '' ) ? $_SESSION['USER_LOGGED'] : null; <-- passed by param
$oAppCache = new AppCacheView();
//get data configuration
$conf = new Configurations();
$confCasesList = $conf->getConfiguration('casesList',($action=='search'||$action=='simple_search')?'sent':$action );
@@ -98,10 +98,20 @@ class Applications
break;
}
// $Criteria->addJoin(AppCacheViewPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$Criteria->addJoin(AppCacheViewPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$Criteria->addSelectColumn(UsersPeer::USR_FIRSTNAME );
$Criteria->addSelectColumn(UsersPeer::USR_LASTNAME );
$Criteria->addAlias('CU', 'USERS');
$Criteria->addJoin(AppCacheViewPeer::USR_UID, 'CU.USR_UID', Criteria::LEFT_JOIN);
$Criteria->addAsColumn('USR_FIRSTNAME', 'CU.USR_FIRSTNAME');
$Criteria->addAsColumn('USR_LASTNAME', 'CU.USR_LASTNAME');
$Criteria->addAsColumn('USR_USERNAME', 'CU.USR_USERNAME');
// Fix for previous user
if ($action == 'todo' || $action == 'selfservice' || $action =='unassigned' || $action == 'paused' || $action == 'to_revise') {
$Criteria->addAlias('PU', 'USERS');
$Criteria->addJoin(AppCacheViewPeer::PREVIOUS_USR_UID, 'PU.USR_UID', Criteria::LEFT_JOIN);
$Criteria->addAsColumn('PREVIOUS_USR_FIRSTNAME', 'PU.USR_FIRSTNAME');
$Criteria->addAsColumn('PREVIOUS_USR_LASTNAME', 'PU.USR_LASTNAME');
$Criteria->addAsColumn('PREVIOUS_USR_USERNAME', 'PU.USR_USERNAME');
}
if ( !is_array($confCasesList) ) {
$rows = $this->getDefaultFields( $action );
@@ -155,14 +165,14 @@ class Applications
$CriteriaCount->add (AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
}
//add the filter
//add the filter
if ( $filter != '' ) {
switch ( $filter ) {
case 'read' :
$Criteria->add (AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
$CriteriaCount->add (AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
break;
case 'unread' :
case 'unread' :
$Criteria->add (AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
$CriteriaCount->add (AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
break;
@@ -175,7 +185,7 @@ class Applications
$CriteriaCount->add (AppCacheViewPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL);
break;
}
}
}
//add the search filter
if ( $search != '' ) {
@@ -245,7 +255,7 @@ class Applications
//here we count how many records exists for this criteria.
//BUT there are some special cases, and if we dont optimize them the server will crash.
$doCountAlreadyExecuted = false;
//case 1. when the SEARCH action is selected and none filter, search criteria is defined,
//case 1. when the SEARCH action is selected and none filter, search criteria is defined,
//we need to count using the table APPLICATION, because APP_CACHE_VIEW takes 3 seconds
if ( $action == 'search' && $filter == '' && $search == '' && $process == '' && $status == '' && $dateFrom == '' && $dateTo == '') {
@@ -282,7 +292,7 @@ class Applications
}
//add sortable options
//add sortable options
if ( $sort != '' ) {
if ( $dir == 'DESC' )
$Criteria->addDescendingOrderByColumn( $sort );
@@ -290,7 +300,7 @@ class Applications
$Criteria->addAscendingOrderByColumn( $sort );
}
//limit the results according the interface
//limit the results according the interface
$Criteria->setLimit( $limit );
$Criteria->setOffset( $start );
@@ -327,7 +337,7 @@ class Applications
$index = $start;
while($aRow = $oDataset->getRow()){
//$aRow = $oAppCache->replaceRowUserData($aRow);
/* For participated cases, we want the last step in the case, not only
* the last step this user participated. To do that we get every case
* information again for the last step. (This could be solved by a subquery,
@@ -349,14 +359,14 @@ class Applications
if (array_key_exists($col, $newData))
$aRow[$col] = $newData[$col];
}
$maxDataset->close();
}
if (!isset($aRow['APP_CURRENT_USER']))
$aRow['APP_CURRENT_USER'] = "[Unassigned]";
// replacing the status data with their respective translation
// replacing the status data with their respective translation
if( isset($aRow['APP_STATUS']) ){
$aRow['APP_STATUS'] = G::LoadTranslation("ID_{$aRow['APP_STATUS']}");
}
@@ -365,17 +375,17 @@ class Applications
if( isset($aRow['DEL_PRIORITY']) ){
$aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}");
}
$rows[] = $aRow;
$oDataset->next();
}
$result['data'] = $rows;
return $result;
}
//TODO: Encapsulates these and another default generation functions inside a class
/**
* generate all the default fields
@@ -631,7 +641,7 @@ class Applications
G::LoadClass('pmScript');
G::LoadClass('case');
$steps = Array();
$case = new Cases;
$step = new Step;
@@ -661,7 +671,7 @@ class Applications
if (trim($caseStep->getStepCondition()) != '') { // if it has a condition
$pmScript->setScript($caseStep->getStepCondition());
if (!$pmScript->evaluate()) { //evaluate
//evaluated false, jump & continue with the others steps
continue;
@@ -689,18 +699,18 @@ class Applications
$outputDoc = $appDocument->getObject($appUid, $index, $caseStep->getStepUidObj(), 'OUTPUT');
$stepItem['title'] = $oDocument->getOutDocTitle();
if ($outputDoc['APP_DOC_UID']) {
$stepItem['url'] = "cases/cases_Step?UID=$stepUid&TYPE=$stepType&POSITION=$stepPosition&ACTION=VIEW&DOC={$outputDoc['APP_DOC_UID']}";
$stepItem['url'] = "cases/cases_Step?UID=$stepUid&TYPE=$stepType&POSITION=$stepPosition&ACTION=VIEW&DOC={$outputDoc['APP_DOC_UID']}";
}
else {
$stepItem['url'] = "cases/cases_Step?UID=$stepUid&TYPE=$stepType&POSITION=$stepPosition&ACTION=GENERATE";
$stepItem['url'] = "cases/cases_Step?UID=$stepUid&TYPE=$stepType&POSITION=$stepPosition&ACTION=GENERATE";
}
break;
case 'INPUT_DOCUMENT':
$oDocument = InputDocumentPeer::retrieveByPK($stepUid);
$stepItem['title'] = $oDocument->getInpDocTitle();
$stepItem['url'] = "cases/cases_Step?UID=$stepUid&TYPE=$stepType&POSITION=$stepPosition&ACTION=ATTACH";
break;
@@ -708,11 +718,11 @@ class Applications
case 'EXTERNAL':
$stepTitle = 'unknown ' . $caseStep->getStepUidObj();
$oPluginRegistry = PMPluginRegistry::getSingleton();
$externalStep = $externalSteps[$caseStep->getStepUidObj()];
$stepItem['id'] = $externalStep->sStepId;
$stepItem['title'] = $externalStep->sStepTitle;
$stepItem['url'] = "cases/cases_Step?UID={$externalStep->sStepId}&TYPE=EXTERNAL&POSITION=$stepPosition&ACTION=EDIT";
$stepItem['url'] = "cases/cases_Step?UID={$externalStep->sStepId}&TYPE=EXTERNAL&POSITION=$stepPosition&ACTION=EDIT";
break;
}
@@ -725,8 +735,8 @@ class Applications
$stepItem['type'] = '';
$stepItem['title'] = G::LoadTranslation('ID_ASSIGN_TASK');
$stepItem['url'] = "cases/cases_Step?TYPE=ASSIGN_TASK&UID=-1&POSITION=10000&ACTION=ASSIGN";
$steps[] = $stepItem;
$steps[] = $stepItem;
return $steps;
}

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

@@ -125,7 +125,7 @@ class Derivation
$aDerivation['NEXT_TASK']['TAS_DEF_PROC_CODE'] = '';
$aDerivation['NEXT_TASK']['TAS_PARENT'] = '';
$aDerivation['NEXT_TASK']['TAS_TRANSFER_FLY'] = '';
switch ($aDerivation['ROU_NEXT_TASK']) {
case -1: $aDerivation['NEXT_TASK']['TAS_TITLE'] = G::LoadTranslation('ID_END_OF_PROCESS');
break;
@@ -274,12 +274,10 @@ class Derivation
$oUser = UsersPeer::retrieveByPK( $row['USR_UID'] );
if( $oUser->getUsrStatus() == 'ACTIVE' ){
$users[$row['USR_UID']] = $row['USR_UID'];
} else if($oUser->getUsrStatus() == 'VACATION'){
//this a litle hook for this issue,...
//TODO if the user in getUsrReplacedBy() is not assignet to the same task,. will have problems,....
$UsrReplace = $oUser->getUsrReplacedBy();
if( trim($UsrReplace) != ''){
//$users[$UsrReplace] = $UsrReplace;
} else {
$userUID = $this->checkReplacedByUser($oUser);
if ($userUID != '') {
$users[$userUID] = $userUID;
}
}
}
@@ -321,7 +319,7 @@ class Derivation
else {
$oCriteria = new Criteria();
$oCriteria->add(UsersPeer::USR_UID, $aUsers);
if (UsersPeer::doCount($oCriteria) < 1) {
return null;
}
@@ -394,7 +392,7 @@ class Derivation
$variable = str_replace ( '@@', '', $nextAssignedTask['TAS_ASSIGN_VARIABLE'] );
if ( isset ( $AppFields['APP_DATA'][$variable] ) ) {
if ($AppFields['APP_DATA'][$variable] != '') {
$value = $AppFields['APP_DATA'][$variable];
$value = $this->checkReplacedByUser($AppFields['APP_DATA'][$variable]);
$userFields = $this->getUsersFullNameFromArray ($value);
if (is_null($userFields)) {
throw ( new Exception("Task doesn't have a valid user in variable $variable.") ) ;
@@ -419,12 +417,12 @@ class Derivation
$userFields['USR_EMAIL'] = '';
//get the report_to user & its full info
$useruid = $this->getDenpendentUser($tasInfo['USER_UID']);
$useruid = $this->getDenpendentUser($this->checkReplacedByUser($tasInfo['USER_UID']));
if (isset($useruid) && $useruid != '') {
$userFields = $this->getUsersFullNameFromArray($useruid);
}
// if there is no report_to user info, throw an exception indicating this
if (!isset($userFields) || $userFields['USR_UID'] == '') {
throw ( new Exception(G::LoadTranslation('ID_MSJ_REPORSTO')));// "The current user does not have a valid Reports To user. Please contact administrator.") ) ;
@@ -555,7 +553,7 @@ class Derivation
$iAppThreadIndex = $appFields['DEL_THREAD'];
$this->case->closeAppThread ( $currentDelegation['APP_UID'], $iAppThreadIndex);
break;
default:
// get all siblingThreads
//if($currentDelegation['TAS_ASSIGN_TYPE'] == 'STATIC_MI')
@@ -574,22 +572,22 @@ class Derivation
$sMIcompleteVar = $aData['APP_DATA'][str_replace('@@', '', $currentDelegation['TAS_MI_COMPLETE_VARIABLE'])];
else
$sMIcompleteVar = $aData['APP_DATA']['TAS_MI_COMPLETE_VARIABLE'];
$discriminateThread = $sMIinstanceVar - $sMIcompleteVar;
// -1 because One App Delegation is closed by above Code
if($discriminateThread == count($siblingThreads))
$canDerivate =true;
else
$canDerivate =false;
break;
default:
if ( $currentDelegation['ROU_TYPE'] == 'SEC-JOIN') {
$siblingThreads = $this->case->getOpenSiblingThreads(
$nextDel['TAS_UID'],
$currentDelegation['APP_UID'],
$currentDelegation['DEL_INDEX'],
$nextDel['TAS_UID'],
$currentDelegation['APP_UID'],
$currentDelegation['DEL_INDEX'],
$currentDelegation['TAS_UID'],
$currentDelegation['ROU_TYPE']
);
@@ -641,26 +639,26 @@ class Derivation
$appFields['APP_STATUS'] = $currentDelegation['APP_STATUS'];
/* Start Block : Count the open threads of $currentDelegation['APP_UID'] */
$openThreads = $this->case->GetOpenThreads( $currentDelegation['APP_UID'] );
///////
$sw = 0;
if ($openThreads == 0) {
//Close case
$appFields["APP_STATUS"] = "COMPLETED";
$appFields["APP_FINISH_DATE"] = "now";
$this->verifyIsCaseChild($currentDelegation["APP_UID"]);
$sw = 1;
}
if (isset($iNewDelIndex)) {
$appFields["DEL_INDEX"] = $iNewDelIndex;
$appFields["TAS_UID"] = $nextDel["TAS_UID"];
$sw = 1;
}
if ($sw == 1) {
//Start Block : UPDATES APPLICATION
$this->case->updateCase($currentDelegation["APP_UID"], $appFields);
@@ -673,7 +671,7 @@ class Derivation
{
$iAppThreadIndex = $appFields['DEL_THREAD'];
$delType = 'NORMAL';
if (is_numeric($nextDel['DEL_PRIORITY'])) {
$nextDel['DEL_PRIORITY'] = (isset($nextDel['DEL_PRIORITY']) ? ($nextDel['DEL_PRIORITY'] >= 1 && $nextDel['DEL_PRIORITY'] <= 5 ? $nextDel['DEL_PRIORITY'] : '3') : '3');
}
@@ -686,12 +684,12 @@ class Derivation
// Create new delegation depending on the no of users in the group
$iNewAppThreadIndex = $appFields['DEL_THREAD'];
$this->case->closeAppThread ( $currentDelegation['APP_UID'], $iAppThreadIndex);
foreach($nextDel['NEXT_TASK']['USER_ASSIGNED'] as $key=>$aValue){
//Incrementing the Del_thread First so that new delegation has new del_thread
$iNewAppThreadIndex += 1;
//Creating new delegation according to users in group
$iMIDelIndex = $this->case->newAppDelegation(
$iMIDelIndex = $this->case->newAppDelegation(
$appFields['PRO_UID'],
$currentDelegation['APP_UID'],
$nextDel['TAS_UID'],
@@ -732,7 +730,7 @@ class Derivation
}
$iAppThreadIndex = $appFields['DEL_THREAD'];
switch ( $currentDelegation['ROU_TYPE'] ) {
case 'PARALLEL' :
case 'PARALLEL-BY-EVALUATION' :
@@ -741,12 +739,12 @@ class Derivation
$this->case->updateAppDelegation ( $currentDelegation['APP_UID'], $iNewDelIndex, $iNewThreadIndex );
//print " this->case->updateAppDelegation ( " . $currentDelegation['APP_UID'] .", " . $iNewDelIndex ." , " . $iNewThreadIndex . " )<br>";
break;
case 'DISCRIMINATOR':
if($currentDelegation['ROU_OPTIONAL'] == 'TRUE') {
$this->case->discriminateCases($currentDelegation);
} //No Break, executing Default Condition
default :
switch ($currentDelegation['TAS_ASSIGN_TYPE']) {
case 'CANCEL_MI':
@@ -776,7 +774,7 @@ class Derivation
$aOldFields['APP_DATA'] = array_merge($aOldFields['APP_DATA'], $aNewFields);
$aOldFields['APP_STATUS'] = 'TO_DO';
$this->case->updateCase($aNewCase['APPLICATION'], $aOldFields);
//Create a registry in SUB_APPLICATION table
$aSubApplication = array('APP_UID' => $aNewCase['APPLICATION'],
@@ -796,11 +794,11 @@ class Derivation
$oSubApplication->create($aSubApplication);
//Update the AppDelegation to execute the update trigger
$AppDelegation = AppDelegationPeer::retrieveByPK($aNewCase['APPLICATION'], $aNewCase['INDEX']);
// note added by krlos pacha carlos[at]colosa[dot]com
// the following line of code was commented because it is related to the 6878 bug
// note added by krlos pacha carlos[at]colosa[dot]com
// the following line of code was commented because it is related to the 6878 bug
//$AppDelegation->setDelInitDate("+1 second");
$AppDelegation->save();
//If not is SYNCHRONOUS derivate one more time
@@ -1031,8 +1029,28 @@ class Derivation
$aData[$aKey] = $userid;
}
return $aGrp;
//var_dump($aDerivation);
//die;
}
}
function checkReplacedByUser($user)
{
if (get_class($user) != 'Users') {
$userInstance = UsersPeer::retrieveByPK($user);
} else {
$userInstance = $user;
}
if (!is_object($userInstance)) {
throw new Exception("The user with the UID '$user' doesn't exist.");
}
if ($userInstance->getUsrStatus() == 'ACTIVE') {
return $userInstance->getUsrUid();
} else {
$userReplace = trim($userInstance->getUsrReplacedBy());
if ($userReplace != '') {
return $this->checkReplacedByUser(UsersPeer::retrieveByPK($userReplace));
} else {
return '';
}
}
}
}

24
workflow/engine/classes/model/Dynaform.php
View File

@@ -2,7 +2,7 @@
/**
* Dynaform.php
* @package workflow.engine.classes.model
*
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2011 Colosa Inc.
*
@@ -81,7 +81,7 @@ class Dynaform extends BaseDynaform {
if ($this->dyn_title !== $v || $v === '') {
$this->dyn_title = $v;
$lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
$res = Content::addContent( 'DYN_TITLE', '', $this->getDynUid(), $lang, $this->dyn_title );
}
@@ -127,7 +127,7 @@ class Dynaform extends BaseDynaform {
if ($this->dyn_description !== $v || $v === '') {
$this->dyn_description = $v;
$lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
$res = Content::addContent( 'DYN_DESCRIPTION', '', $this->getDynUid(), $lang, $this->dyn_description );
}
@@ -175,7 +175,7 @@ class Dynaform extends BaseDynaform {
$con->commit();
$sXml = '<?xml version="1.0" encoding="UTF-8"?>'."\n";
$sXml .= '<dynaForm type="' . $this->getDynType() . '" name="' . $this->getProUid() . '/' . $this->getDynUid() . '" width="500" enabletemplate="0" mode="">'."\n";
$sXml .= '<dynaForm type="' . $this->getDynType() . '" name="' . $this->getProUid() . '/' . $this->getDynUid() . '" width="500" enabletemplate="0" mode="" nextstepsave="prompt">'."\n";
$sXml .= '</dynaForm>';
G::verifyPath(PATH_DYNAFORM . $this->getProUid(), true);
$oFile = fopen(PATH_DYNAFORM . $this->getProUid() . '/' . $this->getDynUid() . '.xml', 'w');
@@ -200,7 +200,7 @@ class Dynaform extends BaseDynaform {
/**
*
* Creates a Dynaform based on a PMTable
*
*
* @name createFromPMTable
* @author gustavo cruz gustavo[at]colosa[dot]com
* @param array $aData Fields with :
@@ -252,7 +252,7 @@ class Dynaform extends BaseDynaform {
} else {
$sql = 'DESC '.$addTabName;
}
$dbh = Propel::getConnection(AdditionalTablesPeer::DATABASE_NAME);
$sth = $dbh->createStatement();
$res = $sth->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
@@ -277,7 +277,7 @@ class Dynaform extends BaseDynaform {
if ($res->get('Key') != '') {
$countKeys++;
}
if ($res->get('Extra') == 'auto_increment') {
if ($res->get('Extra') == 'auto_increment') {
$keyRequered .= $res->get('Field');
}
}
@@ -474,7 +474,7 @@ class Dynaform extends BaseDynaform {
throw($oError);
}
}
function getDynaformContent( $dynaformUid) {
$content = '';
$fields = $this->Load ( $dynaformUid);
@@ -482,9 +482,9 @@ class Dynaform extends BaseDynaform {
if (file_exists( $filename )) {
$content = file_get_contents ( $filename );
}
return $content;
}
}
function getDynaformFields( $dynaformUid) {
$content = '';
@@ -493,10 +493,10 @@ class Dynaform extends BaseDynaform {
if (file_exists( $filename )) {
$content = file_get_contents ( $filename );
}
$G_FORM = new xmlform ( $fields['DYN_FILENAME'] , PATH_DYNAFORM );
$G_FORM->parseFile( $filename , SYS_LANG, true );
return $G_FORM->fields;
}

51
workflow/engine/js/dbConnections/main.js
View File

@@ -1,14 +1,13 @@
/*
* Data base connection javascript routines
* @Author Erik Amatu Ortiz <erik@colosa.com>
* Data base connection javascript routines
* @Author Erik Amatu Ortiz <erik@colosa.com>
* @Update date May 20th, 2009
*/
var PROCESS_REQUEST_FILE = '../dbConnections/dbConnectionsAjax';
String.prototype.trim = function()
{
return this.replace(/^\s+|\s+get/g,"");
String.prototype.trim = function () {
return this.replace(/^\s+|\s+$/g, "");
}
var oPanel;
@@ -86,7 +85,7 @@ function saveEditDBConnection()
if( getField('DBS_PORT').value.trim() == '' || getField('DBS_PORT').value.trim() == '0' ) {
onChangeType();
}
var dbs_uid = currentEditDBS_UID;
var type = $('form[DBS_TYPE]').value;
var server = $('form[DBS_SERVER]').value;
@@ -375,16 +374,16 @@ function validateFields()
if( getField('DBS_PORT').value.trim() == '' || getField('DBS_PORT').value.trim() == '0' ) {
onChangeType();
}
var res = true;
var o = new input(getField('DBS_SERVER'));
if($('form[DBS_SERVER]').value == '') {
//new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG4});
o.failed();
res = false;
} else
} else
o.passed();
var o = new input(getField('DBS_DATABASE_NAME'));
if($('form[DBS_DATABASE_NAME]').value == '') {
//new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG5});
@@ -392,7 +391,7 @@ function validateFields()
res = false;
} else
o.passed();
var o = new input(getField('DBS_USERNAME'));
if($('form[DBS_USERNAME]').value == '') {
//new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_MSG6});
@@ -400,22 +399,22 @@ function validateFields()
res = false;
} else
o.passed();
/*var o = new input(getField('DBS_PORT'));
if($('form[DBS_PORT]').value == '') {
o.failed();
res = false;
} else
o.passed();*/
var o = new input(getField('DBS_TYPE'));
if($('form[DBS_TYPE]').value == '0') {
o.failed();
res = false;
} else
o.passed();
oType = getField('DBS_TYPE');
oType = getField('DBS_TYPE');
if( oType.value != 'mssql' && oType.value != 'oracle' ){
var o = new input(getField('DBS_ENCODE'));
if($('form[DBS_ENCODE]').value == '0') {
@@ -425,7 +424,7 @@ function validateFields()
o.passed();
}
if(!res){
new leimnud.module.app.alert().make({label: G_STRINGS.DBCONNECTIONS_ALERT});
}
@@ -434,7 +433,7 @@ function validateFields()
var onChangeType = function() {
var oAux = getField('DBS_PORT');
switch(getField('DBS_TYPE').value) {
case 'mysql':
oAux.value = '3306';
@@ -451,11 +450,11 @@ var onChangeType = function() {
default:
oAux.value = '';
}
};
function showEncodes(pre){
oType = getField('DBS_TYPE');
oType = getField('DBS_TYPE');
//if( oType.value != 'mssql' && oType.value != 'oracle' ){
if( oType.value != 'oracle' ){
showRowById('DBS_ENCODE');
@@ -465,29 +464,29 @@ function showEncodes(pre){
res = false;
} else
o.passed();
var o = getField('DBS_TYPE');
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
args: 'action=showEncodes&engine='+o.value
});
oRPC.callback = function(rpc){
var oEnc = getField('DBS_ENCODE');
response = eval('{'+oRPC.xmlhttp.responseText+'}');
oEnc.options.length = 0;
//set news
for(i=0; i<response.length; i++){
var newOption = new Option(response[i][1], response[i][0]);
oEnc.options[i] = newOption;
}
if(pre != null)
oEnc.value = pre;
var o = new input(getField('DBS_ENCODE'));
if($('form[DBS_ENCODE]').value == '0') {
o.failed();
@@ -500,5 +499,3 @@ function showEncodes(pre){
hideRowById('DBS_ENCODE');
}
}

2
workflow/engine/js/processmap/core/processmap.js
View File

@@ -1368,7 +1368,7 @@ var processmap=function(){
/* Change label End */
var menu = new this.parent.module.app.menuRight();
var textMenu = G_STRINGS.ID_PROCESSMAP_USERS_AND_GROUPS_ADHOC;
var lengthText = textMenu.length * 0.60;
var lengthText = mb_strlen(textMenu) * 0.60;
menu.make({
target: a,

25
workflow/engine/js/setup/emails.js
View File

@@ -5,7 +5,7 @@
var PROCESS_REQUEST_FILE = '../setup/emails_Ajax';
var oPanel;
function verifyFields(oForm) {
function verifyFields(oForm) {
switch (getField('MESS_ENGINE').value) {
case 'PHPMAILER':
verifyPassword = 0;
@@ -25,7 +25,7 @@ function verifyFields(oForm) {
} else {
if ($('form[MESS_RAUTH]').checked) {
oAuxP = $('form[MESS_PASSWORD]').value;
oAuxPH = $('form[MESS_PASSWORD_HIDDEN]').value;
oAuxPH = $('form[MESS_PASSWORD_HIDDEN]').value;
if ((oAuxP == '')&&(oAuxPH == '')) {
new leimnud.module.app.alert().make({
label : G_STRINGS.ID_PASSWORD_REQUIRED
@@ -82,18 +82,18 @@ function testConnection() {
params += '&passwd=' + getField('MESS_PASSWORD').value;
}
else {
params += '&passwd=' + getField('MESS_PASSWORD_HIDDEN').value;
params += '&passwd=' + getField('MESS_PASSWORD_HIDDEN').value;
}
params += '&auth_required='+ (getField('MESS_RAUTH').checked ? 'yes' : 'no');
params += '&send_test_mail='+ (getField('MESS_TEST_MAIL').checked ? 'yes' : 'no');
params += '&mail_to=' + $('form[MESS_TEST_MAIL_TO]').value;
if(getField('SMTPSecure][ssl').checked) {
params +='&SMTPSecure=ssl';
} else if(getField('SMTPSecure][tls').checked) {
params +='&SMTPSecure=tls';
} else {
params +='&SMTPSecure=';
params +='&SMTPSecure=';
}
oPanel = new leimnud.module.panel();
@@ -111,10 +111,10 @@ function testConnection() {
delete (oPanel);
}.extend(this)
};
oPanel.make();
oPanel.loader.show();
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
args : 'request=init&' + params
@@ -168,7 +168,7 @@ function testConnectionMail() {
var resultset = true;
function testSMTPHost(step, params) {
$("test_" + step).style.display = "block";
var requestfile = PROCESS_REQUEST_FILE;
var uri = 'request=testConnection&step=' + step +'&'+ params;
@@ -222,9 +222,10 @@ function cancelTestConnection() {
}
// /************* Adds routines *************///
String.prototype.trim = function() {
return this.replace(/^\s+|\s+get/g, "");
String.prototype.trim = function () {
return this.replace(/^\s+|\s+$/g, "");
}
function $(id) {
return document.getElementById(id);
}
@@ -277,12 +278,12 @@ function initSet() {
}
var verifyData = function(oForm) {
if (getField('MESS_ENABLED').checked) {
if (getField('MESS_RAUTH').checked) {
if (getField('MESS_PASSWORD') == '') {
getField('MESS_PASSWORD').value = getField('MESS_PASSWORD_HIDDEN').value;
}
}
}
switch (getField('MESS_ENGINE').value) {
case 'PHPMAILER':

43
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -331,23 +331,25 @@
//these getXX function gets the default fields in casesListSetup
function getToDo() {
$caseColumns = array ();
$caseColumns[] = array( 'header' => '#', 'dataIndex' => 'APP_NUMBER', 'width' => 45, 'align' => 'center');
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'), 'dataIndex' => 'CASE_SUMMARY', 'width' => 45, 'align' => 'center', 'sorteable'=>false);
$caseColumns[] = array( 'header' => '#', 'dataIndex' => 'APP_NUMBER', 'width' => 45, 'align' => 'center');
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'), 'dataIndex' => 'CASE_SUMMARY', 'width' => 45, 'align' => 'center', 'sorteable'=>false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center', 'sorteable'=>false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'), 'dataIndex' => 'APP_TITLE', 'width' => 150 );
$caseColumns[] = array( 'header' => 'UserUid', 'dataIndex' => 'USR_UID', 'width' => 50 , 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => 'PreUsrUid', 'dataIndex' => 'PREVIOUS_USR_UID', 'width' => 50 , 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'), 'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_DUE_DATE'), 'dataIndex' => 'DEL_TASK_DUE_DATE', 'width' => 110);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'),'dataIndex' => 'APP_UPDATE_DATE', 'width' => 110 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PRIORITY'), 'dataIndex' => 'DEL_PRIORITY', 'width' => 50 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'), 'dataIndex' => 'APP_TITLE', 'width' => 150 );
$caseColumns[] = array( 'header' => 'UserUid', 'dataIndex' => 'USR_UID', 'width' => 50 , 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'), 'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_DUE_DATE'), 'dataIndex' => 'DEL_TASK_DUE_DATE', 'width' => 110);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE', 'width' => 110 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PRIORITY'), 'dataIndex' => 'DEL_PRIORITY', 'width' => 50 );
$caseReaderFields = array();
$caseReaderFields[] = array( 'name' => 'APP_UID' );
$caseReaderFields[] = array( 'name' => 'USR_UID' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_FIRSTNAME' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_LASTNAME' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_USERNAME' );
$caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
$caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
$caseReaderFields[] = array( 'name' => 'APP_TITLE' );
@@ -491,7 +493,6 @@
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center', 'sorteable'=>false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'), 'dataIndex' => 'APP_TITLE', 'width' => 150 );
$caseColumns[] = array( 'header' => 'UserUid', 'dataIndex' => 'USR_UID', 'width' => 50, 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => 'PreUsrUid', 'dataIndex' => 'PREVIOUS_USR_UID','width' => 50, 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 );
@@ -506,6 +507,9 @@
$caseReaderFields[] = array( 'name' => 'APP_UID' );
$caseReaderFields[] = array( 'name' => 'USR_UID' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_FIRSTNAME' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_LASTNAME' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_USERNAME' );
$caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
$caseReaderFields[] = array( 'name' => 'APP_STATUS' );
$caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
@@ -532,12 +536,9 @@
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center', 'sorteable'=>false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASE'), 'dataIndex' => 'APP_TITLE', 'width' => 150 );
$caseColumns[] = array( 'header' => 'UserUid', 'dataIndex' => 'USR_UID', 'width' => 50, 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => 'PreUsrUid', 'dataIndex' => 'PREVIOUS_USR_UID', 'width' => 50, 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'), 'dataIndex' => 'APP_DEL_PREVIOUS_USER','width' => 90 );
$caseColumns[] = array( 'header' => 'UserUid', 'dataIndex' => 'USR_UID', 'width' => 50, 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => 'PreUsrUid', 'dataIndex' => 'PREVIOUS_USR_UID', 'width' => 50, 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE', 'width' => 80 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_THREAD_INDEX'),'dataIndex' => 'APP_THREAD_INDEX', 'width' => 80 );
@@ -547,6 +548,9 @@
$caseReaderFields[] = array( 'name' => 'APP_UID' );
$caseReaderFields[] = array( 'name' => 'USR_UID' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_FIRSTNAME' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_LASTNAME' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_USERNAME' );
$caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
$caseReaderFields[] = array( 'name' => 'APP_STATUS' );
$caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
@@ -578,7 +582,7 @@
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'), 'dataIndex' => 'ID_SENT_BY','width' => 90 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'), 'dataIndex' => 'APP_DEL_PREVIOUS_USER','width' => 90 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CURRENT_USER'),'dataIndex' => 'APP_CURRENT_USER','width' => 90 );
// $caseColumns[] = array( 'header' =>'Sent By', 'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 90 );
///-- $caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE', 'width' => 110 );
@@ -589,6 +593,9 @@
$caseReaderFields[] = array( 'name' => 'APP_UID' );
$caseReaderFields[] = array( 'name' => 'USR_UID' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_UID' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_FIRSTNAME' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_LASTNAME' );
$caseReaderFields[] = array( 'name' => 'PREVIOUS_USR_USERNAME' );
$caseReaderFields[] = array( 'name' => 'APP_NUMBER' );
$caseReaderFields[] = array( 'name' => 'DEL_INDEX' );
$caseReaderFields[] = array( 'name' => 'APP_TITLE' );
@@ -601,7 +608,7 @@
$caseReaderFields[] = array( 'name' => 'DEL_PRIORITY' );
$caseReaderFields[] = array( 'name' => 'APP_STATUS' );
$caseReaderFields[] = array( 'name' => 'APP_FINISH_DATE' );
$caseReaderFields[] = array( 'name' => 'ID_SENT_BY' );
$caseReaderFields[] = array( 'name' => 'APP_DEL_PREVIOUS_USER' );
$caseReaderFields[] = array( 'name' => 'CASE_SUMMARY' );
$caseReaderFields[] = array( 'name' => 'CASE_NOTES_COUNT' );
@@ -612,8 +619,6 @@
$caseColumns = array ();
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SUMMARY'), 'dataIndex' => 'CASE_SUMMARY', 'width' => 45, 'align' => 'center', 'sorteable'=>false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CASES_NOTES'), 'dataIndex' => 'CASE_NOTES_COUNT', 'width' => 45, 'align' => 'center', 'sorteable'=>false);
$caseColumns[] = array( 'header' => 'TaskUid', 'dataIndex' => 'TAS_UID' , 'width' => 150 ,'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => 'DelIndex', 'dataIndex' => 'DEL_INDEX' , 'width' => 150 ,'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => 'UserUid', 'dataIndex' => 'USR_UID', 'width' => 50, 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => 'PreUsrUid', 'dataIndex' => 'PREVIOUS_USR_UID','width' => 50, 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => '#', 'dataIndex' => 'APP_NUMBER', 'width' => 45, 'align' => 'center');

3
workflow/engine/methods/users/usersAjax.php
View File

@@ -56,6 +56,9 @@ switch($_POST['action'])
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
$oCriteria->add(UsersPeer::USR_STATUS,'ACTIVE');
if (isset($_POST['USR_UID'])) {
$oCriteria->add(UsersPeer::USR_UID, $_POST['USR_UID'], Criteria::NOT_EQUAL);
}
$oDataset = UsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);

27
workflow/engine/skinEngine/base/css/style.css
View File

@@ -11,7 +11,7 @@ a, img {
margin: 0;
}
img {
img {
border: 0 none;
}
@@ -830,6 +830,7 @@ form.formSearch .Record
{
color:#2078A8;
text-decoration:none;
white-space:nowrap;
}
.pagedTableDefault, .pagedTableDefault .headerContent .tableOption a:hover
{
@@ -882,6 +883,7 @@ font-weight:bold;
text-decoration: none;
padding-left: 5px;
font: bold 11px Tahoma,sans-serif, MiscFixed;
white-space:nowrap;
}
.pagedTableDefault .pagedTable a:hover
{
@@ -960,6 +962,7 @@ font-weight:bold;
}
.pagedTableDefault .pagedTable .RowLink a{
display:block;
white-space:nowrap;
}
A.firstPage {
@@ -1555,14 +1558,14 @@ div.autosuggest div.as_footer
position: relative;
height: 0px;
padding: 0 6px;
background-position: top right;
background-repeat: no-repeat;
overflow: hidden;
}
div.autosuggest div.as_footer
{
}
div.autosuggest div.as_header div.as_corner,
@@ -1573,13 +1576,13 @@ div.autosuggest div.as_footer div.as_corner
left: 0;
height: 6px;
width: 6px;
background-position: top left;
background-repeat: no-repeat;
}
div.autosuggest div.as_footer div.as_corner
{
}
div.autosuggest div.as_header div.as_bar,
div.autosuggest div.as_footer div.as_bar
@@ -1651,14 +1654,14 @@ div.autosuggest ul li.as_highlight a
{
color: #000;
background-color: #D1DEDF; /* erik -- hover*/
background-position: bottom right;
background-repeat: no-repeat;
}
div.autosuggest ul li.as_highlight a span
{
background-position: bottom left;
background-repeat: no-repeat;
}
@@ -1689,7 +1692,7 @@ div.autosuggest ul li.as_highlight a .tl
div.autosuggest ul li.as_highlight a .tr
{
right: 0;
background-position: bottom right;
}
@@ -3122,7 +3125,7 @@ ul#pm_submenu a{
}
ul#pm_submenu a img{
float:left;
max-height: 18px;
max-height: 18px;
}
ul#pm_submenu li.SelectedSubMenu,ul#pm_submenu li:hover{
background-color: #CCC;
@@ -3170,7 +3173,7 @@ button.x-btn-text:focus,.x-combo-selected{
-moz-border-left-colors: none;
-moz-border-right-colors: none;
-moz-border-top-colors: none;
background: -moz-linear-gradient(white, #E1E1E1) repeat scroll 0 0 transparent;
background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#E1E1E1));
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#E1E1E1'); /* IE6,IE7 */
@@ -3213,7 +3216,7 @@ button.x-btn-text:focus,.x-combo-selected{
-moz-border-left-colors: none;
-moz-border-right-colors: none;
-moz-border-top-colors: none;
background: -moz-linear-gradient(white, #E1E1E1) repeat scroll 0 0 transparent;
background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#E1E1E1));
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#E1E1E1'); /* IE6,IE7 */
@@ -3261,7 +3264,7 @@ button.x-btn-text:focus,.x-combo-selected{
background: -webkit-gradient(linear, 0 0, 0 100%, from(#829AA8), to(#405A6A));
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#829AA8', endColorstr='#405A6A'); /* IE6,IE7 */
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#829AA8', endColorstr='#405A6A')"; /* IE8 */
border-color: #677C89 #677C89 #6B808D;
border-radius: 3px 3px 0 0;
border-style: solid;

68
workflow/engine/templates/cases/casesList.js
View File

@@ -123,7 +123,7 @@ function jumpToCase(appNumber){
}
},
params: {action:'previusJump', appNumber: appNumber}
});
});
}
function deleteCase() {
@@ -226,7 +226,7 @@ function pauseCase(date){
var noteReasonTxt = '';
}
var notifyReasonVal = Ext.getCmp('notifyReason').getValue() == true ? 1 : 0;
Ext.MessageBox.show({ msg: _('ID_PROCESSING'), wait:true,waitConfig: {interval:200} });
Ext.Ajax.request({
url: 'cases_Ajax',
@@ -260,7 +260,7 @@ function pauseCase(date){
]
});
msgPause.show(this);
} else {
Ext.Msg.show({
title:'',
@@ -459,9 +459,14 @@ Ext.onReady ( function() {
}
function dueDate(value, p, r){
var myDate = convertDate( value );
var myColor = (myDate < new Date()) ? " color:red;" : 'color:green;';
return String.format("<span style='{1}'>{0}</span>", myDate.dateFormat(FORMATS.casesListDateFormat), myColor );
if (value) {
var myDate = convertDate( value );
var myColor = (myDate < new Date()) ? " color:red;" : 'color:green;';
return String.format("<span style='{1}'>{0}</span>", myDate.dateFormat(FORMATS.casesListDateFormat), myColor );
}
else {
return '';
}
}
var renderSummary = function (val, p, r) {
@@ -477,8 +482,22 @@ Ext.onReady ( function() {
}
//Render Full Name
full_name = function(v,x,s){
return _FNF(v, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
full_name = function(v, x, s) {
if (s.data.USR_UID) {
return _FNF(s.data.USR_USERNAME, s.data.USR_FIRSTNAME, s.data.USR_LASTNAME);
}
else {
return '';
}
};
previous_full_name = function(v, x, s) {
if (s.data.PREVIOUS_USR_UID) {
return _FNF(s.data.PREVIOUS_USR_USERNAME, s.data.PREVIOUS_USR_FIRSTNAME, s.data.PREVIOUS_USR_LASTNAME);
}
else {
return '';
}
};
for(var i = 0, len = columns.length; i < len; i++){
@@ -491,7 +510,7 @@ Ext.onReady ( function() {
if( c.id == 'unpauseLink') c.renderer = unpauseLink;
if( c.dataIndex == 'CASE_SUMMARY') c.renderer = renderSummary;
if( c.dataIndex == 'CASE_NOTES_COUNT') c.renderer = renderNote;
if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = full_name;
if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = previous_full_name;
if( c.dataIndex == 'APP_CURRENT_USER') c.renderer = full_name;
}
@@ -502,6 +521,7 @@ Ext.onReady ( function() {
readerFields.push ( {name: "USR_FIRSTNAME"});
readerFields.push ( {name: "USR_LASTNAME"});
readerFields.push ( {name: "USR_USERNAME"});
for (i=0; i<columns.length; i++) {
if (columns[i].dataIndex == 'USR_UID') {
@@ -576,7 +596,7 @@ Ext.onReady ( function() {
//storeReassignCases.reload();
}
});
var ExecReassign = function () {
newPopUp.hide();
var rs = storeReassignCases.getModifiedRecords();
@@ -615,7 +635,7 @@ Ext.onReady ( function() {
params: { APP_UIDS:ids, data:Ext.util.JSON.encode(sv), selected:true }
});
}
// Create HttpProxy instance, all CRUD requests will be directed to single proxy url.
@@ -1097,12 +1117,12 @@ Ext.onReady ( function() {
optionMenuDelete.setDisabled(false);
}
break;
default:
default:
if( rows.length == 0 ) {
optionMenuOpen.setDisabled(true);
}
else {
optionMenuOpen.setDisabled(false);
optionMenuOpen.setDisabled(false);
}
}
}
@@ -1589,7 +1609,7 @@ Ext.onReady ( function() {
id: 'casesGrid',
store: storeCases,
cm: cm,
sm: new Ext.grid.RowSelectionModel({
selectSingle: false,
listeners:{
@@ -1612,7 +1632,7 @@ Ext.onReady ( function() {
listeners: {
rowdblclick: openCase,
render: function(){
//this.loadMask = new Ext.LoadMask(this.body, {msg:TRANSLATIONS.LABEL_GRID_LOADING});
//this.ownerCt.doLayout();
}
@@ -1662,7 +1682,7 @@ Ext.onReady ( function() {
store: storeReassignCases,
cm: reassignCm,
autoHeight: true,
autoHeight: true,
viewConfig: {
forceFit:true
}
@@ -1683,7 +1703,7 @@ Ext.onReady ( function() {
}
}
});
var gridForm = new Ext.FormPanel({
id: 'reassign-form',
frame: true,
@@ -1691,7 +1711,7 @@ var gridForm = new Ext.FormPanel({
//title: 'Company data',
bodyStyle:'padding:5px',
width: 750,
layout: 'column', // Specifies that the items will now be arranged in columns
items: [{
@@ -1717,7 +1737,7 @@ var gridForm = new Ext.FormPanel({
border : true,
listeners: {
click: function() {
rows = this.getSelectionModel().getSelections();
var application = '';
@@ -1730,16 +1750,16 @@ var gridForm = new Ext.FormPanel({
application = rows[i].get('APP_UID');
}
} else {
}
comboUsersToReassign.clearValue();
storeUsersToReassign.removeAll();
storeUsersToReassign.setBaseParam('application',application);
storeUsersToReassign.load();
//alert(record.USERS);
} // Allow rows to be rendered.
}
}
},{
@@ -1752,7 +1772,7 @@ var gridForm = new Ext.FormPanel({
autoHeight: true,
bodyStyle: Ext.isIE ? 'text-align: left;padding:0 0 5px 15px;' : 'text-align: left; padding:10px 5px;',
border: false,
//style: {
//style: {
// "margin-left": "10px", // when you add custom margin in IE 6...
// "margin-right": Ext.isIE6 ? (Ext.isStrict ? "-10px" : "-13px") : "0" // you have to adjust for it somewhere else
//},
@@ -1908,7 +1928,7 @@ function reassign(){
}
storeReassignCases.setBaseParam( 'APP_UIDS', ids);
storeReassignCases.load();
newPopUp.show();
comboUsersToReassign.disable();

2
workflow/engine/templates/users/users.js
View File

@@ -273,7 +273,7 @@ Ext.onReady(function () {
method: "POST"
}),
baseParams: {"action": "usersList"},
baseParams: {"action": "usersList", "USR_UID": USR_UID},
reader: new Ext.data.JsonReader({
fields: [

19
workflow/engine/xmlform/dynaforms/dynaforms_Properties.xml
View File

@@ -70,6 +70,7 @@
</PME_PROP_REVERT>
<sdfsdf type="javascript">
<![CDATA[
// added by gustavo cruz gustavo-at-colosa.com
// function getElementsByClassNameCrossBrowser
@@ -78,6 +79,12 @@
// @param node element or node
// @param tag tag of the class
if(document.getElementById("form[DYN_TYPE]").value=="grid"){
hideRowById('WIDTH');
hideRowById('NEXTSTEPSAVE');
hideRowById('PRINTDYNAFORM');
}
function getElementsByClassNameCrossBrowser(searchClass,node,tag) {
var classElements = new Array();
@@ -109,6 +116,9 @@ leimnud.event.add(getField('DYN_TYPE'), 'change', function() {
validateGridConversion(proUid,dynUid);
} else {
changeToolbar("xmlform");
showRowById('WIDTH');
showRowById('NEXTSTEPSAVE');
showRowById('PRINTDYNAFORM');
}
});
@@ -131,18 +141,19 @@ function validateGridConversion(proUid,dynUid){
oRPC.callback = function(oRPC) {
var response = oRPC.xmlhttp.responseText;
if (response=="ok"){
changeToolbar("grid");
changeToolbar("grid");
hideRowById('WIDTH');
hideRowById('NEXTSTEPSAVE');
hideRowById('PRINTDYNAFORM');
} else {
setDropdownSelection("form[DYN_TYPE]" , "xmlform");
msgBox("Grid forms can not contain the following fields: <br>" + response,"alert");
return false;
}
}.extend(this);
isTrue = oRPC.make();
isTrue = oRPC.make();
return isTrue;
};

109
workflow/engine/xmlform/dynaforms/fields/suggest.xml
View File

@@ -53,7 +53,7 @@ SELECT XMLNODE_NAME, TYPE FROM dynaForm WHERE XMLNODE_NAME = @@PME_XMLNODE_NAME
select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@PME_XMLNODE_NAME AND XMLNODE_NAME <> "" AND ( TYPE="text" or TYPE="textarea" or TYPE="dropdown" or TYPE="listbox" or TYPE="hidden" or TYPE="suggest")
]]><en>Dependent Fields<option name="">(none)</option></en>
</PME_DEPENDENTFIELDS>
<PME_HINT type="textarea" cols="44" rows="1">
<en>Hint</en>
</PME_HINT>
@@ -140,39 +140,44 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
<en>Save</en>
</PME_ACCEPT>
<PME_JS type="javascript"><![CDATA[
<PME_JS type="javascript">
<![CDATA[
var fieldForm = "text";
var fieldName = getField("PME_XMLNODE_NAME", fieldForm);
var savedFieldName = fieldName.value;
var pme_validating;
var fieldForm="text";
var fieldName=getField("PME_XMLNODE_NAME",fieldForm);
var savedFieldName=fieldName.value;
var pme_validating;
fieldName.focus();
fieldName.select();
leimnud.event.add(fieldName, 'change', {method:dynaformVerifyFieldName, instance:fieldName, event:true});
var dyntype="@#PME_DYN_TYPE";
fieldName.focus();
fieldName.select();
leimnud.event.add(fieldName, "change", {method: dynaformVerifyFieldName, instance: fieldName, event: true});
storeNewEntriesOptions(getField('PME_STORE_NEW_ENTRY'));
leimnud.event.add(getField('PME_STORE_NEW_ENTRY'), 'click', function(){
storeNewEntriesOptions(this);
});
var dyntype = "@#PME_DYN_TYPE";
storeNewEntriesOptions(getField("PME_STORE_NEW_ENTRY"));
function storeNewEntriesOptions(o){
if(o.checked){
showRowById('PME_PRIMARY_KEY');
getTablesNames();
getTableFields()
getField('PME_TABLE').value = getField('PME_TABLE_DATA').value.trim();
getField('PME_PRIMARY_KEY').value = getField('PME_PRIMARY_KEY_DATA').value.trim();
getField('PME_PRIMARY_KEY_TYPE').value = getField('PME_PRIMARY_KEY_TYPE_DATA').value.trim();
} else {
hideRowById('PME_PRIMARY_KEY');
leimnud.event.add(
getField("PME_STORE_NEW_ENTRY"),
"click",
function ()
{
storeNewEntriesOptions(getField("PME_STORE_NEW_ENTRY"));
}
);
function storeNewEntriesOptions(o)
{
if (o.checked) {
showRowById("PME_PRIMARY_KEY");
getTablesNames();
getTableFields()
getField("PME_TABLE").value = getField("PME_TABLE_DATA").value.trim();
getField("PME_PRIMARY_KEY").value = getField("PME_PRIMARY_KEY_DATA").value.trim();
getField("PME_PRIMARY_KEY_TYPE").value = getField("PME_PRIMARY_KEY_TYPE_DATA").value.trim();
} else {
hideRowById("PME_PRIMARY_KEY");
}
}
}
leimnud.event.add(getField('PME_XMLNODE_VALUE'), 'keyup', function(){
getTablesNames();
@@ -198,9 +203,15 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
getField('PME_PRIMARY_KEY_TYPE_DATA').value = this.value.trim();
});
function getTablesNames(){
var s0 = getField('PME_XMLNODE_VALUE').value;
var s = getField('PME_XMLNODE_VALUE').value.toUpperCase();
function getTablesNames() {
var strSql = getField("PME_XMLNODE_VALUE").value;
strSql = stringReplace("\\x0A", " ", strSql); //\n 10
strSql = stringReplace("\\x0D", " ", strSql); //\r 13
strSql = stringReplace("\\x09", " ", strSql); //\t 9
var s0 = strSql;
var s = strSql.toUpperCase();
p1 = s.indexOf(" FROM ");
if(p1 > 0){
@@ -218,7 +229,7 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
ss = s0.substring(p1, p2);
ss = ss.replace("FROM", "").trim();
ss = ss.replace("from", "").trim();
aTables = ss.split(',');
otable = getField('PME_TABLE');
@@ -230,16 +241,26 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
var newOption = new Option("", "0");
otable.options[0] = newOption;
for(i=0; i<aTables.length; i++){
var newOption = new Option(aTables[i], aTables[i]);
otable.options[i+1] = newOption;
var t = "";
for (var i = 0; i <= aTables.length - 1; i++) {
t = aTables[i].trim();
var newOption = new Option(t, t);
otable.options[i + 1] = newOption;
}
}
}
function getTableFields(){
var s0 = getField('PME_XMLNODE_VALUE').value;
var s = getField('PME_XMLNODE_VALUE').value.toUpperCase();
function getTableFields() {
var strSql = getField("PME_XMLNODE_VALUE").value;
strSql = stringReplace("\\x0A", " ", strSql); //\n 10
strSql = stringReplace("\\x0D", " ", strSql); //\r 13
strSql = stringReplace("\\x09", " ", strSql); //\t 9
var s0 = strSql;
var s = strSql.toUpperCase();
p1 = s.indexOf("SELECT ");
if(p1 >= 0){
@@ -258,9 +279,13 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
var newOption = new Option("", "0");
otable.options[0] = newOption;
for(i=0; i<aTables.length; i++){
var newOption = new Option(aTables[i], aTables[i]);
otable.options[i+1] = newOption;
var t = "";
for (var i = 0; i <= aTables.length - 1; i++) {
t = aTables[i].trim();
var newOption = new Option(t, t);
otable.options[i + 1] = newOption;
}
}
}
@@ -283,4 +308,4 @@ function cancel(){
}
]]></PME_JS>
</dynaForm>
</dynaForm>

107
workflow/engine/xmlform/roles/roles_Options.xml
View File

@@ -33,27 +33,27 @@ function saveNewRole()
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG3});
return false;
}
var uri = 'request=verifyNewRole&code='+code;
var ajax = AJAX();
ajax.open("POST", PROCESS_REQUEST_FILE, true);
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() {
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() {
if(ajax.readyState == 4) {
if(eval(ajax.responseText.trim())){
try{
parent = $('form[ROL_PARENT]').value;
}catch(e){}
code = $('form[ROL_CODE]').value;
status = $('form[ROL_STATUS]').value;
var uri = 'request=saveNewRole&code='+code+'&parent='+parent+'&status='+status+'&name='+name;
var uri = 'request=saveNewRole&code='+code+'&parent='+parent+'&status='+status+'&name='+name;
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
args: uri
});
oRPC.callback = function(rpc){
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
@@ -62,38 +62,38 @@ function saveNewRole()
args : 'request=show&r='+Math.random()
});
oRPC.make();
$('publisherContent[0]').innerHTML = oRPC.xmlhttp.responseText;
$('publisherContent[0]').innerHTML = oRPC.xmlhttp.responseText;
window.location = 'roles_List';
}.extend(this);
oRPC.make();
currentPopupWindow.remove();
}
if(!eval(ajax.responseText.trim())){
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG2});
return false;
}
}
}
}
ajax.send(uri);
}
function editRole(ROL_UID)
{
{
if(ROL_UID!='00000000000000000000000000000002')
{
var uri = 'request=editRole&ROL_UID='+ROL_UID;
{
var uri = 'request=editRole&ROL_UID='+ROL_UID;
popupWindow('', '../roles/roles_Ajax?'+uri, 350, 265);
}
else
{
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG});
}
{
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_MSG});
}
}
function updateRole(ROL_UID) {
code = $('form[ROL_CODE]').value;
name = $('form[ROL_NAME]').value;
if(code == '') {
@@ -111,16 +111,16 @@ function updateRole(ROL_UID) {
try{
parent = $('form[ROL_PARENT]').value;
}catch(e){}
status = $('form[ROL_STATUS]').value;
var uri = 'request=updateRole&code='+code+'&parent='+parent+'&status='+status+'&rol_uid='+ROL_UID+'&name='+name;
var uri = 'request=updateRole&code='+code+'&parent='+parent+'&status='+status+'&rol_uid='+ROL_UID+'&name='+name;
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
args: uri
});
oRPC.callback = function(rpc){
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
@@ -140,21 +140,21 @@ function deleteRole(ROL_UID) {
var uri = 'request=canDeleteRole&ROL_UID='+ROL_UID;
var ajax = AJAX();
ajax.open("POST", PROCESS_REQUEST_FILE, true);
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() {
ajax.setRequestHeader("Content-Type", "application/x-www-form-urlencoded;");
ajax.onreadystatechange = function() {
if(ajax.readyState == 4) {
if(eval(ajax.responseText.trim())){
if(eval(ajax.responseText.trim())){
new leimnud.module.app.confirm().make({
label:G_STRINGS.ID_REMOVE_ROLE,
action:function() {
var uri = 'request=deleteRole&ROL_UID='+ROL_UID;
var uri = 'request=deleteRole&ROL_UID='+ROL_UID;
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
args: uri
});
oRPC.callback = function(rpc){
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
@@ -167,16 +167,16 @@ function deleteRole(ROL_UID) {
window.location = 'roles_List';
}.extend(this);
oRPC.make();
}.extend(this)
});
}
}
else
{
new leimnud.module.app.alert().make({label: G_STRINGS.ID_ROLES_CAN_NOT_DELETE});
return false;
}
}
}
}
ajax.send(uri);
};
@@ -189,7 +189,7 @@ function usersIntoRole(ROL_UID)
}
function deleteUserRole(ROL_UID, USR_UID){
new leimnud.module.app.confirm().make({
label:G_STRINGS.ID_MSG_CONFIRM,
action:function(){
@@ -219,7 +219,7 @@ oPanel = new leimnud.module.panel();
fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true}
};
oPanel.events = {
remove: function() {
remove: function() {
delete(oPanel);
resetChecks();
}.extend(this)
@@ -237,7 +237,7 @@ oPanel = new leimnud.module.panel();
});
oRPC.make();
currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
}
var checks_selected_Rolid = new Array();
function showUsersLoad( ROL_UID ){
@@ -253,7 +253,7 @@ function showUsersLoad( ROL_UID ){
fx :{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:true}
};
oPanel.events = {
remove: function() {
remove: function() {
delete(oPanel);
resetChecks();
}.extend(this)
@@ -267,7 +267,7 @@ function showUsersLoad( ROL_UID ){
});
//currentPopupWindow.clearContent();
//currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
//currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
checks_selected_Rolid.push(ROL_UID);
oRPC.callback = function(rpc) {
oPanel.loader.hide();
@@ -287,11 +287,11 @@ function showUsersLoad( ROL_UID ){
};
}catch(e){alert(e)}
}
}
}
}.extend(this);
oRPC.make();
}
function assignUserToRole(ROL_UID, USR_UID)
{
@@ -303,13 +303,13 @@ function assignUserToRole(ROL_UID, USR_UID)
});
oRPC.make();
currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
}
function viewPermitions(ROL_UID)
{
var uri = 'request=viewPermitions&ROL_UID='+ROL_UID;
popupWindow('', '../roles/roles_Ajax?'+uri, 500, 450);
popupWindow('', '../roles/roles_Ajax?'+uri, 500, 450);
}
function showPermissions(ROL_UID)
@@ -327,7 +327,7 @@ function showPermissions(ROL_UID)
function assignPermissionToRole(ROL_UID, PER_UID)
{
var oRPC = new leimnud.module.rpc.xmlhttp({
url : PROCESS_REQUEST_FILE,
async : false,
@@ -336,11 +336,11 @@ function assignPermissionToRole(ROL_UID, PER_UID)
});
oRPC.make();
currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
}
function deletePermissionRole(ROL_UID, PER_UID){
new leimnud.module.app.confirm().make({
label:G_STRINGS.ID_MSG_CONFIRM,
action:function(){
@@ -382,14 +382,14 @@ function backUsers(ROL_UID)
currentPopupWindow.clearContent();
currentPopupWindow.addContent(oRPC.xmlhttp.responseText);
}
function AJAX()
function AJAX()
{
try {
xmlhttp = new XMLHttpRequest();
}
}
catch(generic_error) {
try {
xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
@@ -403,10 +403,9 @@ function AJAX()
}
return xmlhttp;
}
String.prototype.trim = function()
{
return this.replace(/^\s+|\s+get/g,"");
String.prototype.trim = function () {
return this.replace(/^\s+|\s+$/g, "");
}
function $(id){
@@ -433,7 +432,7 @@ function saveUsers(){
resetChecks();
oRPC.make();
currentPopupWindow.remove();
usersIntoRole(rolUid);
}

6
workflow/engine/xmlform/steps/conditions_Edit.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm name="dynaforms_Edit" type="xmlform" width="98%" labelWidth="62px">
<dynaForm name="dynaforms_Edit" type="xmlform" width="98%" labelWidth="400px">
<STEP_UID type="hidden" showInTable="0"/>
@@ -7,7 +7,7 @@
<TAS_UID type="hidden" showInTable="0"/>
<STEP_CONDITION type="textareapm" cols="62" rows="5" showVars="1" process="@#PRO_UID">
<STEP_CONDITION type="textareapm" cols="50" rows="5" showVars="1" process="@#PRO_UID">
<en>Condition</en>
</STEP_CONDITION>
@@ -71,4 +71,4 @@ var insertFormVar = function(sFieldName, sValue) {
]]></JS>
</dynaForm>
</dynaForm>

10
workflow/engine/xmlform/steps/conditions_Options.xml
View File

@@ -9,15 +9,15 @@
<JS type="javascript" replaceTags="1">
function editCondition(uid, sStepTitle)
{
popupWindow('@G::LoadTranslation(ID_EDIT_CONDITIONS_OF_STEP)' + ': ' + sStepTitle, '@G::encryptLink(@#URL_CONDITIONS_EDIT)?UID='+ uid , 500, 216);
popupWindow("@G::LoadTranslation(ID_EDIT_CONDITIONS_OF_STEP)" + ": " + sStepTitle, "@G::encryptLink(@#URL_CONDITIONS_EDIT)?UID=" + uid , 535, 240);
}
function saveCondition(oForm)
{
ajax_post(oForm.action, oForm, 'POST');
currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh();
ajax_post(oForm.action, oForm, "POST");
currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh();
}
</JS>
</dynaForm>
</dynaForm>