diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php index 10cf0588e..79fe84a11 100755 --- a/workflow/engine/methods/cases/open.php +++ b/workflow/engine/methods/cases/open.php @@ -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' ); diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index 1ddef4aec..ef6510d93 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -669,6 +669,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 +693,14 @@ Ext.onReady(function(){ value: filterDate, minValue: filterDate }), + new Ext.form.TimeField({ + id: 'unpauseTime', + fieldLabel: _('ID_UNPAUSE_TIME'), + name: 'unpauseTime', + value: filterTime, + minValue: filterTime, + format: 'h:i A' + }), { xtype: 'textarea', id: 'noteReason', @@ -726,15 +735,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,