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

Add custom date range options and stat cards

Alan Lam 8 лет назад
Родитель
Сommit
c29eaa5303
3 измененных файлов с 195 добавлено и 32 удалено
  1. 58 3
      controllers/performance.php
  2. 11 0
      public/js/app-performance.js
  3. 126 29
      views/performance.php

+ 58 - 3
controllers/performance.php

@@ -15,8 +15,13 @@ $page_title = "$customer->name Performance";
 Core::addBreadcrumb("/account/performance?customer_id=$customer->id", $page_title);
 
 $date_range = http::value("date_range");
+if(!$date_range) $date_range = "ytd";
+
 $date_resolution = http::value("date_resolution");
 
+$from_quarter = http::value("from_quarter");
+$to_quarter = http::value("to_quarter");
+
 $all_projects = Project::query([
 	"customer_id" => $customer->id
 ]);
@@ -103,6 +108,9 @@ if($submit) {
 		$min_year = date("Y");
 		$max_year = date("Y");
 
+		$min_unix = strtotime("$min_year-01-01 UTC");
+		$max_unix = strtotime("$max_year-12-31 23:59:59 UTC");
+
 		switch($date_range) {
 			case "ytd":
 				// Nothing to do
@@ -124,11 +132,56 @@ if($submit) {
 				break;
 
 			case "custom":
-				// TODO
-				$date_range_label = "Custom";
+				$check = strcmp($from_quarter, $to_quarter);
+				if($check > 0) {
+					$temp = $to_quarter;
+					$from_quarter = $to_quarter;
+					$to_quarter = $temp;
+				}
+
+				list($min_year, $min_quarter) = explode("-", $from_quarter);
+				list($max_year, $max_quarter) = explode("-", $to_quarter);
+
+				switch($min_quarter) {
+					case 1: $unix_string = "$min_year-01-01 UTC"; break;
+					case 2: $unix_string = "$min_year-04-01 UTC"; break;
+					case 3: $unix_string = "$min_year-07-01 UTC"; break;
+					case 4: $unix_string = "$min_year-10-01 UTC"; break;
+				}
+
+				$min_unix = strtotime($unix_string);
+
+				switch($max_quarter) {
+					case 1: $unix_string = "$max_year-03-31 23:59:59 UTC"; break;
+					case 2: $unix_string = "$max_year-06-30 23:59:59 UTC"; break;
+					case 3: $unix_string = "$max_year-09-30 23:59:59 UTC"; break;
+					case 4: $unix_string = "$max_year-12-31 23:59:59 UTC"; break;
+				}
+
+				$max_unix = strtotime($unix_string);
+
+				$date_range_label = "$min_year Q$min_quarter - $max_year Q$max_quarter";
+
 				break;
 		}
 
+		// Filter tests based on date range
+		$tests = array_filter($tests, function($test) use ($min_unix, $max_unix) {
+
+			$dt = new DateTime($test->dts_start . " UTC");
+			$unix = $dt->format("U");
+
+			if($unix < $min_unix) {
+				return false;
+			}
+			if($unix > $max_unix) {
+				return false;
+			}
+
+			return true;
+		});
+
+
 		$empty_data = (object) [
 			"label" => "",
 			"testCount" => 0,
@@ -164,6 +217,7 @@ if($submit) {
 			"femaleTesterCount" => 0,
 			"maleChallengerCount" => 0,
 			"femaleChallengerCount" => 0,
+			"testCount" => 0,
 			"passCount" => 0,
 			"failCount" => 0,
 
@@ -275,6 +329,7 @@ if($submit) {
 					break;
 			}
 
+			$total_data->testCount++;
 			$data[$key]->testCount++;
 			if($region) $region_data[$region][$key]->testCount++;
 			if($area_manager) $area_manager_data[$area_manager][$key]->testCount++;
@@ -592,7 +647,7 @@ if($submit) {
 
 
 View::includeOnce("header", compact("page_title"));
-View::include("performance", compact("customer", "date_range", "date_resolution", "all_projects", "project_ids", "charts", "data", "total_data", "locations_missing_region", "locations_missing_area_manager", "region_data"));
+View::include("performance", compact("customer", "date_range", "from_quarter", "to_quarter", "date_resolution", "all_projects", "project_ids", "charts", "data", "total_data", "locations_missing_region", "locations_missing_area_manager", "region_data"));
 View::includeOnce("footer");
 
 ?>

+ 11 - 0
public/js/app-performance.js

@@ -13,4 +13,15 @@ $(function() {
 		var chart = new Chart(this, object);
 	});
 
+	$("input[data-date-range-radio-input]").change(function() {
+		let checked = $(this).is(":checked");
+		let value = $(this).val();
+		if(value == "custom") {
+			$("#date-range-custom-fields").slideDown("fast");
+		}
+		else {
+			$("#date-range-custom-fields").slideUp("fast");
+		}
+	});
+
 });

+ 126 - 29
views/performance.php

@@ -8,9 +8,13 @@ $date_resolutions = [
 $date_ranges = [
 	"ytd" => "Year to Date",
 	//"unbound" => "Unbound",
-	//"custom" => "Custom",
+	"custom" => "Custom",
 ];
 
+$years = range(2018, date("Y"));
+
+$date_range_custom_style = ($date_range == "custom") ? "" : "display: none";
+
 ?>
 <div class="container">
 	<div class="row">
@@ -26,9 +30,9 @@ $date_ranges = [
 		<input type="hidden" name="customer_id" value="<?=htmlspecialchars($customer->id)?>" />
 
 		<div class="row">
-			<div class="col-md-6">
+			<div class="col-md">
 				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label">
+					<label class="col-sm-4 col-form-label text-sm-right">
 						Date Range
 					</label>
 					<div class="col-sm">
@@ -37,16 +41,79 @@ $date_ranges = [
 						$checked = ($value == $date_range) ? "checked" : "";
 						?>
 						<div class="form-check form-check-inline">
-							<input class="form-check-input" type="radio" name="date_range" id="date-range-<?=htmlspecialchars($value)?>" value="<?=htmlspecialchars($value)?>" <?=$checked?> />
+							<input class="form-check-input" type="radio" name="date_range" id="date-range-<?=htmlspecialchars($value)?>" value="<?=htmlspecialchars($value)?>" <?=$checked?> data-date-range-radio-input />
 							<label class="form-check-label" for="date-range-<?=htmlspecialchars($value)?>"><?=htmlspecialchars($display)?></label>
 						</div>
 						<?php
 					}
 					?>
+						<div class="row mt-1" id="date-range-custom-fields" style="<?=$date_range_custom_style?>">
+							<div class="col-lg">
+								<div class="input-group">
+									<div class="input-group-prepend">
+										<span class="input-group-text">
+											From
+										</span>
+									</div>
+									<select class="form-control" name="from_quarter">
+									<?php
+									foreach($years as $year) {
+										foreach(range(1, 4) as $quarter) {
+
+											$value = "$year-$quarter";
+											$selected = ($value == $from_quarter) ? "selected" : "";
+
+											switch($quarter) {
+												case 1: $quarter_text = "Q1 (Jan-Mar)"; break;
+												case 2: $quarter_text = "Q2 (Apr-Jun)"; break;
+												case 3: $quarter_text = "Q3 (Jul-Sep)"; break;
+												case 4: $quarter_text = "Q4 (Oct-Dec)"; break;
+											}
+											?>
+											<option value="<?=$value?>" <?=$selected?>><?=$year?> <?=$quarter_text?></option>
+											<?php
+										}
+									}
+									?>
+									</select>
+								</div>
+							</div>
+							<div class="col-lg">
+								<div class="input-group">
+									<div class="input-group-prepend">
+										<span class="input-group-text">
+											To
+										</span>
+									</div>
+									<select class="form-control" name="to_quarter">
+									<?php
+									foreach($years as $year) {
+										foreach(range(1, 4) as $quarter) {
+
+											$value = "$year-$quarter";
+											$selected = ($value == $to_quarter) ? "selected" : "";
+
+											switch($quarter) {
+												case 1: $quarter_text = "Q1 (Jan-Mar)"; break;
+												case 2: $quarter_text = "Q2 (Apr-Jun)"; break;
+												case 3: $quarter_text = "Q3 (Jul-Sep)"; break;
+												case 4: $quarter_text = "Q4 (Oct-Dec)"; break;
+											}
+											?>
+											<option value="<?=$value?>" <?=$selected?>><?=$year?> <?=$quarter_text?></option>
+											<?php
+										}
+									}
+									?>
+									</select>
+								</div>
+							</div>
+						</div>
+
 					</div>
 				</div>
 				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label" for="date-resolution">
+					<label class="col-sm-4 col-form-label text-sm-right" for="date-resolution">
 						Date Resolution
 					</label>
 					<div class="col-sm">
@@ -63,7 +130,7 @@ $date_ranges = [
 					</div>
 				</div>
 				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label" for="project-ids">
+					<label class="col-sm-4 col-form-label text-sm-right" for="project-ids">
 						Projects
 					</label>
 					<div class="col-sm">
@@ -149,37 +216,67 @@ $date_ranges = [
 	}
 	?>
 
-	<div class="row">
-		<div class="col-md-4" style="position: relative;">
-			<h3>Chart List</h3>
-			<div class="list-group" style="position: sticky; top: 7rem;">
+	<?php
+	if($charts) {
+		?>
+
+		<h2>Charts / Statistics</h2>
+
+		<div class="row">
+			<div class="col-md-6">
+				<div class="card card-body mb-3">
+					Test Count
+					<div class="stat">
+						<?=$total_data->testCount?>
+					</div>
+				</div>
+			</div>
+			<div class="col-md-6">
+				<div class="card card-body mb-3">
+					Pass/Fail Count
+					<div class="stat">
+						<?=$total_data->passCount?> /
+						<?=$total_data->failCount?>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div class="row">
+			<div class="col-md-4" style="position: relative;">
+				<h3>Chart List</h3>
+				<div class="list-group" style="position: sticky; top: 7rem;">
+				<?php
+				foreach($charts as $index => $chart) {
+					?>
+					<a class="list-group-item list-group-item-action" href="#chart-<?=$index?>">
+						<?=htmlspecialchars($chart->getTitle())?>
+					</a>
+					<?php
+				}
+				?>
+				</div>
+			</div>
+			<div class="col-md">
 			<?php
 			foreach($charts as $index => $chart) {
+				if($index > 0) {
+					?>
+					<br />
+					<?php
+				}
 				?>
-				<a class="list-group-item list-group-item-action" href="#chart-<?=$index?>">
-					<?=htmlspecialchars($chart->getTitle())?>
-				</a>
+				<a id="chart-<?=$index?>" style="display: block; position: relative; top: -7rem; visibility: hidden;"></a>
+				<canvas id="<?=$chart->getID()?>" data-chart="<?=htmlspecialchars($chart->getJSON())?>" width="400" height="300">
+				</canvas>
 				<?php
 			}
 			?>
 			</div>
 		</div>
-		<div class="col-md">
+
 		<?php
-		foreach($charts as $index => $chart) {
-			if($index > 0) {
-				?>
-				<br />
-				<?php
-			}
-			?>
-			<a id="chart-<?=$index?>" style="display: block; position: relative; top: -7rem; visibility: hidden;"></a>
-			<canvas id="<?=$chart->getID()?>" data-chart="<?=htmlspecialchars($chart->getJSON())?>" width="400" height="300">
-			</canvas>
-			<?php
-		}
-		?>
-		</div>
-	</div>
+	}
+	?>
 
 </div>