Changeset 8232 for branches/2.5/workflow/inc

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

Location:

branches/2.5/workflow/inc

Files:

• class.Logger.inc.php (modified) (4 diffs)
• local/classes/class.wf_instance.php (modified) (3 diffs)
• smarty/wf_plugins/function.wf_select_user.php (modified) (1 diff)

branches/2.5/workflow/inc/class.Logger.inc.php

@@ -29 +29 @@
 
         /**
+         * @var object $db Objeto de banco de dados do modulo workflow
+         * @access private
+         */
+        private $dbGalaxia = null;
+
+        /**
          * @var string $logPath Caminho onde será salvo o arquivo de log, caso o tipo de log Log_file seja adicionado à composição
          * @access private
@@ -81 +87 @@
 
                 $this->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID;
+                $this->dbGalaxia =& Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID;
 
                 if(!empty($curProcessName)){
+
                         $query = '
                                 SELECT
@@ -89 +97 @@
                                         egw_wf_processes';
 
-                        if(!($result = $this->db->query($query)))
+                        if(!($result = $this->dbGalaxia->query($query)))
                                 throw new Exception(lang('Cannot execute query'));
 
@@ -131 +139 @@
                                                 wf_config_name like 'log_level'
                                                 ";
-                        $config_value = array_pop($this->db->query($query)->GetArray(-1));
+                        $config_value = array_pop($this->dbGalaxia->query($query)->GetArray(-1));
                         $this->logLevel = $config_value['wf_config_value_int'];
                 } else {

branches/2.5/workflow/inc/local/classes/class.wf_instance.php

@@ -443 +443 @@
 
         /**
+        * Busca uma instância pelo id
+        * @param int $wf_instance_id O id da instância
+        * @return array As instâncias que satisfazem o critério de seleção.
+        * @access public
+        */
+        public function getById($wf_instance_id)
+        {
+                /* build the SQL query */
+                $query = 'SELECT i.wf_instance_id AS wf_instance_id, ia.wf_activity_id AS wf_activity_id, ia.wf_started AS wf_started, i.wf_name AS wf_name, i.wf_status AS wf_status, ia.wf_user AS wf_user, i.wf_priority AS wf_priority ';
+                $query .= 'FROM egw_wf_instances i LEFT JOIN egw_wf_instance_activities ia ON (ia.wf_instance_id = i.wf_instance_id)';
+                $query .= 'WHERE (i.wf_p_id = ?) AND i.wf_instance_id = ?';
+
+                $resultSet = $this->db->query($query, array($this->processID, intval($wf_instance_id)));
+                
+                return $resultSet->GetArray();
+        }
+
+        /**
         * Busca todas as instâncias que possuem esse nome (identificador).
         * @param string $name O nome da instância que se quer encontrar.
@@ -456 +474 @@
 
                 $resultSet = $this->db->query($query, array($this->processID, $name));
+                return $resultSet->GetArray();
+        }
+
+        /**
+        * Busca todas as instâncias que possuem um trecho do nome (identificador).
+        * @param string $name O trecho do nome da instância que se quer encontrar.
+        * @return array As instâncias que satisfazem o critério de seleção.
+        * @access public
+        */
+        public function getLikeName($name)
+        {
+                /* build the SQL query */
+                $query = 'SELECT i.wf_instance_id AS wf_instance_id, ia.wf_activity_id AS wf_activity_id, ia.wf_started AS wf_started, i.wf_name AS wf_name, i.wf_status AS wf_status, ia.wf_user AS wf_user, i.wf_priority AS wf_priority ';
+                $query .= 'FROM egw_wf_instances i LEFT JOIN egw_wf_instance_activities ia ON (ia.wf_instance_id = i.wf_instance_id)';
+                $query .= "WHERE (i.wf_p_id = ?) AND i.wf_name ILIKE '%$name%'";
+
+                $resultSet = $this->db->query($query, array($this->processID));
+
                 return $resultSet->GetArray();
         }
@@ -584 +620 @@
                 return $this->setUser($instanceID, $activityID, 'p' . $roleID);
         }
+
+        /**
+        * Altera o wf_name das instâncias, fazendo o replace no nome da categoria de serviço. 
+        * Método chamado quando é alterada a categoria de um serviço e existem ocorrências atrelados a esse serviço.
+        * @param int | array $instanceID se for um array, concatena os instances ids
+        * @param string @currentServiceName Nome da categoria de serviço atual
+        * @param string @newServiceName Nome da nova categoria de serviço
+        * @return resultSet em caso de sucesso ou false
+        * @access public 
+        */
+        public function updateReplaceName($instanceID, $currentServiceName, $newServiceName)
+        {
+                $success = true;
+
+                // Se for array, faz implode concatenando os ids
+                if (is_array($instanceID))
+                {
+                        $instanceID = implode(',', $instanceID);
+                }
+
+                $query = "UPDATE egw_wf_instances SET wf_name = REPLACE(wf_name, '" . $currentServiceName . "', '" . $newServiceName . "') WHERE wf_instance_id IN (" . $instanceID . ")";
+                $success = $this->db->execute($query);
+
+                return $success;
+        }
 }
 ?>

branches/2.5/workflow/inc/smarty/wf_plugins/function.wf_select_user.php

@@ -115 +115 @@
 
         $output .= <<<EOF
-                <a alt="$title" title="$title" href="javascript:void(0)" onclick="openParticipants('$name', '$extraParams');"><img border="0" alt="" src="$image" /></a>
+                <a alt="$title" title="$title" href="javascript:void(0)" onclick="openParticipantsWindow('$name', '$extraParams');"><img border="0" alt="" src="$image" /></a>
 EOF;
         return $output;