Sfoglia il codice sorgente

Fix percentage total row; sort data pass rate chart tables by pass rate

Alan Lam 2 anni fa
parent
commit
9857a526dd
2 ha cambiato i file con 28 aggiunte e 1 eliminazioni
  1. 23 1
      engine/chart.php
  2. 5 0
      engine/chart_generator.php

+ 23 - 1
engine/chart.php

@@ -64,6 +64,11 @@ class Chart {
 	public $printPercentages = false;
 	public $printPercentages = false;
 	public $printTotalColumn = false;
 	public $printTotalColumn = false;
 
 
+	public $numeratorColumnIndex = null;
+	public $denominatorColumnIndex = null;
+
+	public $tableSorter = null;
+
 	// Static methods
 	// Static methods
 	public static function getColourByIndex(int $index): string {
 	public static function getColourByIndex(int $index): string {
 		$count = count(self::COLOURS);
 		$count = count(self::COLOURS);
@@ -346,6 +351,10 @@ class Chart {
 				}
 				}
 			}
 			}
 
 
+			if($this->tableSorter) {
+				usort($data, $this->tableSorter);
+			}
+
 			foreach($data as $row_index => $columns) {
 			foreach($data as $row_index => $columns) {
 				?>
 				?>
 				<tr>
 				<tr>
@@ -397,9 +406,22 @@ class Chart {
 					<th><?=htmlspecialchars(__("Total"))?></th>
 					<th><?=htmlspecialchars(__("Total"))?></th>
 					<?php
 					<?php
 					foreach($datasets as $dataset) {
 					foreach($datasets as $dataset) {
+						$label = $dataset->label;
+
+						$is_percentage = strpos($label, "%");
+						if($is_percentage && $this->numeratorColumnIndex !== null && $this->denominatorColumnIndex !== null) {
+							$numerator_sum = array_sum($datasets[$this->numeratorColumnIndex]->data);
+							$denominator_sum = array_sum($datasets[$this->denominatorColumnIndex]->data);
+
+							$text = number_format(($numerator_sum * 100) / $denominator_sum, 2) . "%";
+						}
+						else {
+							$text = number_format(array_sum($dataset->data));
+						}
+
 						?>
 						?>
 						<td class="text-right">
 						<td class="text-right">
-							<?=number_format(array_sum($dataset->data))?>
+							<?=$text?>
 						</td>
 						</td>
 						<?php
 						<?php
 					}
 					}

+ 5 - 0
engine/chart_generator.php

@@ -937,6 +937,11 @@ class ChartGenerator {
 		$chart->setDatalabelSuffixes("%");
 		$chart->setDatalabelSuffixes("%");
 		$chart->print = true;
 		$chart->print = true;
 		$chart->printTotalColumn = true;
 		$chart->printTotalColumn = true;
+		$chart->numeratorColumnIndex = 2;
+		$chart->denominatorColumnIndex = 1;
+		$chart->tableSorter = static function(array $row_a, array $row_b) {
+			return $row_b[0] <=> $row_a[0];
+		};
 		return $chart;
 		return $chart;
 	}
 	}