From 9ccf44e059c00c48b51ae0cbf9996a55bf1606fe Mon Sep 17 00:00:00 2001
From: Alexey Melnichuk <alexeymelnichuck@gmail.com>
Date: Thu, 22 Jun 2017 18:04:44 +0300
Subject: [PATCH] Add. Display both CPM for all calls and for answered only.
 (#2707)

---
 app/xml_cdr/xml_cdr_statistics.php     | 2 +-
 app/xml_cdr/xml_cdr_statistics_inc.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php
index 5f2dfc1de2..a88d9555b3 100644
--- a/app/xml_cdr/xml_cdr_statistics.php
+++ b/app/xml_cdr/xml_cdr_statistics.php
@@ -229,7 +229,7 @@ else {
 		}
 		echo "	<td valign='top' class='".$row_style[$c]."'>".$row['volume']."&nbsp;</td>\n";
 		echo "	<td valign='top' class='".$row_style[$c]."'>".(round($row['minutes'],2))."&nbsp;</td>\n";
-		echo "	<td valign='top' class='".$row_style[$c]."'>".(round($row['avg_min'],2))."&nbsp;</td>\n";
+		echo "	<td valign='top' class='".$row_style[$c]."'>".(round($row['avg_min'],2))."&nbsp;/&nbsp;".(round($row['cpm_ans'],2))."&nbsp;</td>\n";
 		echo "	<td valign='top' class='".$row_style[$c]."'><a href=\"xml_cdr.php?missed=true&direction=$direction&start_epoch=".$row['start_epoch']."&stop_epoch=".$row['stop_epoch']."\">".$row['missed']."</a>&nbsp;</td>\n";
 		echo "	<td valign='top' class='".$row_style[$c]."'>".(round($row['asr'],2))."&nbsp;</td>\n";
 		echo "	<td valign='top' class='".$row_style[$c]."'>".(round($row['aloc'],2))."&nbsp;</td>\n";
diff --git a/app/xml_cdr/xml_cdr_statistics_inc.php b/app/xml_cdr/xml_cdr_statistics_inc.php
index d8a36d5751..6b3bebe618 100644
--- a/app/xml_cdr/xml_cdr_statistics_inc.php
+++ b/app/xml_cdr/xml_cdr_statistics_inc.php
@@ -294,8 +294,11 @@ else {
 		$delta_min = ($stop_epoch - $start_epoch) / 60;
 		$success_volume = ($stats[$i]['volume']==0) ? 0 : ($stats[$i]['volume'] - $stats[$i]['missed']);
 
+		// Calls per minute (answered)
+		$stats[$i]['cpm_ans'] = $success_volume / $delta_min;
+
 		// Calls per minute
-		$stats[$i]['avg_min'] = $success_volume / $delta_min;
+		$stats[$i]['avg_min'] = $stats[$i]['volume'] / $delta_min;
 
 		//answer / seizure ratio
 		$stats[$i]['asr'] = ($stats[$i]['volume']==0) ? 0 : ($success_volume / $stats[$i]['volume'] * 100);