Просмотр исходного кода

Adds data labels and adds more point of challenge graphs.

Alan Lam 8 лет назад
Родитель
Сommit
40e88ca497

+ 36 - 25
controllers/performance.php

@@ -1,6 +1,7 @@
 <?php
 
 Core::addScript("public/js/Chart.bundle.min.js");
+Core::addScript("public/js/chartjs-plugin-datalabels.min.js");
 Core::addScript("public/js/app-performance.js");
 
 Core::addBreadcrumb("/account", "Account");
@@ -105,6 +106,7 @@ if($submit) {
 		switch($date_range) {
 			case "ytd":
 				// Nothing to do
+				$date_range_label = "YTD";
 				break;
 
 			case "unbound":
@@ -118,10 +120,12 @@ if($submit) {
 					if($year < $min_year) $min_year = $year;
 					if($year > $max_year) $max_year = $year;
 				}
+				$date_range_label = "$min_year - $max_year";
 				break;
 
 			case "custom":
 				// TODO
+				$date_range_label = "Custom";
 				break;
 		}
 
@@ -353,7 +357,7 @@ if($submit) {
 		// Challenger Gender
 		$chart = new Chart;
 		$chart->setType("pie");
-		$chart->setTitle("Staff Gender");
+		$chart->setTitle("Staff Gender $date_range_label");
 		$chart->setLabels(["Male", "Female"]);
 		$chart->addDataset("Counts", [
 			$total_data->maleChallengerCount,
@@ -369,7 +373,7 @@ if($submit) {
 		// Tester Gender
 		$chart = new Chart;
 		$chart->setType("pie");
-		$chart->setTitle("Tester Gender");
+		$chart->setTitle("Tester Gender $date_range_label");
 		$chart->setLabels(["Male", "Female"]);
 		$chart->addDataset("Counts", [
 			$total_data->maleTesterCount,
@@ -385,7 +389,7 @@ if($submit) {
 		// Pass / Fail
 		$chart = new Chart;
 		$chart->setType("pie");
-		$chart->setTitle("Pass / Fail");
+		$chart->setTitle("Pass / Fail $date_range_label");
 		$chart->setLabels(["Pass", "Fail"]);
 		$chart->addDataset("Counts", [
 			$total_data->passCount,
@@ -413,30 +417,37 @@ if($submit) {
 		]);
 		$charts[] = $chart;
 
-		// Point of Challenge (Current Period)
+		// Point of Challenge (Each Period)
 
-		$period_data = $data[$key];
+		foreach($keys as $index => $key) {
+			$key_label = $key_labels[$index];
+
+			$period_data = $data[$key];
+
+			if($period_data->testCount == 0) continue;
+
+			$chart = new Chart;
+			$chart->setType("pie");
+			$chart->setTitle("$key_label Point of Challenge");
+			$chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
+			$chart->addDataset("Counts", [
+				$period_data->stage1Count,
+				$period_data->stage2Count,
+				$period_data->stage3Count,
+				$period_data->stage4Count,
+				$period_data->stage5Count,
+			], [
+				"background_colours" => [
+					"#4CAF50",
+					"#FFEB3B",
+					"#FBC02D",
+					"#FFAB91",
+					"#F44336",
+				]
+			]);
+			$charts[] = $chart;
+		}
 
-		$chart = new Chart;
-		$chart->setType("pie");
-		$chart->setTitle("$current_period_name Performance by Point of Challenge");
-		$chart->setLabels(["On Entry", "While Browsing", "During Play", "On Exit", "No Challenge"]);
-		$chart->addDataset("Counts", [
-			$period_data->stage1Count,
-			$period_data->stage2Count,
-			$period_data->stage3Count,
-			$period_data->stage4Count,
-			$period_data->stage5Count,
-		], [
-			"background_colours" => [
-				"#4CAF50",
-				"#FFEB3B",
-				"#FBC02D",
-				"#FFAB91",
-				"#F44336",
-			]
-		]);
-		$charts[] = $chart;
 
 
 

+ 5 - 0
engine/chart.php

@@ -70,6 +70,11 @@ class Chart {
 				"legend" => [
 					"position" => "top",
 				],
+				"plugins" => [
+					"datalabels" => [
+						"color" => "white",
+					],
+				],
 			],
 		]);
 

+ 8 - 0
public/js/app-performance.js

@@ -2,6 +2,14 @@ $(function() {
 
 	$("canvas[data-chart]").each(function() {
 		var object = $(this).data("chart");
+
+		object.options.plugins.datalabels.display = function(context) {
+			var dataset = context.dataset;
+			var count = dataset.data.length;
+			var value = dataset.data[context.dataIndex];
+			return value;
+		};
+
 		var chart = new Chart(this, object);
 	});
 

Разница между файлами не показана из-за своего большого размера
+ 10 - 0
public/js/chartjs-plugin-datalabels.min.js


Некоторые файлы не были показаны из-за большого количества измененных файлов