ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small bug fixes in real-time report and admin pages

Browse Source 
git-svn-id: svn://192.168.202.10@1078 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2009-03-19 23:01:21 +00:00
parent aaf2c9e36e
commit 20414f6d75
7 changed files with 70 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/branches/agc_2.0.5/www/vicidial/AST_timeonVDADall.php
+1
View File
@@ -959,6 +959,7 @@ if ($campaign_allow_inbound > 0)
$rslt=mysql_query($stmt, $link);
$ccamps_to_print = mysql_num_rows($rslt);
$c=0;
$closer_campaignsSQL='';
while ($ccamps_to_print > $c)
{
$row=mysql_fetch_row($rslt);
agc_2-X/branches/agc_2.0.5/www/vicidial/admin.php
+3 -1
View File
@@ -2850,7 +2850,7 @@ if ($SSqc_features_active > 0)
<BR>
<A NAME="vicidial_users-export_reports">
<BR>
<B>Export Reports -</B> This setting if set to 1 will allow a manager to access the export call reports on the REPORTS screen. Default is 0. For the Export Calls Report, the following field order is used for exports: <BR>call_date,phone_number,status,user,full_name,campaign_id/in-group,vendor_lead_code,source_id,list_id,gmt_offset_now,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,length_in_sec,user_group,alt_dial/queue_seconds
<B>Export Reports -</B> This setting if set to 1 will allow a manager to access the export call reports on the REPORTS screen. Default is 0. For the Export Calls Report, the following field order is used for exports: <BR>call_date, phone_number, status, user, full_name, campaign_id/in-group, vendor_lead_code, source_id, list_id, gmt_offset_now, 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, length_in_sec, user_group, alt_dial/queue_seconds
@@ -14842,6 +14842,7 @@ if ( ($ADD==34) or ($ADD==31) )
}
}
echo "</TD></TR></TABLE></center>\n";
}
@@ -20208,6 +20209,7 @@ if (isset($camp_lists))
$Dsql .= "'$Dstatuses[$o]',";
}
$Dsql = preg_replace("/,$/","",$Dsql);
if (strlen($Dsql) < 2) {$Dsql = "''";}
$stmt="SELECT count(*) FROM vicidial_list where called_since_last_reset='N' and status IN($Dsql) and list_id IN($camp_lists) and ($all_gmtSQL) $fSQL";
#$DB=1;
agc_2-X/branches/agc_2.0.5/www/vicidial/admin_header.php
-7
View File
@@ -911,13 +911,6 @@ if (strlen($reports_hh) > 1) {
<?}
### Do nothing if admin has no permissions
if($LOGast_admin_access < 1)
{
$ADD='99999999999999999999';
echo "</TABLE></center>\n";
echo "You are not authorized to view this page. Please go back.\n";
}
if (strlen($reports_hh) > 1) {
?>
agc_2-X/trunk/bin/Vtiger_IN_new_accounts_file.pl
+55 -4
View File
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
# Vtiger_IN_new_accounts_file.pl version 2.0.5 *DBI-version*
# Vtiger_IN_new_accounts_file.pl version 2.2.0 *DBI-version*
#
# DESCRIPTION:
# script lets you insert leads into the vtiger system table from a CSV-formatted
@@ -11,11 +11,13 @@
#
# CHANGES
# 90127-1206 - First build
# 90318-0142 - Added vicidialalt import format and importasdeleted option
#
$secX = time();
$MT[0]='';
$Ealert='';
$importasdeleted=0;
($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
$year = ($year + 1900);
@@ -104,6 +106,7 @@ if (length($ARGV[0])>1)
print " [--duplicate-system-check] = checks for the same phone number in the entire system before inserting lead\n";
print " [--duplicate-system-siccode] = checks for the same SIC code in the entire system before inserting lead\n";
print " [--duplicate-system-website] = checks for the same website in the entire system before inserting lead\n";
print " [--import-as-deleted] = imports the accounts as deleted in vtiger_crmentity\n";
print " [--ftp-pull] = grabs lead files from a remote FTP server, uses REPORTS FTP login information\n";
print " [--ftp-dir=leads_in] = remote FTP server directory to grab files from, should have a DONE sub-directory\n";
print " [--email-list=test@test.com:test2@test.com] = send email results for each file to these addresses\n";
@@ -114,6 +117,9 @@ if (length($ARGV[0])>1)
print "standard:\n";
print "employees,ticker_symbol,sic_code,revenue,account_name,address,po_box,city,state,post_code,phone_number,ownership,fax,email,other_phone,other_email,website\n";
print "4,C03IMM001,39207955,2,ST MARK CHURCH,1710 W COLLEGE AVE,,CHICAGO,IL,61555,3095551111,PAUL SMITH,3095551212,TEST@VERIZON.NET,7775553333,test@1034.com,bigsite.com\n\n";
print "vicidialalt:\n";
print "employees,ticker_symbol,web1,revenue,account_name,address,po_box,city,state,post_code,phone_number,ownership,fax,email,other_phone,other_email,website,emailoptout,notify_owner\n";
print "4,C03IMM001,12345,2,ST MARK CHURCH,1710 W COLLEGE AVE,,CHICAGO,IL,61555,3095551111,PAUL SMITH,3095551212,TEST@VERIZON.NET,7775553333,test@1034.com,bigsite.com,1,0\n\n";
print "minicsv:\n";
print "business,contact,phone_number,address1,city,state,postal_code\n";
print "\"CHURCH\",\"Bob Smith\",\"3525556601\",\"105 Fifth St\",\"Steinhatchee\",\"FL\",\"32359\"\n\n";
@@ -170,6 +176,11 @@ if (length($ARGV[0])>1)
$dupcheckweb=1;
print "\n----- DUPLICATE SYSTEM CHECK WEBSITE -----\n\n";
}
if ($args =~ /-import-as-deleted/i)
{
$importasdeleted=1;
print "\n----- IMPORT ACCOUNTS AS DELETED -----\n\n";
}
if ($args =~ /-ftp-pull/i)
{
$ftp_pull=1;
@@ -217,6 +228,8 @@ else
$forcelistid = '';
$format='standard';
}
if ($format !~ /minicsv|vicidialalt|standard/)
{$format='standard';}
### end parsing run-time options ###
if ($q < 1)
@@ -402,12 +415,48 @@ foreach(@FILES)
$fax = '';
$other_email = '';
$website = '';
$emailoptout = '0';
$notify_owner = '0';
$country = 'USA';
}
# This is the format for the vicidialalt(VICIDIAL alternate) lead files
# employees,ticker_symbol,web1,revenue,account_name,address,po_box,city,state,post_code,phone_number,ownership,fax,email,other_phone,other_email,website,emailoptout,notify_owner
# 4,C03IMM001,12345,2,ST MARK CHURCH,1710 W COLLEGE AVE,,CHICAGO,IL,61555,3095551111,PAUL SMITH,3095551212,TEST@VERIZON.NET,7775553333,test@1034.com,bigsite.com,1,0
# sic_code is left blank because it will be used by vicidial to put the last call dispo status in
if ($format =~ /vicidialalt/)
{
$employees = $m[0]; chomp($employees); $employees =~ s/\D//gi;
$ticker_symbol = $m[1]; chomp($ticker_symbol);
$sic_code = '';
$web1 = $m[2]; chomp($web1);
$revenue = $m[3]; chomp($revenue); $revenue =~ s/\D//gi;
$account_name = $m[4]; chomp($account_name);
if (length($account_name)<1) {$account_name='NONE';}
$address = $m[5]; chomp($address);
$po_box = $m[6]; chomp($po_box);
$city = $m[7]; chomp($city);
$state = $m[8]; chomp($state);
$post_code = $m[9]; chomp($post_code);
$phone_number = $m[10]; chomp($phone_number); $phone_number =~ s/\D//gi;
$ownership = $m[11]; chomp($ownership);
$fax = $m[12]; chomp($fax);
$email = $m[13]; chomp($email);
$other_phone = $m[14]; chomp($other_phone);
$other_email = $m[15]; chomp($other_email);
$website = $m[16]; chomp($website);
if (length($website)<3) {$website="$web1-$revenue";}
$emailoptout = $m[17]; chomp($emailoptout); $emailoptout =~ s/\D//gi;
if (length($emailoptout)<1) {$emailoptout="0";}
$notify_owner = $m[18]; chomp($notify_owner); $notify_owner =~ s/\D//gi;
if (length($notify_owner)<1) {$notify_owner="0";}
$country = 'USA';
}
# This is the format for the standard lead files
# employees,ticker_symbol,sic_code,revenue,account_name,address,po_box,city,state,post_code,phone_number,ownership,fax,email,other_phone,other_email,website
# 4,C03IMM001,39207955,2,ST MARK CHURCH,1710 W COLLEGE AVE,,CHICAGO,IL,61555,3095551111,PAUL SMITH,3095551212,TEST@VERIZON.NET,7775553333,test@1034.com,bigsite.com
else
if ($format =~ /standard/)
{
$employees = $m[0]; chomp($employees); $employees =~ s/\D//gi;
$ticker_symbol = $m[1]; chomp($ticker_symbol);
@@ -428,6 +477,8 @@ foreach(@FILES)
$other_email = $m[15]; chomp($other_email);
$website = $m[16]; chomp($website);
if (length($website)<3) {$website="$sic_code-$revenue";}
$emailoptout = '0';
$notify_owner = '0';
$country = 'USA';
}
@@ -516,12 +567,12 @@ foreach(@FILES)
if($DB){print STDERR "\n|$affected_rows|$stmtB|\n";}
### insert record into crmentity table ###
$stmtB = "INSERT INTO vtiger_crmentity SET crmid='$crm_id',smcreatorid='$user_id',smownerid='$user_id',modifiedby='$user_id',setype='Accounts',description='',createdtime='$NOW_TIME',modifiedtime='$NOW_TIME', viewedtime='$NOW_TIME';";
$stmtB = "INSERT INTO vtiger_crmentity SET crmid='$crm_id',smcreatorid='$user_id',smownerid='$user_id',modifiedby='$user_id',setype='Accounts',description='',createdtime='$NOW_TIME',modifiedtime='$NOW_TIME', viewedtime='$NOW_TIME', deleted='$importasdeleted';";
if (!$T) {$affected_rows = $dbhB->do($stmtB); } # or die "Couldn't execute query: |$stmtB|\n";
if($DB){print STDERR "\n|$affected_rows|$stmtB|\n";}
### insert record into vtiger_account table ###
$stmtB = "INSERT INTO vtiger_account SET accountid='$crm_id',accountname='$account_name',account_type='Customer',industry='--None--',annualrevenue='$revenue',rating='--None--',ownership='$ownership',siccode='$sic_code',tickersymbol='$ticker_symbol',phone='$phone_number',otherphone='$other_phone',email1='$email',email2='$other_email',website='$website',fax='$fax',employees='$employees';";
$stmtB = "INSERT INTO vtiger_account SET accountid='$crm_id',accountname='$account_name',account_type='Customer',industry='--None--',annualrevenue='$revenue',rating='--None--',ownership='$ownership',siccode='$sic_code',tickersymbol='$ticker_symbol',phone='$phone_number',otherphone='$other_phone',email1='$email',email2='$other_email',website='$website',fax='$fax',employees='$employees',emailoptout='$emailoptout',notify_owner='$notify_owner';";
if (!$T) {$affected_rows = $dbhB->do($stmtB); } # or die "Couldn't execute query: |$stmtB|\n";
if($DB){print STDERR "\n|$affected_rows|$stmtB|\n";}
agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php
+7 -3
View File
@@ -384,6 +384,7 @@ echo "\n-->\n
$stmt = "select count(*) from vicidial_campaigns where campaign_id IN($group_SQL) and campaign_allow_inbound='Y';";
$rslt=mysql_query($stmt, $link);
if ($DB) {echo "$stmt\n";}
$row=mysql_fetch_row($rslt);
$campaign_allow_inbound = $row[0];
@@ -453,7 +454,7 @@ if (ereg('O',$with_inbound))
$closer_campaignsSQL .= "'$closer_campaigns',";
$c++;
}
$closer_campaignsSQL = eregi_replace(",$",'',$closer_campaignsSQL);
$closer_campaignsSQL = preg_replace("/,$/","",$closer_campaignsSQL);
if ($DB > 0) {echo "\n|$closer_campaigns|$closer_campaignsSQL|$stmt|\n";}
if ($adastats>1)
@@ -708,6 +709,7 @@ else
if ( (ereg('Y',$with_inbound)) and ($campaign_allow_inbound > 0) )
{
$multi_drop++;
if ($DB) {echo "with_inbound|$with_inbound|$campaign_allow_inbound\n";}
$stmt = "select distinct closer_campaigns from vicidial_campaigns where campaign_id IN($group_SQL);";
$rslt=mysql_query($stmt, $link);
$ccamps_to_print = mysql_num_rows($rslt);
@@ -721,7 +723,7 @@ else
$closer_campaignsSQL .= "'$closer_campaigns',";
$c++;
}
$closer_campaignsSQL = eregi_replace(",$",'',$closer_campaignsSQL);
$closer_campaignsSQL = preg_replace("/,$/","",$closer_campaignsSQL);
if ($DB > 0) {echo "\n|$closer_campaigns|$closer_campaignsSQL|$stmt|\n";}
$stmt="select auto_dial_level,dial_status_a,dial_status_b,dial_status_c,dial_status_d,dial_status_e,lead_order,lead_filter_id,hopper_level,dial_method,adaptive_maximum_level,adaptive_dropped_percentage,adaptive_dl_diff_target,adaptive_intensity,available_only_ratio_tally,adaptive_latest_server_time,local_call_time,dial_timeout,dial_statuses,agent_pause_codes_active from vicidial_campaigns where campaign_id IN ($group_SQL,$closer_campaignsSQL);";
@@ -958,7 +960,9 @@ if ($campaign_allow_inbound > 0)
$stmt="select closer_campaigns from vicidial_campaigns where campaign_id IN($group_SQL);";
$rslt=mysql_query($stmt, $link);
$ccamps_to_print = mysql_num_rows($rslt);
if ($DB) {echo "inbound/outbound calls|$ccamps_to_print|$stmt\n";}
$c=0;
$closer_campaignsSQL='';
while ($ccamps_to_print > $c)
{
$row=mysql_fetch_row($rslt);
@@ -968,7 +972,7 @@ if ($campaign_allow_inbound > 0)
$closer_campaignsSQL .= "'$closer_campaigns',";
$c++;
}
$closer_campaignsSQL = eregi_replace(",$",'',$closer_campaignsSQL);
$closer_campaignsSQL = preg_replace("/,$/","",$closer_campaignsSQL);
$stmtB="from vicidial_auto_calls where status NOT IN('XFER') and ( (call_type='IN' and campaign_id IN($closer_campaignsSQL)) or (campaign_id IN($group_SQL) and call_type IN('OUT','OUTBALANCE')) ) order by queue_priority desc,campaign_id,call_time;";
}
agc_2-X/trunk/www/vicidial/admin.php
+3 -4
View File
@@ -2851,7 +2851,7 @@ if ($SSqc_features_active > 0)
<BR>
<A NAME="vicidial_users-export_reports">
<BR>
<B>Export Reports -</B> This setting if set to 1 will allow a manager to access the export call reports on the REPORTS screen. Default is 0. For the Export Calls Report, the following field order is used for exports: <BR>call_date,phone_number,status,user,full_name,campaign_id/in-group,vendor_lead_code,source_id,list_id,gmt_offset_now,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,length_in_sec,user_group,alt_dial/queue_seconds
<B>Export Reports -</B> This setting if set to 1 will allow a manager to access the export call reports on the REPORTS screen. Default is 0. For the Export Calls Report, the following field order is used for exports: <BR>call_date, phone_number, status, user, full_name, campaign_id/in-group, vendor_lead_code, source_id, list_id, gmt_offset_now, 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, length_in_sec, user_group, alt_dial/queue_seconds
@@ -14843,6 +14843,7 @@ if ( ($ADD==34) or ($ADD==31) )
}
}
echo "</TD></TR></TABLE></center>\n";
}
@@ -19865,9 +19866,6 @@ if ($ADD==999999)
}
echo "</TD></TR></TABLE></center>\n";
echo "</TD></TR></TABLE></center>\n";
@@ -20209,6 +20207,7 @@ if (isset($camp_lists))
$Dsql .= "'$Dstatuses[$o]',";
}
$Dsql = preg_replace("/,$/","",$Dsql);
if (strlen($Dsql) < 2) {$Dsql = "''";}
$stmt="SELECT count(*) FROM vicidial_list where called_since_last_reset='N' and status IN($Dsql) and list_id IN($camp_lists) and ($all_gmtSQL) $fSQL";
#$DB=1;
agc_2-X/trunk/www/vicidial/admin_header.php
+1 -9
View File
@@ -910,15 +910,7 @@ if (strlen($reports_hh) > 1) {
<TR BGCOLOR=<?=$users_color ?>><TD ALIGN=LEFT COLSPAN=2> &nbsp; <a href="./user_stats.php?user=<?=$user ?>"><FONT FACE="ARIAL,HELVETICA" COLOR=BLACK SIZE=<?=$subheader_font_size ?>>User Stats </a> &nbsp; | &nbsp; <a href="./user_status.php?user=<?=$user ?>"><FONT FACE="ARIAL,HELVETICA" COLOR=BLACK SIZE=<?=$subheader_font_size ?>>User Status </a> &nbsp; | &nbsp; <a href="./AST_agent_time_sheet.php?agent=<?=$user ?>"><FONT FACE="ARIAL,HELVETICA" COLOR=BLACK SIZE=<?=$subheader_font_size ?>>Time Sheet </a> &nbsp; | &nbsp; <a href="./AST_agent_days_detail.php?user=<?=$user ?>"><FONT FACE="ARIAL,HELVETICA" COLOR=BLACK SIZE=<?=$subheader_font_size ?>>Days Status </a></TD></TR>
<?}
### Do nothing if admin has no permissions
if($LOGast_admin_access < 1)
{
$ADD='99999999999999999999';
echo "</TABLE></center>\n";
echo "You are not authorized to view this page. Please go back.\n";
}
if (strlen($reports_hh) > 1) {
?>
<TR BGCOLOR=<?=$reports_color ?>><TD ALIGN=LEFT COLSPAN=2><FONT FACE="ARIAL,HELVETICA" COLOR=BLACK SIZE=<?=$subheader_font_size ?>><B> &nbsp; </B></TD></TR>