|
@@ -383,7 +383,7 @@ let projectData = <?=json_encode($project_table_data)?>;
|
|
|
|
|
|
|
|
<?php
|
|
<?php
|
|
|
|
|
|
|
|
- $render_pass_fail_row = static function(string $title, $pass, $fail) {
|
|
|
|
|
|
|
+ $render_pass_fail_row = static function(string $title, $pass, $fail, $void) {
|
|
|
$total = $pass + $fail;
|
|
$total = $pass + $fail;
|
|
|
|
|
|
|
|
$pass_percentage = 0;
|
|
$pass_percentage = 0;
|
|
@@ -397,6 +397,7 @@ let projectData = <?=json_encode($project_table_data)?>;
|
|
|
<td class="text-right"><?=$pass_percentage?></td>
|
|
<td class="text-right"><?=$pass_percentage?></td>
|
|
|
<td class="text-right"><?=$fail?></td>
|
|
<td class="text-right"><?=$fail?></td>
|
|
|
<td class="text-right"><?=$total?></td>
|
|
<td class="text-right"><?=$total?></td>
|
|
|
|
|
+ <td class="text-right"><?=$void?></td>
|
|
|
</tr>
|
|
</tr>
|
|
|
<?php
|
|
<?php
|
|
|
};
|
|
};
|
|
@@ -404,18 +405,20 @@ let projectData = <?=json_encode($project_table_data)?>;
|
|
|
|
|
|
|
|
<table class="table table-sm table-bordered">
|
|
<table class="table table-sm table-bordered">
|
|
|
<colgroup>
|
|
<colgroup>
|
|
|
- <col style="width: 20%"/>
|
|
|
|
|
- <col style="width: 20%"/>
|
|
|
|
|
- <col style="width: 20%"/>
|
|
|
|
|
- <col style="width: 20%"/>
|
|
|
|
|
|
|
+ <col style="width: 16%"/>
|
|
|
|
|
+ <col style="width: 16%"/>
|
|
|
|
|
+ <col style="width: 16%"/>
|
|
|
|
|
+ <col style="width: 16%"/>
|
|
|
|
|
+ <col style="width: 16%"/>
|
|
|
</colgroup>
|
|
</colgroup>
|
|
|
<thead>
|
|
<thead>
|
|
|
<tr>
|
|
<tr>
|
|
|
<th></th>
|
|
<th></th>
|
|
|
- <th><?=htmlspecialchars(__("Pass"))?></th>
|
|
|
|
|
|
|
+ <th><?=htmlspecialchars(__("Passes"))?></th>
|
|
|
<th><?=htmlspecialchars(__("Pass Rate (%)"))?></th>
|
|
<th><?=htmlspecialchars(__("Pass Rate (%)"))?></th>
|
|
|
- <th><?=htmlspecialchars(__("Fail"))?></th>
|
|
|
|
|
|
|
+ <th><?=htmlspecialchars(__("Fails"))?></th>
|
|
|
<th><?=htmlspecialchars(__("Total"))?></th>
|
|
<th><?=htmlspecialchars(__("Total"))?></th>
|
|
|
|
|
+ <th><?=htmlspecialchars(__("Voids"))?></th>
|
|
|
</tr>
|
|
</tr>
|
|
|
</thead>
|
|
</thead>
|
|
|
<tbody>
|
|
<tbody>
|
|
@@ -423,18 +426,19 @@ let projectData = <?=json_encode($project_table_data)?>;
|
|
|
<th><?=htmlspecialchars(__("Venue Tests"))?></th>
|
|
<th><?=htmlspecialchars(__("Venue Tests"))?></th>
|
|
|
<td colspan="3"></td>
|
|
<td colspan="3"></td>
|
|
|
<td class="text-right"><?=htmlspecialchars($total_data->testCount)?></td>
|
|
<td class="text-right"><?=htmlspecialchars($total_data->testCount)?></td>
|
|
|
|
|
+ <td class="text-right"><?=htmlspecialchars($total_data->voidCount)?></td>
|
|
|
</tr>
|
|
</tr>
|
|
|
<?php
|
|
<?php
|
|
|
if(isset($total_data->passCount)) {
|
|
if(isset($total_data->passCount)) {
|
|
|
- $render_pass_fail_row("Gaming Tests", $total_data->passCount, $total_data->failCount);
|
|
|
|
|
|
|
+ $render_pass_fail_row("Gaming Tests", $total_data->passCount, $total_data->failCount, $total_data->gamingCounts["void"] ?? 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(isset($total_data->barCounts)) {
|
|
if(isset($total_data->barCounts)) {
|
|
|
- $render_pass_fail_row("Alcohol Tests", $total_data->barCounts["pass"], $total_data->barCounts["fail"]);
|
|
|
|
|
|
|
+ $render_pass_fail_row("Alcohol Tests", $total_data->barCounts["pass"], $total_data->barCounts["fail"], $total_data->barCounts["void"] ?? 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(isset($total_data->combinedCounts)) {
|
|
if(isset($total_data->combinedCounts)) {
|
|
|
- $render_pass_fail_row("Combined Tests", $total_data->combinedCounts["pass"], $total_data->combinedCounts["fail"]);
|
|
|
|
|
|
|
+ $render_pass_fail_row("Combined Tests", $total_data->combinedCounts["pass"], $total_data->combinedCounts["fail"], $total_data->combinedCounts["void"] ?? 0);
|
|
|
}
|
|
}
|
|
|
?>
|
|
?>
|
|
|
</tbody>
|
|
</tbody>
|