Changeset 1310

Timestamp:

08/12/09 11:28:43 (15 years ago)

Author:

rodsouza

Message:

Ticket #589 - Modificado cache do LDAP (modo e tempo) e interface do usuario (cartao e barra de botoes)

Location:

trunk/workflow

Files:

• inc/class.CachedLDAP.inc.php (modified) (1 diff)
• inc/class.so_userinterface.inc.php (modified) (5 diffs)
• js/userinterface/orgchart.js (modified) (9 diffs)

trunk/workflow/inc/class.CachedLDAP.inc.php

@@ -83 +83 @@
         * @access private
         */
-        private $cacheDays = 5;
+        private $cacheDays = 2;
 
         /**

trunk/workflow/inc/class.so_userinterface.inc.php

@@ -246 +246 @@
                 $employees = $result->GetArray(-1);
                 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP');
-                $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP_DATABASE);
+                $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_NORMAL);
                 $categoriesCount = array();
                 for ($i = 0; $i < count($employees); $i++)
@@ -319 +319 @@
                 $employees = $result->GetArray(-1);
                 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP');
-                $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP_DATABASE);
+                $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_NORMAL);
                 for ($i = 0; $i < count($employees); $i++)
                 {
@@ -520 +520 @@
                 $employees = $result -> GetArray( -1 );
                 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] -> newInstance( 'CachedLDAP' );
-                $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_LDAP_DATABASE );
+                $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_NORMAL );
 
                 $categoriesCount = array( );
@@ -592 +592 @@
 
                 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] -> newInstance( 'CachedLDAP' );
-                $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_LDAP_DATABASE );
+                $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_NORMAL );
 
                 $categoriesCount = array( );
@@ -617 +617 @@
                 usort( $employees, create_function( '$a,$b', 'return strcasecmp($a[\'cn\'],$b[\'cn\']);' ) );
 
-                $paging = $GLOBALS['workflow']['factory']->newInstance('Paging', 100, $_POST);
+                $paging = $GLOBALS['workflow']['factory']->newInstance('Paging', 50, $_POST);
                 $employees = $paging->restrictItems( $employees );
 

trunk/workflow/js/userinterface/orgchart.js

@@ -34 +34 @@
 
         var content = '<ul class="horizontalMenu">';
-        content += '<li style="margin: 5px 5px 0 5px">Visualizar : <select>'
+        content += '<li style="margin: 5px 5px 0 5px">Visualizar : <select onclick="this.parentNode.parentNode.lastChild.style.display = (this.options[1].selected) ? \'block\' : \'none\' ">'
         content += '<option onclick="getAlphabeticalEmployees( )">Alfabética</option>'
         content += '<option onclick="getHierarchicalArea( );" selected="true">Áreas</option>'
@@ -44 +44 @@
         content += '</select></li>';
         content += '<li><a href="#" onclick="window.open(\'' + enderecoImagem + '\', \'extwindow\'); return false;"><img src="templateFile.php?file=images/Process.gif">&nbsp;&nbsp;Gráfico</a></li>';
+        content += '<li><a><input type="text" name="search_term" id="search_term" onkeypress="if (((event.which) ? event.which : event.keyCode) == 13) $(\'search_span\').onclick(); return true;" /><span id="search_span" style="cursor: pointer;" onclick="tmp = $$(\'div#orgchartAreas a.destaque\'); if (tmp[0]) tmp[0].removeClassName(\'destaque\'); orgchartSearchEmployee($F(\'search_term\')); return false;">&nbsp;busca</span></a></li>';
         content += '<li><a href="#" onclick="printArea(); return false;"><img src="templateFile.php?file=images/imprimir.png" width="16">&nbsp;&nbsp;Imprimir</a></li>';
-        content += '<li><a><input type="text" name="search_term" id="search_term" onkeypress="if (((event.which) ? event.which : event.keyCode) == 13) $(\'search_span\').onclick(); return true;" /><span id="search_span" style="cursor: pointer;" onclick="tmp = $$(\'div#orgchartAreas a.destaque\'); if (tmp[0]) tmp[0].removeClassName(\'destaque\'); orgchartSearchEmployee($F(\'search_term\')); return false;">&nbsp;busca</span></a></li>';
         content += '</ul>';
         content += '<br/>';
@@ -201 +201 @@
 function getUsefulPhones( )
 {
+        workflowUserInterfaceCurrentAreaID = 0;
+
         cExecute("$this.bo_userinterface.getUsefulPhones", displayUsefulPhones, "");
 }
@@ -206 +208 @@
 function getAreaWithSubtituteBoss( )
 {
+        workflowUserInterfaceCurrentAreaID = 0;
+
         cExecute("$this.bo_userinterface.getAreaWithSubtituteBoss", displayAreaWithSubtituteBoss, "");
 }
@@ -211 +215 @@
 function getCostCenters()
 {
+        workflowUserInterfaceCurrentAreaID = 0;
+
         cExecute("$this.bo_userinterface.getCostCenters", displayCostCenters, "");
 }
@@ -216 +222 @@
 function getHierarchicalArea()
 {
+        workflowUserInterfaceCurrentAreaID = 0;
+
         cExecute("$this.bo_userinterface.getHierarchicalArea", displayHierarchicalAreas, "");
 }
@@ -226 +234 @@
 function getCategoriesList()
 {
+        workflowUserInterfaceCurrentAreaID = 0;
+
+        var div = $('orgchartEmployees');
+        div.innerHTML = '';
+
         function resultGetCategoriesList(data)
         {
@@ -243 +256 @@
 function getManning( )
 {
+        workflowUserInterfaceCurrentAreaID = 0;
+
+        var div = $('orgchartEmployees');
+        div.innerHTML = '';
+
         function resultGetManning( data )
         {
@@ -560 +578 @@
                 }
 
+                card.appendChild( document.createElement( 'br' ) );
+
                 if ( card_data[ 'sitio' ] )
                 {