HOR-1554
Case Title cannot be set for the parallel tasks Valeo HOR-1554 Case Title cannot be set for the parallel tasks Valeo HOR-1554 Case Title cannot be set for the parallel tasks Valeo HOR-1554 Case Title cannot be set for the parallel tasks Valeo
This commit is contained in:
@@ -739,6 +739,9 @@ class Cases
|
|||||||
$cri->addSelectColumn(AppDelegationPeer::TAS_UID);
|
$cri->addSelectColumn(AppDelegationPeer::TAS_UID);
|
||||||
$cri->add(AppDelegationPeer::APP_UID, $sAppUid);
|
$cri->add(AppDelegationPeer::APP_UID, $sAppUid);
|
||||||
$cri->add(AppDelegationPeer::DEL_THREAD_STATUS, "OPEN");
|
$cri->add(AppDelegationPeer::DEL_THREAD_STATUS, "OPEN");
|
||||||
|
if(isset($fields['DEL_INDEX'])){
|
||||||
|
$cri->add(AppDelegationPeer::DEL_INDEX, $fields['DEL_INDEX']);
|
||||||
|
}
|
||||||
$rsCri = AppDelegationPeer::doSelectRS($cri);
|
$rsCri = AppDelegationPeer::doSelectRS($cri);
|
||||||
$rsCri->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
$rsCri->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||||
$rsCri->next();
|
$rsCri->next();
|
||||||
@@ -908,6 +911,9 @@ class Cases
|
|||||||
if (isset($Fields['APP_DESCRIPTION'])) {
|
if (isset($Fields['APP_DESCRIPTION'])) {
|
||||||
$appFields['APP_DESCRIPTION'] = $Fields['APP_DESCRIPTION'];
|
$appFields['APP_DESCRIPTION'] = $Fields['APP_DESCRIPTION'];
|
||||||
}
|
}
|
||||||
|
if(isset($Fields['DEL_INDEX'])){
|
||||||
|
$appFields['DEL_INDEX'] = $Fields['DEL_INDEX'];
|
||||||
|
}
|
||||||
|
|
||||||
$arrayNewCaseTitleAndDescription = $this->newRefreshCaseTitleAndDescription($sAppUid, $appFields, $aApplicationFields);
|
$arrayNewCaseTitleAndDescription = $this->newRefreshCaseTitleAndDescription($sAppUid, $appFields, $aApplicationFields);
|
||||||
|
|
||||||
@@ -2106,6 +2112,7 @@ class Cases
|
|||||||
//DONE: Al ya existir un delegation, se puede "calcular" el caseTitle.
|
//DONE: Al ya existir un delegation, se puede "calcular" el caseTitle.
|
||||||
$Fields = $Application->toArray(BasePeer::TYPE_FIELDNAME);
|
$Fields = $Application->toArray(BasePeer::TYPE_FIELDNAME);
|
||||||
$aApplicationFields = $Fields['APP_DATA'];
|
$aApplicationFields = $Fields['APP_DATA'];
|
||||||
|
$Fields['DEL_INDEX'] = $iDelIndex;
|
||||||
$newValues = $this->newRefreshCaseTitleAndDescription($sAppUid, $Fields, $aApplicationFields);
|
$newValues = $this->newRefreshCaseTitleAndDescription($sAppUid, $Fields, $aApplicationFields);
|
||||||
if (!isset($newValues['APP_TITLE'])) {
|
if (!isset($newValues['APP_TITLE'])) {
|
||||||
$newValues['APP_TITLE'] = '';
|
$newValues['APP_TITLE'] = '';
|
||||||
@@ -3943,7 +3950,7 @@ class Cases
|
|||||||
* @return object
|
* @return object
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public function pauseCase($sApplicationUID, $iDelegation, $sUserUID, $sUnpauseDate = null)
|
public function pauseCase($sApplicationUID, $iDelegation, $sUserUID, $sUnpauseDate = null, $appTitle = null)
|
||||||
{
|
{
|
||||||
// Check if the case is unassigned
|
// Check if the case is unassigned
|
||||||
if($this->isUnassignedPauseCase($sApplicationUID, $iDelegation)){
|
if($this->isUnassignedPauseCase($sApplicationUID, $iDelegation)){
|
||||||
@@ -3992,11 +3999,12 @@ class Cases
|
|||||||
$this->getExecuteTriggerProcess($sApplicationUID, 'PAUSED');
|
$this->getExecuteTriggerProcess($sApplicationUID, 'PAUSED');
|
||||||
|
|
||||||
/*----------------------------------********---------------------------------*/
|
/*----------------------------------********---------------------------------*/
|
||||||
$data = array (
|
$data = array(
|
||||||
'APP_UID' => $sApplicationUID,
|
'APP_UID' => $sApplicationUID,
|
||||||
'DEL_INDEX' => $iDelegation,
|
'DEL_INDEX' => $iDelegation,
|
||||||
'USR_UID' => $sUserUID,
|
'USR_UID' => $sUserUID,
|
||||||
'APP_RESTART_DATE' => $sUnpauseDate
|
'APP_RESTART_DATE' => $sUnpauseDate,
|
||||||
|
'APP_TITLE' => ($appTitle != null) ? $appTitle : $aFields['APP_TITLE']
|
||||||
);
|
);
|
||||||
$data = array_merge($aFields, $data);
|
$data = array_merge($aFields, $data);
|
||||||
$oListPaused = new ListPaused();
|
$oListPaused = new ListPaused();
|
||||||
|
|||||||
@@ -26,12 +26,14 @@ class ListPaused extends BaseListPaused {
|
|||||||
{
|
{
|
||||||
$criteria = new Criteria();
|
$criteria = new Criteria();
|
||||||
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
|
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
|
||||||
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
|
$criteria->add(ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL);
|
||||||
$dataset = ApplicationPeer::doSelectRS($criteria);
|
$dataset = ApplicationPeer::doSelectRS($criteria);
|
||||||
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||||
$dataset->next();
|
$dataset->next();
|
||||||
$aRow = $dataset->getRow();
|
$aRow = $dataset->getRow();
|
||||||
|
if (!isset($data['APP_TITLE'])) {
|
||||||
$data['APP_TITLE'] = $aRow['APP_TITLE'];
|
$data['APP_TITLE'] = $aRow['APP_TITLE'];
|
||||||
|
}
|
||||||
|
|
||||||
$criteria = new Criteria();
|
$criteria = new Criteria();
|
||||||
$criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
|
$criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
|
||||||
|
|||||||
@@ -103,7 +103,6 @@ class ListUnassigned extends BaseListUnassigned
|
|||||||
|
|
||||||
$criteria = new Criteria();
|
$criteria = new Criteria();
|
||||||
$criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
|
$criteria->addSelectColumn( ApplicationPeer::APP_NUMBER );
|
||||||
$criteria->addSelectColumn( ApplicationPeer::APP_TITLE );
|
|
||||||
$criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
|
$criteria->addSelectColumn( ApplicationPeer::APP_UPDATE_DATE );
|
||||||
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
|
$criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
|
||||||
$dataset = ApplicationPeer::doSelectRS($criteria);
|
$dataset = ApplicationPeer::doSelectRS($criteria);
|
||||||
|
|||||||
@@ -405,8 +405,9 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
|
|||||||
$APP_UID = $_SESSION['APPLICATION'];
|
$APP_UID = $_SESSION['APPLICATION'];
|
||||||
$DEL_INDEX = $_SESSION['INDEX'];
|
$DEL_INDEX = $_SESSION['INDEX'];
|
||||||
}
|
}
|
||||||
|
$appTitle = $_POST['APP_TITLE'];
|
||||||
|
|
||||||
$oCase->pauseCase( $APP_UID, $DEL_INDEX, $_SESSION['USER_LOGGED'], $unpauseDate );
|
$oCase->pauseCase($APP_UID, $DEL_INDEX, $_SESSION['USER_LOGGED'], $unpauseDate, $appTitle);
|
||||||
break;
|
break;
|
||||||
case 'unpauseCase':
|
case 'unpauseCase':
|
||||||
$sApplicationUID = (isset( $_POST['sApplicationUID'] )) ? $_POST['sApplicationUID'] : $_SESSION['APPLICATION'];
|
$sApplicationUID = (isset( $_POST['sApplicationUID'] )) ? $_POST['sApplicationUID'] : $_SESSION['APPLICATION'];
|
||||||
|
|||||||
@@ -344,7 +344,8 @@ function pauseCase(date){
|
|||||||
APP_UID: rowModel.data.APP_UID,
|
APP_UID: rowModel.data.APP_UID,
|
||||||
DEL_INDEX: rowModel.data.DEL_INDEX,
|
DEL_INDEX: rowModel.data.DEL_INDEX,
|
||||||
NOTE_REASON: noteReasonTxt,
|
NOTE_REASON: noteReasonTxt,
|
||||||
NOTIFY_PAUSE: notifyReasonVal
|
NOTIFY_PAUSE: notifyReasonVal,
|
||||||
|
APP_TITLE: rowModel.data.APP_TITLE
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user