From f921955dd96acc7c9375cf6e476e3dd1dbfa0a3b Mon Sep 17 00:00:00 2001
From: ibooking-sigurd <sigurd.augdal@ibooking.no>
Date: Mon, 19 Apr 2021 18:02:00 +0200
Subject: [PATCH] Fix three more bugs. Unneccesary newline in backend. Tags in
table (diets.js) in frontend.
---
backend/secfit/diets/views.py | 19 +++++++++----------
frontend/www/diets.html | 8 ++++----
frontend/www/scripts/diets.js | 8 ++++----
3 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/backend/secfit/diets/views.py b/backend/secfit/diets/views.py
index 86a02ae..7f945ff 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 db92119..5729f02 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 e529409..ce77dff 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);
});
--
GitLab