|
|
@@ -393,61 +393,76 @@ let projectData = <?=json_encode($project_table_data)?>;
|
|
|
?>
|
|
|
<tr>
|
|
|
<th><?=htmlspecialchars($title)?></th>
|
|
|
+ <td class="text-right"><?=$total?></td>
|
|
|
<td class="text-right"><?=$pass?></td>
|
|
|
- <td class="text-right"><?=$pass_percentage?>%</td>
|
|
|
<td class="text-right"><?=$fail?></td>
|
|
|
- <td class="text-right"><?=$total?></td>
|
|
|
+ <td class="text-right"><?=$pass_percentage?>%</td>
|
|
|
<td class="text-right"><?=$void?></td>
|
|
|
</tr>
|
|
|
<?php
|
|
|
};
|
|
|
?>
|
|
|
|
|
|
- <table class="table table-sm table-bordered">
|
|
|
- <colgroup>
|
|
|
- <col style="width: 16%"/>
|
|
|
- <col style="width: 16%"/>
|
|
|
- <col style="width: 16%"/>
|
|
|
- <col style="width: 16%"/>
|
|
|
- <col style="width: 16%"/>
|
|
|
- </colgroup>
|
|
|
- <thead>
|
|
|
- <tr>
|
|
|
- <th></th>
|
|
|
- <th><?=htmlspecialchars(__("Passes"))?></th>
|
|
|
- <th><?=htmlspecialchars(__("Pass Rate"))?></th>
|
|
|
- <th><?=htmlspecialchars(__("Fails"))?></th>
|
|
|
- <th><?=htmlspecialchars(__("Total"))?></th>
|
|
|
- <th><?=htmlspecialchars(__("Voids"))?></th>
|
|
|
- </tr>
|
|
|
- </thead>
|
|
|
- <tbody>
|
|
|
- <tr>
|
|
|
- <th><?=htmlspecialchars(__("Venue Tests"))?></th>
|
|
|
- <td colspan="3"></td>
|
|
|
- <td class="text-right"><?=htmlspecialchars($total_data->testCount)?></td>
|
|
|
- <td class="text-right"><?=htmlspecialchars($total_data->voidCount)?></td>
|
|
|
- </tr>
|
|
|
- <?php
|
|
|
- if(isset($total_data->passCount)) {
|
|
|
- $render_pass_fail_row("Gaming Tests", $total_data->passCount, $total_data->failCount, $total_data->gamingCounts["void"] ?? 0);
|
|
|
- }
|
|
|
+ <section class="mb-4">
|
|
|
+ <table class="table table-sm table-bordered mb-0">
|
|
|
+ <colgroup>
|
|
|
+ <col style="width: 30%"/>
|
|
|
+ <col style="width: 14%"/>
|
|
|
+ <col style="width: 14%"/>
|
|
|
+ <col style="width: 14%"/>
|
|
|
+ <col style="width: 14%"/>
|
|
|
+ <col style="width: 14%"/>
|
|
|
+ </colgroup>
|
|
|
+ <thead>
|
|
|
+ <tr>
|
|
|
+ <th><?=htmlspecialchars(__("Type"))?></th>
|
|
|
+ <th><?=htmlspecialchars(__("Total"))?></th>
|
|
|
+ <th><?=htmlspecialchars(__("Passes"))?></th>
|
|
|
+ <th><?=htmlspecialchars(__("Fails"))?></th>
|
|
|
+ <th><?=htmlspecialchars(__("Pass Rate"))?></th>
|
|
|
+ <th><?=htmlspecialchars(__("Voids"))?></th>
|
|
|
+ </tr>
|
|
|
+ </thead>
|
|
|
+ <tbody>
|
|
|
+ <tr>
|
|
|
+ <th><?=htmlspecialchars(__("Venue Tests"))?></th>
|
|
|
+ <td class="text-right"><?=htmlspecialchars($total_data->testCount)?></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td></td>
|
|
|
+ <td class="text-right"><?=htmlspecialchars($total_data->voidCount)?></td>
|
|
|
+ </tr>
|
|
|
+ <?php
|
|
|
+ if(isset($total_data->passCount)) {
|
|
|
+ $render_pass_fail_row(__("Gaming Tests"), $total_data->passCount, $total_data->failCount, $total_data->gamingCounts["void"] ?? 0);
|
|
|
+ }
|
|
|
|
|
|
- if(isset($total_data->barCounts)) {
|
|
|
- $render_pass_fail_row("Alcohol Tests", $total_data->barCounts["pass"], $total_data->barCounts["fail"], $total_data->barCounts["void"] ?? 0);
|
|
|
- }
|
|
|
+ if(isset($total_data->barCounts)) {
|
|
|
+ $render_pass_fail_row(__("Alcohol Tests"), $total_data->barCounts["pass"], $total_data->barCounts["fail"], $total_data->barCounts["void"] ?? 0);
|
|
|
+ }
|
|
|
|
|
|
- if(isset($total_data->combinedCounts)) {
|
|
|
- $render_pass_fail_row("Combined Tests", $total_data->combinedCounts["pass"], $total_data->combinedCounts["fail"], $total_data->combinedCounts["void"] ?? 0);
|
|
|
- }
|
|
|
+ ?>
|
|
|
+ <tr>
|
|
|
+ <th class="bg-light" colspan="6"><?=htmlspecialchars(__("Aggregate Counts"))?></th>
|
|
|
+ </tr>
|
|
|
+ <?php
|
|
|
|
|
|
- if(isset($total_data->blendedCounts)) {
|
|
|
- $render_pass_fail_row("Blended Tests", $total_data->blendedCounts["pass"], $total_data->blendedCounts["fail"], $total_data->blendedCounts["void"] ?? 0);
|
|
|
- }
|
|
|
+ if(isset($total_data->combinedCounts)) {
|
|
|
+ $render_pass_fail_row(__("Gaming and Alcohol"), $total_data->combinedCounts["pass"], $total_data->combinedCounts["fail"], $total_data->combinedCounts["void"] ?? 0);
|
|
|
+ }
|
|
|
|
|
|
- ?>
|
|
|
- </tbody>
|
|
|
- </table>
|
|
|
+ if(isset($total_data->blendedCounts)) {
|
|
|
+ $render_pass_fail_row(__("Gaming and Assumed Alcohol"), $total_data->blendedCounts["pass"], $total_data->blendedCounts["fail"], $total_data->blendedCounts["void"] ?? 0);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(isset($total_data->mergedCounts)) {
|
|
|
+ $render_pass_fail_row(__("Gaming or Alcohol Pass"), $total_data->mergedCounts["pass"], $total_data->mergedCounts["fail"], $total_data->mergedCounts["void"] ?? 0);
|
|
|
+ }
|
|
|
+
|
|
|
+ ?>
|
|
|
+ </tbody>
|
|
|
+ </table>
|
|
|
+ </section>
|
|
|
|
|
|
<div class="row mb-4">
|
|
|
<div class="col-md-4 d-print-none" style="position: relative;">
|