Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Kristoffer Håkon Håkonsen
tdt4242-base
Commits
e99d34de
Commit
e99d34de
authored
Mar 15, 2021
by
Pernille Welle-Watne
Browse files
Fix sort bug for planned and remove console logs
parent
30948248
Pipeline
#116921
passed with stage
in 1 minute and 31 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
frontend/www/scripts/workout.js
View file @
e99d34de
...
...
@@ -23,7 +23,6 @@ async function retrieveWorkout(id) {
if
(
workoutData
.
planned
)
{
plannedTitle
=
document
.
querySelector
(
"
#title-planned
"
);
console
.
log
(
plannedTitle
)
plannedDescription
=
document
.
querySelector
(
"
#description-planned
"
);
plannedTitle
.
className
=
plannedTitle
.
className
.
replace
(
"
hide
"
,
""
);
...
...
frontend/www/scripts/workouts.js
View file @
e99d34de
...
...
@@ -143,12 +143,9 @@ window.addEventListener("DOMContentLoaded", async () => {
let
workout
=
allWorkouts
[
j
];
let
workoutAnchor
=
workoutAnchors
[
j
];
console
.
log
(
workout
)
switch
(
event
.
currentTarget
.
id
)
{
case
"
list-my-logged-workouts-list
"
:
if
(
workout
.
owner
==
currentUser
.
url
&&
!
workout
.
planned
)
{
console
.
log
(
workout
.
owner
)
workoutAnchor
.
classList
.
remove
(
"
hide
"
);
}
else
{
workoutAnchor
.
classList
.
add
(
"
hide
"
);
...
...
@@ -156,7 +153,7 @@ window.addEventListener("DOMContentLoaded", async () => {
break
;
case
"
list-my-planned-workouts-list
"
:
if
(
workout
.
owner
==
currentUser
.
ur
&&
workout
.
planned
)
{
if
(
workout
.
owner
==
currentUser
.
ur
l
&&
workout
.
planned
)
{
workoutAnchor
.
classList
.
remove
(
"
hide
"
);
}
else
{
workoutAnchor
.
classList
.
add
(
"
hide
"
);
...
...
@@ -198,7 +195,6 @@ window.addEventListener("DOMContentLoaded", async () => {
})
if
(
athletes
.
includes
(
workout
.
athlete
))
{
console
.
log
(
"
hei
"
)
workoutAnchor
.
classList
.
remove
(
'
hide
'
);
}
else
{
workoutAnchor
.
classList
.
add
(
'
hide
'
);
...
...
Pernille Nødtvedt Welle-Watne
@pernilnw
mentioned in commit
e8669e9a
·
Mar 15, 2021
mentioned in commit
e8669e9a
mentioned in commit e8669e9a486036cbc9e179a252e8935ae7b9856e
Toggle commit list
Pernille Nødtvedt Welle-Watne
@pernilnw
mentioned in merge request
!14 (closed)
·
Mar 15, 2021
mentioned in merge request
!14 (closed)
mentioned in merge request !14
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment