Changeset 6503

Timestamp:

06/14/12 18:07:50 (11 years ago)

Author:

eduardow

Message:

Ticket #2851 - Novos campos no organograma - Workflow.

Location:

branches/2.4/workflow

Files:

• inc/class.so_userinterface.inc.php (modified) (7 diffs)
• inc/class.ui_userinterface.inc.php (modified) (2 diffs)
• js/adminaccess/main.js (modified) (1 diff)
• js/userinterface/orgchartPrint.js (modified) (3 diffs)

branches/2.4/workflow/inc/class.so_userinterface.inc.php

@@ -13 +13 @@
          */
         var $db;
-
+        /**
+         * @var bool True se o usuário for administrador do expresso.
+         * @access private
+         */
+        private $isAdmin;
+
+        /**
+         * @var int ID do usuário logado no Expresso
+         * @access private
+         */
+        private $userID;
+
+        /**
+         * @var object Link para a ACL do Workflow.
+         * @access private
+         */
+        private $acl;
+        
+        /**
+         * @var bool indicando se o usuário possui ou não acesso aos dados restritos.
+         * @access private
+         */
+        private $authorized;
+        
         /**
          * Constructor
@@ -21 +44 @@
         function so_userinterface()
         {
+                $this->authorized= false;
+                $this->userID = $_SESSION['phpgw_info']['workflow']['account_id'];
+                $this->isAdmin = $_SESSION['phpgw_info']['workflow']['user_is_admin'];
+                $this->acl = Factory::getInstance('workflow_acl');
                 $this->db =& Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID;
                 $this->db->SetFetchMode(ADODB_FETCH_ASSOC);
@@ -218 +245 @@
 
                 return $output;
+        }       
+
+        /**
+         * Checa se o usuário possui permissão para visualizar informações restritas.
+         * @param int $organizationID O ID da organização do Orgranograma.
+         * @return void
+         * @access public
+         */
+        public function _checkAccess($organizationID = null)
+        {
+                /* the user is an administrator */
+                if ($this->isAdmin)
+                        $this->authorized=true;
+
+                if (!is_numeric($organizationID))
+                        $this->authorized = false;
+                else
+                        $this->authorized = $this->acl->checkUserAccessToResource('ORG', $this->userID, (int) $organizationID, 1);
+                
         }
 
@@ -232 +278 @@
                 $areaID = (int) $areaID;
 
+                require_once dirname(__FILE__) . '/local/classes/class.wf_orgchart.php';
+                $orgchart = new wf_orgchart();
+                
                 /* gather some info from the area */
                 $areaInfo = $this->db->query('SELECT COALESCE(a.titular_funcionario_id, -1) AS titular_funcionario_id, COALESCE(s.funcionario_id, -1) AS substituto_funcionario_id FROM area a LEFT OUTER JOIN substituicao s ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) WHERE (a.organizacao_id = ?) AND (a.area_id = ?)', array($organizationID, $areaID))->GetArray(-1);
@@ -252 +301 @@
                         for ($j = 0; $j < $result->_numOfFields; $j++)
                                 unset($employees[$i][$j]);
-
+                        
                         $employees[$i]['cn'] = '';
                         $employees[$i]['telephoneNumber'] = '';
@@ -268 +317 @@
                                 $employees[$i]['removed'] = is_null($entry['last_update']);
                         }
+                        
+                        /*busca o cargo do funcionario*/
+                        $employeeInfo = $orgchart->getEmployee($employees[$i]['funcionario_id']);
+
+                        $cargo = '';
+
+                        if ($this->authorized && !empty($employeeInfo['cargo_id']))
+                        {
+                                $jobTitleInfo = $orgchart->getJobTitle($employeeInfo['cargo_id']);
+                                $cargo = $jobTitleInfo['descricao'];
+                        }
+                        $employees[$i]['cargo'] = utf8_encode($cargo);  
+                        
+                        /*busca o vínculo do funcionario*/
+                        $vinculo = '';
+                        if ($this->authorized && !empty($employeeInfo['funcionario_categoria_id']))
+                        {
+                                $categoryInfo = $orgchart->getEmployeeCategory($employeeInfo['funcionario_categoria_id']);
+                                $vinculo=$categoryInfo['descricao'];
+                        }                       
+                        $employees[$i]['vinculo'] = utf8_encode($vinculo);
 
                         /* count the number of employees in each category */
@@ -274 +344 @@
                                 $categoriesCount[$categoryID]++;
                         else
-                                $categoriesCount[$categoryID] = 1;
+                                $categoriesCount[$categoryID] = 1;                                      
                 }
                 $usedCategories = array_keys($categoriesCount);

branches/2.4/workflow/inc/class.ui_userinterface.inc.php

@@ -170 +170 @@
                 }
 
+                //Verifica a permissão do usuário
+                $so->_checkAccess($organizationID);
+
                 /* make the array flat (for a simpler handling) */
                 $flatAreas = array();
@@ -184 +187 @@
                         }
                         unset($currentArea['children']);
-
+                        
                         $employees = $so->getAreaEmployees($currentArea['area_id'], $organizationID);
                         if (is_array($employees))

branches/2.4/workflow/js/adminaccess/main.js

@@ -34 +34 @@
 permissionListORG[0]['name'] = "Administrar Organograma";
 permissionListORG[0]['value'] = 0;
-permissionListORG[1]['name'] = "Visualizar Telefones Pessoais";
+permissionListORG[1]['name'] = "Visualizar Informações Restritas";
 permissionListORG[1]['value'] = 1;
 

branches/2.4/workflow/js/userinterface/orgchartPrint.js

@@ -99 +99 @@
                                                         .append(areas[area_id].employees[user_id].cn)
                                                 )
-                                                        .css('width', '55%')
+                                                        .css('width', '30%')
                         );
 
@@ -106 +106 @@
                 element.append(
                                                 $('<td>' + areas[area_id].sigla + '</td>')
-                                                        .css('width', '15%')
+                                                        .css('width', '10%')
                                         );
 
@@ -112 +112 @@
         element.append(
                                         $('<td>' + areas[area_id].employees[user_id].uid + '</td>')
-                                                .css('width', '10%')
-                                        )
+                                                .css('width', '15%') 
+                                        ) 
+
 
         /* telephone: last column */
         element.append(
                                         $('<td>' + areas[area_id].employees[user_id].telephoneNumber + '</td>')
-                                                .css('width', '20%')
-                                        )
+                                                .css('width', '15%') 
+                                        ) 
+                                                         
+        /* Vínculo: show cargo vínculo */ 
+        element.append( 
+                                        $('<td>' + areas[area_id].employees[user_id].vinculo + '</td>') 
+                                                .css('width', '15%') 
+                                        ) 
+                 
+        /* Cargo: show cargo attribute */ 
+        element.append( 
+                                        $('<td>' + areas[area_id].employees[user_id].cargo + '</td>') 
+                                                .css('width', '15%') 
+                                        ) 
+                 
                                 .addClass('employees');