Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tdt4242-base
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
Rolf Erik Sesseng Aas
tdt4242-base
Commits
0ee57281
Commit
0ee57281
authored
4 years ago
by
ibooking-sigurd
Browse files
Options
Downloads
Patches
Plain Diff
Refactor to fix the last two critical code smells.
parent
1147b2e9
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
frontend/www/scripts/myathletes.js
+40
-32
40 additions, 32 deletions
frontend/www/scripts/myathletes.js
with
40 additions
and
32 deletions
frontend/www/scripts/myathletes.js
+
40
−
32
View file @
0ee57281
...
...
@@ -53,7 +53,7 @@ function createFilledRow(templateFilledAthlete, inputValue, controls, disabled)
async
function
getDietInstances
()
{
let
response
=
await
sendRequest
(
"
GET
"
,
`
${
HOST
}
/api/diet-instances/`
);
return
await
response
.
json
();
return
response
.
json
();
}
function
createDiet
(
templateFile
,
name
)
{
...
...
@@ -63,7 +63,32 @@ function createDiet(templateFile, name) {
return
aDiet
;
}
async
function
createDietFiles
(
dietInstances
,
templateDiet
)
{
for
(
let
diet
of
dietInstances
.
results
)
{
let
dietURL
=
diet
.
diet
let
userURL
=
diet
.
user
;
let
dietRes
=
await
sendRequest
(
"
GET
"
,
`
${
dietURL
}
`
);
let
userRes
=
await
sendRequest
(
"
GET
"
,
`
${
userURL
}
`
);
let
dietData
=
await
dietRes
.
json
();
let
userData
=
await
userRes
.
json
();
if
(
userData
.
id
===
athlete
.
id
)
{
assignBtn
.
disabled
=
true
;
let
deleteBtn
=
selectionClone
.
querySelector
(
"
#delete-diet-button
"
);
deleteBtn
.
id
=
`diet-delete-button-
${
athlete
.
username
}
`
;
deleteBtn
.
addEventListener
(
"
click
"
,
async
()
=>
{
deleteDietInstance
(
diet
);
});
tabPanel
.
append
(
deleteBtn
);
let
tabP
=
tabPanel
.
querySelector
(
"
#dietfile
"
);
let
aDiet
=
createDiet
(
templateDiet
,
dietData
.
name
);
tabP
.
appendChild
(
aDiet
);
}
}
}
async
function
displayFiles
()
{
let
user
=
await
getCurrentUser
();
...
...
@@ -118,30 +143,9 @@ async function displayFiles() {
tabPanel
.
prepend
(
assignBtn
);
tabPanel
.
prepend
(
dietSelection
);
for
(
let
diet
of
dietInstances
.
results
)
{
let
dietURL
=
diet
.
diet
let
userURL
=
diet
.
user
;
let
dietRes
=
await
sendRequest
(
"
GET
"
,
`
${
dietURL
}
`
);
let
userRes
=
await
sendRequest
(
"
GET
"
,
`
${
userURL
}
`
);
let
dietData
=
await
dietRes
.
json
();
let
userData
=
await
userRes
.
json
();
if
(
userData
.
id
===
athlete
.
id
)
{
assignBtn
.
disabled
=
true
;
let
deleteBtn
=
selectionClone
.
querySelector
(
"
#delete-diet-button
"
);
deleteBtn
.
id
=
`diet-delete-button-
${
athlete
.
username
}
`
;
deleteBtn
.
addEventListener
(
"
click
"
,
async
()
=>
{
deleteDietInstance
(
diet
);
});
tabPanel
.
append
(
deleteBtn
);
createDietFiles
(
dietInstances
,
templateDiet
);
let
tabP
=
tabPanel
.
querySelector
(
"
#dietfile
"
);
let
aDiet
=
createDiet
(
templateDiet
,
dietData
.
name
);
tabP
.
appendChild
(
aDiet
);
}
}
}
...
...
@@ -301,14 +305,8 @@ async function submitRoster() {
body
.
athletes
.
push
(
athlete
.
id
);
}
else
{
// create offer
let
offerBody
=
{
'
status
'
:
'
p
'
,
'
recipient
'
:
athlete
.
url
};
let
offerResponse
=
await
sendRequest
(
"
POST
"
,
`
${
HOST
}
/api/offers/`
,
offerBody
);
if
(
!
offerResponse
.
ok
)
{
let
data
=
await
response
.
json
();
let
alert
=
createAlert
(
"
Could not create offer!
"
,
data
);
document
.
body
.
prepend
(
alert
);
await
createOffer
(
athlete
)
}
}
}
else
{
let
data
=
await
response
.
json
();
let
alert
=
createAlert
(
`Could not retrieve user
${
rosterInput
.
value
}
!`
,
data
);
...
...
@@ -320,6 +318,16 @@ async function submitRoster() {
location
.
reload
();
}
async
function
createOffer
(
athlete
)
{
let
offerBody
=
{
'
status
'
:
'
p
'
,
'
recipient
'
:
athlete
.
url
};
let
offerResponse
=
await
sendRequest
(
"
POST
"
,
`
${
HOST
}
/api/offers/`
,
offerBody
);
if
(
!
offerResponse
.
ok
)
{
let
data
=
await
offerResponse
.
json
();
let
alert
=
createAlert
(
"
Could not create offer!
"
,
data
);
document
.
body
.
prepend
(
alert
);
}
}
async
function
uploadFiles
(
event
,
athlete
)
{
let
form
=
event
.
currentTarget
.
parentElement
;
let
inputFormData
=
new
FormData
(
form
);
...
...
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