Changeset 293 for trunk/contactcenter/inc/class.so_group.inc.php

Timestamp:

06/03/08 17:58:40 (16 years ago)

Author:

niltonneto

Message:

Bug de exportação de contato com telefones

File:

• trunk/contactcenter/inc/class.so_group.inc.php (modified) (2 diffs)

trunk/contactcenter/inc/class.so_group.inc.php

@@ -116 +116 @@
                         'phpgw_cc_contact_conns B, phpgw_cc_connections C where '.
                         'A.id_contact = B.id_contact and B.id_connection = C.id_connection and '.
-                        'C.connection_is_default = true and B.id_typeof_contact_connection = 1 and '.
-                        'A.id_owner ='.$this->owner.' order by A.names_ordered,C.connection_value';
+                        'A.id_owner ='.$this->owner.' and C.connection_is_default = true '.
+                        ' order by A.names_ordered,C.connection_value';
 
                                         
@@ -131 +131 @@
                                 $return[] = $this->db->row(); 
                         }
-                        
-                        return $return;
+                                
+                        // Essa iteração transforma uma esturuta com contatos redundantes e separados por email ou tel.
+                        // em outra com apenas 1 elemento pra cada contato
+                        foreach($return as $i => $object){
+                                if ($object['id_typeof_contact_connection'] == 1){
+                                        $all_contacts[$object['id_contact']]['connection_value'] = $object['connection_value'];
+                    $all_contacts[$object['id_contact']]['names_ordered'] = $object['names_ordered'];
+                    $all_contacts[$object['id_contact']]['id_contact'] = $object['id_contact'];
+                    $all_contacts[$object['id_contact']]['id_connection'] = $object['id_connection'];
+                                }
+                                else 
+                                        if ($object['id_typeof_contact_connection'] == 2){
+                                                $all_contacts[$object['id_contact']]['phone'] = $object['connection_value'];
+                                                $all_contacts[$object['id_contact']]['names_ordered'] = $object['names_ordered'];
+                                                $all_contacts[$object['id_contact']]['id_contact'] = $object['id_contact'];
+                                                $all_contacts[$object['id_contact']]['id_connection'] = $object['id_connection'];
+                                        }
+                        }
+                        
+                        return array_values($all_contacts);
                 }