|
@@ -17,6 +17,7 @@ class ChartGenerator {
|
|
|
const COLOUR_DARK_BLUE = "#3F51B5";
|
|
const COLOUR_DARK_BLUE = "#3F51B5";
|
|
|
const COLOUR_PURPLE = "#9C27B0";
|
|
const COLOUR_PURPLE = "#9C27B0";
|
|
|
const COLOUR_GREY = "#9E9E9E";
|
|
const COLOUR_GREY = "#9E9E9E";
|
|
|
|
|
+ const COLOUR_CYAN = "#00BCD4";
|
|
|
|
|
|
|
|
/** @var object $totalData */
|
|
/** @var object $totalData */
|
|
|
private $totalData;
|
|
private $totalData;
|
|
@@ -876,33 +877,34 @@ class ChartGenerator {
|
|
|
|
|
|
|
|
private function getPeriodicPassRateByDoorSensorAlert(int $index) {
|
|
private function getPeriodicPassRateByDoorSensorAlert(int $index) {
|
|
|
return array_values(array_map(function($data) use ($index) {
|
|
return array_values(array_map(function($data) use ($index) {
|
|
|
- if($data->testCount == 0) return null;
|
|
|
|
|
- if($data->doorSensorAlertFailCounts[$index] == 0) return 100;
|
|
|
|
|
- return round(($data->doorSensorAlertPassCounts[$index] / $data->testCount) * 100);
|
|
|
|
|
|
|
+ $test_count = $data->doorSensorAlertPassCounts[$index] + $data->doorSensorAlertFailCounts[$index];
|
|
|
|
|
+ if($test_count == 0) return null;
|
|
|
|
|
+
|
|
|
|
|
+ return round(($data->doorSensorAlertPassCounts[$index] / $test_count) * 100);
|
|
|
}, $this->periodicData));
|
|
}, $this->periodicData));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private function getPeriodicPassRateByEyeContact(int $index) {
|
|
private function getPeriodicPassRateByEyeContact(int $index) {
|
|
|
return array_values(array_map(function($data) use ($index) {
|
|
return array_values(array_map(function($data) use ($index) {
|
|
|
- if($data->testCount == 0) return null;
|
|
|
|
|
- if($data->eyeContactFailCounts[$index] == 0) return 100;
|
|
|
|
|
- return round(($data->eyeContactPassCounts[$index] / $data->testCount) * 100);
|
|
|
|
|
|
|
+ $test_count = $data->eyeContactPassCounts[$index] + $data->eyeContactFailCounts[$index];
|
|
|
|
|
+ if($test_count == 0) return null;
|
|
|
|
|
+ return round(($data->eyeContactPassCounts[$index] / $test_count) * 100);
|
|
|
}, $this->periodicData));
|
|
}, $this->periodicData));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private function getPeriodicPassRateByLineOfSight(int $index) {
|
|
private function getPeriodicPassRateByLineOfSight(int $index) {
|
|
|
return array_values(array_map(function($data) use ($index) {
|
|
return array_values(array_map(function($data) use ($index) {
|
|
|
- if($data->testCount == 0) return null;
|
|
|
|
|
- if($data->lineOfSightFailCounts[$index] == 0) return 100;
|
|
|
|
|
- return round(($data->lineOfSightPassCounts[$index] / $data->testCount) * 100);
|
|
|
|
|
|
|
+ $test_count = $data->lineOfSightPassCounts[$index] + $data->lineOfSightFailCounts[$index];
|
|
|
|
|
+ if($test_count == 0) return null;
|
|
|
|
|
+ return round(($data->lineOfSightPassCounts[$index] / $test_count) * 100);
|
|
|
}, $this->periodicData));
|
|
}, $this->periodicData));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private function getPeriodicPassRateByBarPurchase(int $index) {
|
|
private function getPeriodicPassRateByBarPurchase(int $index) {
|
|
|
return array_values(array_map(function($data) use ($index) {
|
|
return array_values(array_map(function($data) use ($index) {
|
|
|
- if($data->testCount == 0) return null;
|
|
|
|
|
- if($data->barPurchaseFailCounts[$index] == 0) return 100;
|
|
|
|
|
- return round(($data->barPurchasePassCounts[$index] / $data->testCount) * 100);
|
|
|
|
|
|
|
+ $test_count = $data->barPurchasePassCounts[$index] + $data->barPurchaseFailCounts[$index];
|
|
|
|
|
+ if($test_count == 0) return null;
|
|
|
|
|
+ return round(($data->barPurchasePassCounts[$index] / $test_count) * 100);
|
|
|
}, $this->periodicData));
|
|
}, $this->periodicData));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -987,36 +989,36 @@ class ChartGenerator {
|
|
|
"tick_config" => ["min" => 0, "max" => 100],
|
|
"tick_config" => ["min" => 0, "max" => 100],
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
- $chart->setType("line");
|
|
|
|
|
|
|
+ $chart->setType("bar");
|
|
|
$chart->setTitle($title);
|
|
$chart->setTitle($title);
|
|
|
$chart->setLabels($this->xDataLabels);
|
|
$chart->setLabels($this->xDataLabels);
|
|
|
|
|
|
|
|
$chart->setDatalabelSuffixes("%", "%");
|
|
$chart->setDatalabelSuffixes("%", "%");
|
|
|
|
|
|
|
|
- if($null_rates !== null) {
|
|
|
|
|
- $chart->addDataset("Don't Know", $null_rates, [
|
|
|
|
|
- "background_colours" => self::COLOUR_YELLOW . "3F",
|
|
|
|
|
- "border_colours" => self::COLOUR_YELLOW,
|
|
|
|
|
- "line_tension" => 0,
|
|
|
|
|
- "datalabels" => ["display" => false],
|
|
|
|
|
- ]);
|
|
|
|
|
- $chart->setDatalabelSuffixes("%", "%", "%");
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- $chart->addDataset("No", $no_rates, [
|
|
|
|
|
- "background_colours" => self::COLOUR_RED . "3F",
|
|
|
|
|
- "border_colours" => self::COLOUR_RED,
|
|
|
|
|
|
|
+ $chart->addDataset("Yes", $yes_rates, [
|
|
|
|
|
+ "background_colours" => self::COLOUR_GREEN,
|
|
|
|
|
+ "border_colours" => self::COLOUR_GREEN,
|
|
|
"line_tension" => 0,
|
|
"line_tension" => 0,
|
|
|
"datalabels" => ["display" => false],
|
|
"datalabels" => ["display" => false],
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
- $chart->addDataset("Yes", $yes_rates, [
|
|
|
|
|
- "background_colours" => self::COLOUR_GREEN . "3F",
|
|
|
|
|
- "border_colours" => self::COLOUR_GREEN,
|
|
|
|
|
|
|
+ $chart->addDataset("No", $no_rates, [
|
|
|
|
|
+ "background_colours" => self::COLOUR_RED,
|
|
|
|
|
+ "border_colours" => self::COLOUR_RED,
|
|
|
"line_tension" => 0,
|
|
"line_tension" => 0,
|
|
|
"datalabels" => ["display" => false],
|
|
"datalabels" => ["display" => false],
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
|
|
+ if($null_rates !== null) {
|
|
|
|
|
+ $chart->addDataset("Don't Know", $null_rates, [
|
|
|
|
|
+ "background_colours" => self::COLOUR_CYAN,
|
|
|
|
|
+ "border_colours" => self::COLOUR_CYAN,
|
|
|
|
|
+ "line_tension" => 0,
|
|
|
|
|
+ "datalabels" => ["display" => false],
|
|
|
|
|
+ ]);
|
|
|
|
|
+ $chart->setDatalabelSuffixes("%", "%", "%");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$chart->print = true;
|
|
$chart->print = true;
|
|
|
return $chart;
|
|
return $chart;
|
|
|
}
|
|
}
|