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

Add operations manager tables

Alan Lam преди 2 години
родител
ревизия
76e2d03c52
променени са 3 файла, в които са добавени 109 реда и са изтрити 10 реда
  1. 22 1
      controllers/reports.php
  2. 8 0
      engine/chart_generator.php
  3. 79 9
      views/reports.php

+ 22 - 1
controllers/reports.php

@@ -78,11 +78,13 @@ $data = [];
 $region_data = [];
 $area_manager_data = [];
 $brand_data = [];
+$operations_manager_data = [];
 
 $total_data = new stdClass;
 
 $locations_missing_region = [];
 $locations_missing_area_manager = [];
+$locations_missing_operations_manager = [];
 $locations_missing_brand = [];
 
 $charts = [];
@@ -244,6 +246,7 @@ if($submit) {
 		$regions = array_filter(array_column($locations, "region"));
 		$area_managers = array_filter(array_column($locations, "area_manager"));
 		$brands = array_filter(array_column($locations, "brand"));
+		$operations_managers = array_filter(array_column($locations, "operations_manager_name"));
 
 		uksort($regions, "strnatcasecmp");
 		uksort($area_managers, "strnatcasecmp");
@@ -261,14 +264,20 @@ if($submit) {
 			$brand_data[$brand] = [];
 		}
 
+		foreach($operations_managers as $operations_manager) {
+			$operations_manager_data[$operations_manager] = [];
+		}
+
 		$has_regions = !empty($region_data);
 		$has_area_managers = !empty($area_manager_data);
 		$has_brands = !empty($brand_data);
+		$has_operation_managers = !empty($operations_manager_data);
 
 		foreach($locations as $location) {
 			if($has_regions && !$location->region) $locations_missing_region[] = $location;
 			if($has_area_managers && !$location->area_manager) $locations_missing_area_manager[] = $location;
 			if($has_brands && !$location->brand) $locations_missing_brand[] = $location;
+			if($has_operation_managers && !$location->operations_manager_name) $locations_missing_operations_manager[] = $location;
 		}
 
 		// Check if date range is same year
@@ -346,6 +355,12 @@ if($submit) {
 				$b[$key]->label = $label;
 			}
 			unset($b);
+
+			foreach($operations_manager_data as &$om) {
+				$om[$key] = clone $empty_data;
+				$om[$key]->label = $label;
+			}
+			unset($om);
 		}
 
 		$max_unix = 0;
@@ -368,6 +383,7 @@ if($submit) {
 		foreach($tests as $test) {
 
 			$tester = $test->getTester();
+			/** @var Location $location */
 			$location = $test->getLocation();
 			$venue_types = $location->getVenueTypes();
 			$project = $test->getProject();
@@ -392,6 +408,7 @@ if($submit) {
 			$region = $location->region;
 			$area_manager = $location->area_manager;
 			$brand = $location->brand;
+			$operations_manager = $location->operations_manager_name;
 
 			$dts = $project->dts_report ?: $test->dts_start;
 
@@ -434,6 +451,9 @@ if($submit) {
 				if($brand) {
 					$brand_data[$brand][$key]->testCount++;
 				}
+				if($operations_manager) {
+					$operations_manager_data[$operations_manager][$key]->testCount++;
+				}
 
 				if($tester->gender === "M") {
 					$data[$key]->maleTesterCount++;
@@ -460,6 +480,7 @@ if($submit) {
 		$generator->setRegionData($region_data);
 		$generator->setBrandData($brand_data);
 		$generator->setAreaManagerData($area_manager_data);
+		$generator->setOperationsManagerData($operations_manager_data);
 		$generator->setTemplate($template);
 
 		// Build charts hook
@@ -486,5 +507,5 @@ if($submit) {
 }
 
 View::includeOnce("header", compact("page_title"));
-View::include("reports", compact("customer", "date_range", "date_start", "date_end", "date_resolution", "all_projects", "project_table_data", "exclude_project_ids", "location_ids", "retests", "charts", "data", "total_data", "locations_missing_region", "locations_missing_area_manager", "locations_missing_brand", "region_data", "area_manager_data", "brand_data", "key_labels", "has_pass_fail"));
+View::include("reports", compact("customer", "date_range", "date_start", "date_end", "date_resolution", "all_projects", "project_table_data", "exclude_project_ids", "location_ids", "retests", "charts", "data", "total_data", "locations_missing_region", "locations_missing_area_manager", "locations_missing_operations_manager", "locations_missing_brand", "region_data", "area_manager_data", "brand_data", "operations_manager_data", "key_labels", "has_pass_fail"));
 View::includeOnce("footer");

+ 8 - 0
engine/chart_generator.php

@@ -48,6 +48,9 @@ class ChartGenerator {
 	/** @var array $areaManagerData */
 	private $areaManagerData;
 
+	/** @var array */
+	private $operationsManagerData;
+
 	/** @var array */
 	private $brandData;
 
@@ -205,6 +208,11 @@ class ChartGenerator {
 		$this->areaManagerData = $data;
 	}
 
+	public function setOperationsManagerData(array $data): void {
+		ksort($data, SORT_NATURAL);
+		$this->operationsManagerData = $data;
+	}
+
 	public function setBrandData(array $data): void {
 		$this->brandData = $data;
 	}

+ 79 - 9
views/reports.php

@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnhandledExceptionInspection */
 
 /**
  * @var Customer $customer
@@ -19,11 +19,13 @@
  * @var Location[] $locations_missing_region
  * @var Location[] $locations_missing_area_manager
  * @var Location[] $locations_missing_brand
+ * @var Location[] $locations_missing_operations_manager
  *
  * @var array $total_data
  * @var array $region_data
  * @var array $area_manager_data
  * @var array $brand_data
+ * @var array $operations_manager_data
  */
 
 $user = Core::$user;
@@ -50,8 +52,8 @@ $date_range_custom_style = ($date_range === "custom") ? "" : "display: none";
 $date_range_value = "";
 
 if($date_start && $date_end) {
-	list($min_year, $min_month, $min_day) = explode("-", $date_start);
-	list($max_year, $max_month, $max_day) = explode("-", $date_end);
+	[$min_year, $min_month, $min_day] = explode("-", $date_start);
+	[$max_year, $max_month, $max_day] = explode("-", $date_end);
 
 	$date_range_value = "$min_day/$min_month/$min_year - $max_day/$max_month/$max_year";
 }
@@ -284,6 +286,9 @@ let projectData = <?=json_encode($project_table_data)?>;
 		if($locations_missing_area_manager) {
 			$render_locations_missing_data("area manager", $locations_missing_area_manager);
 		}
+		if($locations_missing_operations_manager) {
+			$render_locations_missing_data("operations manager", $locations_missing_operations_manager);
+		}
 		if($locations_missing_brand) {
 			$render_locations_missing_data("brand", $locations_missing_brand);
 		}
@@ -429,10 +434,14 @@ let projectData = <?=json_encode($project_table_data)?>;
 					"name" => "Area Manager",
 					"data" => $area_manager_data
 				],
+				(object) [
+					"name" => "Operations Manager",
+					"data" => $operations_manager_data
+				],
 				(object) [
 					"name" => "Brand",
 					"data" => $brand_data
-				]
+				],
 			]
 
 			?>
@@ -443,14 +452,75 @@ let projectData = <?=json_encode($project_table_data)?>;
 				foreach($tables as $table) {
 					$title = $table->name . " Data";
 					$entity_type = $table->name;
+
+					// Calculate totals
+					$totals = [];
+					foreach($table->data as $entity_name => $rows) {
+						$totals[] = [
+							"name" => $entity_name,
+							"testCount" => array_sum(array_column($rows, "testCount")),
+							"passCount" => array_sum(array_column($rows, "passCount")),
+							"failCount" => array_sum(array_column($rows, "failCount")),
+						];
+					}
+
+					if(!$totals) {
+						continue;
+					}
+
 					?>
 					<h3><?=htmlspecialchars($title)?></h3>
+
+					<h4><?=htmlspecialchars($entity_type)?>: Totals</h4>
+					<?php
+
+					usort($totals, static function($a, $b) {
+						return strnatcasecmp($a["name"], $b["name"]);
+					});
+
+					?>
+
+					<table class="table table-sm table-bordered">
+						<colgroup>
+							<col style="width: 20%" />
+							<col style="width: 20%" />
+							<col style="width: 20%" />
+							<col style="width: 20%" />
+							<col style="width: 20%" />
+						</colgroup>
+						<thead>
+						<tr>
+							<th><?=htmlspecialchars($title)?></th>
+							<th>Tests</th>
+							<th>Passes</th>
+							<th>Fails</th>
+							<th>Rate</th>
+						</tr>
+						</thead>
+						<tbody>
+						<?php
+						foreach($totals as $data) {
+							$rate = ($data["testCount"] === 0) ? "0.00" : number_format(($data["passCount"] * 100) / $data["testCount"], 2);
+							?>
+							<tr>
+								<td><?=htmlspecialchars($data["name"])?></td>
+								<td class="text-right"><?=number_format($data["testCount"])?></td>
+								<td class="text-right"><?=number_format($data["passCount"])?></td>
+								<td class="text-right"><?=number_format($data["failCount"])?></td>
+								<td class="text-right"><?=$rate?>%</td>
+							</tr>
+							<?php
+						}
+						?>
+						</tbody>
+					</table>
+
 					<?php
 					foreach($table->data as $entity_name => $rows) {
 						?>
 						<h4><?=htmlspecialchars($entity_type)?>: <?=htmlspecialchars($entity_name)?></h4>
 
-						<table class="table">
+						<table class="table table-sm table-bordered">
 							<colgroup>
 								<col style="width: 20%" />
 								<col style="width: 20%" />
@@ -478,10 +548,10 @@ let projectData = <?=json_encode($project_table_data)?>;
 								?>
 								<tr>
 									<td><?=htmlspecialchars($label)?></td>
-									<td><?=number_format($data->testCount)?></td>
-									<td><?=number_format($data->passCount)?></td>
-									<td><?=number_format($data->failCount)?></td>
-									<td><?=$rate?>%</td>
+									<td class="text-right"><?=number_format($data->testCount)?></td>
+									<td class="text-right"><?=number_format($data->passCount)?></td>
+									<td class="text-right"><?=number_format($data->failCount)?></td>
+									<td class="text-right"><?=$rate?>%</td>
 								</tr>
 								<?php
 								$index++;