fernando/luos
1
0
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
jennylee
2012-10-05 16:59:46 -04:00
parent 275f5a9a17 59c411bf9c
commit 5ac4358d80
14 changed files with 575 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gulliver/js/form/core/form.js
View File

@@ -3409,7 +3409,7 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator)
var strAux = maskNumber.split("").reverse().join("");
cont = 0;
pos = 0;
pos = -1;
for (i = 0; i <= strAux.length - 1; i++) {
if (strAux.charAt(i) == "#") {
@@ -3422,26 +3422,35 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator)
}
}
var mask2 = strAux.substring(0, pos + 1);
mask2 = mask2.split("").reverse().join("");
var mask2 = "";
if (pos != -1) {
mask2 = strAux.substring(0, pos + 1);
mask2 = mask2.split("").reverse().join("");
} else {
mask1 = maskNumber;
}
maskNumber = mask1 + mask2;
}
var newNumber = putStringMask(n.split("").reverse().join(""), maskNumber.split("").reverse().join(""));
var newDecimal = putStringMask(d, maskDecimal);
newNumber = newNumber.split("").reverse().join("");
var newNumber = putStringMask(n, maskNumber, "reverse");
var newDecimal = putStringMask(d, maskDecimal, "forward");
elem.value = newNumber + decimalSeparator + newDecimal;
}
function putStringMask(str, mask)
function putStringMask(str, mask, dir)
{
var newStr = "";
var i1 = 0;
var i2 = 0;
if (dir == "reverse") {
str = str.split("").reverse().join("");
mask = mask.split("").reverse().join("");
}
for (i1 = 0; i1 <= mask.length - 1; i1++) {
switch (mask.charAt(i1)) {
case "#":
@@ -3460,6 +3469,10 @@ function putStringMask(str, mask)
}
}
if (dir == "reverse") {
newStr = newStr.split("").reverse().join("");
}
return newStr;
}

19
workflow/engine/classes/class.case.php
View File

@@ -463,7 +463,7 @@ class Cases
return $rows;
}
public function isSelfService($USR_UID, $TAS_UID)
public function isSelfService($USR_UID, $TAS_UID, $APP_UID = '')
{
$tasks = $this->getSelfServiceTasks($USR_UID);
@@ -472,6 +472,23 @@ class Cases
return true;
}
}
if ($APP_UID != '') {
$groupsInstance = new Groups();
$groups = $groupsInstance->getActiveGroupsForAnUser($USR_UID);
$taskInstance = new Task();
$taskData = $taskInstance->Load($TAS_UID);
$tasGroupVariable = str_replace(array('@', '#'), '', $taskData['TAS_GROUP_VARIABLE']);
$caseData = $this->LoadCase($APP_UID);
if (isset($caseData['APP_DATA'][$tasGroupVariable])) {
if (trim($caseData['APP_DATA'][$tasGroupVariable]) != '') {
if (in_array(trim($caseData['APP_DATA'][$tasGroupVariable]), $groups)) {
return true;
}
}
}
}
return false;
}

13
workflow/engine/classes/class.processMap.php
View File

@@ -1438,6 +1438,13 @@ class processMap {
//If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
$aFields ['TAS_CALENDAR'] = $calendarInfo ['CALENDAR_APPLIED'] != 'DEFAULT' ? $calendarInfo ['CALENDAR_UID'] : "";
}
if ($iForm == 2) {
if ($aFields['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE' && $aFields['TAS_GROUP_VARIABLE'] != '') {
$aFields['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE_EVALUATE';
}
}
global $G_PUBLISH;
G::LoadClass('xmlfield_InputPM');
$G_PUBLISH = new Publisher ( );
@@ -3164,7 +3171,7 @@ class processMap {
$oCriteria->addSelectColumn(ProcessUserPeer::USR_UID);
$oCriteria->addSelectColumn(ProcessUserPeer::PRO_UID);
$oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
$aConditions [] = array(ProcessUserPeer::USR_UID, ContentPeer::CON_ID);
$aConditions [] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter () . 'GRP_TITLE' . DBAdapter::getStringDelimiter ());
$aConditions [] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter () . SYS_LANG . DBAdapter::getStringDelimiter ());
@@ -3263,10 +3270,10 @@ class processMap {
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addAsColumn('GRP_TITLE', ContentPeer::CON_VALUE);
$aConditions [] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
$aConditions [] = array(GroupwfPeer::GRP_UID, ContentPeer::CON_ID);
$aConditions [] = array(ContentPeer::CON_CATEGORY, DBAdapter::getStringDelimiter () . 'GRP_TITLE' . DBAdapter::getStringDelimiter ());
$aConditions [] = array(ContentPeer::CON_LANG, DBAdapter::getStringDelimiter () . SYS_LANG . DBAdapter::getStringDelimiter ());
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(GroupwfPeer::GRP_UID, $aGRUS, Criteria::NOT_IN);

71
workflow/engine/classes/model/AppCacheView.php
View File

@@ -304,6 +304,61 @@ class AppCacheView extends BaseAppCacheView
return $tasks;
}
public function getSelfServiceCasesByEvaluate($userUid) {
$cases = array();
//check groups assigned to SelfService task
G::LoadClass('groups');
$group = new Groups();
$aGroups = $group->getActiveGroupsForAnUser($userUid);
$c = new Criteria();
$c->clearSelectColumns();
$c->addSelectColumn(TaskPeer::TAS_UID);
$c->addSelectColumn(TaskPeer::PRO_UID);
$c->addSelectColumn(TaskPeer::TAS_GROUP_VARIABLE);
$c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
$c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
$c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
$c->add(TaskPeer::TAS_ASSIGN_TYPE, 'SELF_SERVICE');
$c->add(TaskPeer::TAS_GROUP_VARIABLE, '', Criteria::NOT_EQUAL);
$rs = TaskPeer::doSelectRS($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next();
if ($rs->getRecordCount() > 0) {
if (!class_exists('Cases')) {
G::loadClass('case');
}
$caseInstance = new Cases();
while ($row = $rs->getRow()) {
$tasGroupVariable = str_replace(array('@', '#'), '', $row['TAS_GROUP_VARIABLE']);
$c2 = new Criteria();
$c2->clearSelectColumns();
$c2->addSelectColumn(AppDelegationPeer::APP_UID);
$c2->add(AppDelegationPeer::TAS_UID, $row['TAS_UID']);
$c2->add(AppDelegationPeer::USR_UID, '');
$c2->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN');
$rs2 = AppDelegationPeer::doSelectRS($c2);
$rs2->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs2->next();
while ($row2 = $rs2->getRow()) {
$caseData = $caseInstance->LoadCase($row2['APP_UID']);
if (isset($caseData['APP_DATA'][$tasGroupVariable])) {
if (trim($caseData['APP_DATA'][$tasGroupVariable]) != '') {
if (in_array(trim($caseData['APP_DATA'][$tasGroupVariable]), $aGroups)) {
$cases[] = $row2['APP_UID'];
}
}
}
$rs2->next();
}
$rs->next();
}
}
return $cases;
}
/**
* gets the UNASSIGNED cases list criteria
* param $userUid the current userUid
@@ -327,14 +382,18 @@ class AppCacheView extends BaseAppCacheView
$criteria = $this->addPMFieldsToCriteria('unassigned');
}
//$criteria->add(AppCacheViewPeer::APP_STATUS, "TO_DO");
$criteria->add(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL);
//$criteria->add(AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN');
//$criteria->add(AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN');
$criteria->add(AppCacheViewPeer::USR_UID, '');
$criteria->add(AppCacheViewPeer::TAS_UID, $tasks, Criteria::IN);
$cases = $this->getSelfServiceCasesByEvaluate($userUid);
if (!empty($cases)) {
$criteria->add(
$criteria->getNewCriterion(AppCacheViewPeer::TAS_UID, $tasks, Criteria::IN)->
addOr($criteria->getNewCriterion(AppCacheViewPeer::APP_UID, $cases, Criteria::IN))
);
} else {
$criteria->add(AppCacheViewPeer::TAS_UID, $tasks, Criteria::IN);
}
return $criteria;
}

2
workflow/engine/classes/model/map/TaskMapBuilder.php
View File

@@ -89,6 +89,8 @@ class TaskMapBuilder
$tMap->addColumn('TAS_ASSIGN_VARIABLE', 'TasAssignVariable', 'string', CreoleTypes::VARCHAR, true, 100);
$tMap->addColumn('TAS_GROUP_VARIABLE', 'TasGroupVariable', 'string', CreoleTypes::VARCHAR, false, 100);
$tMap->addColumn('TAS_MI_INSTANCE_VARIABLE', 'TasMiInstanceVariable', 'string', CreoleTypes::VARCHAR, true, 100);
$tMap->addColumn('TAS_MI_COMPLETE_VARIABLE', 'TasMiCompleteVariable', 'string', CreoleTypes::VARCHAR, true, 100);

346
workflow/engine/classes/model/om/BaseTask.php
View File

File diff suppressed because it is too large Load Diff

23
workflow/engine/classes/model/om/BaseTaskPeer.php
View File

@@ -25,7 +25,7 @@ abstract class BaseTaskPeer
const CLASS_DEFAULT = 'classes.model.Task';
/** The total number of columns. */
const NUM_COLUMNS = 41;
const NUM_COLUMNS = 42;
/** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -67,6 +67,9 @@ abstract class BaseTaskPeer
/** the column name for the TAS_ASSIGN_VARIABLE field */
const TAS_ASSIGN_VARIABLE = 'TASK.TAS_ASSIGN_VARIABLE';
/** the column name for the TAS_GROUP_VARIABLE field */
const TAS_GROUP_VARIABLE = 'TASK.TAS_GROUP_VARIABLE';
/** the column name for the TAS_MI_INSTANCE_VARIABLE field */
const TAS_MI_INSTANCE_VARIABLE = 'TASK.TAS_MI_INSTANCE_VARIABLE';
@@ -165,10 +168,10 @@ abstract class BaseTaskPeer
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
private static $fieldNames = array (
BasePeer::TYPE_PHPNAME => array ('ProUid', 'TasUid', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasMiInstanceVariable', 'TasMiCompleteVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasWidth', 'TasHeight', 'TasColor', 'TasEvnUid', 'TasBoundary', 'TasDerivationScreenTpl', ),
BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::TAS_UID, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_MI_INSTANCE_VARIABLE, TaskPeer::TAS_MI_COMPLETE_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_WIDTH, TaskPeer::TAS_HEIGHT, TaskPeer::TAS_COLOR, TaskPeer::TAS_EVN_UID, TaskPeer::TAS_BOUNDARY, TaskPeer::TAS_DERIVATION_SCREEN_TPL, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'TAS_UID', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_MI_INSTANCE_VARIABLE', 'TAS_MI_COMPLETE_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_WIDTH', 'TAS_HEIGHT', 'TAS_COLOR', 'TAS_EVN_UID', 'TAS_BOUNDARY', 'TAS_DERIVATION_SCREEN_TPL', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, )
BasePeer::TYPE_PHPNAME => array ('ProUid', 'TasUid', 'TasType', 'TasDuration', 'TasDelayType', 'TasTemporizer', 'TasTypeDay', 'TasTimeunit', 'TasAlert', 'TasPriorityVariable', 'TasAssignType', 'TasAssignVariable', 'TasGroupVariable', 'TasMiInstanceVariable', 'TasMiCompleteVariable', 'TasAssignLocation', 'TasAssignLocationAdhoc', 'TasTransferFly', 'TasLastAssigned', 'TasUser', 'TasCanUpload', 'TasViewUpload', 'TasViewAdditionalDocumentation', 'TasCanCancel', 'TasOwnerApp', 'StgUid', 'TasCanPause', 'TasCanSendMessage', 'TasCanDeleteDocs', 'TasSelfService', 'TasStart', 'TasToLastUser', 'TasSendLastEmail', 'TasDerivation', 'TasPosx', 'TasPosy', 'TasWidth', 'TasHeight', 'TasColor', 'TasEvnUid', 'TasBoundary', 'TasDerivationScreenTpl', ),
BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID, TaskPeer::TAS_UID, TaskPeer::TAS_TYPE, TaskPeer::TAS_DURATION, TaskPeer::TAS_DELAY_TYPE, TaskPeer::TAS_TEMPORIZER, TaskPeer::TAS_TYPE_DAY, TaskPeer::TAS_TIMEUNIT, TaskPeer::TAS_ALERT, TaskPeer::TAS_PRIORITY_VARIABLE, TaskPeer::TAS_ASSIGN_TYPE, TaskPeer::TAS_ASSIGN_VARIABLE, TaskPeer::TAS_GROUP_VARIABLE, TaskPeer::TAS_MI_INSTANCE_VARIABLE, TaskPeer::TAS_MI_COMPLETE_VARIABLE, TaskPeer::TAS_ASSIGN_LOCATION, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC, TaskPeer::TAS_TRANSFER_FLY, TaskPeer::TAS_LAST_ASSIGNED, TaskPeer::TAS_USER, TaskPeer::TAS_CAN_UPLOAD, TaskPeer::TAS_VIEW_UPLOAD, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION, TaskPeer::TAS_CAN_CANCEL, TaskPeer::TAS_OWNER_APP, TaskPeer::STG_UID, TaskPeer::TAS_CAN_PAUSE, TaskPeer::TAS_CAN_SEND_MESSAGE, TaskPeer::TAS_CAN_DELETE_DOCS, TaskPeer::TAS_SELF_SERVICE, TaskPeer::TAS_START, TaskPeer::TAS_TO_LAST_USER, TaskPeer::TAS_SEND_LAST_EMAIL, TaskPeer::TAS_DERIVATION, TaskPeer::TAS_POSX, TaskPeer::TAS_POSY, TaskPeer::TAS_WIDTH, TaskPeer::TAS_HEIGHT, TaskPeer::TAS_COLOR, TaskPeer::TAS_EVN_UID, TaskPeer::TAS_BOUNDARY, TaskPeer::TAS_DERIVATION_SCREEN_TPL, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID', 'TAS_UID', 'TAS_TYPE', 'TAS_DURATION', 'TAS_DELAY_TYPE', 'TAS_TEMPORIZER', 'TAS_TYPE_DAY', 'TAS_TIMEUNIT', 'TAS_ALERT', 'TAS_PRIORITY_VARIABLE', 'TAS_ASSIGN_TYPE', 'TAS_ASSIGN_VARIABLE', 'TAS_GROUP_VARIABLE', 'TAS_MI_INSTANCE_VARIABLE', 'TAS_MI_COMPLETE_VARIABLE', 'TAS_ASSIGN_LOCATION', 'TAS_ASSIGN_LOCATION_ADHOC', 'TAS_TRANSFER_FLY', 'TAS_LAST_ASSIGNED', 'TAS_USER', 'TAS_CAN_UPLOAD', 'TAS_VIEW_UPLOAD', 'TAS_VIEW_ADDITIONAL_DOCUMENTATION', 'TAS_CAN_CANCEL', 'TAS_OWNER_APP', 'STG_UID', 'TAS_CAN_PAUSE', 'TAS_CAN_SEND_MESSAGE', 'TAS_CAN_DELETE_DOCS', 'TAS_SELF_SERVICE', 'TAS_START', 'TAS_TO_LAST_USER', 'TAS_SEND_LAST_EMAIL', 'TAS_DERIVATION', 'TAS_POSX', 'TAS_POSY', 'TAS_WIDTH', 'TAS_HEIGHT', 'TAS_COLOR', 'TAS_EVN_UID', 'TAS_BOUNDARY', 'TAS_DERIVATION_SCREEN_TPL', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, )
);
/**
@@ -178,10 +181,10 @@ abstract class BaseTaskPeer
* e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/
private static $fieldKeys = array (
BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'TasUid' => 1, 'TasType' => 2, 'TasDuration' => 3, 'TasDelayType' => 4, 'TasTemporizer' => 5, 'TasTypeDay' => 6, 'TasTimeunit' => 7, 'TasAlert' => 8, 'TasPriorityVariable' => 9, 'TasAssignType' => 10, 'TasAssignVariable' => 11, 'TasMiInstanceVariable' => 12, 'TasMiCompleteVariable' => 13, 'TasAssignLocation' => 14, 'TasAssignLocationAdhoc' => 15, 'TasTransferFly' => 16, 'TasLastAssigned' => 17, 'TasUser' => 18, 'TasCanUpload' => 19, 'TasViewUpload' => 20, 'TasViewAdditionalDocumentation' => 21, 'TasCanCancel' => 22, 'TasOwnerApp' => 23, 'StgUid' => 24, 'TasCanPause' => 25, 'TasCanSendMessage' => 26, 'TasCanDeleteDocs' => 27, 'TasSelfService' => 28, 'TasStart' => 29, 'TasToLastUser' => 30, 'TasSendLastEmail' => 31, 'TasDerivation' => 32, 'TasPosx' => 33, 'TasPosy' => 34, 'TasWidth' => 35, 'TasHeight' => 36, 'TasColor' => 37, 'TasEvnUid' => 38, 'TasBoundary' => 39, 'TasDerivationScreenTpl' => 40, ),
BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::TAS_UID => 1, TaskPeer::TAS_TYPE => 2, TaskPeer::TAS_DURATION => 3, TaskPeer::TAS_DELAY_TYPE => 4, TaskPeer::TAS_TEMPORIZER => 5, TaskPeer::TAS_TYPE_DAY => 6, TaskPeer::TAS_TIMEUNIT => 7, TaskPeer::TAS_ALERT => 8, TaskPeer::TAS_PRIORITY_VARIABLE => 9, TaskPeer::TAS_ASSIGN_TYPE => 10, TaskPeer::TAS_ASSIGN_VARIABLE => 11, TaskPeer::TAS_MI_INSTANCE_VARIABLE => 12, TaskPeer::TAS_MI_COMPLETE_VARIABLE => 13, TaskPeer::TAS_ASSIGN_LOCATION => 14, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 15, TaskPeer::TAS_TRANSFER_FLY => 16, TaskPeer::TAS_LAST_ASSIGNED => 17, TaskPeer::TAS_USER => 18, TaskPeer::TAS_CAN_UPLOAD => 19, TaskPeer::TAS_VIEW_UPLOAD => 20, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 21, TaskPeer::TAS_CAN_CANCEL => 22, TaskPeer::TAS_OWNER_APP => 23, TaskPeer::STG_UID => 24, TaskPeer::TAS_CAN_PAUSE => 25, TaskPeer::TAS_CAN_SEND_MESSAGE => 26, TaskPeer::TAS_CAN_DELETE_DOCS => 27, TaskPeer::TAS_SELF_SERVICE => 28, TaskPeer::TAS_START => 29, TaskPeer::TAS_TO_LAST_USER => 30, TaskPeer::TAS_SEND_LAST_EMAIL => 31, TaskPeer::TAS_DERIVATION => 32, TaskPeer::TAS_POSX => 33, TaskPeer::TAS_POSY => 34, TaskPeer::TAS_WIDTH => 35, TaskPeer::TAS_HEIGHT => 36, TaskPeer::TAS_COLOR => 37, TaskPeer::TAS_EVN_UID => 38, TaskPeer::TAS_BOUNDARY => 39, TaskPeer::TAS_DERIVATION_SCREEN_TPL => 40, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'TAS_UID' => 1, 'TAS_TYPE' => 2, 'TAS_DURATION' => 3, 'TAS_DELAY_TYPE' => 4, 'TAS_TEMPORIZER' => 5, 'TAS_TYPE_DAY' => 6, 'TAS_TIMEUNIT' => 7, 'TAS_ALERT' => 8, 'TAS_PRIORITY_VARIABLE' => 9, 'TAS_ASSIGN_TYPE' => 10, 'TAS_ASSIGN_VARIABLE' => 11, 'TAS_MI_INSTANCE_VARIABLE' => 12, 'TAS_MI_COMPLETE_VARIABLE' => 13, 'TAS_ASSIGN_LOCATION' => 14, 'TAS_ASSIGN_LOCATION_ADHOC' => 15, 'TAS_TRANSFER_FLY' => 16, 'TAS_LAST_ASSIGNED' => 17, 'TAS_USER' => 18, 'TAS_CAN_UPLOAD' => 19, 'TAS_VIEW_UPLOAD' => 20, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 21, 'TAS_CAN_CANCEL' => 22, 'TAS_OWNER_APP' => 23, 'STG_UID' => 24, 'TAS_CAN_PAUSE' => 25, 'TAS_CAN_SEND_MESSAGE' => 26, 'TAS_CAN_DELETE_DOCS' => 27, 'TAS_SELF_SERVICE' => 28, 'TAS_START' => 29, 'TAS_TO_LAST_USER' => 30, 'TAS_SEND_LAST_EMAIL' => 31, 'TAS_DERIVATION' => 32, 'TAS_POSX' => 33, 'TAS_POSY' => 34, 'TAS_WIDTH' => 35, 'TAS_HEIGHT' => 36, 'TAS_COLOR' => 37, 'TAS_EVN_UID' => 38, 'TAS_BOUNDARY' => 39, 'TAS_DERIVATION_SCREEN_TPL' => 40, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, )
BasePeer::TYPE_PHPNAME => array ('ProUid' => 0, 'TasUid' => 1, 'TasType' => 2, 'TasDuration' => 3, 'TasDelayType' => 4, 'TasTemporizer' => 5, 'TasTypeDay' => 6, 'TasTimeunit' => 7, 'TasAlert' => 8, 'TasPriorityVariable' => 9, 'TasAssignType' => 10, 'TasAssignVariable' => 11, 'TasGroupVariable' => 12, 'TasMiInstanceVariable' => 13, 'TasMiCompleteVariable' => 14, 'TasAssignLocation' => 15, 'TasAssignLocationAdhoc' => 16, 'TasTransferFly' => 17, 'TasLastAssigned' => 18, 'TasUser' => 19, 'TasCanUpload' => 20, 'TasViewUpload' => 21, 'TasViewAdditionalDocumentation' => 22, 'TasCanCancel' => 23, 'TasOwnerApp' => 24, 'StgUid' => 25, 'TasCanPause' => 26, 'TasCanSendMessage' => 27, 'TasCanDeleteDocs' => 28, 'TasSelfService' => 29, 'TasStart' => 30, 'TasToLastUser' => 31, 'TasSendLastEmail' => 32, 'TasDerivation' => 33, 'TasPosx' => 34, 'TasPosy' => 35, 'TasWidth' => 36, 'TasHeight' => 37, 'TasColor' => 38, 'TasEvnUid' => 39, 'TasBoundary' => 40, 'TasDerivationScreenTpl' => 41, ),
BasePeer::TYPE_COLNAME => array (TaskPeer::PRO_UID => 0, TaskPeer::TAS_UID => 1, TaskPeer::TAS_TYPE => 2, TaskPeer::TAS_DURATION => 3, TaskPeer::TAS_DELAY_TYPE => 4, TaskPeer::TAS_TEMPORIZER => 5, TaskPeer::TAS_TYPE_DAY => 6, TaskPeer::TAS_TIMEUNIT => 7, TaskPeer::TAS_ALERT => 8, TaskPeer::TAS_PRIORITY_VARIABLE => 9, TaskPeer::TAS_ASSIGN_TYPE => 10, TaskPeer::TAS_ASSIGN_VARIABLE => 11, TaskPeer::TAS_GROUP_VARIABLE => 12, TaskPeer::TAS_MI_INSTANCE_VARIABLE => 13, TaskPeer::TAS_MI_COMPLETE_VARIABLE => 14, TaskPeer::TAS_ASSIGN_LOCATION => 15, TaskPeer::TAS_ASSIGN_LOCATION_ADHOC => 16, TaskPeer::TAS_TRANSFER_FLY => 17, TaskPeer::TAS_LAST_ASSIGNED => 18, TaskPeer::TAS_USER => 19, TaskPeer::TAS_CAN_UPLOAD => 20, TaskPeer::TAS_VIEW_UPLOAD => 21, TaskPeer::TAS_VIEW_ADDITIONAL_DOCUMENTATION => 22, TaskPeer::TAS_CAN_CANCEL => 23, TaskPeer::TAS_OWNER_APP => 24, TaskPeer::STG_UID => 25, TaskPeer::TAS_CAN_PAUSE => 26, TaskPeer::TAS_CAN_SEND_MESSAGE => 27, TaskPeer::TAS_CAN_DELETE_DOCS => 28, TaskPeer::TAS_SELF_SERVICE => 29, TaskPeer::TAS_START => 30, TaskPeer::TAS_TO_LAST_USER => 31, TaskPeer::TAS_SEND_LAST_EMAIL => 32, TaskPeer::TAS_DERIVATION => 33, TaskPeer::TAS_POSX => 34, TaskPeer::TAS_POSY => 35, TaskPeer::TAS_WIDTH => 36, TaskPeer::TAS_HEIGHT => 37, TaskPeer::TAS_COLOR => 38, TaskPeer::TAS_EVN_UID => 39, TaskPeer::TAS_BOUNDARY => 40, TaskPeer::TAS_DERIVATION_SCREEN_TPL => 41, ),
BasePeer::TYPE_FIELDNAME => array ('PRO_UID' => 0, 'TAS_UID' => 1, 'TAS_TYPE' => 2, 'TAS_DURATION' => 3, 'TAS_DELAY_TYPE' => 4, 'TAS_TEMPORIZER' => 5, 'TAS_TYPE_DAY' => 6, 'TAS_TIMEUNIT' => 7, 'TAS_ALERT' => 8, 'TAS_PRIORITY_VARIABLE' => 9, 'TAS_ASSIGN_TYPE' => 10, 'TAS_ASSIGN_VARIABLE' => 11, 'TAS_GROUP_VARIABLE' => 12, 'TAS_MI_INSTANCE_VARIABLE' => 13, 'TAS_MI_COMPLETE_VARIABLE' => 14, 'TAS_ASSIGN_LOCATION' => 15, 'TAS_ASSIGN_LOCATION_ADHOC' => 16, 'TAS_TRANSFER_FLY' => 17, 'TAS_LAST_ASSIGNED' => 18, 'TAS_USER' => 19, 'TAS_CAN_UPLOAD' => 20, 'TAS_VIEW_UPLOAD' => 21, 'TAS_VIEW_ADDITIONAL_DOCUMENTATION' => 22, 'TAS_CAN_CANCEL' => 23, 'TAS_OWNER_APP' => 24, 'STG_UID' => 25, 'TAS_CAN_PAUSE' => 26, 'TAS_CAN_SEND_MESSAGE' => 27, 'TAS_CAN_DELETE_DOCS' => 28, 'TAS_SELF_SERVICE' => 29, 'TAS_START' => 30, 'TAS_TO_LAST_USER' => 31, 'TAS_SEND_LAST_EMAIL' => 32, 'TAS_DERIVATION' => 33, 'TAS_POSX' => 34, 'TAS_POSY' => 35, 'TAS_WIDTH' => 36, 'TAS_HEIGHT' => 37, 'TAS_COLOR' => 38, 'TAS_EVN_UID' => 39, 'TAS_BOUNDARY' => 40, 'TAS_DERIVATION_SCREEN_TPL' => 41, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, )
);
/**
@@ -306,6 +309,8 @@ abstract class BaseTaskPeer
$criteria->addSelectColumn(TaskPeer::TAS_ASSIGN_VARIABLE);
$criteria->addSelectColumn(TaskPeer::TAS_GROUP_VARIABLE);
$criteria->addSelectColumn(TaskPeer::TAS_MI_INSTANCE_VARIABLE);
$criteria->addSelectColumn(TaskPeer::TAS_MI_COMPLETE_VARIABLE);

1
workflow/engine/config/schema.xml
View File

@@ -1162,6 +1162,7 @@
<column name="TAS_PRIORITY_VARIABLE" type="VARCHAR" size="100" required="true" default=""/>
<column name="TAS_ASSIGN_TYPE" type="VARCHAR" size="30" required="true" default="BALANCED"/>
<column name="TAS_ASSIGN_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_NEXT_USER_TO_BE_ASSIGNED"/>
<column name="TAS_GROUP_VARIABLE" type="VARCHAR" size="100" required="false" default="@@SYS_GROUP_TO_BE_ASSIGNED"/>
<column name="TAS_MI_INSTANCE_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_VAR_TOTAL_INSTANCE"/>
<column name="TAS_MI_COMPLETE_VARIABLE" type="VARCHAR" size="100" required="true" default="@@SYS_VAR_TOTAL_INSTANCES_COMPLETE"/>
<column name="TAS_ASSIGN_LOCATION" type="VARCHAR" size="20" required="true" default="FALSE"/>

5
workflow/engine/js/processmap/core/processes_Map.js
View File

@@ -39,6 +39,10 @@ var saveDataTaskTemporal = function(iForm)
{
oTaskData.TAS_ASSIGN_TYPE = 'SELF_SERVICE';
}
if (getField('TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE').checked)
{
oTaskData.TAS_ASSIGN_TYPE = 'SELF_SERVICE_EVALUATE';
}
if (getField('TAS_ASSIGN_TYPE][REPORT_TO').checked)
{
oTaskData.TAS_ASSIGN_TYPE = 'REPORT_TO';
@@ -65,6 +69,7 @@ var saveDataTaskTemporal = function(iForm)
oTaskData.TAS_ASSIGN_TYPE = 'CANCEL_MI';
}*/
oTaskData.TAS_ASSIGN_VARIABLE = getField('TAS_ASSIGN_VARIABLE').value;
oTaskData.TAS_GROUP_VARIABLE = getField('TAS_GROUP_VARIABLE').value;
/* this feature is temporarily disabled
oTaskData.TAS_MI_INSTANCE_VARIABLE = getField('TAS_MI_INSTANCE_VARIABLE').value;
oTaskData.TAS_MI_COMPLETE_VARIABLE = getField('TAS_MI_COMPLETE_VARIABLE').value;*/

225
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -764,19 +764,55 @@ function moveAction()
{
copyMoveAction("move");
}
function findChilds($uidFolder, $path, $arrayPath) {
$Criteria = new Criteria ();
$Criteria->addSelectColumn ( AppFolderPeer::FOLDER_UID );
$Criteria->addSelectColumn ( AppFolderPeer::FOLDER_PARENT_UID );
$Criteria->addSelectColumn ( AppFolderPeer::FOLDER_NAME );
$Criteria->addSelectColumn ( AppFolderPeer::FOLDER_CREATE_DATE );
$Criteria->addSelectColumn ( AppFolderPeer::FOLDER_UPDATE_DATE );
$Criteria->add(AppFolderPeer::FOLDER_PARENT_UID, $uidFolder);
$Criteria->addAscendingOrderByColumn(AppFolderPeer::FOLDER_NAME);
$rs = appFolderPeer::doSelectRS ( $Criteria );
$rs->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
$folderResult = array ();
$appFoder = new AppFolder ();
while ($rs->next()) {
$row = $rs->getRow();
$path = ($uidFolder != '/')? $path : '';
$path = $path."/".$row['FOLDER_NAME'];
$arrayPath[] = array($row['FOLDER_UID'],$path);
$arrayPath = findChilds($row['FOLDER_UID'], $path, $arrayPath);
}
return $arrayPath;
}
function copyMoveAction($type)
{
require_once ("classes/model/AppFolder.php");
$oPMFolder = new AppFolder ();
$dir=$_REQUEST['dir'];
$paths = array();
$folderResult = findChilds('/', '', $paths);
$withCombo = 30;
foreach ($folderResult as $key => $value) {
$count = strlen($value[1]);
$withCombo = ($count>$withCombo) ? $count : $withCombo;
}
$root = array("/","/");
array_unshift ($folderResult,$root);
$dirCompletePath=$oPMFolder->getFolderStructure($dir);
$copyDialog["xtype"]="form";
$copyDialog["id"]="simpleform";
$copyDialog["labelWidth"]=125;
$copyDialog["width"]=340;
$copyDialog["url"]="URL_SCRIPT";
$copyDialog["xtype"] = "form";
$copyDialog["id"] = "simpleform";
$copyDialog["labelWidth"] = 80;
$copyDialog["width"] = 500;
$copyDialog["modal"] = true;
$copyDialog["url"] = "URL_SCRIPT";
if ($type=="copy") {
$copyDialog["dialogtitle"]= "Copy";
} else {
@@ -787,19 +823,28 @@ function copyMoveAction($type)
$copyDialog["items"]=array();
$itemField=array();
$itemField["xtype"]="textfield";
$itemField["fieldLabel"]="Destination";
$itemField["name"]="new_dir_label";
$itemField["value"]=$dirCompletePath['PATH'];
$itemField["width"]=175;
$itemField["xtype"] = "combo";
$itemField["hiddenName"] = "new_dir";
$itemField["id"] = "new_dir_label";
$itemField["name"] = "new_dir_label";
$itemField["mode"] = "local";
$itemField["triggerAction"] = "all";
$itemField["store"] = $folderResult;
$itemField["valueField"] = "FOLDER_UID";
$itemField["displayField"] = "FOLDER_NAME";
$itemField["selectOnFocus"] = true;
$itemField["tpl"] = '<tpl for="."><div ext:qtip="{field2}" class="x-combo-list-item">{field2}</div></tpl>';
$itemField["fieldLabel"] = "Destination";
$itemField["emptyText"] = "Select a directory...";
$itemField["width"] = 390;
$itemField["allowBlank"]=false;
$copyDialog["items"][]=$itemField;
$itemField=array();
$itemField["xtype"]="hidden";
$itemField["fieldLabel"]="Destination";
$itemField["name"]="new_dir";
$itemField["value"]="$dirCompletePath";
$itemField["fieldLabel"]="copyMove";
$itemField["name"]="copyMove";
$itemField["value"]="all";
$itemField["width"]=175;
$itemField["allowBlank"]=false;
$copyDialog["items"][]=$itemField;
@@ -813,47 +858,58 @@ function copyMoveAction($type)
$itemButton["text"]= "Move";
}
$itemButton["handler"]="copyDialogCreateButtonFunction";
$itemButton["id"]="buttonCopy";
$functionsToReplace["copyDialogCreateButtonFunction"]="function() {
form = Ext.getCmp('simpleform').getForm();
statusBarMessage('Please wait...', true, true);
var requestParams = getRequestParams();
requestParams.confirm = 'true';
requestParams.action = '".$type."Execute';
form.submit({
//reset: true,
reset: false,
success: function(form, action) {
form = Ext.getCmp('simpleform').getForm();
var requestParams = getRequestParams();
requestParams.confirm = 'true';
if (Ext.getCmp('new_dir_label').getValue() == '') {
statusBarMessage('Select a Directory', false, false);
return false;
}
requestParams.new_dir = Ext.getCmp('new_dir_label').getValue()
statusBarMessage('Please wait...', true, true);
Ext.getCmp('new_dir_label').disable();
Ext.getCmp('buttonCopy').disable();
Ext.getCmp('buttonCancel').disable();
requestParams.action = '".$type."Execute';
form.submit({
reset: false,
success: function(form, action) {
if(action.result.success){
if(action.result.success=='success'){
statusBarMessage(action.result.message, false, true);
try{
dirTree.getSelectionModel().getSelectedNode().reload();
} catch(e) {}
datastore.reload();
Ext.getCmp('dialog').destroy();
if(action.result.success=='success'){
statusBarMessage(action.result.message, false, true);
var node = dirTree.getNodeById('root');
node.select();
datastore.directory = 'root';
datastore.reload();
dirTree.getRootNode().reload();
requestParams.dir = 'root';
Ext.getCmp('dialog').destroy();
}else{
statusBarMessage(action.result.message, false, false);
statusBarMessage(action.result.message, false, false);
}
}else{
}else{
if(!action.result) return;
Ext.MessageBox.alert('Error!', action.result.error);
statusBarMessage(action.result.error, false, false);
}
},
failure: function(form, action) {
if(!action.result) return;
Ext.MessageBox.alert('Error!', action.result.error);
statusBarMessage(action.result.error, false, false);
},
scope: form,
// add some vars to the request, similar to hidden fields
params: requestParams
});
}";
}
},
failure: function(form, action) {
if(!action.result) return;
Ext.MessageBox.alert('Error!', action.result.error);
statusBarMessage(action.result.error, false, false);
},
scope: form,
// add some vars to the request, similar to hidden fields
params: requestParams
});
}";
$copyDialog["buttons"][]=$itemButton;
$itemButton=array();
$itemButton["text"]="Cancel";
$itemButton["id"]="buttonCancel";
$itemButton["handler"]= "copyDialogCancelButtonFunction";
$functionsToReplace["copyDialogCancelButtonFunction"]="function() { Ext.getCmp('dialog').destroy(); }";
$copyDialog["buttons"][]=$itemButton;
@@ -924,6 +980,54 @@ function overwriteFile ($node, $fileName) {
}
}
function copyMoveExecuteTree($uidFolder, $newUidFolder)
{
require_once ("classes/model/AppDocument.php");
require_once ('classes/model/AppFolder.php');
$appFoder = new AppFolder ();
$folderContent = $appFoder->getFolderContent($uidFolder);
$folderOrigin = $appFoder->getFolderStructure($uidFolder);
$FolderParentUid = trim($newUidFolder);//$form['FOLDER_PARENT_UID'];
$FolderName = $folderOrigin[$uidFolder]['NAME'];
$newFolderContent = $appFoder->createFolder ($FolderName, $FolderParentUid, "new");
$appDocument = new AppDocument();
if ($_REQUEST['action'] == 'moveExecute') {
$appFoder->remove($uidFolder,$folderOrigin[$uidFolder]['PARENT']);
}
$action = $_REQUEST['action'];
foreach ($folderContent['documents'] as $keys => $value) {
$docInfo = $appDocument->load($value['APP_DOC_UID'],$value['DOC_VERSION']);
$docInfo['FOLDER_UID'] = $newFolderContent['folderUID'];
$docInfo['APP_DOC_CREATE_DATE'] = date('Y-m-d H:i:s');
$docInfo['APP_DOC_STATUS'] = 'ACTIVE';
if ($action == 'copyExecute') {
unset($docInfo['APP_DOC_UID']);
$docUid = $appDocument->create($docInfo);
} else {
$appDocument->update($docInfo);
}
}
return $newFolderContent['folderUID'];
}
function checkTree ($uidOriginFolder, $uidNewFolder)
{
require_once ('classes/model/AppFolder.php');
$appFoder = new AppFolder ();
$newFoldercontent = copyMoveExecuteTree($uidOriginFolder, $uidNewFolder);
$listfolder = $appFoder->getFolderList($uidOriginFolder);
if (count($listfolder)>0) {
foreach ($listfolder['folders'] as $key => $value) {
copyMoveExecuteTree($value['FOLDER_UID'],$newFoldercontent);
}
} else {
return;
}
}
function uploadExternalDocument()
{
$response['action']=$_POST['action']. " - ".$_POST['option'];
@@ -980,19 +1084,30 @@ function uploadExternalDocument()
}
} elseif (isset($_POST['selitems'])) {
$response="";
$response['msg']="correct reload";
$response['msg']= "correct reload";
$response['success']=true;
require_once ("classes/model/AppDocument.php");
require_once ('classes/model/AppFolder.php');
$oAppDocument = new AppDocument();
foreach ($_POST['selitems'] as $docId) {
$arrayDocId = explode ('_',$docId);
//print "<b>$docId</b>";
$docInfo=$oAppDocument->load($arrayDocId[0]);
$docInfo['FOLDER_UID'] = $_POST['new_dir'];
$docInfo['APP_DOC_CREATE_DATE'] = date('Y-m-d H:i:s');
$oAppDocument->update($docInfo);
//G::pr($docInfo);
if (isset($_REQUEST['option']) && isset($_REQUEST['copyMove'])) {
if ($_REQUEST['option'] == 'directory' && $_REQUEST['copyMove'] == 'all') {
$response['action'] = $_POST['action']. " - ".$_POST['option'];
$response['error'] = "Complete";
$response['message']= str_replace("Execute", "", $_POST['action']). " ". "Complete";
$response['success']= 'success';
$response['node'] = '';
$_POST ['node'] = "";
$newFolderUid = checkTree($_REQUEST['dir'], $_REQUEST['new_dir']);
}
$_POST['selitems'] = array();
} else {
require_once ("classes/model/AppDocument.php");
$oAppDocument = new AppDocument();
foreach ($_POST['selitems'] as $docId) {
$arrayDocId = explode ('_',$docId);
$docInfo=$oAppDocument->load($arrayDocId[0]);
$docInfo['FOLDER_UID'] = $_POST['new_dir'];
$docInfo['APP_DOC_CREATE_DATE'] = date('Y-m-d H:i:s');
$oAppDocument->update($docInfo);
//G::pr($docInfo);
}
}
}
//G::pr($quequeUpload);

5
workflow/engine/methods/cases/cases_Open.php
View File

@@ -142,10 +142,11 @@ try {
$_SESSION['CURRENT_TASK'] = $aFields['TAS_UID'];
//if the task is in the valid selfservice tasks for this user, then catch the case, else just view the resume
if( $oCase->isSelfService($_SESSION['USER_LOGGED'], $aFields['TAS_UID']) ) {
if( $oCase->isSelfService($_SESSION['USER_LOGGED'], $aFields['TAS_UID'], $sAppUid) ) {
require_once (PATH_METHODS . 'cases' . PATH_SEP . 'cases_CatchSelfService.php');
} else
} else {
require_once (PATH_METHODS . 'cases' . PATH_SEP . 'cases_Resume.php');
}
exit;
}

7
workflow/engine/methods/tasks/tasks_Ajax.php
View File

@@ -64,6 +64,13 @@ try {
unset($aData['TAS_DEF_MESSAGE_TEMPLATE']);
}
//Validating TAS_ASSIGN_VARIABLE value
if ($aData['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE_EVALUATE') {
$aData['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE';
} else {
$aData['TAS_GROUP_VARIABLE'] = '';
}
$result = $oTask->update($aData);
$response["status"] = "OK";

24
workflow/engine/skinEngine/uxmodern/layout-pm-modern.html
View File

@@ -5,15 +5,13 @@
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
{$_header}
{literal}
<!--[if IE]>
<style>
table.x-pm-headerbar td, table th {
padding-top: 5px;
padding-bottom: 5px;
padding-right: 0px;
<!--[if lt IE 8]>
<style type="text/css">
.x-pm-headerbar-data {
padding-top: 8px;
}
</style>
<![endif]-->
<![endif]-->
{/literal}
</head>
<body>
@@ -21,18 +19,18 @@
<div id="panel-header" />
<div id="header-content" style="display:none">
<table class="x-pm-headerbar">
<table class="x-pm-headerbar">
<tr>
<td width="50%" valign="middle">
<img src="{$logo_company}" height="40"/>
</td>
<td align="right" valign="top">
<td class="x-pm-headerbar-data" align="right" valign="top">
<table width="100%" height="25" border="0" cellspacing="0" cellpadding="0" class="headerRightSection">
<tr valign="middle">
<td align="right">
{if $licenseNotification != ''}
<span class="x-pm-license-notification">
<span class="x-pm-license-notification">
<img src="/images/alert_icon.gif" width="10px" headerRightSection="10px"/> {$licenseNotification}
</span>
{/if}
@@ -40,15 +38,15 @@
<td height="12" valign="middle" align="right" valign="top">
<a href="#" id="options-tool" class="options-tool">
{$userfullname}
<span>
<img src="/images/classic/roll.static.gif" width="10px" headerRightSection="10px"/>
<span>
<img src="/images/classic/roll.static.gif" width="10px" headerRightSection="10px"/>
</span>
<br />
<span style="font-size:9px">{$rolename}</span>
</a>
</td>
<td width="40" align="right">
<span id="user-avatar">
<span id="user-avatar">
<img src="{$user_avatar}" width="25" height="25"/>
</span>
</td>

67
workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
View File

@@ -12,9 +12,13 @@
<LANG type="private"/>
<TAS_ASSIGN_TYPE type="radiogroup" defaultvalue="BALANCED" group="1">
<en>Case to be assigned by<option name="BALANCED">Cyclical Assignment</option><option name="MANUAL">Manual Assignment</option><option name="EVALUATE">Value Based Assignment</option>
<en>Case to be assigned by
<option name="BALANCED">Cyclical Assignment</option>
<option name="MANUAL">Manual Assignment</option>
<option name="EVALUATE">Value Based Assignment</option>
<option name="REPORT_TO">Reports to</option>
<option name="SELF_SERVICE">Self Service</option>
<option name="SELF_SERVICE_EVALUATE">Self Service Value Based Assignment</option>
<!-- this feature is temporarily disabled -->
<!--option name="STATIC_MI">Static Partial Join for Multiple Instances</option>
<option name="CANCEL_MI">Cancelling Partial Join for Multiple Instances</option-->
@@ -24,6 +28,10 @@
<TAS_ASSIGN_VARIABLE type="textpm" size="40" maxlength="155" defaultvalue="@@SYS_NEXT_USER_TO_BE_ASSIGNED" showVars="1" process="@#PRO_UID">
<en>Variable for Value Based Assignment</en>
</TAS_ASSIGN_VARIABLE>
<TAS_GROUP_VARIABLE type="textpm" size="40" maxlength="155" defaultvalue="@@SYS_GROUP_TO_BE_ASSIGNED" showVars="1" process="@#PRO_UID">
<en>Variable for Self Service Value Based Assignment</en>
</TAS_GROUP_VARIABLE>
<!-- this feature is temporarily disabled -->
<!--TAS_MI_INSTANCE_VARIABLE type="textpm" size="40" maxlength="155" defaultvalue="@@SYS_VAR_TOTAL_INSTANCE" showVars="1" process="@#PRO_UID">
<en>Variable for No of Instances</en>
@@ -37,28 +45,37 @@
var showTextpm = function()
{
/* this feature is temporarily disabled
if(getField('TAS_ASSIGN_TYPE][STATIC_MI').checked == true || getField('TAS_ASSIGN_TYPE][CANCEL_MI').checked == true)
{
showRowById('TAS_MI_INSTANCE_VARIABLE');
showRowById('TAS_MI_COMPLETE_VARIABLE');
hideRowById('TAS_ASSIGN_VARIABLE');
}
else */
if(getField('TAS_ASSIGN_TYPE][EVALUATE').checked == true)
/* this feature is temporarily disabled
if(getField('TAS_ASSIGN_TYPE][STATIC_MI').checked == true || getField('TAS_ASSIGN_TYPE][CANCEL_MI').checked == true)
{
showRowById('TAS_ASSIGN_VARIABLE');
/* this feature is temporarily disabled
hideRowById('TAS_MI_INSTANCE_VARIABLE');
hideRowById('TAS_MI_COMPLETE_VARIABLE');*/
}
else
{
showRowById('TAS_MI_INSTANCE_VARIABLE');
showRowById('TAS_MI_COMPLETE_VARIABLE');
hideRowById('TAS_ASSIGN_VARIABLE');
/* this feature is temporarily disabled
}
else */
if(getField('TAS_ASSIGN_TYPE][EVALUATE').checked == true) {
showRowById('TAS_ASSIGN_VARIABLE');
hideRowById('TAS_GROUP_VARIABLE');
//getField('TAS_GROUP_VARIABLE').value = '';
/* this feature is temporarily disabled
hideRowById('TAS_MI_INSTANCE_VARIABLE');
hideRowById('TAS_MI_COMPLETE_VARIABLE');*/
}
} else {
if (getField('TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE').checked) {
hideRowById('TAS_ASSIGN_VARIABLE');
showRowById('TAS_GROUP_VARIABLE');
if (getField('TAS_GROUP_VARIABLE').value == '') {
getField('TAS_GROUP_VARIABLE').value = '@' + '@' + 'SYS_GROUP_TO_BE_ASSIGNED';//the class xmlform replace this variable @@SYS_GROUP_TO_BE_ASSIGNED
}
} else {
hideRowById('TAS_ASSIGN_VARIABLE');
hideRowById('TAS_GROUP_VARIABLE');
//getField('TAS_GROUP_VARIABLE').value = '';
}
/* this feature is temporarily disabled
hideRowById('TAS_MI_INSTANCE_VARIABLE');
hideRowById('TAS_MI_COMPLETE_VARIABLE');*/
}
};
/* Recovery data */
@@ -67,7 +84,11 @@ if (aTaskFlag[1])
switch (oTaskData.TAS_ASSIGN_TYPE)
{
case 'SELF_SERVICE':
getField('TAS_ASSIGN_TYPE][SELF_SERVICE').checked = true;
if (getField('TAS_GROUP_VARIABLE').value == '') {
getField('TAS_ASSIGN_TYPE][SELF_SERVICE').checked = true;
} else {
getField('TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE').checked = true;
}
showTextpm();
break;
case 'REPORT_TO':
@@ -125,6 +146,10 @@ leimnud.event.add(getField('TAS_ASSIGN_TYPE][SELF_SERVICE'), 'click', function()
showTextpm();
});
leimnud.event.add(getField('TAS_ASSIGN_TYPE][SELF_SERVICE_EVALUATE'), 'click', function() {
showTextpm();
});
leimnud.event.add(getField('TAS_ASSIGN_TYPE][REPORT_TO'), 'click', function() {
showTextpm();
});
@@ -206,4 +231,4 @@ var insertFormVar = function(sFieldName, sValue) {
]]></JS>
</dynaForm>
</dynaForm>