xeovalyte/wrbapp
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fixed merge conflicts
All checks were successful
Build and Deploy / Deploy (push) Successful in 1m45s
Details

Browse Source
This commit is contained in:
Xeovalyte 2023-05-10 12:21:11 +02:00
parent c9e6cf37e9
commit 86da69288e
2 changed files with 4255 additions and 5964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10215
frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
frontend/pages/wedstrijd/addcontest.vue
View File

@ -200,11 +200,7 @@ const submitContestForm = async () => {
const docRef = doc(collection(db, 'timings')) const docRef = doc(collection(db, 'timings'))
batch.set(docRef, { batch.set(docRef, {
relatiecode: competitor.relatiecode, relatiecode: competitor.relatiecode,
<<<<<<< HEAD
contest: { location: contest.value.location, date: contest.value.date, type: contest.value.type },
=======
contest: { location: contest.value.location, date: new Date(contest.value.date), type: contest.value.type }, contest: { location: contest.value.location, date: new Date(contest.value.date), type: contest.value.type },
>>>>>>> dev
event: event.id, event: event.id,
time: { minutes: competitor.time.minutes.toString().padStart(2, '0'), seconds: competitor.time.seconds.toString().padStart(2, '0'), milliseconds: competitor.time.milliseconds.toString().padStart(2, '0'), combined: combinedTime }, time: { minutes: competitor.time.minutes.toString().padStart(2, '0'), seconds: competitor.time.seconds.toString().padStart(2, '0'), milliseconds: competitor.time.milliseconds.toString().padStart(2, '0'), combined: combinedTime },
dsq: competitor.dsq, dsq: competitor.dsq,