[food] Add calories per day
This commit is contained in:
@ -2,26 +2,27 @@ import calendar
|
||||
import json
|
||||
import logging
|
||||
from datetime import datetime, timedelta
|
||||
from dateutil.relativedelta import relativedelta
|
||||
|
||||
from django.shortcuts import redirect
|
||||
import pendulum
|
||||
import pytz
|
||||
from dateutil.relativedelta import relativedelta
|
||||
from django.apps import apps
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.db.models import Count, Q, Max
|
||||
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
|
||||
from django.db.models import Count, Max, Q
|
||||
from django.db.models.query import QuerySet
|
||||
from django.http import FileResponse, HttpResponseRedirect, JsonResponse
|
||||
from django.shortcuts import redirect
|
||||
from django.urls import reverse_lazy
|
||||
from django.utils import timezone
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django.views.generic import DetailView, FormView, TemplateView
|
||||
from django.views.generic.edit import CreateView
|
||||
from django.views.generic.list import ListView
|
||||
from moods.models import Mood
|
||||
from music.aggregators import live_charts, scrobble_counts, week_of_scrobbles
|
||||
|
||||
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||
from pendulum.parsing.exceptions import ParserError
|
||||
from rest_framework import status
|
||||
from rest_framework.decorators import (
|
||||
api_view,
|
||||
@ -54,10 +55,10 @@ from scrobbles.tasks import (
|
||||
process_tsv_import,
|
||||
)
|
||||
from scrobbles.utils import (
|
||||
get_daily_calories_for_user_by_day,
|
||||
get_long_plays_completed,
|
||||
get_long_plays_in_progress,
|
||||
)
|
||||
from moods.models import Mood
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@ -146,7 +147,7 @@ class RecentScrobbleList(ListView):
|
||||
if date_str:
|
||||
try:
|
||||
date = pendulum.parse(date_str)
|
||||
except:
|
||||
except ParserError:
|
||||
pass
|
||||
if date_str:
|
||||
if date_str == "this_week" or "-W" in date_str:
|
||||
@ -230,6 +231,7 @@ class RecentScrobbleList(ListView):
|
||||
user=self.request.user,
|
||||
)
|
||||
data["counts"] = [] # scrobble_counts(user)
|
||||
data["daily_calories"] = get_daily_calories_for_user_by_day(self.request.user.id, date)
|
||||
else:
|
||||
data["weekly_data"] = week_of_scrobbles()
|
||||
data["counts"] = scrobble_counts()
|
||||
|
||||
Reference in New Issue
Block a user