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

Merged in bugfix/PMCORE-3707 (pull request #8420)

Browse Source 
PMCORE-3707

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2022-04-13 16:03:37 +00:00
committed by Julio Cesar Laura Avendaño
parent cd2f1b4dd0 93e2908f53
commit df766d4b7f
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/Cases.php
View File

@@ -4615,7 +4615,6 @@ class Cases
$newData['DEL_PREVIOUS'] = $fieldsDel['DEL_PREVIOUS'];
$newData['DEL_TYPE'] = $fieldsDel['DEL_TYPE'];
$newData['DEL_PRIORITY'] = $fieldsDel['DEL_PRIORITY'];
$newData['DEL_DELEGATE_DATE'] = $fieldsDel['DEL_DELEGATE_DATE'];
$newData['USR_UID'] = $newUserUid;
$newData['DEL_INIT_DATE'] = null;
$newData['DEL_FINISH_DATE'] = null;

4
workflow/engine/methods/cases/caseHistory_Ajax.php
View File

@@ -32,6 +32,8 @@ switch ($actionAjax) {
// Apply mask
$dateInitLabel = applyMaskDateEnvironment($result['DEL_INIT_DATE'],'', false);
$dateDelLabel = applyMaskDateEnvironment($result['DEL_DELEGATE_DATE'],'', false);
$disableActionLabel = applyMaskDateEnvironment($result['APP_DISABLE_ACTION_DATE'],'', false);
$enableActionLabel = applyMaskDateEnvironment($result['APP_ENABLE_ACTION_DATE'],'', false);
$dateEndLabel = '-';
// @todo the query for get this '-' needs an update
if ($result['DEL_FINISH_DATE'] != "-") {
@@ -41,6 +43,8 @@ switch ($actionAjax) {
$result['DEL_INIT_DATE_LABEL'] = DateTime::convertUtcToTimeZone($dateInitLabel);
$result['DEL_DELEGATE_DATE_LABEL'] = DateTime::convertUtcToTimeZone($dateDelLabel);
$result['DEL_FINISH_DATE_LABEL'] = DateTime::convertUtcToTimeZone($dateEndLabel);
$result['APP_DISABLE_ACTION_DATE_LABEL'] = DateTime::convertUtcToTimeZone($disableActionLabel);
$result['APP_ENABLE_ACTION_DATE_LABEL'] = DateTime::convertUtcToTimeZone($enableActionLabel);
$process[] = $result;
}

14
workflow/engine/templates/cases/caseHistory.js
View File

@@ -199,8 +199,8 @@
{name : 'CASES_COUNT', type:'float'},
{name : 'APP_TYPE'},
{name : 'DEL_FINISH_DATE_LABEL'},
{name : 'APP_ENABLE_ACTION_DATE'},
{name : 'APP_DISABLE_ACTION_DATE'}
{name : 'APP_ENABLE_ACTION_DATE_LABEL'},
{name : 'APP_DISABLE_ACTION_DATE_LABEL'}
]
}
)
@@ -278,18 +278,12 @@
{header: "", dataIndex: 'PRO_STATUS', width: 50, hidden:true, hideable:false},
{header: _("ID_CASESLIST_APP_TAS_TITLE"), dataIndex: 'TAS_TITLE', width: 100},
{header: _("ID_DELEGATE_USER"), dataIndex: 'USR_NAME', width: 60, hidden:false},
/*{header: TRANSLATIONS.ID_STATUS, dataIndex: 'PRO_STATUS_LABEL', width: 50, renderer:function(v,p,r){
color = r.get('PRO_STATUS') == 'ACTIVE'? 'green': 'red';
return String.format("<font color='{0}'>{1}</font>", color, v);
}},*/
{header: _("ID_TASK_TRANSFER"), dataIndex: 'DEL_DELEGATE_DATE_LABEL', width: 60},
{header: _("ID_START_DATE"), dataIndex: 'DEL_INIT_DATE_LABEL', width: 60},
{header: _("ID_END_DATE"), dataIndex: 'DEL_FINISH_DATE_LABEL', width: 60},
{header: _("ID_ACTION"), dataIndex: 'APP_TYPE', width: 50, renderer: actionRenderingTranslation},
{header: _("ID_ENABLE_ACTION"), dataIndex: 'APP_ENABLE_ACTION_DATE', width: 70, renderer:startDateRender},
{header: _("ID_DISABLE_ACTION"), dataIndex: 'APP_DISABLE_ACTION_DATE', width: 70, renderer:startDateRender}
//{header: TRANSLATIONS.ID_TOTAL_CASES, dataIndex: 'CASES_COUNT', width: 80,renderer:function(v){return "<b>"+v+"</b>";}, align:'right'},
//{header: TRANSLATIONS.ID_PRO_DEBUG, dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'}
{header: _("ID_ENABLE_ACTION"), dataIndex: 'APP_ENABLE_ACTION_DATE_LABEL', width: 70, renderer:startDateRender},
{header: _("ID_DISABLE_ACTION"), dataIndex: 'APP_DISABLE_ACTION_DATE_LABEL', width: 70, renderer:startDateRender}
]
}),
store: store,