Переглянути джерело

Moves submit button to bottom. Adds timer to below Stop button.

Alan Lam 8 роки тому
батько
коміт
bcb51d8791
2 змінених файлів з 38 додано та 17 видалено
  1. 19 16
      engine/template.php
  2. 19 1
      public/js/app-test.js

+ 19 - 16
engine/template.php

@@ -55,27 +55,17 @@ class Template extends Model {
 
 			<input type="hidden" name="duration" id="duration" value="" required />
 
-			<div class="bg-light text-center p-3 mb-3" style="position: sticky; top: 104px; z-index: 1000;">
+			<div class="bg-light text-center p-3 mb-3" style="position: sticky; top: 104px; z-index: 1000;" id="test-stop-button-container">
 
-				<div class="" id="test-stop-button-container">
-					<button class="btn btn-block btn-danger" type="button" id="test-stop-button">Stop Test</button>
+				<div>
+					<button class="btn btn-block btn-danger" type="button" id="test-stop-button">
+						Stop Test<br />
+						<small><span id="test-duration-span">0 min. 0 sec.</span></small>
+					</button>
 					<small data-test-no-internet-text class="form-text text-danger">
 						Tap this button when you are outside of the venue.
 					</small>
 				</div>
-
-				<div class="d-none" id="test-submit-button-container">
-					<input type="hidden" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>" />
-					<button class="btn btn-block btn-primary" type="submit" id="test-submit-button">Submit Test Results</button>
-					<small class="form-text text-muted d-none" id="test-no-internet-text">
-						<span class="text-danger">No Internet Connectivity</span><br />
-						Please check your Internet connectivity and try again.
-					</small>
-					<small id="test-submit-status">
-
-					</small>
-				</div>
-
 			</div>
 
 			<div class="alert alert-info">
@@ -88,6 +78,19 @@ class Template extends Model {
 				Form::renderField($field);
 			}
 			?>
+
+			<div class="bg-light text-center p-3 mt-3 d-none" id="test-submit-button-container">
+				<input type="hidden" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>" />
+				<button class="btn btn-block btn-primary" type="submit" id="test-submit-button">Submit Test Results</button>
+				<small class="form-text text-muted d-none" id="test-no-internet-text">
+					<span class="text-danger">No Internet Connectivity</span><br />
+					Please check your Internet connectivity and try again.
+				</small>
+				<small id="test-submit-status">
+
+				</small>
+			</div>
+
 		</form>
 		<?php
 	}

+ 19 - 1
public/js/app-test.js

@@ -2,10 +2,13 @@ $(function() {
 	initialiseTestForm();
 });
 
+var durationInterval = false;
+var testStartTime = null;
+
 function initialiseTestForm() {
 
 	var date = new Date();
-	var testStartTime = date.getTime();
+	testStartTime = date.getTime();
 
 	$form = $("#test-form");
 
@@ -23,6 +26,8 @@ function initialiseTestForm() {
 
 		event.preventDefault();
 
+		clearInterval(durationInterval);
+
 		var date = new Date();
 		var testEndTime = date.getTime();
 
@@ -36,6 +41,9 @@ function initialiseTestForm() {
 
 	});
 
+	durationInterval = setInterval(updateDurationText, 1000);
+
+
 	$form.on("submit", function(event) {
 
 		event.preventDefault();
@@ -77,6 +85,16 @@ function initialiseTestForm() {
 		});
 
 	});
+}
+
+function updateDurationText() {
+
+	var date = new Date();
+	var testEndTime = date.getTime();
 
+	var duration = testEndTime - testStartTime;
+	var secs = Math.floor(duration / 1000);
+	var mins = Math.floor(secs / 60);
 
+	$("#test-duration-span").text(mins + " min. " + secs + " sec.");
 }