Skip to content

Adding filtering and labels to frontend #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
reynoldsottawa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adding filtering and labels to frontend #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions frontend/src/components/DisplayDriver.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@
const driversName = ref(runs[0].driverName);
const carNumber = ref(runs[0].carNumber);
const carClass = ref(runs[0].carClass);
const bestRawTime = ref(Math.min(...runs.map(run => run.rawTime)));
const bestPaxTime = ref(Math.min(...runs.map(run => run.paxTime)));
</script>

<template>
<p>Driver: {{ driversName }}</p>
<p>Car Number: {{ carNumber }}</p>
<p>Car Class: {{ carClass }}</p>
<p>Best Raw Time: {{ bestRawTime }}</p>
<p>Best Pax Time: {{ bestPaxTime }}</p>
</template>
127 changes: 105 additions & 22 deletions frontend/src/components/DisplayRuns.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,72 @@
const props = defineProps(['runs', 'displayType', 'sortType']);

function sort(runs, sortType){
if(sortType === "raw"){
const newRuns = [].slice.call(runs).sort((a, b) => a.rawTime - b.rawTime);
return newRuns;
// sort by created time
if (sortType === undefined) {
const newRuns = [].slice.call(runs).sort((a, b) => {
const runCreateA = Number(a.created);
const runCreateB = Number(b.created);
if (runCreateA < runCreateB) {
return 1;
}
if (runCreateA > runCreateB) {
return -1;
}
return 0;
});
return newRuns
}
else if(sortType === "pax"){
const newRuns = [].slice.call(runs).sort((a, b) => a.paxTime - b.paxTime);
return newRuns;
}
else {
return runs;
}
};

// sort by run time, only show fastest per-car
const newRuns = [].slice.call(runs).sort((a, b) => {
const timeA = Number(sortType == 'raw' ? a.rawTime : a.paxTime);
const timeB = Number(sortType == 'raw' ? b.rawTime : b.paxTime);

// Add 2 seconds per cone
const timePenA = Number(a.cones * 2);
const timePenB = Number(b.cones * 2);

if (timeA + timePenA > timeB + timePenB) {
return 1;
}
if (timeA + timePenA < timeB + timePenB) {
return -1;
}
return 0;
});

// filter to only fastest run
const cars_seen = []
const filterRuns = newRuns.filter((run) => {
if (cars_seen.includes(run.carNumber)) {
return false
}
cars_seen.push(run.carNumber)
return true
});
return filterRuns
}

function individualmeta(runs){
// Find best run
var best_time = 999999999
runs.forEach((run) => {
const runTime = Number(run.rawTime) + run.cones * 2;
if (runTime < best_time && run.isDnf!==1 && run.getsRerun!==1) {
if (best_time !== 999999999) {
run.delta = Math.round((best_time - runTime) * 1000) / 1000
}
best_time = runTime
}
});
runs.forEach((run) => {
const runTime = Number(run.rawTime) + run.cones * 2;
if (runTime == best_time) {
run.best = 1
}
});
return runs
}
</script>

<template>
Expand All @@ -24,13 +78,14 @@
</div>
<div v-if="runs" class="content">
<div v-if="displayType==='individual-car'">
<p class="run-container" v-for="(run, index) in runs" :key="runs.runNumber">
<span class="run-number">{{ index+1 }}</span>
<p class="run-container" v-for="(run, index) in individualmeta(runs)" :key="runs.runNumber">
<span class="run-number">Run {{ index+1 }}</span>
<span class="run-name">{{ run.driverName }}</span>
<template v-if="run.isDnf!==1 && run.getsRerun!==1">
<span class="right">
<span v-if="run.cones" class="run-cones">+{{ run.cones }}</span>
<span class="run-paxtime">{{ run.paxTime }}</span>
<span v-if="run.cones >= 2" class="run-cones">+{{ run.cones }} Cones</span>
<span v-else-if="run.cones == 1" class="run-cones">+{{ run.cones }} Cone</span>
<span class="run-rawtime">Raw: {{ run.rawTime }}</span>
</span>
</template>
<template v-else-if="run.getsRerun==1">
Expand All @@ -48,22 +103,36 @@
<span class="run-car-number">#{{ run.carNumber }}</span>
<template v-if="run.isDnf!==1 && run.getsRerun!==1">
<span class="right">
<span class="run-rawtime">({{ run.rawTime }})</span>
<span class="run_alt_time">
<span class="run-paxtime">(PAX: {{ run.paxTime }})</span>
</span>
</span>
</template>
<br/>
<span v-if="run.best==1" class="best-run">🔥 BEST TIME 🔥</span>
<template v-if="run.isDnf!==1 && run.getsRerun!==1 && run.delta > 0">
<span class="right">
<span class="run-delta"> NEW BEST (-{{ run.delta }})</span>
</span>
</template>
<br/>
</p>
</div>
<div v-else>
<p v-for="(run, index) in sort(runs, sortType)" :key="sortType">
<RouterLink :to="'/event/' + run.eventId + '/car/' + run.carNumber" class="link-container">
<span v-if="sortType" class="run-number">{{ index+1 }}</span>
<span v-else class="run-number">{{ run.runNumber }}</span>
<span v-else class="run-number">Run {{ run.runNumber }}</span>
<span class="run-name">{{ run.driverName }}</span>
<span v-if="sortType && index == 0">🥇</span>
<span v-else-if="sortType && index == 1">🥈</span>
<span v-else-if="sortType && index == 2">🥉</span>
<template v-if="run.isDnf!==1 && run.getsRerun!==1">
<span class="right">
<span v-if="run.cones" class="run-cones">+{{ run.cones }}</span>
<span v-if="sortType==='raw'" class="run-rawtime">{{ run.rawTime }}</span>
<span v-else class="run-paxtime">{{ run.paxTime }}</span>
<span v-if="run.cones >= 2" class="run-cones">+{{ run.cones }} Cones</span>
<span v-else-if="run.cones == 1" class="run-cones">+{{ run.cones }} Cone</span>
<span v-if="sortType==='raw'" class="run-rawtime">Raw {{ run.rawTime }}</span>
<span v-else class="run-paxtime">PAX {{ run.paxTime }}</span>
</span>
</template>
<template v-else-if="run.getsRerun==1">
Expand All @@ -81,8 +150,10 @@
<span class="run-car-number">#{{ run.carNumber }}</span>
<template v-if="run.isDnf!==1 && run.getsRerun!==1">
<span class="right">
<span v-if="sortType==='raw'" class="run-paxtime">({{ run.paxTime }})</span>
<span v-else class="run-rawtime">({{ run.rawTime }})</span>
<span class="run_alt_time">
<span v-if="sortType==='raw'" class="run-paxtime">(PAX: {{ run.paxTime }})</span>
<span v-else class="run-rawtime">(Raw: {{ run.rawTime }})</span>
</span>
</span>
</template>
</RouterLink>
Expand All @@ -101,6 +172,18 @@
padding-right: 10px;
}

.run_alt_time {
color: grey;
}

.run-delta {
color: green;
}
.best-run {
color: green;
}


.link-container, .run-container {
display: block;
text-decoration: none; /* Remove default underline */
Expand Down