Quellcode durchsuchen

Add operations manager, gaming manager and senior gaming manager fields to location table

Alan Lam vor 2 Jahren
Ursprung
Commit
2bf4d26811

+ 10 - 0
controllers/location_add.php

@@ -40,9 +40,19 @@ if($submit) {
 		$location->internal_id = http::value("internal_id", "trim");
 		$location->brand = http::value("brand", "trim");
 		$location->region = http::value("region", "trim");
+
 		$location->area_manager = http::value("area_manager", "trim");
 		$location->area_manager_email = http::value("area_manager_email", "email");
 
+		$location->operations_manager_name = http::value("operations_manager_name", "trim");
+		$location->operations_manager_email = http::value("operations_manager_email", "email");
+
+		$location->gaming_manager_name = http::value("gaming_manager_name", "trim");
+		$location->gaming_manager_email = http::value("gaming_manager_email", "email");
+
+		$location->senior_gaming_manager_name = http::value("senior_gaming_manager_name", "trim");
+		$location->senior_gaming_manager_email = http::value("senior_gaming_manager_email", "email");
+
 		$location->machine_count = http::value("machine_count", "int");
 		$location->annual_test_count = Util::clamp(http::value("annual_test_count", "int") ?: 1, 1, 200);
 

+ 10 - 0
controllers/location_edit.php

@@ -43,9 +43,19 @@ if($submit) {
 		$location->internal_id = http::value("internal_id", "trim");
 		$location->region = http::value("region", "trim");
 		$location->brand = http::value("brand", "trim");
+
 		$location->area_manager = http::value("area_manager", "trim");
 		$location->area_manager_email = http::value("area_manager_email", "email");
 
+		$location->operations_manager_name = http::value("operations_manager_name", "trim");
+		$location->operations_manager_email = http::value("operations_manager_email", "email");
+
+		$location->gaming_manager_name = http::value("gaming_manager_name", "trim");
+		$location->gaming_manager_email = http::value("gaming_manager_email", "email");
+
+		$location->senior_gaming_manager_name = http::value("senior_gaming_manager_name", "trim");
+		$location->senior_gaming_manager_email = http::value("senior_gaming_manager_email", "email");
+
 		$location->machine_count = http::value("machine_count", "int");
 		$location->annual_test_count = Util::clamp(http::value("annual_test_count", "int") ?: 1, 1, 200);
 

+ 15 - 0
controllers/test_verify_form.php

@@ -185,6 +185,9 @@ if($submit) {
 				$email_customer = http::value("email_customer");
 				$email_location = http::value("email_location");
 				$email_location_area_manager = http::value("email_location_area_manager");
+				$email_location_operations_manager = http::value("email_location_operations_manager");
+				$email_location_gaming_manager = http::value("email_location_gaming_manager");
+				$email_location_senior_gaming_manager = http::value("email_location_senior_gaming_manager");
 
 				$include_previous_test = (bool) http::value("include_previous_test");
 
@@ -202,6 +205,18 @@ if($submit) {
 					$email_addresses[] = $location->area_manager_email;
 				}
 
+				if($email_location_operations_manager && $customer->email_locations_after_test && $location->operations_manager_email) {
+					$email_addresses[] = $location->operations_manager_email;
+				}
+
+				if($email_location_gaming_manager && $customer->email_locations_after_test && $location->gaming_manager_email) {
+					$email_addresses[] = $location->gaming_manager_email;
+				}
+
+				if($email_location_senior_gaming_manager && $customer->email_locations_after_test && $location->senior_gaming_manager_email) {
+					$email_addresses[] = $location->senior_gaming_manager_email;
+				}
+
 				if(EMAIL_TEST_RESULT) {
 					$email_addresses[] = EMAIL_TEST_RESULT;
 				}

+ 19 - 0
db/migrations/20231206130210_add_greene_king_manager_fields_to_location_table.php

@@ -0,0 +1,19 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class AddGreeneKingManagerFieldsToLocationTable extends AbstractMigration {
+	public function change() {
+		if($this->isMigratingUp()) {
+			$this->execute("ALTER TABLE `location` ROW_FORMAT=DYNAMIC;");
+		}
+
+		$this->table("location")
+			->addColumn("operations_manager_email", "string", ["limit" => 100, "after" => "operations_manager_name"])
+			->addColumn("gaming_manager_name", "string", ["limit" => 50, "after" => "operations_manager_email"])
+			->addColumn("gaming_manager_email", "string", ["limit" => 100, "after" => "gaming_manager_name"])
+			->addColumn("senior_gaming_manager_name", "string", ["limit" => 50, "after" => "gaming_manager_email"])
+			->addColumn("senior_gaming_manager_email", "string", ["limit" => 100, "after" => "senior_gaming_manager_name"])
+			->update();
+	}
+}

+ 20 - 1
engine/location.php

@@ -26,6 +26,11 @@
  * @property string $area_manager_name
  * @property string $area_manager_email
  * @property string $operations_manager_name
+ * @property string $operations_manager_email
+ * @property string $gaming_manager_name
+ * @property string $gaming_manager_email
+ * @property string $senior_gaming_manager_name
+ * @property string $senior_gaming_manager_email
  * @property int $machine_count
  * @property int $annual_test_count
  * @property bool $do_not_test
@@ -40,7 +45,21 @@ class Location extends Model {
 
 	protected static $table = "location";
 	protected static $id_field = "id";
-	protected static $fillable_fields = ["customer_id", "name", "legal_entity_name", "address_1", "address_2", "city", "county", "postal_code", "state", "country", "email", "phone", "opening_hours", "notes", "shop_left", "shop_right", "brand", "region", "region_name", "internal_id", "area_manager", "area_manager_name", "area_manager_email", "operations_manager_name", "machine_count", "annual_test_count", "do_not_test", "closed", "archived", "latitude", "longitude", "dts_verified"];
+	protected static $fillable_fields = [
+		"customer_id", "name", "legal_entity_name",
+		"address_1", "address_2", "city", "county", "postal_code", "state", "country", "email", "phone",
+		"opening_hours", "notes",
+		"shop_left", "shop_right",
+		"brand", "region", "region_name", "internal_id",
+		"area_manager", "area_manager_name", "area_manager_email",
+		"operations_manager_name", "operations_manager_email",
+		"gaming_manager_name", "gaming_manager_email",
+		"senior_gaming_manager_name", "senior_gaming_manager_email",
+		"machine_count", "annual_test_count",
+		"do_not_test", "closed", "archived",
+		"latitude", "longitude",
+		"dts_verified"
+	];
 
 	// Object methods
 

+ 23 - 0
tasks/import_venues.php

@@ -127,6 +127,13 @@ for($i = 0; $data = fgetcsv($handle); $i++) {
 				case "Area Manager Email": $area_manager_email_column = $index; break;
 
 				case "Operations Manager Name": $operations_manager_name_column = $index; break;
+				case "Operations Manager Email": $operations_manager_email_column = $index; break;
+
+				case "Gaming Manager Name": $gaming_manager_name_column = $index; break;
+				case "Gaming Manager Email": $gaming_manager_email_column = $index; break;
+
+				case "Senior Gaming Manager Name": $senior_gaming_manager_name_column = $index; break;
+				case "Senior Gaming Manager Email": $senior_gaming_manager_email_column = $index; break;
 
 				case "Archived": $archived_column = $index; break;
 				case "Closed": $closed_column = $index; break;
@@ -173,7 +180,15 @@ for($i = 0; $data = fgetcsv($handle); $i++) {
 	$area_manager_name = isset($area_manager_name_column) ? $data[$area_manager_name_column] : null;
 	$area_manager_email = isset($area_manager_email_column) ? $data[$area_manager_email_column] : null;
 	$region_name = isset($region_name_column) ? $data[$region_name_column] : null;
+
 	$operations_manager_name = isset($operations_manager_name_column) ? $data[$operations_manager_name_column] : null;
+	$operations_manager_email = isset($operations_manager_email_column) ? $data[$operations_manager_email_column] : null;
+
+	$gaming_manager_name = isset($gaming_manager_name_column) ? $data[$gaming_manager_name_column] : null;
+	$gaming_manager_email = isset($gaming_manager_email_column) ? $data[$gaming_manager_email_column] : null;
+
+	$senior_gaming_manager_name = isset($senior_gaming_manager_name_column) ? $data[$senior_gaming_manager_name_column] : null;
+	$senior_gaming_manager_email = isset($senior_gaming_manager_email_column) ? $data[$senior_gaming_manager_email_column] : null;
 
 	$machine_count = isset($machine_count_column) ? $data[$machine_count_column] : null;
 
@@ -230,7 +245,15 @@ for($i = 0; $data = fgetcsv($handle); $i++) {
 	if(!empty($area_manager_name)) $location->area_manager_name = $area_manager_name;
 	if(!empty($area_manager_email)) $location->area_manager_email = $area_manager_email;
 	if(!empty($region_name)) $location->region_name = $region_name;
+
 	if(!empty($operations_manager_name)) $location->operations_manager_name = $operations_manager_name;
+	if(!empty($operations_manager_email)) $location->operations_manager_email = $operations_manager_email;
+
+	if(!empty($gaming_manager_name)) $location->gaming_manager_name = $gaming_manager_name;
+	if(!empty($gaming_manager_email)) $location->gaming_manager_email = $gaming_manager_email;
+
+	if(!empty($senior_gaming_manager_name)) $location->senior_gaming_manager_name = $senior_gaming_manager_name;
+	if(!empty($senior_gaming_manager_email)) $location->senior_gaming_manager_email = $senior_gaming_manager_email;
 
 	if(!empty($city)) $location->city = $city;
 	if(!empty($legal_entity_name)) $location->legal_entity_name = $legal_entity_name;

+ 220 - 169
views/location_form.php

@@ -50,219 +50,270 @@ if($is_edit) {
 			<div class="tab-pane fade show active" id="details" role="tabpanel" aria-labelledby="details-tab">
 				<div class="row">
 					<div class="col-lg mb-3 mb-lg-0">
+						<section class="mb-4">
+							<h3>Main Details</h3>
 
-						<h3>Main Details</h3>
-
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="name">Name</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="name" id="name" placeholder="Enter name" value="<?=htmlspecialchars($location->name)?>" maxlength="200" required />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="name">Name</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="name" id="name" placeholder="Enter name" value="<?=htmlspecialchars($location->name)?>" maxlength="200" required />
+								</div>
 							</div>
-						</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="legal-entity-name">Legal Entity Name</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="legal_entity_name" id="legal-entity-name" placeholder="Enter legal entity name" value="<?=htmlspecialchars($location->legal_entity_name)?>" />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="legal-entity-name">Legal Entity Name</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="legal_entity_name" id="legal-entity-name" placeholder="Enter legal entity name" value="<?=htmlspecialchars($location->legal_entity_name)?>" />
+								</div>
 							</div>
-						</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="address-1">Address Line 1</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="address_1" id="address-1" placeholder="Enter address line 1" value="<?=htmlspecialchars($location->address_1)?>" required />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="address-1">Address Line 1</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="address_1" id="address-1" placeholder="Enter address line 1" value="<?=htmlspecialchars($location->address_1)?>" required />
+								</div>
 							</div>
-						</div>
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="address-2">Address Line 2</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="address_2" id="address-2" placeholder="Enter address line 2" value="<?=htmlspecialchars($location->address_2)?>" />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="address-2">Address Line 2</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="address_2" id="address-2" placeholder="Enter address line 2" value="<?=htmlspecialchars($location->address_2)?>" />
+								</div>
 							</div>
-						</div>
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="city">City</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="city" id="city" placeholder="Enter city" value="<?=htmlspecialchars($location->city)?>" required />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="city">City</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="city" id="city" placeholder="Enter city" value="<?=htmlspecialchars($location->city)?>" required />
+								</div>
 							</div>
-						</div>
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="county">County</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="county" id="county" placeholder="Enter county" value="<?=htmlspecialchars($location->county)?>" />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="county">County</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="county" id="county" placeholder="Enter county" value="<?=htmlspecialchars($location->county)?>" />
+								</div>
 							</div>
-						</div>
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="postal-code">Postal Code</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="postal_code" id="postal-code" placeholder="Enter postal code" value="<?=htmlspecialchars($location->postal_code)?>" required />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="postal-code">Postal Code</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="postal_code" id="postal-code" placeholder="Enter postal code" value="<?=htmlspecialchars($location->postal_code)?>" required />
+								</div>
 							</div>
-						</div>
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="country">Country</label>
-							<div class="col-sm">
-								<select class="form-control" name="country" id="country" required>
-								<?php
-								Form::renderCountryOptions($location->country);
-								?>
-								</select>
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="country">Country</label>
+								<div class="col-sm">
+									<select class="form-control form-control-sm" name="country" id="country" required>
+										<?php
+										Form::renderCountryOptions($location->country);
+										?>
+									</select>
+								</div>
 							</div>
-						</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="email">Email Address</label>
-							<div class="col-sm">
-								<input class="form-control" type="email" name="email" id="email" placeholder="Enter email address" value="<?=htmlspecialchars($location->email)?>" />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="email">Email Address</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="email" name="email" id="email" placeholder="Enter email address" value="<?=htmlspecialchars($location->email)?>" />
+								</div>
 							</div>
-						</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="phone">Contact Number</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="phone" id="phone" placeholder="Enter contact number" value="<?=htmlspecialchars($location->phone)?>" />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="phone">Contact Number</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="phone" id="phone" placeholder="Enter contact number" value="<?=htmlspecialchars($location->phone)?>" />
+								</div>
 							</div>
-						</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="opening-hours">Opening Hours</label>
-							<div class="col-sm">
-								<textarea class="form-control" name="opening_hours" id="opening-hours" placeholder="Enter opening hours" rows="4" maxlength="100"><?=htmlspecialchars($location->opening_hours)?></textarea>
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="opening-hours">Opening Hours</label>
+								<div class="col-sm">
+									<textarea class="form-control form-control-sm" name="opening_hours" id="opening-hours" placeholder="Enter opening hours" rows="4" maxlength="100"><?=htmlspecialchars($location->opening_hours)?></textarea>
+								</div>
 							</div>
-						</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="notes">Notes</label>
-							<div class="col-sm">
-								<textarea class="form-control" name="notes" id="notes" placeholder="Enter notes" rows="4" maxlength="65535"><?=htmlspecialchars($location->notes)?></textarea>
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="notes">Notes</label>
+								<div class="col-sm">
+									<textarea class="form-control form-control-sm" name="notes" id="notes" placeholder="Enter notes" rows="4" maxlength="65535"><?=htmlspecialchars($location->notes)?></textarea>
+								</div>
 							</div>
-						</div>
 
-                        <div class="row mb-1">
-                            <div class="col-sm offset-sm-4">
-                                <div class="custom-control custom-switch">
-                                    <input class="custom-control-input" type="checkbox" name="do_not_test" id="do-not-test" value="1" <?=Form::checked($location->do_not_test)?> />
-                                    <label class="custom-control-label" for="do-not-test">Do Not Test</label>
-                                </div>
-                            </div>
-                        </div>
-
-						<div class="row mb-1">
-							<div class="col-sm offset-sm-4">
-								<div class="custom-control custom-switch">
-									<input class="custom-control-input" type="checkbox" name="closed" id="closed" value="1" <?=Form::checked($location->closed)?> />
-									<label class="custom-control-label" for="closed">Closed</label>
+							<div class="row mb-1">
+								<div class="col-sm offset-sm-4">
+									<div class="custom-control custom-switch">
+										<input class="custom-control-input" type="checkbox" name="do_not_test" id="do-not-test" value="1" <?=Form::checked($location->do_not_test)?> />
+										<label class="custom-control-label" for="do-not-test">Do Not Test</label>
+									</div>
 								</div>
-								<small class="text-muted form-text">If a location is closed, it will be unable to be selected for any new tests.</small>
 							</div>
-						</div>
 
-						<div class="row mb-1">
-							<div class="col-sm offset-sm-4">
-								<div class="custom-control custom-switch">
-									<input class="custom-control-input" type="checkbox" name="archived" id="archived" value="1" <?=Form::checked($location->archived)?> />
-									<label class="custom-control-label" for="archived">Archived</label>
+							<div class="row mb-1">
+								<div class="col-sm offset-sm-4">
+									<div class="custom-control custom-switch">
+										<input class="custom-control-input" type="checkbox" name="closed" id="closed" value="1" <?=Form::checked($location->closed)?> />
+										<label class="custom-control-label" for="closed">Closed</label>
+									</div>
+									<small class="text-muted form-text">If a location is closed, it will be unable to be selected for any new tests.</small>
 								</div>
-								<small class="text-muted form-text">If a location is archived, it will be unable to be selected for any new tests and will not appear in the Map Overview.</small>
 							</div>
-						</div>
+
+							<div class="row mb-1">
+								<div class="col-sm offset-sm-4">
+									<div class="custom-control custom-switch">
+										<input class="custom-control-input" type="checkbox" name="archived" id="archived" value="1" <?=Form::checked($location->archived)?> />
+										<label class="custom-control-label" for="archived">Archived</label>
+									</div>
+									<small class="text-muted form-text">If a location is archived, it will be unable to be selected for any new tests and will not appear in the Map Overview.</small>
+								</div>
+							</div>
+						</section>
 					</div>
 					<div class="col-lg">
 
-						<h3>Map</h3>
-						<?php
-						if(empty($location->id)) {
-							?>
-							<div class="alert alert-info">
-								<i class="fal fa-fw fa-info-circle"></i> Map will become available when location is added.
-							</div>
+						<section class="mb-4">
+							<h3>Map</h3>
 							<?php
-						}
-						else {
+							if(empty($location->id)) {
+								?>
+								<div class="alert alert-info">
+									<i class="fal fa-fw fa-info-circle"></i> Map will become available when location is added.
+								</div>
+								<?php
+							}
+							else {
+								?>
+								<div class="mb-3" id="map" style="height: 330px;" data-maps data-lat="<?=$location->latitude?>" data-lng="<?=$location->longitude?>" data-zoom="15" data-marker="true" data-marker-draggable="true" data-marker-dragend-target="#map-data"></div>
+
+								<div id="map-data">
+									<input type="hidden" name="latitude" data-latitude value="<?=$location->latitude?>" />
+									<input type="hidden" name="longitude" data-longitude value="<?=$location->longitude?>" />
+								</div>
+								<?php
+							}
 							?>
-							<div class="mb-3" id="map" style="height: 330px;" data-maps data-lat="<?=$location->latitude?>" data-lng="<?=$location->longitude?>" data-zoom="15" data-marker="true" data-marker-draggable="true" data-marker-dragend-target="#map-data"></div>
+						</section>
+
+						<section class="mb-4">
+							<h3>Extra Details</h3>
 
-							<div id="map-data">
-								<input type="hidden" name="latitude" data-latitude value="<?=$location->latitude?>" />
-								<input type="hidden" name="longitude" data-longitude value="<?=$location->longitude?>" />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="internal-id">Internal ID</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="internal_id" id="internal-id" placeholder="Enter internal ID" value="<?=htmlspecialchars($location->internal_id)?>" />
+								</div>
 							</div>
-							<?php
-						}
-						?>
 
-						<h3>Extra Details</h3>
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="brand">Brand</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="brand" id="brand" placeholder="Enter brand" value="<?=htmlspecialchars($location->brand)?>" />
+								</div>
+							</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="internal-id">Internal ID</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="internal_id" id="internal-id" placeholder="Enter internal ID" value="<?=htmlspecialchars($location->internal_id)?>" />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="region">Region <span class="badge badge-secondary"></span></label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="text" name="region" id="region" placeholder="Enter region" value="<?=htmlspecialchars($location->region)?>" />
+								</div>
 							</div>
-						</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="brand">Brand</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="brand" id="brand" placeholder="Enter brand" value="<?=htmlspecialchars($location->brand)?>" />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="machine-count">Machine Count</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="number" name="machine_count" id="machine-count" placeholder="Enter machine count" value="<?=htmlspecialchars($location->machine_count)?>" min="0" max="400" />
+								</div>
 							</div>
-						</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="region">Region <span class="badge badge-secondary"></span></label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="region" id="region" placeholder="Enter region" value="<?=htmlspecialchars($location->region)?>" />
+							<div class="row mb-1">
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="annual-test-count">Tests Per Year</label>
+								<div class="col-sm">
+									<input class="form-control form-control-sm" type="number" name="annual_test_count" id="annual-test-count" placeholder="Enter tests per year" value="<?=htmlspecialchars($location->annual_test_count)?>" min="1" max="200" />
+								</div>
 							</div>
-						</div>
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="area-manager">Area Manager</label>
-							<div class="col-sm">
-								<input class="form-control" type="text" name="area_manager" id="area-manager" placeholder="Enter area manager" value="<?=htmlspecialchars($location->area_manager)?>" />
+						</section>
+
+						<section class="mb-4">
+							<h3>Venue Types</h3>
+
+							<div class="row">
+								<?php
+								foreach($venue_type_columns as $types) {
+									?>
+									<div class="col-lg-6">
+										<?php
+										foreach($types as $type) {
+											$checked = in_array($type->id, $selected_venue_type_ids) ? "checked" : "";
+											?>
+											<div class="custom-control custom-checkbox">
+												<input class="custom-control-input" id="venue-type-id-<?=$type->id?>" name="venue_type_ids[]" type="checkbox" value="<?=$type->id?>" <?=$checked?> />
+												<label class="custom-control-label" for="venue-type-id-<?=$type->id?>"><?=htmlspecialchars($type->name)?></label>
+											</div>
+											<?php
+										}
+										?>
+									</div>
+									<?php
+								}
+								?>
 							</div>
+						</section>
+
+					</div>
+				</div>
+
+				<section class="mb-4">
+					<h3><?=htmlspecialchars(__("Managers"))?></h3>
+
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label col-form-label-sm" for="area-manager">Area Manager Name</label>
+						<div class="col-sm">
+							<input class="form-control form-control-sm" type="text" name="area_manager" id="area-manager" placeholder="Enter area manager" value="<?=htmlspecialchars($location->area_manager)?>" />
 						</div>
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="area-manager-email">Area Manager Email Address</label>
-							<div class="col-sm">
-								<input class="form-control" type="email" name="area_manager_email" id="area-manager-email" placeholder="Enter area manager email address" value="<?=htmlspecialchars($location->area_manager_email)?>" />
-							</div>
+					</div>
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label col-form-label-sm" for="area-manager-email">Area Manager Email Address</label>
+						<div class="col-sm">
+							<input class="form-control form-control-sm" type="email" name="area_manager_email" id="area-manager-email" placeholder="Enter area manager email address" value="<?=htmlspecialchars($location->area_manager_email)?>" />
 						</div>
+					</div>
 
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="machine-count">Machine Count</label>
-							<div class="col-sm">
-								<input class="form-control" type="number" name="machine_count" id="machine-count" placeholder="Enter machine count" value="<?=htmlspecialchars($location->machine_count)?>" min="0" max="400" />
-							</div>
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label col-form-label-sm" for="operations-manager-name">Operations Manager Name</label>
+						<div class="col-sm">
+							<input class="form-control form-control-sm" type="text" name="operations_manager_name" id="operations-manager-name" placeholder="Enter operations manager name" value="<?=htmlspecialchars($location->operations_manager_name)?>" />
 						</div>
-
-						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="annual-test-count">Tests Per Year</label>
-							<div class="col-sm">
-								<input class="form-control" type="number" name="annual_test_count" id="annual-test-count" placeholder="Enter tests per year" value="<?=htmlspecialchars($location->annual_test_count)?>" min="1" max="200" />
-							</div>
+					</div>
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label col-form-label-sm" for="operations-manager-email">Operations Manager Email Address</label>
+						<div class="col-sm">
+							<input class="form-control form-control-sm" type="email" name="operations_manager_email" id="operations-manager-email" placeholder="Enter operations manager email address" value="<?=htmlspecialchars($location->operations_manager_email)?>" />
 						</div>
+					</div>
 
-						<h3>Venue Types</h3>
-
-						<div class="row">
-						<?php
-						foreach($venue_type_columns as $types) {
-							?>
-							<div class="col-lg-6">
-							<?php
-							foreach($types as $type) {
-								$checked = in_array($type->id, $selected_venue_type_ids) ? "checked" : "";
-								?>
-								<div class="custom-control custom-checkbox">
-									<input class="custom-control-input" id="venue-type-id-<?=$type->id?>" name="venue_type_ids[]" type="checkbox" value="<?=$type->id?>" <?=$checked?> />
-									<label class="custom-control-label" for="venue-type-id-<?=$type->id?>"><?=htmlspecialchars($type->name)?></label>
-								</div>
-								<?php
-							}
-							?>
-							</div>
-							<?php
-						}
-						?>
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label col-form-label-sm" for="gaming-manager-name">Gaming Manager Name</label>
+						<div class="col-sm">
+							<input class="form-control form-control-sm" type="text" name="gaming_manager_name" id="gaming-manager-name" placeholder="Enter gaming manager name" value="<?=htmlspecialchars($location->gaming_manager_name)?>" />
+						</div>
+					</div>
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label col-form-label-sm" for="gaming-manager-email">Gaming Manager Email Address</label>
+						<div class="col-sm">
+							<input class="form-control form-control-sm" type="email" name="gaming_manager_email" id="gaming-manager-email" placeholder="Enter gaming manager email address" value="<?=htmlspecialchars($location->gaming_manager_email)?>" />
 						</div>
+					</div>
 
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label col-form-label-sm" for="senior-gaming-manager-name">Senior Gaming Manager Name</label>
+						<div class="col-sm">
+							<input class="form-control form-control-sm" type="text" name="senior_gaming_manager_name" id="senior-gaming-manager-name" placeholder="Enter senior gaming manager name" value="<?=htmlspecialchars($location->senior_gaming_manager_name)?>" />
+						</div>
 					</div>
-				</div>
+					<div class="row mb-1">
+						<label class="col-sm-4 col-form-label col-form-label-sm" for="senior-gaming-manager-email">Senior Gaming Manager Email Address</label>
+						<div class="col-sm">
+							<input class="form-control form-control-sm" type="email" name="senior_gaming_manager_email" id="senior-gaming-manager-email" placeholder="Enter senior gaming manager email address" value="<?=htmlspecialchars($location->senior_gaming_manager_email)?>" />
+						</div>
+					</div>
+				</section>
 			</div>
 
 			<?php
@@ -273,15 +324,15 @@ if($is_edit) {
 					<div class="row">
 						<div class="col-lg">
 							<div class="row mb-1">
-								<label class="col-sm-4 col-form-label" for="shop-left">Shop Name (Left)</label>
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="shop-left">Shop Name (Left)</label>
 								<div class="col-sm">
-									<input class="form-control" type="text" name="shop_left" id="shop-left" placeholder="Enter shop name (left)" value="<?=htmlspecialchars($location->shop_left)?>" />
+									<input class="form-control form-control-sm" type="text" name="shop_left" id="shop-left" placeholder="Enter shop name (left)" value="<?=htmlspecialchars($location->shop_left)?>" />
 								</div>
 							</div>
 							<div class="row mb-1">
-								<label class="col-sm-4 col-form-label" for="shop-right">Shop Name (Right)</label>
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="shop-right">Shop Name (Right)</label>
 								<div class="col-sm">
-									<input class="form-control" type="text" name="shop_right" id="shop-right" placeholder="Enter shop name (right)" value="<?=htmlspecialchars($location->shop_right)?>" />
+									<input class="form-control form-control-sm" type="text" name="shop_right" id="shop-right" placeholder="Enter shop name (right)" value="<?=htmlspecialchars($location->shop_right)?>" />
 								</div>
 							</div>
 
@@ -291,7 +342,7 @@ if($is_edit) {
 						if($location->id) {
 							?>
 							<div class="row mb-3">
-								<label class="col-sm-4 col-form-label" for="photo">JPEG File</label>
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="photo">JPEG File</label>
 								<div class="col-sm">
 									<input class="form-control-file" type="file" name="photo" id="photo" />
 								</div>

+ 46 - 57
views/test_verify_form.php

@@ -331,7 +331,7 @@ function render_card_list_group($details) {
 					</div>
 					<div class="card-body">
 						<div class="row mb-1 align-items-center">
-							<label class="col-sm-4 col-form-label">Verifier</label>
+							<label class="col-sm-4 col-form-label col-form-label-sm">Verifier</label>
 							<div class="col-sm">
 								<?=htmlspecialchars(Core::$user->getDisplayName())?>
 							</div>
@@ -341,9 +341,9 @@ function render_card_list_group($details) {
 						if($template->hasPassFail()) {
 							?>
 							<div class="row mb-1">
-								<label class="col-sm-4 col-form-label" for="pass-override">Pass Override</label>
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="pass-override">Pass Override</label>
 								<div class="col-sm">
-									<select class="form-control" name="pass_override" id="pass-override">
+									<select class="form-control form-control-sm" name="pass_override" id="pass-override">
 										<option value="">None</option>
 										<option value="1">Pass</option>
 										<option value="0">Fail</option>
@@ -354,23 +354,23 @@ function render_card_list_group($details) {
 						}
 						?>
 						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="start-override">Start Override</label>
+							<label class="col-sm-4 col-form-label col-form-label-sm" for="start-override">Start Override</label>
 
 							<div class="col-sm">
-								<input class="form-control" type="datetime-local" name="start_override" id="start-override" />
+								<input class="form-control form-control-sm" type="datetime-local" name="start_override" id="start-override" />
 							</div>
 
 						</div>
 						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="end-override">End Override</label>
+							<label class="col-sm-4 col-form-label col-form-label-sm" for="end-override">End Override</label>
 							<div class="col-sm">
-								<input class="form-control" type="datetime-local" name="end_override" id="end-override" />
+								<input class="form-control form-control-sm" type="datetime-local" name="end_override" id="end-override" />
 							</div>
 						</div>
 						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="customer-fee">Customer Fee Override</label>
+							<label class="col-sm-4 col-form-label col-form-label-sm" for="customer-fee">Customer Fee Override</label>
 							<div class="col-sm">
-								<div class="input-group">
+								<div class="input-group input-group-sm">
 									<div class="input-group-prepend">
 										<span class="input-group-text">£</span>
 									</div>
@@ -379,9 +379,9 @@ function render_card_list_group($details) {
 							</div>
 						</div>
 						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="tester-fee">Tester Fee Override</label>
+							<label class="col-sm-4 col-form-label col-form-label-sm" for="tester-fee">Tester Fee Override</label>
 							<div class="col-sm">
-								<div class="input-group">
+								<div class="input-group input-group-sm">
 									<div class="input-group-prepend">
 										<span class="input-group-text">£</span>
 									</div>
@@ -390,9 +390,9 @@ function render_card_list_group($details) {
 							</div>
 						</div>
 						<row class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="travel-cost">Travel Costs</label>
+							<label class="col-sm-4 col-form-label col-form-label-sm" for="travel-cost">Travel Costs</label>
 							<div class="col-sm">
-								<div class="input-group">
+								<div class="input-group input-group-sm">
 									<div class="input-group-prepend">
 										<span class="input-group-text">£</span>
 									</div>
@@ -402,14 +402,14 @@ function render_card_list_group($details) {
 						</row>
 						
 						<div class="row mb-1">
-							<label class="col-sm-4 col-form-label" for="verifier-notes">Verifier Notes</label>
+							<label class="col-sm-4 col-form-label col-form-label-sm" for="verifier-notes">Verifier Notes</label>
 							<div class="col-sm">
-								<textarea class="form-control" name="verifier_notes" id="verifier-notes" placeholder="Enter verifier notes" rows="4"><?=htmlspecialchars($test->verifier_notes)?></textarea>
+								<textarea class="form-control form-control-sm" name="verifier_notes" id="verifier-notes" placeholder="Enter verifier notes" rows="4"><?=htmlspecialchars($test->verifier_notes)?></textarea>
 							</div>
 						</div>
 
 						<div class="row mb-1 align-items-center">
-							<label class="col-sm-4 col-form-label" for="retest">Set As Retest</label>
+							<label class="col-sm-4 col-form-label col-form-label-sm" for="retest">Set As Retest</label>
 							<div class="col-sm">
 								<div class="custom-control custom-checkbox">
 									<input class="custom-control-input" type="checkbox" name="retest" id="retest" value="1" <?=Form::checked($test->retest)?> />
@@ -419,7 +419,7 @@ function render_card_list_group($details) {
 						</div>
 
                         <div class="row mb-1">
-                            <label class="col-sm-4 col-form-label" for="new-test-project-id">Create New Test</label>
+                            <label class="col-sm-4 col-form-label col-form-label-sm" for="new-test-project-id">Create New Test</label>
                             <div class="col-sm">
 								<div class="input-group">
 									<select class="form-control" name="new_test_project_id" id="new-test-project-id">
@@ -448,46 +448,37 @@ function render_card_list_group($details) {
 						if($test->getStatus() === Test::STATUS_PENDING_VERIFICATION) {
 							?>
 							<?php
-							if($customer->email) {
-								?>
-								<div class="row mb-1">
-									<div class="col-sm-4">
-										<label class="form-check-label" for="email-customer">Email Headquarters</label>
-									</div>
-									<div class="col-sm">
-										<div class="custom-control custom-checkbox">
-											<input class="custom-control-input" type="checkbox" name="email_customer" id="email-customer" value="1" <?=Form::checked($customer->email_after_test)?> />
-											<label class="custom-control-label" for="email-customer"><?=htmlspecialchars($customer->email)?></label>
-										</div>
-									</div>
-								</div>
-								<?php
-							}
-							if($location->email) {
-								?>
-								<div class="row mb-1">
-									<div class="col-sm-4">
-										<label class="form-check-label" for="email-location">Email Venue</label>
-									</div>
-									<div class="col-sm">
-										<div class="custom-control custom-checkbox">
-											<input class="custom-control-input" type="checkbox" name="email_location" id="email-location" value="1" <?=Form::checked($customer->email_locations_after_test)?> />
-											<label class="custom-control-label" for="email-location"><?=htmlspecialchars($location->email)?></label>
-										</div>
-									</div>
-								</div>
-								<?php
-							}
-							if($location->area_manager_email) {
+							$customer_checked = $customer->email_after_test;
+							$location_checked = $customer->email_locations_after_test;
+
+							$email_address_configs = [
+								["email" => $customer->email, "label" => "Email Headquarters", "name" => "email_customer", "checked" => $customer_checked],
+								["email" => $location->email, "label" => "Email Venue", "name" => "email_location", "checked" => $location_checked],
+								["email" => $location->area_manager_email, "label" => "Email AM", "name" => "email_location_area_manager", "checked" => $location_checked],
+								["email" => $location->operations_manager_email, "label" => "Email OM", "name" => "email_location_operations_manager", "checked" => $location_checked],
+								["email" => $location->gaming_manager_email, "label" => "Email GM", "name" => "email_location_gaming_manager", "checked" => $location_checked],
+								["email" => $location->senior_gaming_manager_email, "label" => "Email SGM", "name" => "email_location_senior_gaming_manager", "checked" => $location_checked],
+							];
+
+							foreach($email_address_configs as $email_address_config) {
+								$email_address = $email_address_config["email"];
+								if(!$email_address) {
+									continue;
+								}
+
+								$label = $email_address_config["label"];
+								$name = $email_address_config["name"];
+								$checked = $email_address_config["checked"];
+								$id = str_replace("_", "-", $name);
 								?>
 								<div class="row mb-1">
-									<div class="col-sm-4">
-										<label class="form-check-label" for="email-location-area-manager">Email Area Manager</label>
-									</div>
+									<label class="col-sm-4 col-form-label col-form-label-sm" for="<?=$id?>">
+										<?=htmlspecialchars($label)?>
+									</label>
 									<div class="col-sm">
 										<div class="custom-control custom-checkbox">
-											<input class="custom-control-input" type="checkbox" name="email_location_area_manager" id="email-location-area-manager" value="1" <?=Form::checked($customer->email_locations_after_test)?> />
-											<label class="custom-control-label" for="email-location-area-manager"><?=htmlspecialchars($location->area_manager_email)?></label>
+											<input class="custom-control-input" type="checkbox" name="<?=$name?>" id="<?=$id?>" value="1" <?=Form::checked($checked)?> />
+											<label class="custom-control-label" for="<?=$id?>"><?=htmlspecialchars($email_address)?></label>
 										</div>
 									</div>
 								</div>
@@ -495,9 +486,7 @@ function render_card_list_group($details) {
 							}
 							?>
 							<div class="row mb-1">
-								<div class="col-sm-4">
-									<label class="form-check-label" for="include-previous-test"><?=htmlspecialchars(__("Previous Test"))?></label>
-								</div>
+								<label class="col-sm-4 col-form-label col-form-label-sm" for="include-previous-test"><?=htmlspecialchars(__("Previous Test"))?></label>
 								<div class="col-sm">
 									<div class="custom-control custom-checkbox">
 										<input class="custom-control-input" type="checkbox" name="include_previous_test" id="include-previous-test" value="1" checked />
@@ -511,7 +500,7 @@ function render_card_list_group($details) {
 							<div class="row mb-1">
 								<label class="col-sm-4 col-form-label" for="tester-message">Message to Tester (if rejecting)</label>
 								<div class="col-sm">
-									<textarea class="form-control" name="tester_message" id="tester-message" placeholder="Enter message to tester" rows="4"><?=htmlspecialchars($tester_message)?></textarea>
+									<textarea class="form-control form-control-sm" name="tester_message" id="tester-message" placeholder="Enter message to tester" rows="4"><?=htmlspecialchars($tester_message)?></textarea>
 								</div>
 							</div>