@@ -127,6 +170,7 @@
{% include "modals/angler.html" %}
+ {% endcomment %}
{% endblock content %}
diff --git a/src/mainapp/templates/index.html b/src/mainapp/templates/index.html
index cb9c353..e786c99 100644
--- a/src/mainapp/templates/index.html
+++ b/src/mainapp/templates/index.html
@@ -2,6 +2,16 @@
{% block content %}
+
+
+
+
+
-->
{% endblock content %}
diff --git a/src/mainapp/templates/modals/angler.html b/src/mainapp/templates/modals/angler.html
index 16db149..0f21a5f 100644
--- a/src/mainapp/templates/modals/angler.html
+++ b/src/mainapp/templates/modals/angler.html
@@ -2,34 +2,36 @@
\ No newline at end of file
diff --git a/src/mainapp/views.py b/src/mainapp/views.py
index 70abaa6..9af1da4 100644
--- a/src/mainapp/views.py
+++ b/src/mainapp/views.py
@@ -4,7 +4,7 @@ from functools import reduce
from django.shortcuts import render, redirect
from django.http import JsonResponse
-from django.db.models import Q, Case, When, Value, IntegerField
+from django.db.models import Q, Case, When, Value, IntegerField, Min
from django.db.utils import IntegrityError
from django.views import View
from django.views.decorators.http import require_GET, require_POST
@@ -57,7 +57,10 @@ class ManageAnglersView(View):
HttpRequest: A render of the Manage Anglers page.
"""
- return render(request, self.template_name)
+ anglers = Member.objects.order_by("first_name", "last_name")
+ context = {"anglers": anglers}
+
+ return render(request, self.template_name, context)
def post(self, request: HttpRequest, *args, **kwargs) -> JsonResponse:
"""Handle POST requests to the Manage Anglers page.
@@ -99,6 +102,11 @@ class ManageAnglersView(View):
"get-teams": self.get_teams,
"get-sections": self.get_sections,
"get-anglers": self.get_anglers,
+ "delete-team": self.delete_team,
+ "delete-section": self.delete_section,
+ "delete-angler": self.delete_angler,
+ "get-nextTeamNumber": self.get_next_team_number,
+ "get-nextPegNumber": self.get_next_peg_number,
}
handler = task_handlers.get(task)
@@ -127,7 +135,7 @@ class ManageAnglersView(View):
team.save()
result["team"] = {"id": team.id, "number": team.number}
except IntegrityError:
- result["form_errors"]["#editTeamNumberError"] = "A Team with this number already exists"
+ result["form_errors"]["#teamNumber"] = "A Team with this number already exists"
return result
@@ -188,9 +196,13 @@ class ManageAnglersView(View):
angler.team = team
angler.section = section
- angler.save()
+ try:
+ angler.save()
+ except IntegrityError:
+ result["form_errors"]["#anglerPeg"] = "An Angler with this peg number already exists"
+
result["angler"] = {
- "id": id,
+ "id": angler.id,
"forename": forename,
"surname": surname,
"peg_number": peg_number,
@@ -205,7 +217,7 @@ class ManageAnglersView(View):
def get_teams(self, request) -> dict[str]:
"""Returns a dictionary of all teams."""
- search = request.GET.get("search")
+ search = request.POST.get("search")
teams = Team.objects.order_by("number").all()
# Search works by exluding teams that do not contain members with the search term in their names.
@@ -222,7 +234,7 @@ class ManageAnglersView(View):
def get_sections(self, request) -> dict[str]:
"""Returns a dictionary of all sections."""
- search = request.GET.get("search")
+ search = request.POST.get("search")
sections = Section.objects.order_by("character").all()
if search:
@@ -238,8 +250,9 @@ class ManageAnglersView(View):
def get_anglers(self, request) -> dict[str]:
"""Returns a dictionary of all anglers."""
- search = request.GET.get("search")
+ search = request.POST.get("search")
anglers = Member.objects.order_by("first_name").all()
+ order_by = "peg_number" if request.POST.get("sortAnglers") == "pegs" else "first_name"
if search:
search_terms = search.split()
@@ -260,10 +273,65 @@ class ManageAnglersView(View):
"team_number": angler.team.number,
"section_character": angler.section.character
}
- for angler in anglers
+ for angler in anglers.order_by(order_by).all()
]
}
+ def delete_team(self, request) -> dict:
+ """Deletes a team."""
+
+ team_id = request.POST.get("team_id")
+ if not team_id:
+ raise ValueError("Invalid team ID")
+
+ teams = Team.objects.get(id=team_id)
+ teams.delete()
+
+ return {}
+
+ def delete_section(self, request) -> dict:
+ """Deletes a section."""
+
+ section_id = request.POST.get("section_id")
+ if not section_id:
+ raise ValueError("Invalid section ID")
+
+ sections = Section.objects.get(id=section_id)
+ sections.delete()
+
+ return {}
+
+ def delete_angler(self, request) -> dict:
+ """Delete an angler."""
+
+ angler_id = request.POST.get("angler_id")
+ if not angler_id:
+ raise ValueError("Invalid angler ID")
+
+ angler = Member.objects.get(id=angler_id)
+ angler.delete()
+
+ return {}
+
+ def get_next_team_number(self, request) -> dict[str, int]:
+ """Returns the next available team number."""
+
+ next_team_number = 1
+
+ while Team.objects.filter(number=next_team_number).exists():
+ next_team_number += 1
+
+ return {"nextTeamNumber": next_team_number}
+
+ def get_next_peg_number(self, request) -> dict[str, int]:
+ """Returns the next available peg number."""
+
+ next_peg_number = 1
+
+ while Member.objects.filter(peg_number=next_peg_number).exists():
+ next_peg_number += 1
+
+ return {"nextPegNumber": next_peg_number}
@@ -412,8 +480,8 @@ def update_team(request):
if not request.POST:
return
- team_id = request.POST.get("teamId")
- team_number = request.POST.get("teamNumber")
+ team_id = request.POST.get("id")
+ team_number = request.POST.get("number")
try:
if team_id == "-1":
diff --git a/src/static/css/custom.css b/src/static/css/custom.css
index 840d149..e046bdb 100644
--- a/src/static/css/custom.css
+++ b/src/static/css/custom.css
@@ -58,6 +58,10 @@
font-family: "Source Sans Pro";
}
+.font-helvetica {
+ font-family: Arial, Helvetica, sans-serif;
+}
+
.pencil-btn {
width: 32px;
height: 32px;
@@ -118,4 +122,154 @@ input[type='radio']:checked {
background-color: #04385c;
border: 1px solid #04385c;
box-shadow: none;
-}
\ No newline at end of file
+}
+
+#sidebar {
+ width: 80px;
+}
+
+#webContent {
+ margin-left: 80px;
+}
+
+.light-tooltip {
+ --bs-tooltip-bg: #04385c;
+}
+
+#sidebar .nav-item > a:hover {
+ background-color: rgba(0, 0, 0, 0.15);
+}
+
+html, body {
+ height: 100%;
+}
+
+#waterContainer {
+ background-color: rgba(2, 40, 110, 0.70);
+ max-height: calc(100vh - 70px);
+ overflow: hidden;
+}
+
+:root {
+ --drip-time: 4s;
+ --drip-length: 600px;
+}
+
+#drop {
+ position: relative;
+ width: 20px;
+ height: 20px;
+ top: -30px;
+ margin: 0 auto;
+ background: #FFF;
+ -moz-border-radius: 20px;
+ -webkit-border-radius: 20px;
+ border-radius: 20px;
+ -moz-animation-name: drip;
+ -webkit-animation-name: drip;
+ animation-name: drip;
+ -moz-animation-timing-function: cubic-bezier(1,0,.91,.19);
+ -webkit-animation-timing-function: cubic-bezier(1,0,.91,.19);
+ animation-timing-function: cubic-bezier(1,0,.91,.19);
+ -moz-animation-duration: var(--drip-time);
+ -webkit-animation-duration: var(--drip-time);
+ animation-duration: var(--drip-time);
+ -moz-animation-iteration-count: infinite;
+ -webkit-animation-iteration-count: infinite;
+ animation-iteration-count: infinite;
+ margin: 0 auto;
+}
+
+#drop:before {
+ content: "";
+ position: absolute;
+ width: 0;
+ height: 0;
+ border-left: 10px solid transparent;
+ border-right: 10px solid transparent;
+ border-bottom: 30px solid rgba(255,255,255,1);
+ top: -22px;
+}
+
+#wave {
+ position: relative;
+ opacity: 0;
+ top: 0;
+ width: 2px;
+ height: 1px;
+ border: #FFF 7px solid;
+ -moz-border-radius: 300px / 150px;
+ -webkit-border-radius: 300px / 150px;
+ border-radius: 300px / 150px;
+ -moz-animation-name: ripple;
+ -webkit-animation-name: ripple;
+ animation-name: ripple;
+ -moz-animation-delay: var(--drip-time);
+ -webkit-animation-delay: var(--drip-time);
+ animation-delay: var(--drip-time);
+ -moz-animation-duration: var(--drip-time);
+ -webkit-animation-duration: var(--drip-time);
+ animation-duration: var(--drip-time);
+ -moz-animation-iteration-count: infinite;
+ -webkit-animation-iteration-count: infinite;
+ animation-iteration-count: infinite;
+ margin: var(--drip-length) auto 0 auto;
+}
+
+#wave:after {
+ content: "";
+ position: absolute;
+ opacity: 0;
+ top: -5px;
+ left: -5px;
+ width: 2px;
+ height: 1px;
+ border: #FFF 5px solid;
+ -moz-border-radius: 300px / 150px;
+ -webkit-border-radius: 300px / 150px;
+ border-radius: 300px / 150px;
+ -moz-animation-name: ripple-2;
+ -webkit-animation-name: ripple-2;
+ animation-name: ripple-2;
+ -moz-animation-duration: var(--drip-time);
+ -webkit-animation-duration: var(--drip-time);
+ animation-duration: var(--drip-time);
+ -moz-animation-iteration-count: infinite;
+ -webkit-animation-iteration-count: infinite;
+ animation-iteration-count: infinite;
+}
+
+@keyframes ripple {
+ from {
+ opacity: 1;
+ }
+ to {
+ width: 600px;
+ height: 300px;
+ border-width: 1px;
+ top: -100px;
+ opacity: 0;
+ }
+}
+
+@keyframes ripple-2 {
+ 0% {
+ opacity: 1;
+ }
+ 50% {
+ opacity: 0;
+ }
+ 100% {
+ width: 200px;
+ height: 100px;
+ border-width: 1px;
+ top: 100px;
+ left: 200px;
+ }
+}
+
+@keyframes drip {
+ to {
+ top: var(--drip-length);
+ }
+}
diff --git a/src/static/css/index.css b/src/static/css/index.css
index 7691a02..49b6c03 100644
--- a/src/static/css/index.css
+++ b/src/static/css/index.css
@@ -53,7 +53,7 @@
-webkit-overflow-scrolling: touch;
}
-.card{
+/* .card{
border-radius: 4px;
background: #fff;
box-shadow: 0 6px 10px rgba(0,0,0,.08), 0 0 6px rgba(0,0,0,.05);
@@ -64,4 +64,4 @@
.card:hover{
transform: scale(1.05);
box-shadow: 0 10px 20px rgba(0,0,0,.12), 0 4px 8px rgba(0,0,0,.06);
-}
\ No newline at end of file
+} */
\ No newline at end of file
diff --git a/src/static/img/at-logo.png b/src/static/img/at-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e9504495262b04d9fcd493c9c602ab9a63d6e1a
GIT binary patch
literal 24121
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
ClQzBp
literal 0
HcmV?d00001
diff --git a/src/static/js/custom.js b/src/static/js/custom.js
index f77b435..8b8b6fd 100644
--- a/src/static/js/custom.js
+++ b/src/static/js/custom.js
@@ -8,7 +8,9 @@ $(document).ready(() => {
activateTooltips();
pageLoadMotionEffects();
- $("select").select2({theme: "bootstrap-5", minimumResultsForSearch: -1})
+ // $("select").select2({theme: "bootstrap-5", minimumResultsForSearch: -1})
+
+ $("#headerTitle").text(document.title);
});
@@ -58,3 +60,8 @@ jQuery.expr[':'].icontains = function(a, i, m) {
const findByKey = (array, key, value) => {
return array.find(item => item[key] === value);
}
+
+function isEmpty(obj) {
+ return Object.keys(obj).length === 0;
+}
+
\ No newline at end of file
diff --git a/src/static/js/mainapp/anglers.js b/src/static/js/mainapp/anglers.js
index 10ad73b..be3c450 100644
--- a/src/static/js/mainapp/anglers.js
+++ b/src/static/js/mainapp/anglers.js
@@ -27,6 +27,16 @@ $(document).ready(() => {
fetchAndLoadGroups();
});
+ const showGroupsValue = localStorage.getItem("showGroups");
+ if (showGroupsValue !== null) {
+ $("#sortForm input[name='showGroups']").val([showGroupsValue]);
+ }
+
+ const sortAnglersValue = localStorage.getItem("sortAnglers");
+ if (sortAnglersValue !== null) {
+ $("#sortForm input[name='sortAnglers']").val([sortAnglersValue]);
+ }
+
// Modals
$("#addAngler").on("click", () => {
@@ -51,7 +61,7 @@ function fetchAndLoadGroups() {
const showGroups = localStorage.getItem("showGroups");
const sortAnglers = localStorage.getItem("sortAnglers");
const task = showGroups === "teams" ? "get-teams" : "get-sections";
-
+ const search = $("#search").val()
$.ajax({
type: "POST",
url: pageUrl,
@@ -59,7 +69,7 @@ function fetchAndLoadGroups() {
csrfmiddlewaretoken: csrfMiddlewareToken,
tasks: [task, "get-anglers"],
sortAnglers: sortAnglers,
- search: $("#search").val()
+ search: isEmptyOrSpaces(search) ? "" : search,
},
error: (error) => {
console.error(error);
@@ -74,18 +84,20 @@ function fetchAndLoadGroups() {
function groupTemplate(group, groupType, oppositeGroupType) {
groupValue = groupType === "teams" ? group.number : group.character
+ const nonPluralGroupType = groupType.slice(0, -1);
+ const editFunction = groupType === "teams"? "addTeam" : "addSection";
return `
+ class='${nonPluralGroupType.toLowerCase()} px-4 py-3 bg-body-tertiary bg-gradient rounded h-100 fluid-hover-zoom shadow-sm md-shadow-on-hover'
+ data-id='${group.id}' data-value='${groupValue}'>
- ${groupType.toUpperCase()}
+ ${nonPluralGroupType.toUpperCase()}
${groupValue}
-
+
@@ -104,7 +116,7 @@ function anglerTemplate(angler, oppositeGroupType) {
oppositeGroup = oppositeGroup.charAt(0).toUpperCase() + oppositeGroup.slice(1);
return `
-
+
-
+
@@ -140,10 +152,15 @@ function loadGroups(data) {
$("#groups").html("");
+ if (!groups.length) {
+ $("#notFound").show();
+ return;
+ }
+
groups.forEach((group) => {
$("#groups").append(groupTemplate(group, groupType, oppositeGroupType));
data.anglers.forEach((angler) => {
- if (angler.team_id === group.id || angler.section_id === group.id) {
+ if ((groupType == "teams" && angler.team_id === group.id) || (groupType == "sections" && angler.section_id === group.id)) {
$("#groups").find(".anglers").last().append(
anglerTemplate(angler, oppositeGroupType)
);
@@ -152,6 +169,13 @@ function loadGroups(data) {
});
activateTooltips();
+
+ if (!isEmptyOrSpaces($("#search").val())) {
+ $("#groups").find('.angler-fullname').each(function() {
+ var regex = new RegExp($("#search").val(), 'gi');
+ $(this).html($(this).text().replace(regex, '
$& '));
+ });
+ }
}
/**
@@ -177,7 +201,182 @@ function toggleLoading(loading) {
* @param {Number} anglerId - ID of the angler, if -1 will create a new angler
*/
function addAngler(anglerId) {
+
+ // Reset the form values
+ $("#anglerTitle").text("Add New Angler");
+ $("#anglerForename").val("");
+ $("#anglerSurname").val("");
+ $("#anglerTeam").empty().trigger("change");
+ $("#anglerSection").empty().trigger("change");
+ $("#anglerPeg").val(1);
+ $("#anglerForm .error").text("").hide();
+ $("#anglerDelete").hide();
+
+ function validateSection() {
+ const sectionId = $("#anglerSection").val();
+
+ var valid = true;
+
+ // Ensure that no teammates are in this section
+ const teamId = $("#anglerTeam").val();
+ $(`.team[data-id='${teamId}'] .angler`).each(function() {
+ if ($(this).data("section-id") == sectionId && $(this).data("id") != anglerId) {
+ valid = false;
+ return false;
+ }
+ else {
+ $("#anglerSectionError").text("").hide();
+ }
+ });
+
+ return valid;
+ }
+
+ $("#anglerSection").change(() => {validateSection()});
+
+ $.ajax({
+ type: "POST",
+ url: pageUrl,
+ data: {
+ csrfmiddlewaretoken: csrfMiddlewareToken,
+ tasks: ["get-teams", "get-sections"]
+ },
+ error: (error) => {
+ console.error(error);
+ },
+ success: (data) => {
+ data.teams.forEach((team) => {
+ $("#anglerTeam").append(`
Team ${team.number} `);
+ });
+ data.sections.forEach((section) => {
+ $("#anglerSection").append(`
Section ${section.character} `);
+ });
+
+ if (anglerId !== -1) {
+ const angler = $(`.angler[data-id='${anglerId}']`)
+ const forename = angler.data("first");
+ const surname = angler.data("last");
+ const peg = angler.data("peg-number");
+ const teamId = angler.data("team-id");
+ const sectionId = angler.data("section-id");
+
+ $("#anglerTitle").text(`Edit ${forename} ${surname}`);
+ $("#anglerForename").val(forename);
+ $("#anglerSurname").val(surname);
+ $("#anglerTeam").val(teamId).trigger("change");
+ $("#anglerSection").val(sectionId).trigger("change");
+ $("#anglerPeg").val(peg);
+ $("#anglerDelete").show();
+ }
+ }
+ });
+
$("#anglerModal").modal("show");
+
+ $("#anglerForm").off("submit").on("submit", (e) => {
+ e.preventDefault();
+
+ $("#anglerForm .error").text("").hide();
+
+ const forename = $("#anglerForename").val();
+ const surname = $("#anglerSurname").val();
+ const teamId = $("#anglerTeam").val();
+ const sectionId = $("#anglerSection").val();
+ const peg = $("#anglerPeg").val();
+ const validSection = validateSection();
+1
+ var formErrors = !(forename && surname && teamId && sectionId && peg && validSection);
+
+ // This form validation is not very scalable
+ if (!forename) {
+ $("#anglerForenameError").text("Please enter a forename").show();
+ }
+ if (!surname) {
+ $("#anglerSurnameError").text("Please enter a surname").show();
+ }
+ if (!teamId) {
+ $("#anglerTeamError").text("Please select a team").show();
+ }
+ if (!sectionId) {
+ $("#anglerSectionError").text("Please select a section").show();
+ }
+ if (!peg) {
+ $("#anglerPegError").text("Please enter a peg number").show();
+ }
+ if (!validSection) {
+ $("#anglerSectionError").text("Anglers cannot share a section with a teammate").show();
+ }
+ if (formErrors) {
+ return;
+ }
+
+ $.ajax({
+ type: "POST",
+ url: pageUrl,
+ data: {
+ csrfmiddlewaretoken: csrfMiddlewareToken,
+ tasks: ["update-angler"],
+ angler_id: anglerId,
+ forename: forename,
+ surname: surname,
+ team_id: teamId,
+ section_id: sectionId,
+ peg_number: peg
+ },
+ error: (error) => {
+ console.error(error);
+ },
+ success: (data) => {
+ if (isEmpty(data.form_errors)) {
+ fetchAndLoadGroups();
+ $("#anglerModal").modal("hide");
+ return;
+ }
+
+ for(var inputId in data.form_errors) {
+ var errorMessage = data.form_errors[inputId];
+ $(`${inputId}Error`).text(errorMessage).show();
+ }
+ }
+ });
+ });
+
+ $("#anglerDelete").off("click").on("click", () => {
+ $.ajax({
+ type: "POST",
+ url: pageUrl,
+ data: {
+ csrfmiddlewaretoken: csrfMiddlewareToken,
+ tasks: ["delete-angler"],
+ angler_id: anglerId
+ },
+ error: (error) => {
+ console.error(error);
+ },
+ success: (data) => {
+ fetchAndLoadGroups();
+ $("#anglerModal").modal("hide");
+ alert("Angler Deleted");
+ }
+ });
+ });
+
+ $("#anglerPegNext").off("click").on("click", () => {
+ $.ajax({
+ type: "POST",
+ url: pageUrl,
+ data: {
+ csrfmiddlewaretoken: csrfMiddlewareToken,
+ tasks: ["get-nextPegNumber"]
+ },
+ error: (error) => {
+ console.error(error);
+ },
+ success: (data) => {
+ $("#anglerPeg").val(data.nextPegNumber);
+ }
+ });
+ });
}
/**
@@ -186,7 +385,96 @@ function addAngler(anglerId) {
* @param {Number} teamId - ID of the team, if -1 will create a new team
*/
function addTeam(teamId) {
+
+ // Reset the form values
+ $("#teamNumberError").text("").hide();
+
+ if (teamId !== -1) {
+ const team = $(`.team[data-id='${teamId}']`)
+ const number = team.data("value");
+
+ $("#teamTitle").text(`Edit Team #${number}`);
+ $("#teamNumber").val(number);
+ $("#teamDelete").show();
+ }
+ else {
+ $("#teamTitle").text("Add New Team");
+ $("#teamNumber").val(1);
+ $("#teamDelete").hide();
+ }
+
$("#teamModal").modal("show");
+
+ $("#teamForm").off("submit").on("submit", (e) => {
+ e.preventDefault();
+
+ const number = $("#teamNumber").val();
+ if (!number) {
+ $("#teamNumberError").text("Please enter a team number").show();
+ return;
+ }
+
+ $.ajax({
+ type: "POST",
+ url: pageUrl,
+ data: {
+ csrfmiddlewaretoken: csrfMiddlewareToken,
+ tasks: ["update-team"],
+ id: teamId,
+ number: number
+ },
+ error: (error) => {
+ console.error(error);
+ },
+ success: (data) => {
+ if (isEmpty(data.form_errors)) {
+ fetchAndLoadGroups();
+ $("#teamModal").modal("hide");
+ return;
+ }
+ for(var inputId in data.form_errors) {
+ var errorMessage = data.form_errors[inputId];
+ $(`${inputId}Error`).text(errorMessage).show();
+ }
+ }
+ });
+ });
+
+ $("#teamDelete").off("click").on("click", () => {
+ $.ajax({
+ type: "POST",
+ url: pageUrl,
+ data: {
+ csrfmiddlewaretoken: csrfMiddlewareToken,
+ tasks: ["delete-team"],
+ team_id: teamId
+ },
+ error: (error) => {
+ console.error(error);
+ },
+ success: (data) => {
+ fetchAndLoadGroups();
+ $("#teamModal").modal("hide");
+ }
+ });
+ });
+
+ $("#teamNumberNext").off("click").on("click", () => {
+ $.ajax({
+ type: "POST",
+ url: pageUrl,
+ data: {
+ csrfmiddlewaretoken: csrfMiddlewareToken,
+ tasks: ["get-nextTeamNumber"]
+ },
+ error: (error) => {
+ console.error(error);
+ },
+ success: (data) => {
+ $("#teamNumber").val(data.nextTeamNumber);
+ }
+ });
+ });
}
/**
diff --git a/src/templates/base.html b/src/templates/base.html
index 94a1532..1cb3765 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -3,7 +3,7 @@
-
{% block title %}{% endblock title %}AT Results
+
{% block title %}{% endblock title %}Angling Trust Results
{% load static %}
@@ -14,9 +14,60 @@
{% block style %}
{% endblock style %}
-
- {% block content %}
- {% endblock content %}
+
+
+
+
+
+
+
+
+ {% block header_buttons %}
+ {% endblock header_buttons %}
+
+
+
+ {% block content %}
+ {% endblock content %}
+
+
+
+
+
