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
1147b2e9
Commit
1147b2e9
authored
4 years ago
by
ibooking-sigurd
Browse files
Options
Downloads
Plain Diff
Merge branch 'Refactor' of gitlab.stud.idi.ntnu.no:reaas/tdt4242-base into Refactor
parents
e2d7b5dd
1111868e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/www/myathletes.html
+4
-4
4 additions, 4 deletions
frontend/www/myathletes.html
frontend/www/scripts/mealtype.js
+3
-3
3 additions, 3 deletions
frontend/www/scripts/mealtype.js
with
7 additions
and
7 deletions
frontend/www/myathletes.html
+
4
−
4
View file @
1147b2e9
...
...
@@ -52,7 +52,7 @@
</div>
<div
class=
"row"
>
<div
id=
"list-diets-div"
class=
"col"
>
<i
class=
"fas fa-utensils"
></i>
<i
class=
"fas fa-utensils"
aria-hidden=
"true"
></i>
<label
for=
"list-diet-tab"
class=
"form-label"
>
Diets
</label>
</div>
</div>
...
...
@@ -71,7 +71,7 @@
<div
class=
"entry input-group"
>
<input
class=
"form-control"
name=
"athlete"
type=
"text"
/>
<button
class=
"btn btn-danger btn-remove"
type=
"button"
>
<i
class=
"fas fa-minus"
></i>
<i
class=
"fas fa-minus"
aria-hidden=
"true"
></i>
</button>
</span>
</div>
...
...
@@ -81,7 +81,7 @@
<div
class=
"entry input-group"
>
<input
class=
"form-control"
name=
"athlete"
type=
"text"
/>
<button
class=
"btn btn-success btn-add"
type=
"button"
>
<i
class=
"fas fa-plus"
></i>
<i
class=
"fas fa-plus"
aria-hidden=
"true"
></i>
</button>
</span>
</div>
...
...
@@ -139,7 +139,7 @@
<div
class=
"entry input-group"
>
<input
class=
"form-control"
name=
"athlete-no-diet"
type=
"text"
/>
<button
class=
"btn btn-success btn-add-diet"
type=
"button"
>
<i
class=
"fas fa-utensils"
></i>
<i
class=
"fas fa-utensils"
aria-hidden=
"true"
></i>
</button>
<div
class=
"tab-pane fade"
role=
"tabpanel"
>
...
...
This diff is collapsed.
Click to expand it.
frontend/www/scripts/mealtype.js
+
3
−
3
View file @
1147b2e9
...
...
@@ -132,8 +132,8 @@ window.addEventListener("DOMContentLoaded", async () => {
await
retrieveMealtype
(
mealtypeId
);
editButton
.
addEventListener
(
"
click
"
,
handleEditMealtypeButtonClick
);
deleteButton
.
addEventListener
(
"
click
"
,
(
async
(
id
)
=>
await
deleteMealtype
(
id
)).
bind
(
undefined
,
mealtypeId
));
okButton
.
addEventListener
(
"
click
"
,
(
async
(
id
)
=>
await
updateMealtype
(
id
)).
bind
(
undefined
,
mealtypeId
));
deleteButton
.
addEventListener
(
"
click
"
,
(
async
(
id
)
=>
deleteMealtype
(
id
)).
bind
(
undefined
,
mealtypeId
));
okButton
.
addEventListener
(
"
click
"
,
(
async
(
id
)
=>
updateMealtype
(
id
)).
bind
(
undefined
,
mealtypeId
));
}
//create
else
{
...
...
@@ -143,7 +143,7 @@ window.addEventListener("DOMContentLoaded", async () => {
okButton
.
className
=
okButton
.
className
.
replace
(
"
hide
"
,
""
);
cancelButton
.
className
=
cancelButton
.
className
.
replace
(
"
hide
"
,
""
);
okButton
.
addEventListener
(
"
click
"
,
async
()
=>
await
createMealtype
());
okButton
.
addEventListener
(
"
click
"
,
async
()
=>
createMealtype
());
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