lukas
/
timetracker
1
0
Fork 0
Code Issues 18 Pull Requests 3 Actions Packages Projects 1 Releases 20 Wiki Activity

Improve playtime graph date formatting

This commit is contained in:
Lukáš Kucharczyk 2023-01-16 19:27:52 +01:00
parent 2ce4dd3a0e
commit 8b7ed90b49
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
* Fixed * Fixed
* When filtering by game, the "Filtering by (...)" text would erroneously list an unrelated platform * When filtering by game, the "Filtering by (...)" text would erroneously list an unrelated platform
* Playtime graph would display timeline backwards * Playtime graph would display timeline backwards
* Playtime graph with many dates would overlap (https://git.kucharczyk.xyz/lukas/timetracker/issues/34)
## 0.2.3 / 2023-01-15 23:13+01:00 ## 0.2.3 / 2023-01-15 23:13+01:00

37
src/web/common/util/plots.py
View File

@ -3,6 +3,7 @@ from datetime import datetime
from io import BytesIO from io import BytesIO
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import matplotlib.dates as mdates
import pandas as pd import pandas as pd
from django.db.models import F, IntegerField, QuerySet, Sum from django.db.models import F, IntegerField, QuerySet, Sum
from django.db.models.functions import TruncDay from django.db.models.functions import TruncDay
@ -30,7 +31,8 @@ def playtime_over_time_chart(queryset: QuerySet = Session.objects):
values = [] values = []
running_total = int(0) running_total = int(0)
for item in result: for item in result:
date_value = datetime.strftime(item["date"], "%d-%m-%Y") # date_value = datetime.strftime(item["date"], "%d-%m-%Y")
date_value = item["date"]
keys.append(date_value) keys.append(date_value)
running_total += int(item["hours"] / (3600 * microsecond_in_second)) running_total += int(item["hours"] / (3600 * microsecond_in_second))
values.append(running_total) values.append(running_total)
@ -50,13 +52,34 @@ def get_graph():
def get_chart(data, title="", xlabel="", ylabel=""): def get_chart(data, title="", xlabel="", ylabel=""):
x = data[0]
y = data[1]
plt.style.use("dark_background") plt.style.use("dark_background")
plt.switch_backend("SVG") plt.switch_backend("SVG")
fig = plt.figure(figsize=(10, 4)) fig, ax = plt.subplots()
plt.plot(data[0], data[1]) fig.set_size_inches(10, 4)
plt.title(title) ax.plot(x, y)
plt.xlabel(xlabel) first = x[0]
plt.ylabel(ylabel) last = x[-1]
plt.tight_layout() difference = last - first
if difference.days <= 14:
ax.xaxis.set_major_locator(mdates.DayLocator())
elif difference.days < 60 or len(x) < 60:
ax.xaxis.set_major_locator(mdates.WeekdayLocator())
ax.xaxis.set_minor_locator(mdates.DayLocator())
elif difference.days < 720:
ax.xaxis.set_major_locator(mdates.MonthLocator())
ax.xaxis.set_minor_locator(mdates.WeekdayLocator())
else:
ax.xaxis.set_major_locator(mdates.YearLocator())
ax.xaxis.set_minor_locator(mdates.MonthLocator())
ax.xaxis.set_major_formatter(mdates.DateFormatter("%Y-%m-%d"))
for label in ax.get_xticklabels(which="major"):
label.set(rotation=30, horizontalalignment="right")
ax.set_xlabel(xlabel)
ax.set_ylabel(ylabel)
ax.set_title(title)
fig.tight_layout()
chart = get_graph() chart = get_graph()
return chart return chart