Changeset 293

Timestamp:

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

Author:

niltonneto

Message:

Bug de exportação de contato com telefones

Location:

trunk/contactcenter/inc

Files:

• class.so_group.inc.php (modified) (2 diffs)
• class.ui_data.inc.php (modified) (7 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);
                 }               
                 

trunk/contactcenter/inc/class.ui_data.inc.php

@@ -2742 +2742 @@
                         if(!count($contacts))
                                 echo null;
-
-
-                        // Essa iteração transforma uma esturuta com contatos redundantes e separados por email ou tel.
-                        // em outra com apenas 1 elemento pra cada contato
-                        $i=0;
-                        foreach($contacts as $object){
-                                $i=($object['id_contact'] - 1);
-                                $all_contacts[$i]['name']=$object['names_ordered'];
-                                if ($object['id_typeof_contact_connection'] == 1)
-                                        $all_contacts[$i]['email']=$object['connection_value'];
-                                else
-                                        $all_contacts[$i]['phone']=$object['connection_value'];
-                        }
                         
                         switch($typeExport) {
@@ -2761 +2748 @@
                                         $streamBuffer = "Name;E-mail Address;Notes;Mobile Phone;Pager;Company;".
                                                         "Job Title;Home Phone;Home Fax;Business Phone;Business Fax\r\n";                                                        
-                                        foreach($all_contacts as $index => $object){
-                                                $streamBuffer.= $object['name'].";".$object['email'].";;;;;;".$object['phone'].";;;\r\n";
+                                        foreach($contacts as $index => $object){
+                                                $streamBuffer.= $object['names_ordered'].";".$object['connection_value'].";;;;;;".$object['phone'].";;;\r\n";
                                         }
                                 break;
@@ -2773 +2760 @@
                                         "CEP do endereço comercial;Estado do endereço comercial;".
                                         "País/região do endereço comercial;Telefone comercial;Empresa;Cargo\r\n";                                                       
-                                        foreach($all_contacts as $index => $object){
-                                                $streamBuffer.= $object['name'].";".$object['email'].";;;;;;".$object['phone'].";;;;;;;;\r\n";
+                                        foreach($contacts as $index => $object){
+                                                $streamBuffer.= $object['names_ordered'].";".$object['connection_value'].";;;;;;".$object['phone'].";;;;;;;;\r\n";
                                         }
                                 break;
@@ -2797 +2784 @@
                                         "\"Personalizado 3\",\"Personalizado 4\",\"Prioridade\",\"Profissão\",\"Quilometragem\",\"Sala\",\"Sensibilidade\",\"Servidor de diretório\",".
                                         "\"Sexo\"\r\n";
-                                        foreach($all_contacts as $index => $object){
-                                                $streamBuffer.= ",\"".$object['name']."\",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,".$object['phone'].",,,,,,,,,,,,\"".$object['email']."\",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n";
+                                        foreach($contacts as $index => $object){
+                                                $streamBuffer.= ",\"".$object['names_ordered']."\",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,".$object['phone'].",,,,,,,,,,,,\"".$object['connection_value']."\",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n";
                                         }
                                 break;
@@ -2813 +2800 @@
                                         "Gender,Government ID Number,Hobby,Initials,Internet Free Busy,Keywords,Language,Location,Manager's Name,Mileage,Notes,".
                                         "Office Location,Organizational ID Number,PO Box,Priority,Private,Profession,Referred By,Sensitivity,Spouse,User 1,User 2,User 3,User 4,Web Page\r\n";
-                                        foreach($all_contacts as $index => $object){
-                                                $streamBuffer.= ",".$object['name'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,".$object['phone'].",,,,,,,,,,,,".$object['email'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n";
+                                        foreach($contacts as $index => $object){
+                                                $streamBuffer.= ",".$object['names_ordered'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,".$object['phone'].",,,,,,,,,,,,".$object['connection_value'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n";
                                         }
                                 break;
@@ -2820 +2807 @@
                                 case 'thunderbird':
                                         $streamBuffer = "\n";                                                   
-                                        foreach($all_contacts as $index => $object){
-                                                $streamBuffer.= ",,".$object['name'].",,".$object['email'].",,".$object['phone'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n";
+                                        foreach($contacts as $index => $object){
+                                                $streamBuffer.= ",,".$object['names_ordered'].",,".$object['connection_value'].",,".$object['phone'].",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,\r\n";
                                         }
                                 break;
@@ -2827 +2814 @@
                                 case 'expresso':
                                         $streamBuffer = "Nome,Email,Telefone\r\n";
-                                        foreach($all_contacts as $index => $object){
-                                                $streamBuffer.= $object['name'].",".$object['email'].",".$object['phone']."\r\n";
+                                        foreach($contacts as $index => $object){
+                                                $streamBuffer.= $object['names_ordered'].",".$object['connection_value'].",".$object['phone']."\r\n";
                                         }
                                 break;