Преглед на файлове

Remove "N/A" from eye contact chart

Alan Lam преди 7 години
родител
ревизия
8c0ed88b55

+ 3 - 6
template_processing/age_verification/reports_build_charts.php

@@ -124,8 +124,8 @@ $eye_contact_rates = array_values(array_map(function($period) {
 	if($period->testCount == 0) return [0, 0, 0];
 	if($period->testCount == 0) return [0, 0, 0];
 
 
 	$yes = round(($period->eyeContactCounts[0] / $period->testCount) * 100);
 	$yes = round(($period->eyeContactCounts[0] / $period->testCount) * 100);
-	$no = round(($period->eyeContactCounts[1] / $period->testCount) * 100);
-	$na = 100 - $yes - $no;
+	$no = 100 - $yes;
+	$na = 0;
 
 
 	return [$yes, $no, $na];
 	return [$yes, $no, $na];
 }, $data));
 }, $data));
@@ -149,10 +149,7 @@ $chart->addDataset("Yes (%)", array_column($eye_contact_rates, 0), [
 $chart->addDataset("No (%)", array_column($eye_contact_rates, 1), [
 $chart->addDataset("No (%)", array_column($eye_contact_rates, 1), [
 	"background_colours" => "#F44336"
 	"background_colours" => "#F44336"
 ]);
 ]);
-$chart->addDataset("N/A (%)", array_column($eye_contact_rates, 2), [
-	"background_colours" => "#bdbdbd"
-]);
-$chart->setDatalabelSuffixes("%", "%", "%");
+$chart->setDatalabelSuffixes("%", "%");
 $charts[] = $chart;
 $charts[] = $chart;
 
 
 // Totals by Period
 // Totals by Period

+ 3 - 6
template_processing/age_verification_mitchells_butlers/reports_build_charts.php

@@ -124,8 +124,8 @@ $eye_contact_rates = array_values(array_map(function($period) {
 	if($period->testCount == 0) return [0, 0, 0];
 	if($period->testCount == 0) return [0, 0, 0];
 
 
 	$yes = round(($period->eyeContactCounts[0] / $period->testCount) * 100);
 	$yes = round(($period->eyeContactCounts[0] / $period->testCount) * 100);
-	$no = round(($period->eyeContactCounts[1] / $period->testCount) * 100);
-	$na = 100 - $yes - $no;
+	$no = 100 - $yes;
+	$na = 0;
 
 
 	return [$yes, $no, $na];
 	return [$yes, $no, $na];
 }, $data));
 }, $data));
@@ -149,10 +149,7 @@ $chart->addDataset("Yes (%)", array_column($eye_contact_rates, 0), [
 $chart->addDataset("No (%)", array_column($eye_contact_rates, 1), [
 $chart->addDataset("No (%)", array_column($eye_contact_rates, 1), [
 	"background_colours" => "#F44336"
 	"background_colours" => "#F44336"
 ]);
 ]);
-$chart->addDataset("N/A (%)", array_column($eye_contact_rates, 2), [
-	"background_colours" => "#bdbdbd"
-]);
-$chart->setDatalabelSuffixes("%", "%", "%");
+$chart->setDatalabelSuffixes("%", "%");
 $charts[] = $chart;
 $charts[] = $chart;
 
 
 // Totals by Period
 // Totals by Period