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
91beab12
Commit
91beab12
authored
3 years ago
by
hollum
Browse files
Options
Downloads
Patches
Plain Diff
refactoring
parent
454811a5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#159977
passed with stages
in 1 minute and 48 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/www/goal.html
+4
-4
4 additions, 4 deletions
frontend/www/goal.html
frontend/www/scripts/goal.js
+13
-15
13 additions, 15 deletions
frontend/www/scripts/goal.js
with
17 additions
and
19 deletions
frontend/www/goal.html
+
4
−
4
View file @
91beab12
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<h3
class=
"mt-3"
>
Create/Edit Goal
</h3>
<h3
class=
"mt-3"
>
Create/Edit Goal
</h3>
</div>
</div>
</div>
</div>
<form
class=
"row g-3"
id=
"form-
exercise
"
>
<form
class=
"row g-3"
id=
"form-
goal
"
>
<div
class=
"col-lg-6 "
>
<div
class=
"col-lg-6 "
>
<label
for=
"inputName"
class=
"form-label"
>
Goal
</label>
<label
for=
"inputName"
class=
"form-label"
>
Goal
</label>
<input
type=
"text"
class=
"form-control"
id=
"inputName"
name=
"name"
>
<input
type=
"text"
class=
"form-control"
id=
"inputName"
name=
"name"
>
...
@@ -42,9 +42,9 @@
...
@@ -42,9 +42,9 @@
</div>
</div>
<div
class=
"col-lg-6"
></div>
<div
class=
"col-lg-6"
></div>
<div
class=
"col-lg-6"
>
<div
class=
"col-lg-6"
>
<input
type=
"button"
class=
"btn btn-primary "
id=
"btn-ok-
exercise
"
value=
" UPDATE "
>
<input
type=
"button"
class=
"btn btn-primary "
id=
"btn-ok-
goal
"
value=
" UPDATE "
>
<input
type=
"button"
class=
"btn btn-secondary "
id=
"btn-cancel-
exercise
"
value=
"Cancel"
>
<input
type=
"button"
class=
"btn btn-secondary "
id=
"btn-cancel-
goal
"
value=
"Cancel"
>
<input
type=
"button"
class=
"btn btn-danger float-end "
id=
"btn-delete-
exercise
"
value=
"Delete"
>
<input
type=
"button"
class=
"btn btn-danger float-end "
id=
"btn-delete-
goal
"
value=
"Delete"
>
</div>
</div>
<div
class=
"col-lg-6"
>
<div
class=
"col-lg-6"
>
...
...
This diff is collapsed.
Click to expand it.
frontend/www/scripts/goal.js
+
13
−
15
View file @
91beab12
...
@@ -9,17 +9,15 @@ function handleCancelButtonDuringCreate() {
...
@@ -9,17 +9,15 @@ function handleCancelButtonDuringCreate() {
window
.
location
.
replace
(
"
goals.html
"
);
window
.
location
.
replace
(
"
goals.html
"
);
}
}
async
function
create
Exercise
()
{
async
function
create
Goal
()
{
let
form
=
document
.
querySelector
(
"
#form-
exercise
"
);
let
form
=
document
.
querySelector
(
"
#form-
goal
"
);
let
formData
=
new
FormData
(
form
);
let
formData
=
new
FormData
(
form
);
let
body
=
{
"
name
"
:
formData
.
get
(
"
name
"
),
let
body
=
{
"
name
"
:
formData
.
get
(
"
name
"
),
"
description
"
:
formData
.
get
(
"
description
"
),
"
description
"
:
formData
.
get
(
"
description
"
),
"
date
"
:
formData
.
get
(
"
date
"
),
"
date
"
:
formData
.
get
(
"
date
"
),
"
exercise
"
:
formData
.
get
(
"
exercise
"
)};
"
exercise
"
:
formData
.
get
(
"
exercise
"
)};
console
.
log
(
"
HEELO
"
,
body
)
let
response
=
await
sendRequest
(
"
POST
"
,
`
${
HOST
}
/api/goal/`
,
body
);
let
response
=
await
sendRequest
(
"
POST
"
,
`
${
HOST
}
/api/goal/`
,
body
);
if
(
response
.
ok
)
{
if
(
response
.
ok
)
{
...
@@ -37,7 +35,7 @@ async function deleteExercise(id) {
...
@@ -37,7 +35,7 @@ async function deleteExercise(id) {
let
response
=
await
sendRequest
(
"
DELETE
"
,
`
${
HOST
}
/api/goal/
${
id
}
/`
);
let
response
=
await
sendRequest
(
"
DELETE
"
,
`
${
HOST
}
/api/goal/
${
id
}
/`
);
if
(
!
response
.
ok
)
{
if
(
!
response
.
ok
)
{
let
data
=
await
response
.
json
();
let
data
=
await
response
.
json
();
let
alert
=
createAlert
(
`Could not delete
exercise
${
id
}
`
,
data
);
let
alert
=
createAlert
(
`Could not delete
goal
${
id
}
`
,
data
);
document
.
body
.
prepend
(
alert
);
document
.
body
.
prepend
(
alert
);
}
else
{
}
else
{
window
.
location
.
replace
(
"
goals.html
"
);
window
.
location
.
replace
(
"
goals.html
"
);
...
@@ -51,11 +49,11 @@ async function retrieveGoal(id) {
...
@@ -51,11 +49,11 @@ async function retrieveGoal(id) {
if
(
!
response
.
ok
)
{
if
(
!
response
.
ok
)
{
let
data
=
await
response
.
json
();
let
data
=
await
response
.
json
();
let
alert
=
createAlert
(
"
Could not retrieve
exercise
data!
"
,
data
);
let
alert
=
createAlert
(
"
Could not retrieve
goal
data!
"
,
data
);
document
.
body
.
prepend
(
alert
);
document
.
body
.
prepend
(
alert
);
}
else
{
}
else
{
let
goalData
=
await
response
.
json
();
let
goalData
=
await
response
.
json
();
let
form
=
document
.
querySelector
(
"
#form-
exercise
"
);
let
form
=
document
.
querySelector
(
"
#form-
goal
"
);
let
formData
=
new
FormData
(
form
);
let
formData
=
new
FormData
(
form
);
for
(
let
key
of
formData
.
keys
())
{
for
(
let
key
of
formData
.
keys
())
{
...
@@ -77,7 +75,7 @@ async function retrieveGoal(id) {
...
@@ -77,7 +75,7 @@ async function retrieveGoal(id) {
}
}
async
function
updateExercise
(
id
)
{
async
function
updateExercise
(
id
)
{
let
form
=
document
.
querySelector
(
"
#form-
exercise
"
);
let
form
=
document
.
querySelector
(
"
#form-
goal
"
);
let
formData
=
new
FormData
(
form
);
let
formData
=
new
FormData
(
form
);
let
muscleGroupSelector
=
document
.
querySelector
(
"
select
"
)
let
muscleGroupSelector
=
document
.
querySelector
(
"
select
"
)
...
@@ -93,7 +91,7 @@ async function updateExercise(id) {
...
@@ -93,7 +91,7 @@ async function updateExercise(id) {
if
(
!
response
.
ok
)
{
if
(
!
response
.
ok
)
{
let
data
=
await
response
.
json
();
let
data
=
await
response
.
json
();
let
alert
=
createAlert
(
`Could not update
exercise
${
id
}
`
,
data
);
let
alert
=
createAlert
(
`Could not update
goal
${
id
}
`
,
data
);
document
.
body
.
prepend
(
alert
);
document
.
body
.
prepend
(
alert
);
}
else
{
}
else
{
console
.
log
(
response
)
console
.
log
(
response
)
...
@@ -103,7 +101,7 @@ async function updateExercise(id) {
...
@@ -103,7 +101,7 @@ async function updateExercise(id) {
}
}
const
init
=
async
()
=>
{
const
init
=
async
()
=>
{
let
c
oa
ch
Container
=
document
.
getElementById
(
'
exercise-content
'
);
let
g
oa
l
Container
=
document
.
getElementById
(
'
exercise-content
'
);
await
sendRequest
(
"
GET
"
,
`
${
HOST
}
/api/exercises/`
).
then
(
async
(
val
)
=>
{
await
sendRequest
(
"
GET
"
,
`
${
HOST
}
/api/exercises/`
).
then
(
async
(
val
)
=>
{
val
.
json
().
then
((
resp
)
=>
{
val
.
json
().
then
((
resp
)
=>
{
resp
.
results
.
forEach
(
workout
=>
{
resp
.
results
.
forEach
(
workout
=>
{
...
@@ -120,7 +118,7 @@ const init = async () => {
...
@@ -120,7 +118,7 @@ const init = async () => {
newOption
.
textContent
=
workout
.
name
;
newOption
.
textContent
=
workout
.
name
;
}
}
c
oa
ch
Container
.
appendChild
(
newOption
);
g
oa
l
Container
.
appendChild
(
newOption
);
}
}
});
});
})
})
...
@@ -131,9 +129,9 @@ const init = async () => {
...
@@ -131,9 +129,9 @@ const init = async () => {
window
.
addEventListener
(
"
DOMContentLoaded
"
,
async
()
=>
{
window
.
addEventListener
(
"
DOMContentLoaded
"
,
async
()
=>
{
await
init
();
await
init
();
cancelButton
=
document
.
querySelector
(
"
#btn-cancel-
exercise
"
);
cancelButton
=
document
.
querySelector
(
"
#btn-cancel-
goal
"
);
okButton
=
document
.
querySelector
(
"
#btn-ok-
exercise
"
);
okButton
=
document
.
querySelector
(
"
#btn-ok-
goal
"
);
deleteButton
=
document
.
querySelector
(
"
#btn-delete-
exercise
"
);
deleteButton
=
document
.
querySelector
(
"
#btn-delete-
goal
"
);
oldFormData
=
null
;
oldFormData
=
null
;
const
urlParams
=
new
URLSearchParams
(
window
.
location
.
search
);
const
urlParams
=
new
URLSearchParams
(
window
.
location
.
search
);
...
@@ -152,7 +150,7 @@ window.addEventListener("DOMContentLoaded", async () => {
...
@@ -152,7 +150,7 @@ window.addEventListener("DOMContentLoaded", async () => {
cancelButton
.
className
=
cancelButton
.
className
+=
"
hide
"
;
cancelButton
.
className
=
cancelButton
.
className
+=
"
hide
"
;
deleteButton
.
className
=
deleteButton
.
className
+=
"
hide
"
;
deleteButton
.
className
=
deleteButton
.
className
+=
"
hide
"
;
okButton
.
addEventListener
(
"
click
"
,
async
()
=>
await
create
Exercise
());
okButton
.
addEventListener
(
"
click
"
,
async
()
=>
await
create
Goal
());
}
}
});
});
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