Ticket #1719: class.wf_instance.php.diff

class.wf_instance.php

@@ -76 +76 @@
         private function getInstanceObject($instanceID)
         {
                 $instanceID = (int) $instanceID;
-                $instance = Factory::getInstance('workflow_instance');
+                $instance = Factory::newInstance('workflow_instance');
                 if (!$instance->getInstance($instanceID))
                         return false;
                 else
@@ -242 +242 @@
         * @param array $activities Uma lista de atividades das quais se quer as instâncias (também pode ser um valor inteiro).
         * @return array As instâncias que satisfazem o critério de seleção.
         * @access public
+        * @deprecated 2.2.000
         */
         public function getAll($activities = null)
         {
+                wf_warn_deprecated_method('wf_instances', 'getAllActive');
                 return $this->getIdle(0, $activities);
         }
 
         /**
+        * Search and return all active instances.
+        * @param array $activities A list of activities codes to restrict instances from (may also be a single integer code).
+        * @return array The instaces which match the search criteria.
+        * @access public
+        */
+        public function getAllActive($activities = null)
+        {
+                return $this->getIdle(0, $activities);
+        }
+
+        /**
+        * Retrieve all completed instances.
+        * @return array All completed instances from current process. Be careful this may be a long array.
+        * @access public
+        */
+        public function getAllCompleted()
+        {
+                $output = array();
+
+                // Build the SQL query
+                // Select all instances from the process that has a final date
+                $query = 'SELECT i.wf_instance_id, i.wf_started, i.wf_ended, i.wf_name, i.wf_status, i.wf_priority ';
+                $query .= 'FROM egw_wf_instances i ';
+                $query .= 'WHERE (i.wf_p_id = ?) AND (i.wf_ended > 0)';
+                $resultSet = $this->db->query($query, array($this->processID));
+
+                /* fetch the results */
+                while ($row = $resultSet->fetchRow())
+                {
+                        $output[] = $row;
+                }
+
+                return $output;
+        }
+
+        /**
         * This method gets all children instances of the given instance.
         * If there is no parameter, it gets the children instances of the current instance
         * @param int $instanceID Dad instance's identification.