Skip to content
GitLab
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
5b7d9717
Commit
5b7d9717
authored
Mar 15, 2021
by
Pernille Nødtvedt Welle-Watne
Browse files
Merge branch 'fix-athlete-suggest' into 'master'
make no athlete page more user friendly See merge request
!15
parents
b4a75ef7
bc22cd97
Pipeline
#117082
passed with stages
in 3 minutes and 23 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
frontend/www/scripts/suggestedworkout.js
View file @
5b7d9717
...
...
@@ -401,34 +401,38 @@ window.addEventListener("DOMContentLoaded", async () => {
postCommentButton
.
addEventListener
(
"
click
"
,
(
async
(
id
)
=>
await
createComment
(
id
)).
bind
(
undefined
,
id
));
}
}
else
{
await
createBlankExercise
();
coachTitle
.
className
=
coachTitle
.
className
.
replace
(
"
hide
"
,
""
);
if
(
currentUser
.
athletes
.
length
>
0
)
{
await
selectAthletesForSuggest
(
currentUser
);
}
else
{
let
alert
=
createAlert
(
"
Will no be able to suggest workout due to not having any athltes
"
,
undefined
);
document
.
body
.
prepend
(
alert
);
}
await
createBlankExercise
();
setReadOnly
(
false
,
"
#form-workout
"
);
let
ownerInput
=
document
.
querySelector
(
"
#inputOwner
"
);
ownerInput
.
value
=
currentUser
.
username
;
ownerInput
.
readOnly
=
!
ownerInput
.
readOnly
;
let
dateInput
=
document
.
querySelector
(
"
#inputDateTime
"
);
dateInput
.
readOnly
=
!
dateInput
.
readOnly
;
setReadOnly
(
false
,
"
#form-workout
"
);
let
ownerInput
=
document
.
querySelector
(
"
#inputOwner
"
);
ownerInput
.
value
=
currentUser
.
username
;
ownerInput
.
readOnly
=
!
ownerInput
.
readOnly
;
let
dateInput
=
document
.
querySelector
(
"
#inputDateTime
"
);
dateInput
.
readOnly
=
!
dateInput
.
readOnly
;
coachTitle
.
className
=
coachTitle
.
className
.
replace
(
"
hide
"
,
""
);
okWorkoutButton
.
className
=
okWorkoutButton
.
className
.
replace
(
"
hide
"
,
""
);
cancelWorkoutButton
.
className
=
cancelWorkoutButton
.
className
.
replace
(
"
hide
"
,
""
);
buttonAddExercise
.
className
=
buttonAddExercise
.
className
.
replace
(
"
hide
"
,
""
);
buttonRemoveExercise
.
className
=
buttonRemoveExercise
.
className
.
replace
(
"
hide
"
,
""
);
coachTitle
.
className
=
coachTitle
.
className
.
replace
(
"
hide
"
,
""
);
okWorkoutButton
.
addEventListener
(
"
click
"
,
(
async
(
currentUser
)
=>
await
createSuggestWorkout
(
currentUser
)).
bind
(
undefined
,
currentUser
));
cancelWorkoutButton
.
addEventListener
(
"
click
"
,
handleCancelDuringWorkoutCreate
);
okWorkoutButton
.
className
=
okWorkoutButton
.
className
.
replace
(
"
hide
"
,
""
);
cancelWorkoutButton
.
className
=
cancelWorkoutButton
.
className
.
replace
(
"
hide
"
,
""
);
buttonAddExercise
.
className
=
buttonAddExercise
.
className
.
replace
(
"
hide
"
,
""
);
buttonRemoveExercise
.
className
=
buttonRemoveExercise
.
className
.
replace
(
"
hide
"
,
""
);
okWorkoutButton
.
addEventListener
(
"
click
"
,
(
async
(
currentUser
)
=>
await
createSuggestWorkout
(
currentUser
)).
bind
(
undefined
,
currentUser
));
cancelWorkoutButton
.
addEventListener
(
"
click
"
,
handleCancelDuringWorkoutCreate
);
}
else
{
let
description
=
document
.
querySelector
(
"
#description-no-athletes
"
);
description
.
className
=
description
.
className
.
replace
(
"
hide
"
,
""
);
}
}
});
\ No newline at end of file
frontend/www/suggestworkout.html
View file @
5b7d9717
...
...
@@ -31,6 +31,11 @@
</h3>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-lg"
>
<p
class=
"mt-4 hide"
id=
"description-no-athletes"
>
You can not suggest a workout since you have no registered athletes
</p>
</div>
</div>
<form
class=
"row g-3 mb-4"
id=
"form-workout"
>
<div
class=
"col-lg-6"
>
<label
for=
"inputName"
class=
"form-label"
>
Name
</label>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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