diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php index a4878fab2..154e1813d 100755 --- a/workflow/engine/methods/cases/ajaxListener.php +++ b/workflow/engine/methods/cases/ajaxListener.php @@ -140,7 +140,8 @@ class Ajax $node->text = $oDocument->getDynTitle(); $node->iconCls = 'ss_sprite ss_application_form'; $node->leaf = true; - $node->url = "cases_Step?UID=$stepUidObj&TYPE=$stepTypeObj&POSITION=$stepPosition&ACTION=EDIT"; + $node->url = "cases_Step?UID=$stepUidObj&TYPE=$stepTypeObj&POSITION=$stepPosition&ACTION=EDIT"; + $node->idtodraw= $stepUidObj; break; case 'OUTPUT_DOCUMENT': diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index 4fcb7d2fb..8a69ab41d 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -186,6 +186,8 @@ $array['TITLE'] = G::LoadTranslation('ID_TITLE'); $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array); +$uidf=$_GET['UID']; + switch ($_GET['TYPE']) { case 'DYNAFORM': @@ -198,7 +200,14 @@ } $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE']; $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation('ID_NEXT_STEP'); - + + $oHeadPublisher =& headPublisher::getSingleton(); + $oHeadPublisher->addScriptCode(" + if (typeof parent != 'undefined') { + parent.setNode('$uidf'); + } + "); + $oStep = new Step(); $oStep = $oStep->loadByProcessTaskPosition($_SESSION['PROCESS'], $_SESSION['TASK'], $_GET['POSITION']); @@ -689,6 +698,7 @@ 'APP_UID' => $_SESSION['APPLICATION'], 'DEL_INDEX' => $_SESSION['INDEX']) ); + if ( empty($aFields['TASK']) ) { throw ( new Exception ( G::LoadTranslation( 'ID_NO_DERIVATION_RULE') ) ); } @@ -976,7 +986,6 @@ die; } - /* Render page */ $oHeadPublisher =& headPublisher::getSingleton(); $oHeadPublisher->addScriptCode(" if (typeof parent != 'undefined') { diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php index aa86c6fe0..88c924137 100755 --- a/workflow/engine/methods/cases/open.php +++ b/workflow/engine/methods/cases/open.php @@ -31,7 +31,7 @@ if (!isset($_GET['APP_UID']) || !isset($_GET['DEL_INDEX'])) { throw new Exception("Application ID or Delegation Index is missing!. The System can't open the case."); } - + require_once ("classes/model/Step.php"); G::LoadClass("configuration"); G::LoadClass("case"); $oCase = new Cases(); @@ -62,10 +62,15 @@ echo "
"; } + $oStep = new Step; + $oStep = $oStep->loadByProcessTaskPosition($case['PRO_UID'], $case['TAS_UID'], 1); + $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('idfirstform', $oStep->getStepUidObj()); + G::RenderPage('publish', 'extJs'); diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index ae6c7d2fd..a9bafedcf 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -9,7 +9,6 @@ var _ENV_CURRENT_DATE; Ext.onReady(function(){ Ext.QuickTips.init(); - showCaseNavigatorPanel = function(app_status) { if (typeof(treeToReviseTitle) != 'undefined'){ @@ -155,20 +154,31 @@ Ext.onReady(function(){ root: { nodeType: 'async' }, + listeners: { render: function() { this.getRootNode().expand(); }, click: function(tp) { if( tp.attributes.url ){ - document.getElementById('openCaseFrame').src = tp.attributes.url; - } } - } + + }, + "afterrender": { + fn: setNodeini, + scope: this + } }) + var loader = casesStepTree.getLoader(); + loader.on("load", setNodeini); + function setNodeini(){ + var aNode = Ext.getCmp('casesStepTree').getNodeById(idfirstform); + aNode.select(); + } + var navPanelWest = { id: 'navPanelWest', region: 'west', @@ -880,6 +890,12 @@ Ext.onReady(function(){ CloseWindow = function(){ Ext.getCmp('w').hide(); }; + + setNode = function (uid){ + var aNode = Ext.getCmp('casesStepTree').getNodeById(uid); + aNode.select(); + } + /*-----added by krlos end------------*/ /*Date.prototype.dateFormat = function(format) { var result = "";