Przeglądaj źródła

Adds assign tester modal.

Alan Lam 8 lat temu
rodzic
commit
13d298244a

+ 1 - 0
controllers/project.php

@@ -48,6 +48,7 @@ $deadline_date = explode(" ", $project->dts_deadline)[0];
 
 View::includeOnce("header", compact("page_title"));
 View::include("project", compact("project", "tests", "latitude", "longitude", "completed_percentage", "customer", "locations", "deadline_date", "created_test_count", "completed_test_count"));
+View::include("modal_assign_tester");
 View::includeOnce("footer");
 
 ?>

+ 24 - 1
controllers/project_ajax.php

@@ -194,6 +194,21 @@ if($submit) {
 			// Assigns a tester to a test
 			case "assign-tester": {
 
+				$year = http::value("year", "int");
+				$month = http::value("month", "int");
+				$day = http::value("day", "int");
+
+				$unix_due = 0;
+				if($year && $month && $day) {
+
+					$month = str_pad($month, 2, "0", STR_PAD_LEFT);
+					$day = str_pad($day, 2, "0", STR_PAD_LEFT);
+
+					$unix_due = strtotime("$year-$month-$day");
+				}
+
+				$message = http::value("message");
+
 				$location_id = http::value("location_id", "int");
 				$location = Location::get($location_id);
 				if(!$location) throw new Exception("Location not found.");
@@ -219,12 +234,20 @@ if($submit) {
 				if($user->level == User::LEVEL_REGISTERED) throw new Exception("A test cannot be assigned to an unverified user.");
 				if($user->level == User::LEVEL_UNVERIFIED) throw new Exception("A test cannot be assigned to an unverified user.");
 				if($user->level == User::LEVEL_DEACTIVATED) throw new Exception("A test cannot be assigned to a deactivated user.");
-				if($user->level >= User::LEVEL_VENUE) throw new Exception("A test cannot be assigned to a user that's not a tester.");
+				if($user->level != User::LEVEL_TESTER) throw new Exception("A test cannot be assigned to a user that's not a tester.");
 
 				$test->status = Test::STATUS_ASSIGNED;
 				$test->tester_id = $user->id;
 				$test->dts_assigned = Util::getDateTime();
 
+				if($unix_due) {
+					$test->dts_due = "$year-$month-$day 23:59:59";
+
+					if(strcmp($test->dts_due, $project->dts_start) < 0) throw new Exception("The date due cannot be before the project start date.");
+					if(strcmp($test->dts_due, $project->dts_deadline) > 0) throw new Exception("The date due cannot be beyond the project deadline.");
+
+				}
+
 				$success = $test->commit();
 				if(!$success) throw new Exception("Test cannot be assigned, please try again later.");
 

+ 32 - 0
engine/form.php

@@ -2,6 +2,38 @@
 
 class Form {
 
+	public static function renderYearOptions($min = null, $max = null, $selected_value = null) {
+
+		if(empty($min)) $min = date("Y") - 100;
+		if(empty($max)) $max = date("Y") - 16;
+
+		for($i = $min; $i <= $max; $i++) {
+			$selected = ($selected_value == $i) ? "selected" : "";
+			?>
+			<option value="<?=$i?>" <?=$selected?>><?=$i?></option>
+			<?php
+		}
+	}
+
+	public static function renderMonthOptions($selected_value = null) {
+		for($i = 1; $i <= 12; $i++) {
+			$selected = ($selected_value == $i) ? "selected" : "";
+			$display = date("M", mktime(0, 0, 0, $i));
+			?>
+			<option value="<?=$i?>" <?=$selected?>><?=$display?></option>
+			<?php
+		}
+	}
+
+	public static function renderDayOptions($selected_value = null) {
+		for($i = 1; $i <= 31; $i++) {
+			$selected = ($selected_value == $i) ? "selected" : "";
+			?>
+			<option value="<?=$i?>" <?=$selected?>><?=$i?></option>
+			<?php
+		}
+	}
+
 	public static function renderField($options) {
 
 		switch($options->type) {

+ 81 - 17
public/js/app-project.js

@@ -5,9 +5,13 @@ var selectedLocation;
 
 var map = null;
 
+var locations = [];
+var testers = [];
+
 $(function() {
-	$(document).on("click", "button[data-assign-button]", handleAssignButtonClick);
 	$(document).on("click", "button[data-find-testers-button]", handleFindTestersButtonClick);
+	$(document).on("click", "button[data-assign-button]", handleAssignButtonClick);
+	$(document).on("click", "#assign-confirm-button", handleConfirmAssignButtonClick);
 });
 
 function initialiseLocations() {
@@ -25,6 +29,8 @@ function initialiseLocations() {
 	}, function(response) {
 		if(!response.locations) return;
 
+		locations = response.locations;
+
 		$("#tests-tbody").empty();
 
 		for(let i in response.locations) {
@@ -101,8 +107,6 @@ function handleFindTestersButtonClick() {
 		id: locationId
 	};
 
-	console.log(container);
-
 	var latLng = {
 		lat: lat,
 		lng: lng
@@ -135,7 +139,6 @@ function clearTesters() {
 	testerMarkers = [];
 
 	$("#tester-list-loading-container").text("Please select a location with a pending test.");
-	$("#tester-list-group").empty();
 	$("#testers-tbody").empty();
 }
 
@@ -155,6 +158,8 @@ function initialiseTesters() {
 			return;
 		}
 
+		testers = response.testers;
+
 		$("#tester-list-loading-container").text(response.testers.length + " tester addresses found in the vicinity.");
 
 		for(let i in response.testers) {
@@ -180,7 +185,7 @@ function initialiseTesters() {
 
 			testerMarkers.push(marker);
 
-			var tr = $("<tr data-address-id=\"" + tester.addressId + "\"></tr>");
+			var tr = $("<tr data-tester-id=\"" + tester.id + "\" data-address-id=\"" + tester.addressId + "\"></tr>");
 
 			var td = $("<td></td>");
 			td.append("<a href=\"/account/users/" + tester.id + "\" target=\"_blank\">" + tester.name + "</a>");
@@ -209,7 +214,7 @@ function initialiseTesters() {
 
 			td = $("<td class=\"text-right align-middle\"></td>");
 			if(!tester.isCurrentTester) {
-				td.append("<button class=\"btn btn-outline-primary\" data-assign-button>Assign</button>");
+				td.append("<button class=\"btn btn-outline-primary\" data-assign-button>Assign...</button>");
 			}
 			tr.append(td);
 
@@ -219,23 +224,82 @@ function initialiseTesters() {
 }
 
 function handleAssignButtonClick(event) {
-	event.preventDefault();
 	let container = $(this).closest("[data-address-id]");
 
-	var addressId = $(container).data("address-id");
+	let addressId = parseInt($(container).data("address-id"));
+	let testerId = parseInt($(container).data("tester-id"));
 
-	$.post("/account/projects/" + projectID + "/assign-tester", {
-		submit: $("#submit").val(),
-		location_id: selectedLocation.id,
-		address_id: addressId
-	}, function(response) {
-		if(!response.success) return;
+	// Find location
+	var location = false;
+	for(var i in locations) {
+		if(locations[i].id == selectedLocation.id) {
+			location = locations[i];
+			break;
+		}
+	}
+
+	if(location) {
+		$("#modal-assign-tester").find("[data-location-photo]").css("background-image", "url(/account/locations/" + location.id + "/photo)");
+		$("#modal-assign-tester").find("[data-location-name]").text(location.name);
+		$("#modal-assign-tester").find("[data-location-address]").text(location.address);
+	}
+
+	// Find tester
+	var tester = false;
+	for(var i in testers) {
+		if(testers[i].id == testerId) {
+			tester = testers[i];
+			break;
+		}
+	}
+	if(tester) {
+		$("#modal-assign-tester").find("[data-tester-photo]").css("background-image", "url(/account/users/" + tester.id + "/photo)");
+		$("#modal-assign-tester").find("[data-tester-name]").text(tester.name);
+		$("#modal-assign-tester").find("[data-tester-age]").text(tester.age);
+		$("#modal-assign-tester").find("[data-tester-level] span").attr("class", "badge badge-lg badge-" + tester.levelClass).text(tester.levelText);
+		$("#modal-assign-tester").find("[data-tester-score]").text(tester.score);
+	}
 
-		selectedLocation.status = "assigned";
+	$("#modal-assign-tester").modal("show");
+
+	$("#assign-location-id").val(selectedLocation.id);
+	$("#assign-address-id").val(addressId);
+}
+
+function handleConfirmAssignButtonClick(event) {
+	event.preventDefault();
+
+	var assignButton = this;
+	var assignProgressContainer = $("#assign-progress-container").get(0);
+
+	$(assignButton).attr("disabled", "");
+	$(assignProgressContainer).removeClass("d-none");
+	$(assignProgressContainer).removeClass("text-danger");
+	$(assignProgressContainer).find("svg").addClass("fa-pulse");
+	$(assignProgressContainer).find("span").text("Please wait...");
+
+	let form = $(this).closest("form");
+
+	let data = $(form).serialize() + "&submit=" + $("#submit").val();
+
+	$.post("/account/projects/" + projectID + "/assign-tester", data, function(response) {
+
+		$(assignButton).removeAttr("disabled");
+
+		$(assignProgressContainer).find("svg").removeClass("fa-pulse");
+
+		if(!response.success) {
+			$(assignProgressContainer).addClass("text-danger");
+			$(assignProgressContainer).find("span").text("Failed to assign tester.");
+			$(assignProgressContainer).find("span").text(response.message);
+			return;
+		}
+
+		$(assignProgressContainer).addClass("d-none");
+
+		$("#modal-assign-tester").modal("hide");
 
 		clearTesters();
 		initialiseLocations();
-
 	});
-
 }

+ 96 - 0
views/modal_assign_tester.php

@@ -0,0 +1,96 @@
+<div class="modal fade" id="modal-assign-tester" tabindex="-1" role="dialog">
+	<div class="modal-dialog modal-lg" role="document">
+		<div class="modal-content">
+			<form>
+				<div class="modal-header">
+					<h5 class="modal-title"><strong>Confirm Assign</strong></h5>
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body">
+					<input type="hidden" name="location_id" id="assign-location-id" value="" />
+					<input type="hidden" name="address_id" id="assign-address-id" value="" />
+
+					<div class="row">
+						<div class="col-lg mb-3">
+							<div class="card">
+								<div class="card-header">
+									Test Details
+								</div>
+								<img class="img-contain card-img-top" src="/img/blank_4_3.png" style="background-image: url(/img/no_image_4_3.png)" data-location-photo />
+								<div class="list-group list-group-flush">
+									<div class="list-group-item"><div class="row"><div class="col-sm-4">Location</div><div class="col-sm" data-location-name></div></div></div>
+									<div class="list-group-item"><div class="row"><div class="col-sm-4">Address</div><div class="col-sm" data-location-address></div></div></div>
+								</div>
+							</div>
+						</div>
+						<div class="col-lg mb-3">
+							<div class="card">
+								<div class="card-header">
+									Tester
+								</div>
+								<img class="img-contain card-img-top" src="/img/blank_4_3.png" style="background-image: url(/img/no_image_4_3.png)" />
+								<div class="list-group list-group-flush">
+									<div class="list-group-item"><div class="row"><div class="col-sm-4">Name</div><div class="col-sm" data-tester-name></div></div></div>
+									<div class="list-group-item"><div class="row"><div class="col-sm-4">Score</div><div class="col-sm" data-tester-score></div></div></div>
+									<div class="list-group-item"><div class="row"><div class="col-sm-4">Level</div><div class="col-sm" data-tester-level><span class="badge badge-lg badge-secondary">Registered</span></div></div></div>
+									<div class="list-group-item"><div class="row"><div class="col-sm-4">Age</div><div class="col-sm" data-tester-age></div></div></div>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div class="card">
+						<div class="card-header">
+							Options
+						</div>
+						<div class="card-body">
+							<div class="row mb-3">
+								<label class="col-sm-3 col-form-label" id="assign-year">Date Due</label>
+								<div class="col-sm">
+									<select class="form-control w-auto d-inline-block" name="year" id="assign-year">
+										<option value="">Year</option>
+										<?php
+										Form::renderYearOptions(date("Y"), date("Y") + 1);
+										?>
+									</select>
+									<select class="form-control w-auto d-inline-block" name="month" id="assign-month">
+										<option value="">Month</option>
+										<?php
+										Form::renderMonthOptions();
+										?>
+									</select>
+									<select class="form-control w-auto d-inline-block" name="day" id="assign-day">
+										<option value="">Day</option>
+										<?php
+										Form::renderDayOptions();
+										?>
+									</select><br />
+									<small class="form-text">Optional. Date the tester should aim to do the test by.</small>
+
+								</div>
+							</div>
+							<div class="row">
+								<label class="col-sm-3 col-form-label" for="message">Message to Tester</label>
+								<div class="col-sm">
+									<textarea class="form-control" name="message" id="message" placeholder="Enter message to tester"></textarea>
+									<small class="form-text">Optional. This will be sent in the email to the tester if provided.</small>
+								</div>
+							</div>
+						</div>
+					</div>
+
+				</div>
+				<div class="modal-footer justify-content-start">
+					<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+					<button type="button" class="btn btn-primary" id="assign-confirm-button">Confirm</button>
+					<div id="assign-progress-container" class="align-self-center d-none">
+						<i class="far fa-pulse fa-sync"></i>
+						<span>Please wait...</span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>