Changeset 575 for trunk/contactcenter

Timestamp:

01/07/09 15:51:56 (15 years ago)

Author:

niltonneto

Message:

Melhorando tratamento de csv automático.
Resolve também #250

Location:

trunk/contactcenter

Files:

• inc/class.ui_data.inc.php (modified) (2 diffs)
• js/ccMain.js (modified) (2 diffs)
• templates/default/full_add.tpl (modified) (2 diffs)

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

@@ -120 +120 @@
                         $GLOBALS['phpgw']->template->set_var('cc_personal',lang('Personal'));
                         
-                        $GLOBALS['phpgw']->template->set_var('cc_full_add',lang('Full Add'));
+                        $GLOBALS['phpgw']->template->set_var('cc_full_add_button',lang('Full Add'));
                         $GLOBALS['phpgw']->template->set_var('cc_reset',lang('Reset'));
                         
@@ -3038 +3038 @@
                                                 foreach($csv_header as $index => $fieldName)
                                                 {
-                                                        switch($fieldName){
-                                                        case 'Name':
-                                                        case 'Nome':
-                                                        case 'First Name':
+                                                        switch(strtoupper($fieldName)){
+                                                        case 'NAME':
+                                                        case 'NOME':
+                                                        case 'FIRST NAME':
                                                                 $name_pos = $index;
                                                                 break;
-                                                        case 'E-mail':
-                                                        case 'Email':
-                                                        case 'E-mail Address':
-                                                        case 'Endereço de correio eletrônico':
-                                                        case 'End. de email':
+                                                        case 'E-MAIL':
+                                                        case 'EMAIL':
+                                                        case 'E-MAIL ADDRESS':
+                                                        case 'ENDEREÇO DE CORREIO ELETRÔNICO':
+                                                        case 'END. DE EMAIL':
                                                                 $email_pos = $index;
                                                                 break;
-                                                        case 'Home Phone':
-                                                        case 'Phone':
-                                                        case 'Telefone':
-                                                        case 'Telefone principal':
-                                                        case 'Telefone comercial':
+                                                        case 'HOME PHONE':
+                                                        case 'PHONE':
+                                                        case 'TELEFONE':
+                                                        case 'TELEFONE PRINCIPAL':
+                                                        case 'TELEFONE COMERCIAL':
                                                                 $phone_pos = $index;
                                                                 break;
                                                         }
-                                                }       
+                                                }
                                                 break;
                                 }

trunk/contactcenter/js/ccMain.js

@@ -93 +93 @@
                         
                 textmenu[0] = ["cc_msg_contact_qa","cc_msg_contact_full","cc_msg_group"]
-                textmenu[1] = ["cc_quick_add", "cc_full_add", "cc_add_group"];          
+                textmenu[1] = ["cc_quick_add", "cc_full_add_button", "cc_add_group_button"];            
                 function show(){
                         clearTimeout(_timeout);
@@ -124 +124 @@
                         
                 ccQuickAdd.associateAsButton(Element('cc_quick_add'));
-                ccAddGroup.associateAsButton(Element('cc_add_group'));
-                document.getElementById("cc_full_add").onclick= newContact;
+                ccAddGroup.associateAsButton(Element('cc_add_group_button'));
+                Element("cc_full_add_button").onclick = newContact;
                          
                         

trunk/contactcenter/templates/default/full_add.tpl

@@ -219 +219 @@
                                          'unselectedClass': 'tab_box'});                                         
 
-                fullAddWin = new dJSWin({'id': 'cc_full_add',
+                fullAddWin = new dJSWin({'id': 'cc_full_add_window',
                                          'content_id': 'cc_contact_tab',
                                          'win_class': 'row_off',
@@ -231 +231 @@
                                          'border': true});
 
-                fullAddWin.draw();              
-                                                
+                fullAddWin.draw();
+
                 if (is_ie)
                 {