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

BUG-13376 Self service value based assignment is set to self... SOLVED

Browse Source 
- Al editar el "Self Service Value Based Assignment" y asignarles un valor a "Variable for Self Service Value Based Assignment" y luego cambiar a cualquier pestaña no se guardaba el valor.

- La opcion ya se guardaba en el js solo que no se recuperaba el valor, se edito el file tasks_AssignmentRules.xml y se recupera el dato de TAS_GROUP_VARIABLE cuando es del tipo SELF_SERVICE_EVALUATE.

- Se agrego un switch en el archivo tasks.ajax.php al momento de hacer el saveTaskData recuperar datos que no se ubieran modificado en el formulario principal.
This commit is contained in:
Marco Antonio Nina
2013-10-23 14:55:59 -04:00
parent 423fa6ede1
commit bef23addcf
1 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ try {
$response = array (); $response = array ();
$oTask = new Task(); $oTask = new Task();
$aTaskInfo = $oTask->load($aData['TAS_UID']);
/** /**
* routine to replace @amp@ by & * routine to replace @amp@ by &
@@ -46,7 +47,7 @@ try {
if (isset( $aData['SEND_EMAIL'] )) { if (isset( $aData['SEND_EMAIL'] )) {
$aData['TAS_SEND_LAST_EMAIL'] = $aData['SEND_EMAIL'] == 'TRUE' ? 'TRUE' : 'FALSE'; $aData['TAS_SEND_LAST_EMAIL'] = $aData['SEND_EMAIL'] == 'TRUE' ? 'TRUE' : 'FALSE';
} else { } else {
$aTaskInfo = $oTask->load($aData['TAS_UID']); //$aTaskInfo = $oTask->load($aData['TAS_UID']);
$aData['TAS_SEND_LAST_EMAIL'] = is_null($aTaskInfo['TAS_SEND_LAST_EMAIL']) ? 'FALSE' : $aTaskInfo['TAS_SEND_LAST_EMAIL']; $aData['TAS_SEND_LAST_EMAIL'] = is_null($aTaskInfo['TAS_SEND_LAST_EMAIL']) ? 'FALSE' : $aTaskInfo['TAS_SEND_LAST_EMAIL'];
} }
@@ -65,8 +66,21 @@ try {
} }
//Validating TAS_ASSIGN_VARIABLE value //Validating TAS_ASSIGN_VARIABLE value
$sw = false;
if (!isset($aData['TAS_ASSIGN_TYPE'])) { if (!isset($aData['TAS_ASSIGN_TYPE'])) {
$sw = true;
if (isset($aTaskInfo['TAS_ASSIGN_TYPE'])) {
switch($aTaskInfo['TAS_ASSIGN_TYPE']) {
case 'SELF_SERVICE':
case 'SELF_SERVICE_EVALUATE':
$aData['TAS_ASSIGN_TYPE'] = ($aTaskInfo['TAS_GROUP_VARIABLE'] == '') ? 'SELF_SERVICE':'SELF_SERVICE_EVALUATE';
$aData['TAS_GROUP_VARIABLE'] = $aTaskInfo['TAS_GROUP_VARIABLE'];
break;
default:
$aData['TAS_ASSIGN_TYPE'] = $aTaskInfo['TAS_ASSIGN_TYPE'];
break;
}
} else {
$derivateType = $oTask->kgetassigType($_SESSION['PROCESS'],$aData['TAS_UID']); $derivateType = $oTask->kgetassigType($_SESSION['PROCESS'],$aData['TAS_UID']);
if (is_null($derivateType)){ if (is_null($derivateType)){
$aData['TAS_ASSIGN_TYPE'] = 'BALANCED'; $aData['TAS_ASSIGN_TYPE'] = 'BALANCED';
@@ -74,6 +88,10 @@ try {
$aData['TAS_ASSIGN_TYPE'] = $derivateType['TAS_ASSIGN_TYPE']; $aData['TAS_ASSIGN_TYPE'] = $derivateType['TAS_ASSIGN_TYPE'];
} }
} }
}
switch($aData['TAS_ASSIGN_TYPE']) {
case 'SELF_SERVICE':
case 'SELF_SERVICE_EVALUATE':
if ($aData['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE_EVALUATE') { if ($aData['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE_EVALUATE') {
$aData['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE'; $aData['TAS_ASSIGN_TYPE'] = 'SELF_SERVICE';
if(trim($aData['TAS_GROUP_VARIABLE']) == '') { if(trim($aData['TAS_GROUP_VARIABLE']) == '') {
@@ -82,6 +100,14 @@ try {
} else { } else {
$aData['TAS_GROUP_VARIABLE'] = ''; $aData['TAS_GROUP_VARIABLE'] = '';
} }
break;
default:
if (isset($aTaskInfo['TAS_ASSIGN_TYPE']) && $sw) {
$aData['TAS_ASSIGN_TYPE'] = $aTaskInfo['TAS_ASSIGN_TYPE'];
}
$aData['TAS_GROUP_VARIABLE'] = '';
break;
}
$result = $oTask->update( $aData ); $result = $oTask->update( $aData );