Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tdt4242-ex2
Manage
Activity
Members
Labels
Plan
Issues
4
Issue boards
Milestones
Wiki
Code
Merge requests
0
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
Jørgen Hollum
tdt4242-ex2
Commits
ce668400
Commit
ce668400
authored
2 years ago
by
Sigurd
Browse files
Options
Downloads
Patches
Plain Diff
Exercise.js - Solarlint and some p42
Only missing safe changes is let -> const
parent
d8d51f97
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#168376
passed with stage
in 30 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
frontend/www/scripts/exercise.js
+45
-47
45 additions, 47 deletions
frontend/www/scripts/exercise.js
with
45 additions
and
47 deletions
frontend/www/scripts/exercise.js
+
45
−
47
View file @
ce668400
...
...
@@ -10,7 +10,7 @@ class MuscleGroup {
this
.
validTypes
=
[
"
Legs
"
,
"
Chest
"
,
"
Back
"
,
"
Arms
"
,
"
Abdomen
"
,
"
Shoulders
"
]
this
.
type
=
this
.
validTypes
.
includes
(
type
)
?
type
:
undefined
;
}
;
}
setMuscleGroupType
=
(
newType
)
=>
{
this
.
isValidType
=
false
;
...
...
@@ -23,7 +23,7 @@ class MuscleGroup {
alert
(
"
Invalid muscle group!
"
);
}
}
;
}
getMuscleGroupType
=
()
=>
{
console
.
log
(
this
.
type
,
"
SWIOEFIWEUFH
"
)
...
...
@@ -77,11 +77,11 @@ async function createExercise() {
if
(
response
.
ok
)
{
window
.
location
.
replace
(
"
exercises.html
"
);
}
else
{
let
data
=
await
response
.
json
();
let
alert
=
createAlert
(
"
Could not create new exercise!
"
,
data
);
document
.
body
.
prepend
(
alert
);
return
;
}
let
data
=
await
response
.
json
();
let
alert
=
createAlert
(
"
Could not create new exercise!
"
,
data
);
document
.
body
.
prepend
(
alert
);
}
function
handleEditExerciseButtonClick
()
{
...
...
@@ -120,21 +120,20 @@ async function retrieveExercise(id) {
let
data
=
await
response
.
json
();
let
alert
=
createAlert
(
"
Could not retrieve exercise data!
"
,
data
);
document
.
body
.
prepend
(
alert
);
}
else
{
document
.
querySelector
(
"
select
"
).
removeAttribute
(
"
disabled
"
)
let
exerciseData
=
await
response
.
json
();
let
form
=
document
.
querySelector
(
"
#form-exercise
"
);
let
formData
=
new
FormData
(
form
);
for
(
let
key
of
formData
.
keys
())
{
let
selector
key
!==
"
muscleGroup
"
?
selector
=
`input[name="
${
key
}
"], textarea[name="
${
key
}
"]`
:
selector
=
`select[name=
${
key
}
]`
let
input
=
form
.
querySelector
(
selector
);
let
newVal
=
exerciseData
[
key
];
input
.
value
=
newVal
;
}
document
.
querySelector
(
"
select
"
).
setAttribute
(
"
disabled
"
,
""
)
return
;
}
document
.
querySelector
(
"
select
"
).
removeAttribute
(
"
disabled
"
)
let
exerciseData
=
await
response
.
json
();
let
form
=
document
.
querySelector
(
"
#form-exercise
"
);
let
formData
=
new
FormData
(
form
);
for
(
let
key
of
formData
.
keys
())
{
const
selector
=
key
!==
"
muscleGroup
"
?
`input[name="
${
key
}
"], textarea[name="
${
key
}
"]`
:
`select[name=
${
key
}
]`
let
input
=
form
.
querySelector
(
selector
);
let
newVal
=
exerciseData
[
key
];
input
.
value
=
newVal
;
}
document
.
querySelector
(
"
select
"
).
setAttribute
(
"
disabled
"
,
""
)
}
async
function
updateExercise
(
id
)
{
...
...
@@ -158,25 +157,25 @@ async function updateExercise(id) {
let
data
=
await
response
.
json
();
let
alert
=
createAlert
(
`Could not update exercise
${
id
}
`
,
data
);
document
.
body
.
prepend
(
alert
);
}
else
{
muscleGroupSelector
.
setAttribute
(
"
disabled
"
,
""
)
// duplicate code from handleCancelButtonDuringEdit
// you should refactor this
setReadOnly
(
true
,
"
#form-exercise
"
);
okButton
.
className
+=
"
hide
"
;
deleteButton
.
className
+=
"
hide
"
;
cancelButton
.
className
+=
"
hide
"
;
editButton
.
className
=
editButton
.
className
.
replace
(
"
hide
"
,
""
);
return
;
}
muscleGroupSelector
.
setAttribute
(
"
disabled
"
,
""
)
// duplicate code from handleCancelButtonDuringEdit
// you should refactor this
setReadOnly
(
true
,
"
#form-exercise
"
);
okButton
.
className
+=
"
hide
"
;
deleteButton
.
className
+=
"
hide
"
;
cancelButton
.
className
+=
"
hide
"
;
editButton
.
className
=
editButton
.
className
.
replace
(
"
hide
"
,
""
);
cancelButton
.
removeEventListener
(
"
click
"
,
handleCancelButtonDuringEdit
);
cancelButton
.
removeEventListener
(
"
click
"
,
handleCancelButtonDuringEdit
);
oldFormData
.
delete
(
"
name
"
);
oldFormData
.
delete
(
"
description
"
);
oldFormData
.
delete
(
"
duration
"
);
oldFormData
.
delete
(
"
calories
"
);
oldFormData
.
delete
(
"
muscleGroup
"
);
oldFormData
.
delete
(
"
unit
"
);
}
oldFormData
.
delete
(
"
name
"
);
oldFormData
.
delete
(
"
description
"
);
oldFormData
.
delete
(
"
duration
"
);
oldFormData
.
delete
(
"
calories
"
);
oldFormData
.
delete
(
"
muscleGroup
"
);
oldFormData
.
delete
(
"
unit
"
);
}
window
.
addEventListener
(
"
DOMContentLoaded
"
,
async
()
=>
{
...
...
@@ -194,18 +193,17 @@ window.addEventListener("DOMContentLoaded", async () => {
await
retrieveExercise
(
exerciseId
);
editButton
.
addEventListener
(
"
click
"
,
handleEditExerciseButtonClick
);
deleteButton
.
addEventListener
(
"
click
"
,
(
async
(
id
)
=>
await
deleteExercise
(
id
)).
bind
(
undefined
,
exerciseId
));
okButton
.
addEventListener
(
"
click
"
,
(
async
(
id
)
=>
await
updateExercise
(
id
)).
bind
(
undefined
,
exerciseId
));
deleteButton
.
addEventListener
(
"
click
"
,
(
async
(
id
)
=>
deleteExercise
(
id
)).
bind
(
undefined
,
exerciseId
));
okButton
.
addEventListener
(
"
click
"
,
(
async
(
id
)
=>
updateExercise
(
id
)).
bind
(
undefined
,
exerciseId
));
return
;
}
//create
else
{
setReadOnly
(
false
,
"
#form-exercise
"
);
setReadOnly
(
false
,
"
#form-exercise
"
);
editButton
.
className
+=
"
hide
"
;
okButton
.
className
=
okButton
.
className
.
replace
(
"
hide
"
,
""
);
cancelButton
.
className
=
cancelButton
.
className
.
replace
(
"
hide
"
,
""
);
editButton
.
className
+=
"
hide
"
;
okButton
.
className
=
okButton
.
className
.
replace
(
"
hide
"
,
""
);
cancelButton
.
className
=
cancelButton
.
className
.
replace
(
"
hide
"
,
""
);
okButton
.
addEventListener
(
"
click
"
,
async
()
=>
await
createExercise
());
cancelButton
.
addEventListener
(
"
click
"
,
handleCancelButtonDuringCreate
);
}
okButton
.
addEventListener
(
"
click
"
,
async
()
=>
createExercise
());
cancelButton
.
addEventListener
(
"
click
"
,
handleCancelButtonDuringCreate
);
});
\ No newline at end of file
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