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

Add alert for locations missing brand

Alan Lam 3 лет назад
Родитель
Сommit
d8af9e754b
2 измененных файлов с 35 добавлено и 43 удалено
  1. 2 1
      controllers/reports.php
  2. 33 42
      views/reports.php

+ 2 - 1
controllers/reports.php

@@ -233,6 +233,7 @@ if($submit) {
 		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;
 		}
 
 		// Check if date range is same year
@@ -450,5 +451,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", "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_brand", "region_data", "area_manager_data", "brand_data", "key_labels", "has_pass_fail"));
 View::includeOnce("footer");

+ 33 - 42
views/reports.php

@@ -18,6 +18,7 @@
  * @var array $project_table_data
  * @var Location[] $locations_missing_region
  * @var Location[] $locations_missing_area_manager
+ * @var Location[] $locations_missing_brand
  *
  * @var array $total_data
  * @var array $region_data
@@ -190,57 +191,47 @@ let projectData = <?=json_encode($project_table_data)?>;
 
 	<?php
 	if($user->canSeeMissingData()) {
-		if($locations_missing_region) {
+
+		/**
+		 * @param string $field
+		 * @param Location[] $locations
+		 * @return void
+		 */
+		$render_locations_missing_data = static function(string $field, array $locations): void {
 			?>
 			<div class="alert alert-warning limit-height-1 d-print-none">
-				There are some locations that are missing "region" information:
+				There are some locations that are missing "<?=htmlspecialchars($field)?>" information:
 				<ul class="mb-0">
-				<?php
-				foreach($locations_missing_region as $location) {
-					$url = (Core::$user->canAdmin()) ? "/account/locations/$location->id/edit" : "#";
-					?>
-					<li>
-						<a href="<?=htmlspecialchars($url)?>"><?=htmlspecialchars($location->name)?></a>
-						<?php
-						if($location->internal_id) {
-							?>
-							<small class="text-info">(Internal ID: <?=htmlspecialchars($location->internal_id)?>)</small>
-							<?php
-						}
-						?>
-					</li>
 					<?php
-				}
-				?>
+					foreach($locations as $location) {
+						$url = (Core::$user->canAdmin()) ? "/account/locations/$location->id/edit" : "#";
+						?>
+						<li>
+							<a href="<?=htmlspecialchars($url)?>"><?=htmlspecialchars($location->name)?></a>
+							<?php
+							if($location->internal_id) {
+								?>
+								<small class="text-info">(Internal ID: <?=htmlspecialchars($location->internal_id)?>)</small>
+								<?php
+							}
+							?>
+						</li>
+						<?php
+					}
+					?>
 				</ul>
 			</div>
 			<?php
+		};
+
+		if($locations_missing_region) {
+			$render_locations_missing_data("region", $locations_missing_region);
 		}
 		if($locations_missing_area_manager) {
-			?>
-			<div class="alert alert-warning limit-height-1 d-print-none">
-				There are some locations that are missing "area manager" information:
-				<ul class="mb-0">
-				<?php
-				foreach($locations_missing_area_manager as $location) {
-					$url = (Core::$user->canAdmin()) ? "/account/locations/$location->id/edit" : "#";
-					?>
-					<li>
-						<a href="<?=htmlspecialchars($url)?>"><?=htmlspecialchars($location->name)?></a>
-						<?php
-						if($location->internal_id) {
-							?>
-							<small class="text-info">(Internal ID: <?=htmlspecialchars($location->internal_id)?>)</small>
-							<?php
-						}
-						?>
-					</li>
-					<?php
-				}
-				?>
-				</ul>
-			</div>
-			<?php
+			$render_locations_missing_data("area manager", $locations_missing_area_manager);
+		}
+		if($locations_missing_brand) {
+			$render_locations_missing_data("brand", $locations_missing_brand);
 		}
 	}