فهرست منبع

Modifies date time override fields to be dropdowns.

Alan Lam 8 سال پیش
والد
کامیت
d263c29ab7
4فایلهای تغییر یافته به همراه168 افزوده شده و 46 حذف شده
  1. 2 2
      controllers/test.php
  2. 18 0
      engine/form.php
  3. 25 0
      engine/http.php
  4. 123 44
      views/test_verify_form.php

+ 2 - 2
controllers/test.php

@@ -230,12 +230,12 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
 				$test->pass = $pass_override;
 			}
 
-			$start_override = http::value("start_override");
+			$start_override = http::getDateTimeFromFields("start_override");
 			if($start_override) {
 				$unix_start = strtotime($start_override);
 			}
 
-			$end_override = http::value("end_override");
+			$end_override = http::getDateTimeFromFields("end_override");
 			if($end_override) {
 				$unix_end = strtotime($end_override);
 			}

+ 18 - 0
engine/form.php

@@ -67,6 +67,24 @@ class Form {
 		}
 	}
 
+	public static function renderHourOptions($selected_value = null) {
+		for($i = 0; $i <= 23; $i++) {
+			$selected = ($selected_value === $i) ? "selected" : "";
+			?>
+			<option value="<?=$i?>" <?=$selected?>><?=$i?></option>
+			<?php
+		}
+	}
+
+	public static function renderMinuteOptions($selected_value = null) {
+		for($i = 0; $i <= 59; $i++) {
+			$selected = ($selected_value === $i) ? "selected" : "";
+			?>
+			<option value="<?=$i?>" <?=$selected?>><?=$i?></option>
+			<?php
+		}
+	}
+
 	public static function renderField($options) {
 
 		switch($options->type) {

+ 25 - 0
engine/http.php

@@ -60,6 +60,31 @@ class HTTP {
 		return $date;
 	}
 
+	public static function getDateTimeFromFields($prefix = "") {
+		$date = http::getDateFromFields($prefix);
+
+		if(empty($prefix)) {
+			$hour_field = "hour";
+			$minute_field = "minute";
+			$second_field = "second";
+		}
+		else {
+			$hour_field = $prefix . "_hour";
+			$minute_field = $prefix . "_minute";
+			$second_field = $prefix . "_second";
+		}
+
+		$hour = http::value($hour_field, "int");
+		$minute = http::value($minute_field, "int");
+		$second = http::value($second_field, "int");
+
+		list($hour, $minute, $second) = array_map(function($part) {
+			return str_pad($part, 2, "0", STR_PAD_LEFT);
+		}, [$hour, $minute, $second]);
+
+		return "$date $hour:$minute:$second";
+	}
+
 	public static function value($key, $validation = "none", $request_type = "request") {
 
 		$request_type = strtolower($request_type);

+ 123 - 44
views/test_verify_form.php

@@ -81,7 +81,7 @@ function render_card_list_group($details) {
 		<input type="hidden" name="submit" value="<?=$_SESSION["csrf_token"]?>" />
 
 		<div class="row">
-			<div class="col-lg">
+			<div class="col-xl">
 				<div class="card mb-3">
 					<div class="card-header">
 						Submitted Data
@@ -128,27 +128,32 @@ function render_card_list_group($details) {
 					</div>
 				</div>
 			</div>
-			<div class="col-lg">
-				<div class="card mb-3">
-					<div class="card-header">
-						Info
-					</div>
-					<div class="card-body p-0">
-						<div id="map" data-maps data-lat="<?=$location->latitude?>" data-lng="<?=$location->longitude?>" data-zoom="17" data-marker="true" style="height: 320px;">
+			<div class="col-xl">
+				<div class="row">
+					<div class="col-md col-xl-12">
+						<div class="card mb-3">
+							<div class="card-header">
+								Info
+							</div>
+							<div class="card-body p-0">
+								<div id="map" data-maps data-lat="<?=$location->latitude?>" data-lng="<?=$location->longitude?>" data-zoom="17" data-marker="true" style="height: 320px;">
+								</div>
+							</div>
+							<?php
+							render_card_list_group($test_details);
+							?>
 						</div>
 					</div>
-					<?php
-					render_card_list_group($test_details);
-					?>
-				</div>
-
-				<div class="card mb-3">
-					<div class="card-header">
-						Tester
+					<div class="col-md col-xl-12">
+						<div class="card mb-3">
+							<div class="card-header">
+								Tester
+							</div>
+							<?php
+							render_card_list_group($tester_details);
+							?>
+						</div>
 					</div>
-					<?php
-					render_card_list_group($tester_details);
-					?>
 				</div>
 
 				<div class="card mb-3">
@@ -156,42 +161,116 @@ function render_card_list_group($details) {
 						Verification
 					</div>
 					<div class="card-body">
-						<div class="form-group">
-							<label>Verifier</label>
-							<div><?=htmlspecialchars(Core::$user->getDisplayName())?></div>
+						<div class="row mb-1">
+							<label class="col-sm-4 col-form-label">Verifier</label>
+							<div class="col-sm">
+								<?=htmlspecialchars(Core::$user->getDisplayName())?>
+							</div>
 						</div>
 						<hr />
-						<div class="form-group">
-							<label for="pass-override">Pass Override</label>
-							<select class="form-control" name="pass_override" id="pass-override">
-								<option value="">None</option>
-								<option value="1">Pass</option>
-								<option value="0">Fail</option>
-							</select>
+						<div class="row mb-1">
+							<label class="col-sm-4 col-form-label" for="pass-override">Pass Override</label>
+							<div class="col-sm">
+								<select class="form-control" name="pass_override" id="pass-override">
+									<option value="">None</option>
+									<option value="1">Pass</option>
+									<option value="0">Fail</option>
+								</select>
+							</div>
 						</div>
-						<div class="form-group">
-							<label for="start-override">Start Override</label>
-							<input class="form-control" type="datetime-local" name="start_override" id="start-override" placeholder="YYYY-MM-DD HH:MM:SS" />
+						<div class="row mb-1">
+							<label class="col-sm-4 col-form-label" for="start-override-day">Start Override</label>
+
+							<div class="col-sm">
+								<select class="form-control w-auto d-inline-block" name="start_override_day" id="start-override-day">
+									<option value="">Day</option>
+									<?php
+									Form::renderDayOptions();
+									?>
+								</select>
+								<select class="form-control w-auto d-inline-block" name="start_override_month" id="start-override-month">
+									<option value="">Month</option>
+									<?php
+									Form::renderMonthOptions();
+									?>
+								</select>
+								<select class="form-control w-auto d-inline-block" name="start_override_year" id="start-override-year">
+									<option value="">Year</option>
+									<?php
+									Form::renderYearOptionsDescending(2017, date("Y"));
+									?>
+								</select>
+								<select class="form-control w-auto d-inline-block" name="start_override_hour" id="start-override-hour">
+									<option value="">HH</option>
+									<?php
+									Form::renderHourOptions();
+									?>
+								</select>
+								<select class="form-control w-auto d-inline-block" name="start_override_minute" id="start-override-minute">
+									<option value="">MM</option>
+									<?php
+									Form::renderMinuteOptions();
+									?>
+								</select>
+							</div>
+
 						</div>
-						<div class="form-group">
-							<label for="end-override">End Override</label>
-							<input class="form-control" type="datetime-local" name="end_override" id="end-override" placeholder="YYYY-MM-DD HH:MM:SS" />
+						<div class="row mb-1">
+							<label class="col-sm-4 col-form-label" for="end-override-day">End Override</label>
+							<div class="col-sm">
+								<select class="form-control w-auto d-inline-block" name="end_override_day" id="end-override-day">
+									<option value="">Day</option>
+									<?php
+									Form::renderDayOptions();
+									?>
+								</select>
+								<select class="form-control w-auto d-inline-block" name="end_override_month" id="end-override-month">
+									<option value="">Month</option>
+									<?php
+									Form::renderMonthOptions();
+									?>
+								</select>
+								<select class="form-control w-auto d-inline-block" name="end_override_year" id="end-override-year">
+									<option value="">Year</option>
+									<?php
+									Form::renderYearOptionsDescending(2017, date("Y"));
+									?>
+								</select>
+								<select class="form-control w-auto d-inline-block" name="end_override_hour" id="end-override-hour">
+									<option value="">HH</option>
+									<?php
+									Form::renderHourOptions();
+									?>
+								</select>
+								<select class="form-control w-auto d-inline-block" name="end_override_minute" id="end-override-minute">
+									<option value="">MM</option>
+									<?php
+									Form::renderMinuteOptions();
+									?>
+								</select>
+							</div>
 						</div>
-						<div class="form-group">
-							<label for="tester-fee">Tester Fee Override</label>
-							<input class="form-control" type="number" name="tester_fee" id="tester-fee" placeholder="Enter tester fee override" />
+						<div class="row mb-1">
+							<label class="col-sm-4 col-form-label" for="tester-fee">Tester Fee Override</label>
+							<div class="col-sm">
+								<input class="form-control" type="number" name="tester_fee" id="tester-fee" placeholder="Enter tester fee override" />
+							</div>
 						</div>
-						<div class="form-group">
-							<label>Verifier Notes</label>
-							<textarea class="form-control" name="verifier_notes" id="verifier-notes" placeholder="Enter verifier notes" value="<?=htmlspecialchars($test->verifier_notes)?>" rows="4"></textarea>
+						<div class="row mb-1">
+							<label class="col-sm-4 col-form-label" for="verifier-notes">Verifier Notes</label>
+							<div class="col-sm">
+								<textarea class="form-control" name="verifier_notes" id="verifier-notes" placeholder="Enter verifier notes" value="<?=htmlspecialchars($test->verifier_notes)?>" rows="4"></textarea>
+							</div>
 						</div>
 
 						<?php
 						if($test->status == Test::STATUS_PENDING_VERIFICATION) {
 							?>
-							<div class="form-group">
-								<label for="tester-message">Message to Tester (if rejecting)</label>
-								<textarea class="form-control" name="tester_message" id="tester-message" placeholder="Enter message to tester" value="<?=htmlspecialchars($tester_message)?>" rows="4"></textarea>
+							<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" value="<?=htmlspecialchars($tester_message)?>" rows="4"></textarea>
+								</div>
 							</div>
 							<button class="btn btn-success" type="submit" name="accept" value="1">Accept</button>
 							<button class="btn btn-danger" type="submit" name="reject" value="1">Reject</button>