From d35c7577bf5ec669f89f07c66679c66daa132b0f Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:38:48 -0700
Subject: [PATCH] Fixed call forward chart not showing up (#6547)

Fixed a bug where the chart doesn't show up when all the values are equal to 0.
---
 .../resources/dashboard/call_forward.php      | 131 +++++++++---------
 1 file changed, 68 insertions(+), 63 deletions(-)

diff --git a/app/call_forward/resources/dashboard/call_forward.php b/app/call_forward/resources/dashboard/call_forward.php
index 3b6c00209c..b276793fb7 100644
--- a/app/call_forward/resources/dashboard/call_forward.php
+++ b/app/call_forward/resources/dashboard/call_forward.php
@@ -92,69 +92,74 @@
 //begin widget
 	echo "<div class='hud_box'>\n";
 
-//doughnut chart
-	if ($show_stat) {
-		echo "<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px;' onclick=\"$('#hud_call_forward_details').slideToggle('fast');\">\n";
-		echo "	<div style='width: 250px; height: 175px;'><canvas id='call_forward_chart'></canvas></div>\n";
-		echo "</div>\n";
+//set defaults
+	if ($stats['dnd'] == null) { $stats['dnd'] = 0; }
+	if ($stats['follow_me'] == null) { $stats['follow_me'] = 0; }
+	if ($stats['call_forward'] == null) { $stats['call_forward'] = 0; }
+	if ($stats['active'] == null) { $stats['active'] = 0; }
 
-		echo "<script>\n";
-		echo "	const call_forward_chart = new Chart(\n";
-		echo "		document.getElementById('call_forward_chart').getContext('2d'),\n";
-		echo "		{\n";
-		echo "			type: 'doughnut',\n";
-		echo "			data: {\n";
-		echo "				labels: [\n";
-		echo "					'".$text['label-dnd'].": ".$stats['dnd']."',\n";
-		echo "					'".$text['label-follow_me'].": ".$stats['follow_me']."',\n";
-		echo "					'".$text['label-call_forward'].": ".$stats['call_forward']."',\n";
-		echo "					'".$text['label-active'].": ".$stats['active']."',\n";
-		echo "					],\n";
-		echo "				datasets: [{\n";
-		echo "					data: [\n";
-		echo "						'".$stats['dnd']."',\n";
-		echo "						'".$stats['follow_me']."',\n";
-		echo "						'".$stats['call_forward']."',\n";
-		echo "						'".$stats['active']."',\n";
-		echo "						],\n";
-		echo "					backgroundColor: [\n";
-		echo "						'".$_SESSION['dashboard']['call_forward_chart_color_do_not_disturb']['text']."',\n";
-		echo "						'".$_SESSION['dashboard']['call_forward_chart_color_follow_me']['text']."',\n";
-		echo "						'".$_SESSION['dashboard']['call_forward_chart_color_call_forward']['text']."',\n";
-		echo "						'".$_SESSION['dashboard']['call_forward_chart_color_active']['text']."',\n";
-		echo "						'#000',\n";
-		echo "					],\n";
-		echo "					borderColor: '".$_SESSION['dashboard']['call_forward_chart_border_color']['text']."',\n";
-		echo "					borderWidth: '".$_SESSION['dashboard']['call_forward_chart_border_width']['text']."',\n";
-		echo "					cutout: chart_cutout\n";
-		echo "				}]\n";
-		echo "			},\n";
-		echo "			options: {\n";
-		echo "			responsive: true,\n";
-		echo "				maintainAspectRatio: false,\n";
-		echo "				plugins: {\n";
-		echo "					chart_counter: {\n";
-		echo "						chart_text: '".$stats['call_forward']."'\n";
-		echo "					},\n";
-		echo "					legend: {\n";
-		echo "					position: 'right',\n";
-		echo "						reverse: true,\n";
-		echo "						labels: {\n";
-		echo "							usePointStyle: true,\n";
-		echo "							pointStyle: 'rect'\n";
-		echo "						}\n";
-		echo "					},\n";
-		echo "					title: {\n";
-		echo "						display: true,\n";
-		echo "						text: '".$text['header-call_forward']."'\n";
-		echo "					}\n";
-		echo "				}\n";
-		echo "			},\n";
-		echo "			plugins: [chart_counter],\n";
-		echo "		}\n";
-		echo "	);\n";
-		echo "</script>\n";
-	}
+//doughnut chart
+	echo "<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px;' onclick=\"$('#hud_call_forward_details').slideToggle('fast');\">\n";
+	echo "	<div style='width: 275px; height: 175px;'><canvas id='call_forward_chart'></canvas></div>\n";
+	echo "</div>\n";
+
+	echo "<script>\n";
+	echo "	const call_forward_chart = new Chart(\n";
+	echo "		document.getElementById('call_forward_chart').getContext('2d'),\n";
+	echo "		{\n";
+	echo "			type: 'doughnut',\n";
+	echo "			data: {\n";
+	echo "				labels: [\n";
+	echo "					'".$text['label-dnd'].": ".$stats['dnd']."',\n";
+	echo "					'".$text['label-follow_me'].": ".$stats['follow_me']."',\n";
+	echo "					'".$text['label-call_forward'].": ".$stats['call_forward']."',\n";
+	echo "					'".$text['label-active'].": ".$stats['active']."',\n";
+	echo "					],\n";
+	echo "				datasets: [{\n";
+	echo "					data: [\n";
+	echo "						'".$stats['dnd']."',\n";
+	echo "						'".$stats['follow_me']."',\n";
+	echo "						'".$stats['call_forward']."',\n";
+	echo "						'".$stats['active']."',\n";
+	echo "						0.00001,\n";
+	echo "						],\n";
+	echo "					backgroundColor: [\n";
+	echo "						'".$_SESSION['dashboard']['call_forward_chart_color_do_not_disturb']['text']."',\n";
+	echo "						'".$_SESSION['dashboard']['call_forward_chart_color_follow_me']['text']."',\n";
+	echo "						'".$_SESSION['dashboard']['call_forward_chart_color_call_forward']['text']."',\n";
+	echo "						'".$_SESSION['dashboard']['call_forward_chart_color_active']['text']."',\n";
+	echo "						'".$_SESSION['dashboard']['call_forward_chart_color_active']['text']."',\n";
+	echo "					],\n";
+	echo "					borderColor: '".$_SESSION['dashboard']['call_forward_chart_border_color']['text']."',\n";
+	echo "					borderWidth: '".$_SESSION['dashboard']['call_forward_chart_border_width']['text']."',\n";
+	echo "					cutout: chart_cutout,\n";
+	echo "				}]\n";
+	echo "			},\n";
+	echo "			options: {\n";
+	echo "				responsive: true,\n";
+	echo "				maintainAspectRatio: false,\n";
+	echo "				plugins: {\n";
+	echo "					chart_counter: {\n";
+	echo "						chart_text: '".$stats['call_forward']."'\n";
+	echo "					},\n";
+	echo "					legend: {\n";
+	echo "					position: 'right',\n";
+	echo "						reverse: true,\n";
+	echo "						labels: {\n";
+	echo "							usePointStyle: true,\n";
+	echo "							pointStyle: 'rect'\n";
+	echo "						}\n";
+	echo "					},\n";
+	echo "					title: {\n";
+	echo "						display: true,\n";
+	echo "						text: '".$text['header-call_forward']."'\n";
+	echo "					}\n";
+	echo "				}\n";
+	echo "			},\n";
+	echo "			plugins: [chart_counter],\n";
+	echo "		}\n";
+	echo "	);\n";
+	echo "</script>\n";
 
 //details
 	echo "<div class='hud_details hud_box' id='hud_call_forward_details'>";
@@ -212,4 +217,4 @@
 	echo "<span class='hud_expander' onclick=\"$('#hud_call_forward_details').slideToggle('fast');\"><span class='fas fa-ellipsis-h'></span></span>\n";
 	echo "</div>\n";
 
-?>
\ No newline at end of file
+?>