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

Merge pull request #1469 from hector-cortez/BUG-10178

Browse Source 
BUG 10178 Pause the Case, add Unpause Time SOLVED
This commit is contained in:
julceslauhub
2013-03-28 08:47:20 -07:00
parent cd8ec52de5 0a46157cc8
commit 128ead91bb
5 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/cases/ajaxListener.php
View File

@@ -490,7 +490,7 @@ class Ajax
public function pauseCase()
{
try {
$unpauseDate = $_REQUEST['unpauseDate'];
$unpauseDate = $_REQUEST['unpauseDate'] . ' '. $_REQUEST['unpauseTime'];
$oCase = new Cases();
if (isset($_POST['APP_UID']) && isset($_POST['DEL_INDEX'])) {
$APP_UID = $_POST['APP_UID'];

2
workflow/engine/methods/cases/cases_Ajax.php
View File

@@ -372,7 +372,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
// End save
$unpauseDate = $_POST['unpausedate'];
$unpauseDate = $_POST['unpausedate'] . ' '. $_REQUEST['unpauseTime'];
$oCase = new Cases();
if (isset( $_POST['APP_UID'] ) && isset( $_POST['DEL_INDEX'] )) {
$APP_UID = $_POST['APP_UID'];

2
workflow/engine/methods/cases/open.php
View File

@@ -81,7 +81,7 @@ $oStep = $oStep->loadByProcessTaskPosition( $case['PRO_UID'], $case['TAS_UID'],
$oHeadPublisher->assign( 'uri', $script . $uri );
$oHeadPublisher->assign( '_APP_NUM', '#: ' . $case['APP_NUMBER'] );
$oHeadPublisher->assign( '_ENV_CURRENT_DATE', $conf->getSystemDate( date( 'Y-m-d' ) ) );
$oHeadPublisher->assign( '_ENV_CURRENT_DATE_NO_FORMAT', date( 'Y-m-d' ) );
$oHeadPublisher->assign( '_ENV_CURRENT_DATE_NO_FORMAT', date( 'Y-m-d-h-i-A' ) );
$oHeadPublisher->assign( 'idfirstform', is_null( $oStep ) ? '' : $oStep->getStepUidObj() );
G::RenderPage( 'publish', 'extJs' );

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

@@ -23,6 +23,17 @@ var storeReassignCases;
var grid;
var textJump;
function formatAMPM(date, initVal) {
var hours = date.getHours();
var minutes = (initVal === true)? ((date.getMinutes()<15)? 0: ((date.getMinutes()<30)? 15: ((date.getMinutes()<45)? 30: 45))): date.getMinutes();
var ampm = hours >= 12 ? 'PM' : 'AM';
hours = hours % 12;
hours = hours ? hours : 12; // the hour '0' should be '12'
minutes = minutes < 10 ? '0' + minutes : minutes;
var strTime = hours + ':' + minutes + ' ' + ampm;
return strTime;
}
Ext.Ajax.timeout = 4 * 60 * 1000;
var caseSummary = function() {
@@ -202,6 +213,14 @@ function pauseCase(date){
{
html: '<div align="center" style="font: 14px tahoma,arial,helvetica,sans-serif">' + _('ID_PAUSE_CASE_TO_DATE') +' '+date.format('M j, Y')+'? </div> <br/>'
},
new Ext.form.TimeField({
id: 'unpauseTime',
fieldLabel: _('ID_UNPAUSE_TIME'),
name: 'unpauseTime',
value: formatAMPM(new Date(), false),
minValue: formatAMPM(new Date(), true),
format: 'h:i A'
}),
{
xtype: 'textarea',
id: 'noteReason',
@@ -251,7 +270,15 @@ function pauseCase(date){
Ext.MessageBox.hide();
msgPause.close();
},
params: {action:'pauseCase', unpausedate:unpauseDate, APP_UID:rowModel.data.APP_UID, DEL_INDEX: rowModel.data.DEL_INDEX, NOTE_REASON: noteReasonTxt, NOTIFY_PAUSE: notifyReasonVal}
params: {
action: 'pauseCase',
unpausedate: unpauseDate,
unpauseTime: Ext.getCmp('unpauseTime').getValue(),
APP_UID: rowModel.data.APP_UID,
DEL_INDEX: rowModel.data.DEL_INDEX,
NOTE_REASON: noteReasonTxt,
NOTIFY_PAUSE: notifyReasonVal
}
});
}
},{

36
workflow/engine/templates/cases/open.js
View File

@@ -21,6 +21,17 @@ ActionTabFrameGlobal.tabName = '';
ActionTabFrameGlobal.tabTitle = '';
ActionTabFrameGlobal.tabData = '';
function formatAMPM(date, initVal) {
var hours = date.getHours();
var minutes = (initVal === true)? ((date.getMinutes()<15)? 0: ((date.getMinutes()<30)? 15: ((date.getMinutes()<45)? 30: 45))): date.getMinutes();
var ampm = hours >= 12 ? 'PM' : 'AM';
hours = hours % 12;
hours = hours ? hours : 12; // the hour '0' should be '12'
minutes = minutes < 10 ? '0'+minutes : minutes;
var strTime = hours + ':' + minutes + ' ' + ampm;
return strTime;
}
Ext.onReady(function(){
openToRevisePanel = function() {
var treeToRevise = new Ext.tree.TreePanel({
@@ -669,6 +680,7 @@ Ext.onReady(function(){
nDay = '' + (parseInt(curDate[2])+1);
nDay = nDay.length == 1 ? '0' + nDay : nDay;
filterDate += nDay;
filterTime = ('0' + curDate[3]).slice(-2) + ':' + ('0' + curDate[4]).slice(-2) + ' ' + curDate[5];
var fieldset = {
xtype : 'fieldset',
@@ -692,6 +704,14 @@ Ext.onReady(function(){
value: filterDate,
minValue: filterDate
}),
new Ext.form.TimeField({
id: 'unpauseTime',
fieldLabel: _('ID_UNPAUSE_TIME'),
name: 'unpauseTime',
value: filterTime,
minValue: formatAMPM(new Date(), true),
format: 'h:i A'
}),
{
xtype: 'textarea',
id: 'noteReason',
@@ -726,15 +746,15 @@ Ext.onReady(function(){
id: 'unpauseFrm',
labelAlign : 'right',
//bodyStyle : 'padding:5px 5px 0',
width : 250,
width : 260,
items : [fieldset]
});
var win = new Ext.Window({
title: _('ID_PAUSE_CASE'),
width: 370,
height: 230,
width: 380,
height: 250,
layout:'fit',
autoScroll:true,
modal: true,
@@ -755,20 +775,22 @@ Ext.onReady(function(){
var paramsNote = '&NOTE_REASON=' + noteReasonTxt + '&NOTIFY_PAUSE=' + notifyReasonVal;
var unpauseDate = Ext.getCmp('unpauseDate').getValue();
var vUnpauseTime = Ext.getCmp('unpauseTime').getValue();
if( unpauseDate == '') {
//Ext.getCmp('submitPauseCase').setDisabled(true);
return;
} else
} else {
//Ext.getCmp('submitPauseCase').enable();
unpauseDate = unpauseDate.format('Y-m-d');
unpauseDate = unpauseDate.format('Y-m-d');
}
Ext.getCmp('unpauseFrm').getForm().submit({
url:'ajaxListener',
method : 'post',
params : {
action: 'pauseCase',
unpauseDate:unpauseDate,
unpauseDate: unpauseDate,
unpauseTime: vUnpauseTime,
NOTE_REASON: noteReasonTxt,
NOTIFY_PAUSE: notifyReasonVal
},