From 8955b4f63307923655ca8f2e12ecef79df9962ae Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 23 Jun 2010 02:42:22 +0000 Subject: [PATCH] Added custom default field names for fields in the agent interface. Defined in the Admin System Settings git-svn-id: svn://192.168.202.10@1454 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/UPGRADE | 2 + .../trunk/extras/MySQL_AST_CREATE_tables.sql | 23 ++- agc_2-X/trunk/extras/upgrade_2.4.sql | 22 +++ .../TO_BE_TRANSLATED_2.4.txt | 21 +++ agc_2-X/trunk/www/agc/vdc_db_query.php | 90 +++++++++--- agc_2-X/trunk/www/agc/vdc_script_notes.php | 68 +++++++-- agc_2-X/trunk/www/agc/vicidial.php | 83 ++++++++--- agc_2-X/trunk/www/vicidial/admin.php | 134 +++++++++++++++++- .../trunk/www/vicidial/admin_modify_lead.php | 91 +++++++++--- .../trunk/www/vicidial/admin_search_lead.php | 59 +++++++- 10 files changed, 506 insertions(+), 87 deletions(-) diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index ef9ebd56..d7feb93b 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -167,6 +167,8 @@ OTHER CHANGES: 40. Added function for start_call_url to work with remote agents +41. Added custom default field names for fields in the agent interface. Defined + in the Admin System Settings diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index b97402db..f2a3ea92 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -1272,7 +1272,26 @@ callcard_enabled ENUM('1','0') default '0', queuemetrics_callstatus ENUM('0','1') default '1', default_codecs VARCHAR(100) default '', custom_fields_enabled ENUM('0','1') default '0', -admin_web_directory VARCHAR(255) default 'vicidial' +admin_web_directory VARCHAR(255) default 'vicidial', +label_title VARCHAR(40) default '', +label_first_name VARCHAR(40) default '', +label_middle_initial VARCHAR(40) default '', +label_last_name VARCHAR(40) default '', +label_address1 VARCHAR(40) default '', +label_address2 VARCHAR(40) default '', +label_address3 VARCHAR(40) default '', +label_city VARCHAR(40) default '', +label_state VARCHAR(40) default '', +label_province VARCHAR(40) default '', +label_postal_code VARCHAR(40) default '', +label_vendor_lead_code VARCHAR(40) default '', +label_gender VARCHAR(40) default '', +label_phone_number VARCHAR(40) default '', +label_phone_code VARCHAR(40) default '', +label_alt_phone VARCHAR(40) default '', +label_security_phrase VARCHAR(40) default '', +label_email VARCHAR(40) default '', +label_comments VARCHAR(40) default '' ); CREATE TABLE vicidial_campaigns_list_mix ( @@ -2250,7 +2269,7 @@ ALTER TABLE vicidial_agent_log_archive MODIFY agent_log_id INT(9) UNSIGNED NOT N CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log; -UPDATE system_settings SET db_schema_version='1228',db_schema_update_date=NOW(); +UPDATE system_settings SET db_schema_version='1229',db_schema_update_date=NOW(); GRANT RELOAD ON *.* TO cron@'%'; GRANT RELOAD ON *.* TO cron@localhost; diff --git a/agc_2-X/trunk/extras/upgrade_2.4.sql b/agc_2-X/trunk/extras/upgrade_2.4.sql index 1d163750..249e8534 100644 --- a/agc_2-X/trunk/extras/upgrade_2.4.sql +++ b/agc_2-X/trunk/extras/upgrade_2.4.sql @@ -367,3 +367,25 @@ UPDATE system_settings SET db_schema_version='1227',db_schema_update_date=NOW(); ALTER TABLE vicidial_tts_prompts ADD tts_voice VARCHAR(100) default 'Allison-8kHz'; UPDATE system_settings SET db_schema_version='1228',db_schema_update_date=NOW(); + +ALTER TABLE system_settings ADD label_title VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_first_name VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_middle_initial VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_last_name VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_address1 VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_address2 VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_address3 VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_city VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_state VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_province VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_postal_code VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_vendor_lead_code VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_gender VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_phone_number VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_phone_code VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_alt_phone VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_security_phrase VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_email VARCHAR(40) default ''; +ALTER TABLE system_settings ADD label_comments VARCHAR(40) default ''; + +UPDATE system_settings SET db_schema_version='1229',db_schema_update_date=NOW(); diff --git a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt index e445dd8d..45858e7b 100644 --- a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt +++ b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt @@ -215,6 +215,27 @@ Admin Web Directory|| This is the directory that your administation web content, like admin.php, are in. Default is vicidial. To figure out your Admin web directory, it is everything that is between the domain name and the admin.php in the URL on this page, without the beginning and ending slashes|| TTS Voice|| This is where you define the voice to be used in the TTS generation. Default is Allison-8kHz|| +Default Field Labels|| +These 19 fields allow you to set the name as it will appear in the ViciDial agent interface as well as the administrative modify lead page. Default is empty which will use the hard-coded defaults in the agent interface|| +Label Title|| +Label First Name|| +Label Middle Initial|| +Label Last Name|| +Label Address1|| +Label Address2|| +Label Address3|| +Label City|| +Label State|| +Label Province|| +Label Postal Code|| +Label Vendor Lead Code|| +Label Gender|| +Label Phone Number|| +Label Phone Code|| +Label Alt Phone|| +Label Security Phrase|| +Label Email|| +Label Comments|| AST_VICIDIAL_ingrouplist.php diff --git a/agc_2-X/trunk/www/agc/vdc_db_query.php b/agc_2-X/trunk/www/agc/vdc_db_query.php index f44af924..f37f9387 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -246,10 +246,11 @@ # 100413-1341 - Fixes for extended alt-dial # 100420-1006 - Added option for LIVE-only callback count # 100424-1630 - Added uniqueid display options +# 100622-2217 - Added field labels # -$version = '2.4-153'; -$build = '100424-1630'; +$version = '2.4-154'; +$build = '100622-2217'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=333; $one_mysql_log=0; @@ -7174,6 +7175,51 @@ if ($ACTION == 'LEADINFOview') {echo "ERROR: no Lead ID";} else { + ### BEGIN find any custom field labels ### + $label_title = 'Title'; + $label_first_name = 'First'; + $label_middle_initial = 'MI'; + $label_last_name = 'Last'; + $label_address1 = 'Address1'; + $label_address2 = 'Address2'; + $label_address3 = 'Address3'; + $label_city = 'City'; + $label_state = 'State'; + $label_province = 'Province'; + $label_postal_code = 'PostCode'; + $label_vendor_lead_code = 'Vendor ID'; + $label_gender = 'Gender'; + $label_phone_number = 'Phone'; + $label_phone_code = 'DialCode'; + $label_alt_phone = 'Alt. Phone'; + $label_security_phrase = 'Show'; + $label_email = 'Email'; + $label_comments = 'Comments'; + + $stmt="SELECT label_title,label_first_name,label_middle_initial,label_last_name,label_address1,label_address2,label_address3,label_city,label_state,label_province,label_postal_code,label_vendor_lead_code,label_gender,label_phone_number,label_phone_code,label_alt_phone,label_security_phrase,label_email,label_comments from system_settings;"; + $rslt=mysql_query($stmt, $link); + $row=mysql_fetch_row($rslt); + if (strlen($row[0])>0) {$label_title = $row[0];} + if (strlen($row[1])>0) {$label_first_name = $row[1];} + if (strlen($row[2])>0) {$label_middle_initial = $row[2];} + if (strlen($row[3])>0) {$label_last_name = $row[3];} + if (strlen($row[4])>0) {$label_address1 = $row[4];} + if (strlen($row[5])>0) {$label_address2 = $row[5];} + if (strlen($row[6])>0) {$label_address3 = $row[6];} + if (strlen($row[7])>0) {$label_city = $row[7];} + if (strlen($row[8])>0) {$label_state = $row[8];} + if (strlen($row[9])>0) {$label_province = $row[9];} + if (strlen($row[10])>0) {$label_postal_code = $row[10];} + if (strlen($row[11])>0) {$label_vendor_lead_code = $row[11];} + if (strlen($row[12])>0) {$label_gender = $row[12];} + if (strlen($row[13])>0) {$label_phone_number = $row[13];} + if (strlen($row[14])>0) {$label_phone_code = $row[14];} + if (strlen($row[15])>0) {$label_alt_phone = $row[15];} + if (strlen($row[16])>0) {$label_security_phrase = $row[16];} + if (strlen($row[17])>0) {$label_email = $row[17];} + if (strlen($row[18])>0) {$label_comments = $row[18];} + ### END find any custom field labels ### + echo "
\n"; echo ""; @@ -7186,29 +7232,29 @@ if ($ACTION == 'LEADINFOview') { $row=mysql_fetch_row($rslt); echo ""; - echo ""; + echo ""; echo ""; echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; echo ""; echo ""; # echo ""; diff --git a/agc_2-X/trunk/www/agc/vdc_script_notes.php b/agc_2-X/trunk/www/agc/vdc_script_notes.php index 9395c47e..818f9750 100644 --- a/agc_2-X/trunk/www/agc/vdc_script_notes.php +++ b/agc_2-X/trunk/www/agc/vdc_script_notes.php @@ -11,10 +11,11 @@ # # CHANGELOG: # 100215-0744 - First build of script +# 100622-2230 - Added field labels # -$version = '2.4-1'; -$build = '100215-0744'; +$version = '2.4-2'; +$build = '100622-2230'; require("dbconnect.php"); @@ -245,6 +246,51 @@ if ($DB > 0) echo "
$lead_id|$entry_date|$modify_date|$status|$user|$vendor_lead_code|$source_id|$list_id|$gmt_offset_now|$called_since_last_reset|$phone_code|$phone_number|$title|$first_name|$middle_initial|$last_name|$address1|$address2|$address3|$city|$state|$province|$postal_code|$country_code|$gender|$date_of_birth|$alt_phone|$email|$security_phrase|$comments|$called_count|$last_local_call_time|$rank|$owner|\n
"; } +### BEGIN find any custom field labels ### +$label_title = 'Title'; +$label_first_name = 'First'; +$label_middle_initial = 'MI'; +$label_last_name = 'Last'; +$label_address1 = 'Address1'; +$label_address2 = 'Address2'; +$label_address3 = 'Address3'; +$label_city = 'City'; +$label_state = 'State'; +$label_province = 'Province'; +$label_postal_code = 'PostCode'; +$label_vendor_lead_code = 'Vendor ID'; +$label_gender = 'Gender'; +$label_phone_number = 'Phone'; +$label_phone_code = 'DialCode'; +$label_alt_phone = 'Alt. Phone'; +$label_security_phrase = 'Show'; +$label_email = 'Email'; +$label_comments = 'Comments'; + +$stmt="SELECT label_title,label_first_name,label_middle_initial,label_last_name,label_address1,label_address2,label_address3,label_city,label_state,label_province,label_postal_code,label_vendor_lead_code,label_gender,label_phone_number,label_phone_code,label_alt_phone,label_security_phrase,label_email,label_comments from system_settings;"; +$rslt=mysql_query($stmt, $link); +$row=mysql_fetch_row($rslt); +if (strlen($row[0])>0) {$label_title = $row[0];} +if (strlen($row[1])>0) {$label_first_name = $row[1];} +if (strlen($row[2])>0) {$label_middle_initial = $row[2];} +if (strlen($row[3])>0) {$label_last_name = $row[3];} +if (strlen($row[4])>0) {$label_address1 = $row[4];} +if (strlen($row[5])>0) {$label_address2 = $row[5];} +if (strlen($row[6])>0) {$label_address3 = $row[6];} +if (strlen($row[7])>0) {$label_city = $row[7];} +if (strlen($row[8])>0) {$label_state = $row[8];} +if (strlen($row[9])>0) {$label_province = $row[9];} +if (strlen($row[10])>0) {$label_postal_code = $row[10];} +if (strlen($row[11])>0) {$label_vendor_lead_code = $row[11];} +if (strlen($row[12])>0) {$label_gender = $row[12];} +if (strlen($row[13])>0) {$label_phone_number = $row[13];} +if (strlen($row[14])>0) {$label_phone_code = $row[14];} +if (strlen($row[15])>0) {$label_alt_phone = $row[15];} +if (strlen($row[16])>0) {$label_security_phrase = $row[16];} +if (strlen($row[17])>0) {$label_email = $row[17];} +if (strlen($row[18])>0) {$label_comments = $row[18];} +### END find any custom field labels ### + # default optional vars if not set if (!isset($format)) {$format="text";} if ($format == 'debug') {$DB=1;} @@ -354,28 +400,28 @@ $URLsubmit = $URLarray[0]; --> - + - + - + - + - + - + - --> - + - +
Status:   $row[0]
Vendor ID:   $row[1]
$label_vendor_lead_code:   $row[1]
List ID:   $row[2]
Timezone:   $row[3]
Called SInce Last Reset:   $row[4]
Phone Code:   $row[5]
Phone Number:   $row[6] -         DIAL
Title:   $row[7]
First Name:   $row[8]
MI:   $row[9]
Last Name:   $row[10]
Address 1:   $row[11]
Address 2:   $row[12]
Address 3:   $row[13]
City:   $row[14]
State:   $row[15]
Province:   $row[16]
Postal Code:   $row[17]
Called Since Last Reset:   $row[4]
$label_phone_code:   $row[5]
$label_phone_number:   $row[6] -         DIAL
$label_title:   $row[7]
$label_first_name:   $row[8]
$label_middle_initial:   $row[9]
$label_last_name:   $row[10]
$label_address1:   $row[11]
$label_address2:   $row[12]
$label_address3:   $row[13]
$label_city:   $row[14]
$label_state:   $row[15]
$label_province:   $row[16]
$label_postal_code:   $row[17]
Country:   $row[18]
Gender:   $row[19]
Alt. Phone:   $row[20] -         DIAL
Email:   $row[21]
Show:   $row[22]
Comments:   $row[23]
$label_gender:   $row[19]
$label_alt_phone:   $row[20] -         DIAL
$label_email:   $row[21]
$label_security_phrase:   $row[22]
$label_comments:   $row[23]
Called Count:   $row[24]
Last Local Call Time:   $row[25]
Rank:   $row[26]
Title:
First Name: *: *
Last Name: *: *
Address: *: *
Address2: :
Address3: :
City: *: *
State: +: Province:
Postal Code: *: *
Phone Number: *: *