diff --git a/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt b/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt index d8b2279f..d66b0786 100644 --- a/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt +++ b/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt @@ -457,6 +457,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 48 POL * +1 Y LSM-LSO Poland CET Europe/Warsaw 49 DEU * +1 Y LSM-LSO Germany CET Europe/Berlin 51 PER * -5 N Peru PET America/Lima +52 MEX 221 -6 Y FSA-LSO Puebla, Pue. CST America/Mexico_City 52 MEX 222 -6 Y FSA-LSO Puebla, Pue. CST America/Mexico_City 52 MEX 223 -6 Y FSA-LSO Magdalena Tetela Morelos, La CST America/Mexico_City 52 MEX 224 -6 Y FSA-LSO Almolonga Todos Santos jp CST America/Mexico_City @@ -505,6 +506,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 52 MEX 315 -6 Y FSA-LSO Barra De Navidadbe CST America/Mexico_City 52 MEX 316 -6 Y FSA-LSO Ayutlagj CST America/Mexico_City 52 MEX 317 -6 Y FSA-LSO Ahuacapanmrk CST America/Mexico_City +52 MEX 318 COL -6 Y FSA-LSO QUESERIA CST America/Mexico_City 52 MEX 319 NAY -7 Y FSA-LSO Boquita, Lamya MST America/Chihuahua 52 MEX 321 -6 Y FSA-LSO Ayuquilaej CST America/Mexico_City 52 MEX 322 NAY -7 Y FSA-LSO Puerto Vallarta, Jal.b MST America/Chihuahua @@ -551,6 +553,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 52 MEX 376 -6 Y FSA-LSO Ajijiccc CST America/Mexico_City 52 MEX 377 -6 Y FSA-LSO Coculav CST America/Mexico_City 52 MEX 378 -6 Y FSA-LSO Tepatitlan, Jal.a CST America/Mexico_City +52 MEX 379 MICH -6 Y FSA-LSO NUMARAN CST America/Mexico_City 52 MEX 381 -6 Y FSA-LSO Cojumatlan De Reguleshuj CST America/Mexico_City 52 MEX 382 -6 Y FSA-LSO Mazamitla CST America/Mexico_City 52 MEX 383 -6 Y FSA-LSO Chavindaiq CST America/Mexico_City @@ -624,6 +627,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 52 MEX 476 -6 Y FSA-LSO Caqada De Negrosmzx CST America/Mexico_City 52 MEX 477 -6 Y FSA-LSO Leon CST America/Mexico_City 52 MEX 478 -6 Y FSA-LSO General Enrique Estrada CST America/Mexico_City +52 MEX 479 -6 Y FSA-LSO Leon CST America/Mexico_City 52 MEX 481 -6 Y FSA-LSO Ciudad Valles, S.L.P.jn CST America/Mexico_City 52 MEX 482 -6 Y FSA-LSO Agua Buenar CST America/Mexico_City 52 MEX 483 -6 Y FSA-LSO Chalchocoyoqi CST America/Mexico_City @@ -649,7 +653,20 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 52 MEX 557 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City 52 MEX 558 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City 52 MEX 559 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 560 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 561 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 562 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 563 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 564 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 565 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 566 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 567 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 568 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 569 -6 Y FSA-LSO Ciudad de Mexico, D.F. CST America/Mexico_City +52 MEX 586 MEX -6 Y FSA-LSO TLALMANALCO CST America/Mexico_City +52 MEX 587 MEX -6 Y FSA-LSO AMECAMECA CST America/Mexico_City 52 MEX 588 -6 Y FSA-LSO Arana, Los CST America/Mexico_City +52 MEX 589 MEX -6 Y FSA-LSO JUCHITEPEC CST America/Mexico_City 52 MEX 591 -6 Y FSA-LSO Praderas Del Potrero CST America/Mexico_City 52 MEX 592 -6 Y FSA-LSO Jaltepec CST America/Mexico_City 52 MEX 593 -6 Y FSA-LSO Coyotepec CST America/Mexico_City @@ -699,8 +716,10 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 52 MEX 659 CHIH -7 Y FSA-LSO Abraham Gonzalez MST America/Chihuahua 52 MEX 661 BC -8 Y FSA-LSO Playas De Rosarito PST America/Tijuana 52 MEX 662 SON -7 N Hermosillo, Son.vkv MST America/Hermosillo +52 MEX 663 BC -8 Y FSA-LSO Tijuana, B.C.j PST America/Tijuana 52 MEX 664 BC -8 Y FSA-LSO Tijuana, B.C.j PST America/Tijuana 52 MEX 665 BC -8 Y FSA-LSO Tecatese PST America/Tijuana +52 MEX 666 BC -8 Y FSA-LSO Tijuana, B.C.j PST America/Tijuana 52 MEX 667 SIN -7 Y FSA-LSO Culiacan MST America/Chihuahua 52 MEX 668 SIN -7 Y FSA-LSO Los Mochis, Sin.qx MST America/Chihuahua 52 MEX 669 SIN -7 Y FSA-LSO Mazatlan MST America/Chihuahua @@ -735,6 +754,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 52 MEX 726 -6 Y FSA-LSO Amanalco De Becerra CST America/Mexico_City 52 MEX 727 -6 Y FSA-LSO Atenango Del Riobwn CST America/Mexico_City 52 MEX 728 -6 Y FSA-LSO Lerma, Mex.puy CST America/Mexico_City +52 MEX 729 -6 Y FSA-LSO Toluca, Mex.vg CST America/Mexico_City 52 MEX 731 -6 Y FSA-LSO Amayucaj CST America/Mexico_City 52 MEX 732 -6 Y FSA-LSO Ajuchitlan Del Progresowq CST America/Mexico_City 52 MEX 733 -6 Y FSA-LSO Mayanalan CST America/Mexico_City @@ -754,6 +774,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 52 MEX 748 -6 Y FSA-LSO Almoloyag CST America/Mexico_City 52 MEX 749 -6 Y FSA-LSO Calpulalpanp CST America/Mexico_City 52 MEX 751 -6 Y FSA-LSO Ahuehuetzingoae CST America/Mexico_City +52 MEX 752 MOR -6 Y FSA-LSO ATLATLAHUCAN CST America/Mexico_City 52 MEX 753 -6 Y FSA-LSO Ciudad Lazaro Cardenas CST America/Mexico_City 52 MEX 754 -6 Y FSA-LSO Apangoyy CST America/Mexico_City 52 MEX 755 -6 Y FSA-LSO Zihuatanejo, Gro. CST America/Mexico_City @@ -803,6 +824,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 52 MEX 824 -6 Y FSA-LSO Ciudad Sabinas Hidalgohp CST America/Mexico_City 52 MEX 825 -6 Y FSA-LSO Cienega De Florespqs CST America/Mexico_City 52 MEX 826 -6 Y FSA-LSO Aramberri CST America/Mexico_City +52 MEX 827 MON -6 Y FSA-LSO SANTIAGO, EL CERCADO CST America/Mexico_City 52 MEX 828 -6 Y FSA-LSO Barranquito, Elq CST America/Mexico_City 52 MEX 829 -6 Y FSA-LSO Bustamantes CST America/Mexico_City 52 MEX 831 -6 Y FSA-LSO Ciudad Mante, Tamps.q CST America/Mexico_City diff --git a/agc_2-X/trunk/www/vicidial/call_report_export.php b/agc_2-X/trunk/www/vicidial/call_report_export.php index bd0d6f68..5d961b76 100644 --- a/agc_2-X/trunk/www/vicidial/call_report_export.php +++ b/agc_2-X/trunk/www/vicidial/call_report_export.php @@ -59,6 +59,7 @@ # 190926-0925 - Fixes for PHP7 # 191119-1731 - Fix for alternate server url for recordings, issue #1175 # 200115-1151 - Added ALTERNATE_2 export option with alternate header option in options.php +# 200709-2106 - Added EXTENDED_4 export option with logged list_id from time of call # $startMS = microtime(); @@ -547,6 +548,11 @@ if ($run_export > 0) $export_fields_SQL = ",entry_date,vl.called_count,last_local_call_time,modify_date,called_since_last_reset,term_reason"; $EFheader = "\tentry_date\tcalled_count\tlast_local_call_time\tmodify_date\tcalled_since_last_reset\tterm_reason"; } + if ($export_fields == 'EXTENDED_4') + { + $export_fields_SQL = ",vl.called_count,vl.list_id"; + $EFheader = "\tlog_called_count\tlog_list_id"; + } if ($export_fields == 'ALTERNATE_1') { $export_fields_SQL = ",vl.called_count,last_local_call_time"; @@ -581,7 +587,7 @@ if ($run_export > 0) $k=0; if ($RUNcampaign > 0) { - if ( ($export_fields == 'EXTENDED') or ($export_fields == 'EXTENDED_2') or ($export_fields == 'EXTENDED_3') ) + if ( ($export_fields == 'EXTENDED') or ($export_fields == 'EXTENDED_2') or ($export_fields == 'EXTENDED_3') or ($export_fields == 'EXTENDED_4') ) { $stmt = "SELECT vl.call_date,vl.phone_number,vl.status,vl.user,vu.full_name,vl.campaign_id,vi.vendor_lead_code,vi.source_id,vi.list_id,vi.gmt_offset_now,vi.phone_code,vi.phone_number,vi.title,vi.first_name,vi.middle_initial,vi.last_name,vi.address1,vi.address2,vi.address3,vi.city,vi.state,vi.province,vi.postal_code,vi.country_code,vi.gender,vi.date_of_birth,vi.alt_phone,vi.email,vi.security_phrase,vi.comments,vl.length_in_sec,vl.user_group,vl.alt_dial,vi.rank,vi.owner,vi.lead_id,vl.uniqueid,vi.entry_list_id, ifnull(val.dispo_sec+val.dead_sec,0)$export_fields_SQL from vicidial_users vu,vicidial_list vi,".$vicidial_log_table." vl LEFT OUTER JOIN ".$vicidial_agent_log_table." val ON vl.uniqueid=val.uniqueid and vl.lead_id=val.lead_id and vl.user=val.user where ".$date_field." >= '$query_date 00:00:00' and ".$date_field." <= '$end_date 23:59:59' and vu.user=vl.user and vi.lead_id=vl.lead_id $list_SQL $campaign_SQL $user_group_SQL $status_SQL order by ".$date_field." limit 1000000;"; } @@ -706,6 +712,8 @@ if ($run_export > 0) {$export_fieldsDATA = "$row[39]\t$row[40]\t$row[41]\t$row[42]\t$row[43]\t$row[44]\t";} if ($export_fields == 'EXTENDED_3') {$export_fieldsDATA = "$row[39]\t$row[40]\t$row[41]\t$row[42]\t$row[43]\t$row[44]\t";} + if ($export_fields == 'EXTENDED_4') + {$export_fieldsDATA = "$row[39]\t$row[40]\t";} if ($export_fields == 'ALTERNATE_2') {$export_rows[$k] = "$row[18]\t$row[13]\t$row[15]\t$row[11]\t$row[17]\t!STATUS_DESCRIPTION!\t$row[0]";} else @@ -724,7 +732,7 @@ if ($run_export > 0) if ($RUNgroup > 0) { - if ( ($export_fields == 'EXTENDED') or ($export_fields == 'EXTENDED_2') or ($export_fields == 'EXTENDED_3') ) + if ( ($export_fields == 'EXTENDED') or ($export_fields == 'EXTENDED_2') or ($export_fields == 'EXTENDED_3') or ($export_fields == 'EXTENDED_4') ) { $stmtA = "SELECT vl.call_date,vl.phone_number,vl.status,vl.user,vu.full_name,vl.campaign_id,vi.vendor_lead_code,vi.source_id,vi.list_id,vi.gmt_offset_now,vi.phone_code,vi.phone_number,vi.title,vi.first_name,vi.middle_initial,vi.last_name,vi.address1,vi.address2,vi.address3,vi.city,vi.state,vi.province,vi.postal_code,vi.country_code,vi.gender,vi.date_of_birth,vi.alt_phone,vi.email,vi.security_phrase,vi.comments,vl.length_in_sec,vl.user_group,vl.queue_seconds,vi.rank,vi.owner,vi.lead_id,vl.closecallid,vi.entry_list_id,vl.uniqueid, ifnull(val.dispo_sec+val.dead_sec,0)$export_fields_SQL from vicidial_users vu,vicidial_list vi,".$vicidial_closer_log_table." vl LEFT OUTER JOIN ".$vicidial_agent_log_table." val ON vl.uniqueid=val.uniqueid and vl.lead_id=val.lead_id and vl.user=val.user where ".$date_field." >= '$query_date 00:00:00' and ".$date_field." <= '$end_date 23:59:59' and vu.user=vl.user and vi.lead_id=vl.lead_id $list_SQL $group_SQL $user_group_SQL $status_SQL order by ".$date_field." limit 1000000;"; } @@ -848,6 +856,8 @@ if ($run_export > 0) {$export_fieldsDATA = "$row[40]\t$row[41]\t$row[42]\t$row[43]\t$row[44]\t$row[45]\t";} if ($export_fields == 'EXTENDED_3') {$export_fieldsDATA = "$row[40]\t$row[41]\t$row[42]\t$row[43]\t$row[44]\t$row[45]\t";} + if ($export_fields == 'EXTENDED_4') + {$export_fieldsDATA = "$row[40]\t$row[41]\t";} if ($export_fields == 'ALTERNATE_2') {$export_rows[$k] = "$row[18]\t$row[13]\t$row[15]\t$row[11]\t$row[17]\t!STATUS_DESCRIPTION!\t$row[0]";} else @@ -901,6 +911,8 @@ if ($run_export > 0) {$EXheader = "\twrapup_time\tqueue_time\tuniqueid\tcaller_code\tserver_ip\thangup_cause\tdialstatus\tchannel\tdial_time\tanswered_time\tcpd_result\tdid_pattern\tdid_id\tdid_description";} if ($export_fields=='EXTENDED_3') {$EXheader = "\twrapup_time\tqueue_time\tuniqueid\tcaller_code\tserver_ip\thangup_cause\tdialstatus\tchannel\tdial_time\tanswered_time\tcpd_result\tdid_pattern\tdid_id\tdid_description\tdid_custom_one\tdid_custom_two\tdid_custom_three\tdid_custom_four\tdid_custom_five\tdid_carrier_description";} + if ($export_fields=='EXTENDED_4') + {$EXheader = "\twrapup_time\tqueue_time\tuniqueid\tcaller_code\tserver_ip\thangup_cause\tdialstatus\tchannel\tdial_time\tanswered_time\tcpd_result\tdid_pattern\tdid_id\tdid_description";} if ($export_fields == 'ALTERNATE_1') {$EXheader = "|caller_code";} if ($call_notes=='YES') @@ -1069,7 +1081,7 @@ if ($run_export > 0) {$extended_data_a = "";} $extended_data .= "$extended_data_a"; } - if ( ($export_fields=='EXTENDED') or ($export_fields=='EXTENDED_2') or ($export_fields=='EXTENDED_3') ) + if ( ($export_fields=='EXTENDED') or ($export_fields=='EXTENDED_2') or ($export_fields=='EXTENDED_3') or ($export_fields=='EXTENDED_4') ) { $extended_data = "\t$export_wrapup_time[$i]\t$export_queue_time[$i]\t$export_uniqueid[$i]"; if (strlen($export_uniqueid[$i]) > 0) @@ -1615,7 +1627,7 @@ else echo "

\n"; echo ""._QXZ("Export Fields").":
\n"; - echo "\n"; + echo "\n"; if ($archives_available=="Y")