Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TDT4242-group15
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vegard Murvold Sporstøl
TDT4242-group15
Commits
cdca36e1
Commit
cdca36e1
authored
4 years ago
by
Irina Kera Gundersen
Browse files
Options
Downloads
Patches
Plain Diff
Hide possibility to assign owner when editing workout
parent
5fb6df7e
No related branches found
No related tags found
1 merge request
!6
Uc 1
Pipeline
#113906
passed
4 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/www/scripts/workout.js
+8
-9
8 additions, 9 deletions
frontend/www/scripts/workout.js
frontend/www/workout.html
+4
-2
4 additions, 2 deletions
frontend/www/workout.html
with
12 additions
and
11 deletions
frontend/www/scripts/workout.js
+
8
−
9
View file @
cdca36e1
...
...
@@ -34,6 +34,7 @@ async function retrieveWorkout(id) {
}
let
input
=
form
.
querySelector
(
"
select:disabled
"
);
document
.
getElementById
(
"
divAthlete
"
).
style
.
display
=
"
none
"
;
input
.
value
=
workoutData
[
"
visibility
"
];
// files
let
filesDiv
=
document
.
querySelector
(
"
#uploaded-files
"
);
...
...
@@ -108,6 +109,7 @@ async function retrieveWorkout(id) {
let
exerciseNumberInput
=
divExerciseContainer
.
querySelector
(
"
input[name='number']
"
);
exerciseNumberInput
.
id
=
`inputNumber
${
i
}
`
;
exerciseNumberInput
.
value
=
workoutData
.
exercise_instances
[
i
].
number
;
exerciseNumberInput
.
readOnly
=
true
;
...
...
@@ -154,8 +156,8 @@ function handleEditWorkoutButtonClick() {
let
removeExerciseButton
=
document
.
querySelector
(
"
#btn-remove-exercise
"
);
setReadOnly
(
false
,
"
#form-workout
"
);
document
.
querySelector
(
"
#inputOwner
"
).
readOnly
=
true
;
// owner field should still be readonly
document
.
querySelector
(
"
#forAthlete
"
).
hidden
=
true
editWorkoutButton
.
className
+=
"
hide
"
;
okWorkoutButton
.
className
=
okWorkoutButton
.
className
.
replace
(
"
hide
"
,
""
);
...
...
@@ -220,7 +222,7 @@ function generateWorkoutForm() {
submitForm
.
append
(
"
name
"
,
formData
.
get
(
"
name
"
));
let
date
=
new
Date
(
formData
.
get
(
"
date
"
)).
toISOString
();
submitForm
.
append
(
"
date
"
,
date
);
submitForm
.
append
(
"
owner
"
,
formData
.
get
(
"
owner_username
"
))
submitForm
.
append
(
"
owner
"
,
formData
.
get
(
"
owner_username
"
))
;
submitForm
.
append
(
"
notes
"
,
formData
.
get
(
"
notes
"
));
submitForm
.
append
(
"
visibility
"
,
formData
.
get
(
"
visibility
"
));
...
...
@@ -247,7 +249,7 @@ function generateWorkoutForm() {
async
function
createWorkout
()
{
let
submitForm
=
generateWorkoutForm
();
console
.
log
(
submitForm
)
console
.
log
(
submitForm
)
;
let
response
=
await
sendRequest
(
"
POST
"
,
...
...
@@ -422,15 +424,12 @@ window.addEventListener("DOMContentLoaded", async () => {
}
else
{
await
createBlankExercise
();
coach
=
false
;
//sjekke om den er huket av
let
query
=
"
#inputOwner
"
;
let
ownerInput
=
document
.
querySelector
(
query
);
let
check
=
document
.
querySelector
(
"
#forAthlete
"
);
console
.
log
(
check
);
ownerInput
.
value
=
currentUser
.
username
;
if
(
coach
)
{
query
=
"
#athletes
"
;
ownerInput
=
document
.
querySelector
(
query
);
ownerInput
.
value
=
"
athlete1
"
;
}
console
.
log
(
ownerInput
.
value
);
setReadOnly
(
false
,
"
#form-workout
"
);
ownerInput
.
readOnly
=
!
ownerInput
.
readOnly
;
...
...
This diff is collapsed.
Click to expand it.
frontend/www/workout.html
+
4
−
2
View file @
cdca36e1
...
...
@@ -60,8 +60,10 @@
</div>
<div
class=
"col-lg-6"
></div>
<div
class=
"col-lg-6"
>
<label
for=
"forAthlete"
>
Create workout for athlete
</label>
<input
id=
"forAthlete"
type=
"checkbox"
onclick=
"athleteChecked()"
/>
<div
id=
"divAthlete"
>
<label
for=
"forAthlete"
>
Create workout for athlete
</label>
<input
id=
"forAthlete"
type=
"checkbox"
onclick=
"athleteChecked()"
/>
</div>
<div
class=
"col-lg-6"
></div>
<p>
Owner
</p>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment