diff --git a/backend/secfit/diets/views.py b/backend/secfit/diets/views.py index 86a02ae51b761755749e8887b008a80dbb480c3d..7f945ff52c6edee10fabd3c9e5922bba3be67986 100644 --- a/backend/secfit/diets/views.py +++ b/backend/secfit/diets/views.py @@ -2,9 +2,7 @@ """ from rest_framework import generics, mixins, permissions, filters -from rest_framework.parsers import ( - JSONParser, -) +from rest_framework.parsers import (JSONParser) from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework.reverse import reverse @@ -23,13 +21,14 @@ from diets.permissions import ( from rest_framework.permissions import (AllowAny) from diets.mixins import CreateListModelMixin from diets.models import Diet, Mealtype, MealtypeInstance, DietFile, DietInstance -from diets.serializers import (DietSerializer, - DietInstanceSerializer, - MealtypeSerializer, - RememberMeSerializer, - MealtypeInstanceSerializer, - DietFileSerializer - ) +from diets.serializers import ( + DietSerializer, + DietInstanceSerializer, + MealtypeSerializer, + RememberMeSerializer, + MealtypeInstanceSerializer, + DietFileSerializer +) from django.core.exceptions import PermissionDenied from rest_framework_simplejwt.tokens import RefreshToken from rest_framework.response import Response diff --git a/frontend/www/diets.html b/frontend/www/diets.html index db9211937e535a3976471ff0b0a77ac5a1a7a9c8..5729f02b304587eb96178578575163f76518e72b 100644 --- a/frontend/www/diets.html +++ b/frontend/www/diets.html @@ -46,10 +46,10 @@ </div> <div class="d-flex"> <table class="mb-1 text-start"> - <tr><td>Date:</td><td></td></tr> - <tr><td>Time:</td><td></td></tr> - <tr><td>Owner:</td><td></td></tr> - <tr><td>Mealtypes:</td><td></td></tr> + <tr><th id="date">Date:</th><td></td></tr> + <tr><th id="time">Time:</th><td></td></tr> + <tr><th id="owner">Owner:</th><td></td></tr> + <tr><th id="mealtypes">Mealtypes:</th><td></td></tr> </table> </div> </a> diff --git a/frontend/www/scripts/diets.js b/frontend/www/scripts/diets.js index e5294094fd0b0c3bb94ec32c70a4305169bbb824..ce77dff6548b35765cb55bceef55d56838e84228 100644 --- a/frontend/www/scripts/diets.js +++ b/frontend/www/scripts/diets.js @@ -22,10 +22,10 @@ async function fetchDiets(ordering) { let table = aDiet.querySelector("table"); let rows = table.querySelectorAll("tr"); - rows[0].querySelectorAll("td")[1].textContent = localDate.toLocaleDateString(); // Date - rows[1].querySelectorAll("td")[1].textContent = localDate.toLocaleTimeString(); // Time - rows[2].querySelectorAll("td")[1].textContent = diet.owner_username; //Owner - rows[3].querySelectorAll("td")[1].textContent = diet.mealtype_instances.length; // Mealtypes + rows[0].querySelectorAll("td")[0].textContent = localDate.toLocaleDateString(); // Date + rows[1].querySelectorAll("td")[0].textContent = localDate.toLocaleTimeString(); // Time + rows[2].querySelectorAll("td")[0].textContent = diet.owner_username; //Owner + rows[3].querySelectorAll("td")[0].textContent = diet.mealtype_instances.length; // Mealtypes container.appendChild(aDiet); });