Просмотр исходного кода

Add extra filters to the "Locations" page

Alan Lam 8 месяцев назад
Родитель
Сommit
8cbe25416f

+ 12 - 0
controllers/customer_ajax.php

@@ -29,6 +29,12 @@ switch($action) {
 		$internal_id = http::value("internal_id", "trim");
 		$name = http::value("name", "trim");
 		$legal_entity_name = http::value("legal_entity_name", "trim");
+		$region_name = http::value("region_name");
+		$brand_name = http::value("brand_name");
+		$area_manager_name = http::value("area_manager_name");
+		$operations_manager_name = http::value("operations_manager_name");
+		$gaming_manager_name = http::value("gaming_manager_name");
+		$senior_gaming_manager_name = http::value("senior_gaming_manager_name");
 		$include_archived = http::value("include_archived", "int");
 		$include_closed = http::value("include_closed", "int");
 		$min_date = http::value("min_date");
@@ -39,6 +45,12 @@ switch($action) {
 		$search->setInternalId($internal_id);
 		$search->setName($name);
 		$search->setLegalEntityName($legal_entity_name);
+		$search->setBrandName($brand_name);
+		$search->setRegionName($region_name);
+		$search->setAreaManagerName($area_manager_name);
+		$search->setOperationsManagerName($operations_manager_name);
+		$search->setGamingManagerName($gaming_manager_name);
+		$search->setSeniorGamingManagerName($senior_gaming_manager_name);
 		$search->setIncludeArchived((bool) $include_archived);
 		$search->setIncludeClosed((bool) $include_closed);
 		$search->setMinTestDate($min_date);

+ 20 - 28
controllers/locations.php

@@ -67,6 +67,24 @@ $search->setMinTestDate($min_date);
 $max_date = http::value("max_date");
 $search->setMaxTestDate($max_date);
 
+$brand_name = http::value("brand_name");
+$search->setBrandName($brand_name);
+
+$region_name = http::value("region_name");
+$search->setRegionName($region_name);
+
+$area_manager_name = http::value("area_manager_name");
+$search->setAreaManagerName($area_manager_name);
+
+$operations_manager_name = http::value("operations_manager_name");
+$search->setOperationsManagerName($operations_manager_name);
+
+$gaming_manager_name = http::value("gaming_manager_name");
+$search->setGamingManagerName($gaming_manager_name);
+
+$senior_gaming_manager_name = http::value("senior_gaming_manager_name");
+$search->setSeniorGamingManagerName($senior_gaming_manager_name);
+
 $include_archived = (int) http::value("include_archived");
 $search->setIncludeArchived($include_archived);
 
@@ -80,29 +98,6 @@ $filter_count = 0;
 
 $where_strings = [];
 
-if($id) {
-	$filter_count++;
-}
-
-if($internal_id) {
-	$filter_count++;
-}
-
-if($name) {
-	$filter_count++;
-}
-if($legal_entity_name) {
-	$filter_count++;
-}
-
-if($include_archived) {
-	$filter_count++;
-}
-
-if($include_closed) {
-	$filter_count++;
-}
-
 if($min_date) {
 	$filter_count++;
 }
@@ -111,10 +106,6 @@ if($max_date) {
 	$filter_count++;
 }
 
-if($filter) {
-	$filter_count++;
-}
-
 $sort = http::value("sort");
 switch($sort) {
 	case "last-added":
@@ -138,9 +129,10 @@ switch($sort) {
 		break;
 }
 
-
 $locations = $search->run();
 
+$filter_count += $search->getFilterCount();
+
 $location_ids = array_column($locations, "id") ?: [0];
 $location_ids_csv = implode(", ", $location_ids);
 

+ 113 - 7
engine/searches/location_search.php

@@ -19,6 +19,12 @@ class LocationSearch {
 	private ?string $internalId = null;
 	private ?string $name = null;
 	private ?string $legalEntityName = null;
+	private ?string $brandName = null;
+	private ?string $regionName = null;
+	private ?string $areaManagerName = null;
+	private ?string $operationsManagerName = null;
+	private ?string $gamingManagerName = null;
+	private ?string $seniorGamingManagerName = null;
 	private bool $includeArchived = false;
 	private bool $includeClosed = false;
 	private ?string $minTestDate = null;
@@ -31,6 +37,8 @@ class LocationSearch {
 	/** @var Test[] */
 	private array $allTests = [];
 
+	private int $filterCount = 0;
+
 	public function __construct(Customer $customer, ?User $user) {
 		$this->customer = $customer;
 		$this->user = $user;
@@ -127,13 +135,58 @@ class LocationSearch {
 			"closed" => 0
 		];
 
-		if($this->id) $nvp["id"] = $this->id;
-		if($this->ids) $nvp["id"] = $this->ids;
-		if($this->internalId) $nvp["internal_id"] = Db::escape($this->internalId);
-		if($this->name) $nvp["name"] = Constraint::contains($this->name);
-		if($this->legalEntityName) $nvp["legal_entity_name"] = Constraint::contains($this->legalEntityName);
-		if($this->includeArchived) unset($nvp["archived"]);
-		if($this->includeClosed) unset($nvp["closed"]);
+		if($this->id) {
+			$nvp["id"] = $this->id;
+			$this->filterCount++;
+		}
+		if($this->ids) {
+			$nvp["id"] = $this->ids;
+			$this->filterCount++;
+		}
+		if($this->internalId) {
+			$nvp["internal_id"] = Db::escape($this->internalId);
+			$this->filterCount++;
+		}
+		if($this->name) {
+			$nvp["name"] = Constraint::contains($this->name);
+			$this->filterCount++;
+		}
+		if($this->legalEntityName) {
+			$nvp["legal_entity_name"] = Constraint::contains($this->legalEntityName);
+			$this->filterCount++;
+		}
+		if($this->includeArchived) {
+			unset($nvp["archived"]);
+			$this->filterCount++;
+		}
+		if($this->includeClosed) {
+			unset($nvp["closed"]);
+			$this->filterCount++;
+		}
+		if($this->brandName) {
+			$nvp["brand"] = $this->brandName;
+			$this->filterCount++;
+		}
+		if($this->regionName) {
+			$nvp["region"] = $this->regionName;
+			$this->filterCount++;
+		}
+		if($this->areaManagerName) {
+			$nvp["area_manager"] = $this->areaManagerName;
+			$this->filterCount++;
+		}
+		if($this->operationsManagerName) {
+			$nvp["operations_manager_name"] = $this->operationsManagerName;
+			$this->filterCount++;
+		}
+		if($this->gamingManagerName) {
+			$nvp["gaming_manager_name"] = $this->gamingManagerName;
+			$this->filterCount++;
+		}
+		if($this->seniorGamingManagerName) {
+			$nvp["senior_gaming_manager_name"] = $this->seniorGamingManagerName;
+			$this->filterCount++;
+		}
 
 		$locations = Location::query($nvp, ["sort" => "name", "order" => "asc"]);
 
@@ -229,4 +282,57 @@ class LocationSearch {
 		return $constraint;
 	}
 
+	public function getBrandName(): ?string {
+		return $this->brandName;
+	}
+
+	public function getRegionName(): ?string {
+		return $this->regionName;
+	}
+
+	public function getAreaManagerName(): ?string {
+		return $this->areaManagerName;
+	}
+
+	public function getOperationsManagerName(): ?string {
+		return $this->operationsManagerName;
+	}
+
+	public function getGamingManagerName(): ?string {
+		return $this->gamingManagerName;
+	}
+
+	public function getSeniorGamingManagerName(): ?string {
+		return $this->seniorGamingManagerName;
+	}
+
+	public function setBrandName(?string $brandName): void {
+		$this->brandName = $brandName;
+	}
+
+	public function setRegionName(?string $regionName): void {
+		$this->regionName = $regionName;
+	}
+
+	public function setAreaManagerName(?string $areaManagerName): void {
+		$this->areaManagerName = $areaManagerName;
+	}
+
+	public function setOperationsManagerName(?string $operationsManagerName): void {
+		$this->operationsManagerName = $operationsManagerName;
+	}
+
+	public function setSeniorGamingManagerName(?string $seniorGamingManagerName): void {
+		$this->seniorGamingManagerName = $seniorGamingManagerName;
+	}
+
+	public function setGamingManagerName(?string $gamingManagerName): void {
+		$this->gamingManagerName = $gamingManagerName;
+	}
+
+	public function getFilterCount(): int {
+		return $this->filterCount;
+	}
+
+
 }

+ 6 - 0
public/js/app-locations.js

@@ -18,6 +18,12 @@ function initialiseLocations() {
 		internal_id: $("#internal-id").val(),
 		name: $("#name").val(),
 		legal_entity_name: $("#legal-entity-name").val(),
+		brand_name: $("#brand-name").val(),
+		region_name: $("#region-name").val(),
+		area_manager_name: $("#area-manager-name").val(),
+		operations_manager_name: $("#operations-manager-name").val(),
+		gaming_manager_name: $("#gaming-manager-name").val(),
+		senior_gaming_manager_name: $("#senior-gaming-manager-name").val(),
 		include_archived: $("#include-archived").prop("checked") ? 1 : 0,
 		include_closed: $("#include-closed").prop("checked") ? 1 : 0,
 		filter: $("#filter").val(),

+ 53 - 0
views/locations.php

@@ -16,6 +16,23 @@ $query = $_GET;
 unset($query["path"]);
 $query["sort"] = "SORT";
 
+$render_dropdown = static function(string $id, string $label, string $name, array $options, string $placeholder, ?string $selected_value): void {
+	?>
+	<div class="row form-group">
+		<label class="col-sm-4 col-form-label" for="<?=$id?>"><?=$label?></label>
+		<div class="col-sm">
+			<select class="form-control" name="<?=$name?>" id="<?=$id?>">
+				<option value=""><?=htmlspecialchars($placeholder)?></option>
+				<?php
+				HtmlHelper::renderOptions($options, $selected_value);
+				?>
+			</select>
+		</div>
+	</div>
+	<?php
+
+};
+
 ?>
 
 <script>
@@ -107,6 +124,42 @@ var customerId = <?=$customer->id?>;
 							</div>
 						</div>
 					</div>
+					<div class="col-lg-6">
+						<?php
+						$brand_names = $customer->getBrands();
+						$render_dropdown("brand-name", __("Brand"), "brand_name", array_combine($brand_names, $brand_names), __("Any"), $search->getBrandName());
+						?>
+					</div>
+					<div class="col-lg-6">
+						<?php
+						$region_names = $customer->getRegions();
+						$render_dropdown("region-name", __("Region"), "region_name", array_combine($region_names, $region_names), __("Any"), $search->getRegionName());
+						?>
+					</div>
+					<div class="col-lg-6">
+						<?php
+						$area_manager_names = $customer->getAreaManagerNames();
+						$render_dropdown("area-manager-name", __("Area Manager"), "area_manager_name", array_combine($area_manager_names, $area_manager_names), __("Any"), $search->getAreaManagerName());
+						?>
+					</div>
+					<div class="col-lg-6">
+						<?php
+						$operations_manager_names = $customer->getOperationsManagerNames();
+						$render_dropdown("operations-manager-name", __("Operations Manager"), "operations_manager_name", array_combine($operations_manager_names, $operations_manager_names), __("Any"), $search->getOperationsManagerName());
+						?>
+					</div>
+					<div class="col-lg-6">
+						<?php
+						$gaming_manager_name = $customer->getGamingManagerNames();
+						$render_dropdown("gaming-manager-name", __("Gaming Manager"), "gaming_manager_name", array_combine($gaming_manager_name, $gaming_manager_name), __("Any"), $search->getGamingManagerName());
+						?>
+					</div>
+					<div class="col-lg-6">
+						<?php
+						$senior_gaming_manager_name = $customer->getSeniorGamingManagerNames();
+						$render_dropdown("senior-gaming-manager-name", __("Senior Gaming Manager"), "senior_gaming_manager_name", array_combine($senior_gaming_manager_name, $senior_gaming_manager_name), __("Any"), $search->getSeniorGamingManagerName());
+						?>
+					</div>
 					<div class="col-lg-6">
 						<div class="row form-group">
 							<label class="col-sm-4 col-form-label" for="min-date">Min. Test Date</label>