diff --git a/workflow/engine/methods/cases/casesMenuLoader.php b/workflow/engine/methods/cases/casesMenuLoader.php index ddb50e00c..d45138fe7 100644 --- a/workflow/engine/methods/cases/casesMenuLoader.php +++ b/workflow/engine/methods/cases/casesMenuLoader.php @@ -9,9 +9,6 @@ switch ($action) { case 'getAllCounters': getAllCounters(); break; - case 'getProcess': - getProcess(); - break; /*----------------------------------********---------------------------------*/ case 'getAllCountersEnterprise': getAllCountersEnterprise(); @@ -218,64 +215,6 @@ function getLoadTreeMenuData () print $xml;*/ } -// get the process summary of specific case list type, -function getProcess () -{ - global $G_TMP_MENU; - global $userId; - if (! isset( $_GET['item'] )) { - die(); - } - - $oMenu = new Menu(); - $oMenu->load( 'cases' ); - $type = $_GET['item']; - $oCases = new AppCacheView(); - - $aTypesID = array (); - $aTypesID['CASES_INBOX'] = 'to_do'; - $aTypesID['CASES_DRAFT'] = 'draft'; - $aTypesID['CASES_CANCELLED'] = 'cancelled'; - $aTypesID['CASES_SENT'] = 'sent'; - $aTypesID['CASES_PAUSED'] = 'paused'; - $aTypesID['CASES_COMPLETED'] = 'completed'; - $aTypesID['CASES_SELFSERVICE'] = 'selfservice'; - //$aTypesID['CASES_TO_REVISE'] = 'to_revise'; - //$aTypesID['CASES_TO_REASSIGN'] = 'to_reassign'; - $aTypesID = Array ('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice','CASES_TO_REVISE' => 'to_revise','CASES_TO_REASSIGN' => 'to_reassign'); - - $aCount = $oCases->getAllCounters( Array ($aTypesID[$type] - ), $userId, true ); - - $response = Array (); - //disabling the summary... - /* - $i=0; - foreach($aCount[$aTypesID[$type]]['sumary'] as $PRO_UID=>$process){ - //{"text":"state","id":"src\/state","cls":"folder", loaded:true}, - $response[$i] = new stdClass(); - $response[$i]->text = $process['name'] . ' ('.$process['count'].')'; - $response[$i]->id = $process['name']; - $response[$i]->cls = 'folder'; - $response[$i]->loaded = true; - $i++; - } - */ - //ordering - /*for($i=0; $i<=count($response)-1; $i++){ - for($j=$i+1; $j<=count($response); $j++){ - - echo $response[$j]->text .'<'. $response[$i]->text; - if($response[$j]->text[0] < $response[$i]->text[0]){ - $x = $response[$i]; - $response[$i] = $response[$j]; - $response[$j] = $x; - } - } - }*/ - echo G::json_encode( $response ); -} - /*----------------------------------********---------------------------------*/ function getAllCountersEnterprise() { diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js index a8b4b9b4c..cee5b829a 100644 --- a/workflow/engine/templates/cases/main.js +++ b/workflow/engine/templates/cases/main.js @@ -16,7 +16,6 @@ var propStore; var triggerStore; var debugVariablesFilter; -var ReloadTreeMenuItemDetail; var NOTIFIER_FLAG = false; var result; var _action = ''; @@ -258,39 +257,6 @@ Ext.onReady(function(){ } }); - - - var treeMenuItemDetail = new Ext.tree.TreePanel({ - id: 'tree_menuItem_detail', - region: 'south', - animate:true, - autoScroll:true, - loader: new Ext.tree.TreeLoader({ - dataUrl:'casesMenuLoader?action=getProcess' - }), - enableDD:true, - containerScroll: true, - border: false, - width: 250, - height: 120, - dropConfig: {appendOnly:true}, - collapsible: true, - split: true, - margins: '0 2 2 2', - cmargins: '2 2 2 2', - rootVisible: false, - root: new Ext.tree.AsyncTreeNode()/*, - tbar: [{ - text: 'reload', - handler: ReloadTreeMenuItemDetail - }]*/ - }); - - ReloadTreeMenuItemDetail = function(params){ - treeMenuItemDetail.loader.dataUrl = 'casesMenuLoader?action=getProcess&item='+params.item; - treeMenuItemDetail.root.reload(); - } - // set the root node var root = new Ext.tree.AsyncTreeNode({ text: 'Ext JS', @@ -300,8 +266,6 @@ Ext.onReady(function(){ expanded:true }); - treeMenuItemDetail.setRootNode(root); - mainMenu = new Ext.Panel({ id:'menuTreePanel', title: '', @@ -317,8 +281,7 @@ Ext.onReady(function(){ margins: '0 0 0 2', items: [ - treeMenuItems, - treeMenuItemDetail + treeMenuItems ] }); mainMenu.setTitle("
"); @@ -530,15 +493,6 @@ Ext.onReady(function(){ menuPanelC.hide(); menuPanelC.ownerCt.doLayout(); - /**show*/ - //w.show(); - //w.ownerCt.doLayout(); - //w.expand(); - - var menuPanelDetail = Ext.getCmp('tree_menuItem_detail'); - menuPanelDetail.hide(); - menuPanelDetail.ownerCt.doLayout(); - //FORMATS.casesListRefreshTime is in seconds setTimeout("timer()", parseInt(FORMATS.casesListRefreshTime) * 1000); }); @@ -571,9 +525,7 @@ function updateCasesTree() { document.getElementById('refreshNotifiers').src = '/images/ext/default/grid/loading.gif'; itemsTypes = Array('CASES_INBOX', 'CASES_DRAFT', 'CASES_CANCELLED', 'CASES_SENT', 'CASES_PAUSED', 'CASES_COMPLETED', 'CASES_SELFSERVICE'); - if (currentSelectedTreeMenuItem) { - ReloadTreeMenuItemDetail({item: currentSelectedTreeMenuItem}); - } + Ext.Ajax.request({ url: urlProxy + Math.random(), success: function (response) {