|
@@ -151,6 +151,11 @@ function initialiseLocations() {
|
|
|
|
|
|
|
|
var td = $("<td></td>");
|
|
var td = $("<td></td>");
|
|
|
td.append(a);
|
|
td.append(a);
|
|
|
|
|
+
|
|
|
|
|
+ if(location.retest) {
|
|
|
|
|
+ td.append(" <span class=\"badge badge-primary\">Retest</span>");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
td.append("<br />");
|
|
td.append("<br />");
|
|
|
|
|
|
|
|
if(location.internalId) {
|
|
if(location.internalId) {
|
|
@@ -300,7 +305,11 @@ function initialiseTesters() {
|
|
|
|
|
|
|
|
$("#tester-list-loading-container").text(response.testers.length + " tester addresses found in the vicinity.");
|
|
$("#tester-list-loading-container").text(response.testers.length + " tester addresses found in the vicinity.");
|
|
|
|
|
|
|
|
- let tbody = $("#testers-tbody").detach();
|
|
|
|
|
|
|
+ let tbody = $("#testers-tbody").get(0);
|
|
|
|
|
+ tbody.innerHTML = "";
|
|
|
|
|
+
|
|
|
|
|
+ let tbodyInnerHtml = "";
|
|
|
|
|
+
|
|
|
let maxDistance = $("#testers-max-distance").val();
|
|
let maxDistance = $("#testers-max-distance").val();
|
|
|
|
|
|
|
|
for(let i in response.testers) {
|
|
for(let i in response.testers) {
|
|
@@ -334,18 +343,7 @@ function initialiseTesters() {
|
|
|
var filterValueParts = [tester.name];
|
|
var filterValueParts = [tester.name];
|
|
|
var filterValue = filterValueParts.join("").toLowerCase();
|
|
var filterValue = filterValueParts.join("").toLowerCase();
|
|
|
|
|
|
|
|
- var tr = $("<tr data-tester-id=\"" + tester.id + "\" data-address-id=\"" + tester.addressId + "\" data-filter-value=\"" + filterValue + "\"></tr>");
|
|
|
|
|
-
|
|
|
|
|
- if(tester.id == testerId) {
|
|
|
|
|
- $(tr).addClass(highlightClass);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- var td = $("<td class=\"text-right\"></td>");
|
|
|
|
|
- td.append(tester.id);
|
|
|
|
|
- tr.append(td);
|
|
|
|
|
-
|
|
|
|
|
- var td = $("<td></td>");
|
|
|
|
|
- td.append("<a href=\"/account/users/" + tester.id + "\" target=\"_blank\">" + tester.name + "</a> ");
|
|
|
|
|
|
|
+ var testerClass = (tester.id == testerId) ? highlightClass : "";
|
|
|
|
|
|
|
|
var scoreClass = "secondary";
|
|
var scoreClass = "secondary";
|
|
|
if(tester.score > 0) {
|
|
if(tester.score > 0) {
|
|
@@ -355,50 +353,62 @@ function initialiseTesters() {
|
|
|
scoreClass = "danger";
|
|
scoreClass = "danger";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- td.append("<span class=\"badge badge-pill badge-" + scoreClass + "\" title=\"Score\">" + tester.score + "</span>");
|
|
|
|
|
|
|
+ var distanceClass = "";
|
|
|
|
|
+ if(tester.maxRadiusExceeded) {
|
|
|
|
|
+ distanceClass = "text-danger";
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- td.append("<br />");
|
|
|
|
|
|
|
+ var trHtml = "<tr class=\"" + testerClass + "\" data-tester-id=\"" + tester.id + "\" data-address-id=\"" + tester.addressId + "\" data-filter-value=\"" + filterValue + "\">";
|
|
|
|
|
+
|
|
|
|
|
+ trHtml += "<td class=\"text-right\">" + tester.id + "</td>";
|
|
|
|
|
+ trHtml += "<td><a href=\"/account/users/" + tester.id + "\" target=\"_blank\">" + tester.name + "</a> <span class=\"badge badge-pill badge-" + scoreClass + "\" title=\"Score\">" + tester.score + "</span><br />";
|
|
|
|
|
+
|
|
|
|
|
+ trHtml += "<small class=\"" + distanceClass + "\">";
|
|
|
|
|
+ trHtml += tester.distanceMiles + " / " + tester.maxRadiusMiles + " miles";
|
|
|
|
|
|
|
|
- var small = $("<small>" + tester.distanceMiles + " / " + tester.maxRadiusMiles + " miles</small>");
|
|
|
|
|
if(tester.maxRadiusExceeded) {
|
|
if(tester.maxRadiusExceeded) {
|
|
|
- small.addClass("text-danger");
|
|
|
|
|
- small.append(" <i class=\"fas fa-exclamation-circle\"></i>");
|
|
|
|
|
|
|
+ trHtml += " <i class=\"fas fa-exclamation-circle\"></i>";
|
|
|
}
|
|
}
|
|
|
- td.append(small);
|
|
|
|
|
- tr.append(td);
|
|
|
|
|
|
|
|
|
|
- td = $("<td class=\"text-right align-middle\"></td>");
|
|
|
|
|
- td.append(tester.age);
|
|
|
|
|
- tr.append(td);
|
|
|
|
|
|
|
+ trHtml += "</small>";
|
|
|
|
|
+ trHtml += "</td>";
|
|
|
|
|
|
|
|
- td = $("<td class=\"text-right align-middle\"></td>");
|
|
|
|
|
|
|
+ trHtml += "<td class=\"text-right align-middle\">" + tester.age + "</td>";
|
|
|
|
|
+ trHtml += "<td class=\"text-right align-middle\">";
|
|
|
|
|
|
|
|
if(!tester.termsAccepted) {
|
|
if(!tester.termsAccepted) {
|
|
|
- td.append("<span class=\"badge badge-danger\" title=\"Terms and Conditions not accepted\">T&C</span> ");
|
|
|
|
|
|
|
+ trHtml += "<span class=\"badge badge-danger\" title=\"Terms and Conditions not accepted\">T&C</span> ";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(tester.reported) {
|
|
if(tester.reported) {
|
|
|
- td.append("<span class=\"badge badge-danger\" data-toggle=\"tooltip\" data-title=\"" + tester.reportedComment + "\">Reported</span> ");
|
|
|
|
|
|
|
+ trHtml += "<span class=\"badge badge-danger\" data-toggle=\"tooltip\" data-title=\"" + tester.reportedComment + "\">Reported</span> ";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- td.append("<span class=\"badge badge-" + tester.levelClass + "\">" + tester.levelText + "</span>");
|
|
|
|
|
- td.append("<br />");
|
|
|
|
|
- td.append($("<small>").text(tester.phone));
|
|
|
|
|
- tr.append(td);
|
|
|
|
|
|
|
+ trHtml += "<span class=\"badge badge-" + tester.levelClass + "\">" + tester.levelText + "</span><br />";
|
|
|
|
|
+ trHtml += "<small>" + tester.phone + "</small>";
|
|
|
|
|
+
|
|
|
|
|
+ trHtml += "<td class=\"text-right align-middle\">";
|
|
|
|
|
|
|
|
- td = $("<td class=\"text-right align-middle\"></td>");
|
|
|
|
|
if(!tester.isCurrentTester) {
|
|
if(!tester.isCurrentTester) {
|
|
|
- td.append($("<button class=\"btn btn-outline-primary\" data-assign-button title=\"Assign\" data-toggle=\"tooltip\"><i class=\"fal fa-fw fa-user-plus\"></i>...</button>").tooltip());
|
|
|
|
|
|
|
+ trHtml += "<button class=\"btn btn-outline-primary\" data-assign-button title=\"Assign\" data-toggle=\"tooltip\"><i class=\"fal fa-fw fa-user-plus\"></i></button>";
|
|
|
}
|
|
}
|
|
|
- tr.append(td);
|
|
|
|
|
|
|
+ trHtml += "</td>";
|
|
|
|
|
|
|
|
- $(tbody).append(tr);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ trHtml += "</td>";
|
|
|
|
|
+ trHtml += "</tr>";
|
|
|
|
|
+
|
|
|
|
|
+ tbodyInnerHtml += trHtml;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $("#testers-table").append(tbody);
|
|
|
|
|
|
|
+ tbody.innerHTML = tbodyInnerHtml;
|
|
|
|
|
+
|
|
|
|
|
+ console.log(tbodyInnerHtml);
|
|
|
|
|
|
|
|
initialiseTooltips();
|
|
initialiseTooltips();
|
|
|
|
|
|
|
|
|
|
+ $("input[data-filter-target]").trigger("keyup");
|
|
|
|
|
+
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -456,6 +466,11 @@ function handleAssignButtonClick(event) {
|
|
|
assignMarkers.push(marker);
|
|
assignMarkers.push(marker);
|
|
|
|
|
|
|
|
$("#modal-assign-tester").find("[data-location-name]").text(location.name);
|
|
$("#modal-assign-tester").find("[data-location-name]").text(location.name);
|
|
|
|
|
+
|
|
|
|
|
+ if(location.retest) {
|
|
|
|
|
+ $("#modal-assign-tester").find("[data-location-name]").append(" <span class=\"badge badge-primary\">Retest</span>");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$("#modal-assign-tester").find("[data-location-address]").text(location.address);
|
|
$("#modal-assign-tester").find("[data-location-address]").text(location.address);
|
|
|
}
|
|
}
|
|
|
|
|
|