Compare commits
22 Commits
1.1.2
...
cdc6ca1324
Author | SHA1 | Date | |
---|---|---|---|
cdc6ca1324 | |||
e7ed349356 | |||
5052ca7dbf | |||
f408bfd927 | |||
666dee33ba | |||
e0b09e051a | |||
4552cf7616 | |||
a614b51d29 | |||
e67aa3fda1 | |||
8423fd02b4 | |||
2bd07e5f2d | |||
058b83522c | |||
f13ed8a078 | |||
02d5adcb3c | |||
d6fb16bb74 | |||
71b90b8202 | |||
3ee36932c3 | |||
391fcc79a8 | |||
57d4fd7212 | |||
a5b2854bf6 | |||
518c0ecd56 | |||
a6cd7a3430 |
51
CHANGELOG.md
51
CHANGELOG.md
@ -1,3 +1,54 @@
|
|||||||
|
## Unreleased
|
||||||
|
|
||||||
|
### New
|
||||||
|
* More fields are now optional. This is to make it easier to add new items in bulk.
|
||||||
|
* Game: Wikidata ID
|
||||||
|
* Edition: Platform, Year
|
||||||
|
* Purchase: Platform
|
||||||
|
* Platform: Group
|
||||||
|
* Session: Device
|
||||||
|
* New fields:
|
||||||
|
* Game: Year Released
|
||||||
|
* To record original year of release
|
||||||
|
* Upon migration, this will be set to a year of any of the game's edition that has it set
|
||||||
|
* Purchase: Date Finished
|
||||||
|
* Editions are now unique combination of name and platform
|
||||||
|
* Add more stats:
|
||||||
|
* All finished games
|
||||||
|
* All finished 2023 games
|
||||||
|
* All finished games that were purchased this year
|
||||||
|
* Sessions (count)
|
||||||
|
* Days played
|
||||||
|
* Finished (count)
|
||||||
|
* Unfinished (count)
|
||||||
|
* Refunded (count)
|
||||||
|
|
||||||
|
### Improved
|
||||||
|
* game overview: simplify playtime range display
|
||||||
|
|
||||||
|
## 1.3.0 / 2023-11-05 15:09+01:00
|
||||||
|
|
||||||
|
### New
|
||||||
|
* Add Stats to the main navigation
|
||||||
|
* Allow selecting year on the Stats page
|
||||||
|
|
||||||
|
### Improved
|
||||||
|
* Make some pages redirect back instead to session list
|
||||||
|
|
||||||
|
### Improved
|
||||||
|
* Make navigation more compact
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
* Correctly limit sessions to a single year for stats
|
||||||
|
|
||||||
|
## 1.2.0 / 2023-11-01 20:18+01:00
|
||||||
|
|
||||||
|
### New
|
||||||
|
* Add yearly stats page (https://git.kucharczyk.xyz/lukas/timetracker/issues/15)
|
||||||
|
|
||||||
|
### Enhancements
|
||||||
|
* Add a button to start session from game overview
|
||||||
|
|
||||||
## 1.1.2 / 2023-10-13 16:30+02:00
|
## 1.1.2 / 2023-10-13 16:30+02:00
|
||||||
|
|
||||||
### Enhancements
|
### Enhancements
|
||||||
|
@ -6,7 +6,7 @@ RUN npm install && \
|
|||||||
|
|
||||||
FROM python:3.10.9-slim-bullseye
|
FROM python:3.10.9-slim-bullseye
|
||||||
|
|
||||||
ENV VERSION_NUMBER 1.1.2
|
ENV VERSION_NUMBER 1.3.0
|
||||||
ENV PROD 1
|
ENV PROD 1
|
||||||
ENV PYTHONUNBUFFERED=1
|
ENV PYTHONUNBUFFERED=1
|
||||||
|
|
||||||
|
@ -66,9 +66,12 @@ def format_duration(
|
|||||||
match = re.search(rf"%(\d*\.?\d*){pattern}", formatted_string)
|
match = re.search(rf"%(\d*\.?\d*){pattern}", formatted_string)
|
||||||
if match:
|
if match:
|
||||||
format_spec = match.group(1)
|
format_spec = match.group(1)
|
||||||
if format_spec:
|
if "." in format_spec:
|
||||||
# Format the number according to the specifier
|
# Format the number as float if precision is specified
|
||||||
replacement = f"{float(replacement):{format_spec}f}"
|
replacement = f"{float(replacement):{format_spec}f}"
|
||||||
|
else:
|
||||||
|
# Format the number as integer if no precision is specified
|
||||||
|
replacement = f"{int(float(replacement)):>{format_spec}}"
|
||||||
# Replace the format specifier with the formatted number
|
# Replace the format specifier with the formatted number
|
||||||
formatted_string = re.sub(
|
formatted_string = re.sub(
|
||||||
rf"%\d*\.?\d*{pattern}", replacement, formatted_string
|
rf"%\d*\.?\d*{pattern}", replacement, formatted_string
|
||||||
|
@ -50,6 +50,7 @@ class PurchaseForm(forms.ModelForm):
|
|||||||
widgets = {
|
widgets = {
|
||||||
"date_purchased": custom_date_widget,
|
"date_purchased": custom_date_widget,
|
||||||
"date_refunded": custom_date_widget,
|
"date_refunded": custom_date_widget,
|
||||||
|
"date_finished": custom_date_widget,
|
||||||
}
|
}
|
||||||
model = Purchase
|
model = Purchase
|
||||||
fields = [
|
fields = [
|
||||||
@ -57,6 +58,7 @@ class PurchaseForm(forms.ModelForm):
|
|||||||
"platform",
|
"platform",
|
||||||
"date_purchased",
|
"date_purchased",
|
||||||
"date_refunded",
|
"date_refunded",
|
||||||
|
"date_finished",
|
||||||
"price",
|
"price",
|
||||||
"price_currency",
|
"price_currency",
|
||||||
"ownership_type",
|
"ownership_type",
|
||||||
@ -67,7 +69,9 @@ class EditionForm(forms.ModelForm):
|
|||||||
game = forms.ModelChoiceField(
|
game = forms.ModelChoiceField(
|
||||||
queryset=Game.objects.order_by("name"), widget=autofocus_select_widget
|
queryset=Game.objects.order_by("name"), widget=autofocus_select_widget
|
||||||
)
|
)
|
||||||
platform = forms.ModelChoiceField(queryset=Platform.objects.order_by("name"))
|
platform = forms.ModelChoiceField(
|
||||||
|
queryset=Platform.objects.order_by("name"), required=False
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Edition
|
model = Edition
|
||||||
@ -77,7 +81,7 @@ class EditionForm(forms.ModelForm):
|
|||||||
class GameForm(forms.ModelForm):
|
class GameForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Game
|
model = Game
|
||||||
fields = ["name", "wikidata"]
|
fields = ["name", "year_released", "wikidata"]
|
||||||
widgets = {"name": autofocus_input_widget}
|
widgets = {"name": autofocus_input_widget}
|
||||||
|
|
||||||
|
|
||||||
|
@ -0,0 +1,51 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 11:10
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0015_edition_wikidata_edition_year_released"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="edition",
|
||||||
|
name="platform",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.platform",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="edition",
|
||||||
|
name="year_released",
|
||||||
|
field=models.IntegerField(blank=True, default=None, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="game",
|
||||||
|
name="wikidata",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=50, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="platform",
|
||||||
|
name="group",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=255, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="session",
|
||||||
|
name="device",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.device",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,141 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 18:14
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
def rename_duplicates(apps, schema_editor):
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
|
||||||
|
duplicates = (
|
||||||
|
Edition.objects.values("name", "platform")
|
||||||
|
.annotate(name_count=models.Count("id"))
|
||||||
|
.filter(name_count__gt=1)
|
||||||
|
)
|
||||||
|
|
||||||
|
for duplicate in duplicates:
|
||||||
|
counter = 1
|
||||||
|
duplicate_editions = Edition.objects.filter(
|
||||||
|
name=duplicate["name"], platform_id=duplicate["platform"]
|
||||||
|
).order_by("id")
|
||||||
|
|
||||||
|
for edition in duplicate_editions[1:]: # Skip the first one
|
||||||
|
edition.name = f"{edition.name} {counter}"
|
||||||
|
edition.save()
|
||||||
|
counter += 1
|
||||||
|
|
||||||
|
|
||||||
|
def update_game_year(apps, schema_editor):
|
||||||
|
Game = apps.get_model("games", "Game")
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
|
||||||
|
for game in Game.objects.filter(year__isnull=True):
|
||||||
|
# Try to get the first related edition with a non-null year_released
|
||||||
|
edition = Edition.objects.filter(game=game, year_released__isnull=False).first()
|
||||||
|
if edition:
|
||||||
|
# If an edition is found, update the game's year
|
||||||
|
game.year = edition.year_released
|
||||||
|
game.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
replaces = [
|
||||||
|
("games", "0016_alter_edition_platform_alter_edition_year_released_and_more"),
|
||||||
|
("games", "0017_alter_device_type_alter_purchase_platform"),
|
||||||
|
("games", "0018_auto_20231106_1825"),
|
||||||
|
("games", "0019_alter_edition_unique_together"),
|
||||||
|
("games", "0020_game_year"),
|
||||||
|
("games", "0021_auto_20231106_1909"),
|
||||||
|
("games", "0022_rename_year_game_year_released"),
|
||||||
|
]
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0015_edition_wikidata_edition_year_released"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="edition",
|
||||||
|
name="platform",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.platform",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="edition",
|
||||||
|
name="year_released",
|
||||||
|
field=models.IntegerField(blank=True, default=None, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="game",
|
||||||
|
name="wikidata",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=50, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="platform",
|
||||||
|
name="group",
|
||||||
|
field=models.CharField(blank=True, default=None, max_length=255, null=True),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="session",
|
||||||
|
name="device",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.device",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="device",
|
||||||
|
name="type",
|
||||||
|
field=models.CharField(
|
||||||
|
choices=[
|
||||||
|
("pc", "PC"),
|
||||||
|
("co", "Console"),
|
||||||
|
("ha", "Handheld"),
|
||||||
|
("mo", "Mobile"),
|
||||||
|
("sbc", "Single-board computer"),
|
||||||
|
("un", "Unknown"),
|
||||||
|
],
|
||||||
|
default="un",
|
||||||
|
max_length=3,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="platform",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.platform",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.RunPython(
|
||||||
|
code=rename_duplicates,
|
||||||
|
),
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name="edition",
|
||||||
|
unique_together={("name", "platform")},
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="game",
|
||||||
|
name="year",
|
||||||
|
field=models.IntegerField(blank=True, default=None, null=True),
|
||||||
|
),
|
||||||
|
migrations.RunPython(
|
||||||
|
code=update_game_year,
|
||||||
|
),
|
||||||
|
migrations.RenameField(
|
||||||
|
model_name="game",
|
||||||
|
old_name="year",
|
||||||
|
new_name="year_released",
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,41 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 16:53
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0016_alter_edition_platform_alter_edition_year_released_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="device",
|
||||||
|
name="type",
|
||||||
|
field=models.CharField(
|
||||||
|
choices=[
|
||||||
|
("pc", "PC"),
|
||||||
|
("co", "Console"),
|
||||||
|
("ha", "Handheld"),
|
||||||
|
("mo", "Mobile"),
|
||||||
|
("sbc", "Single-board computer"),
|
||||||
|
("un", "Unknown"),
|
||||||
|
],
|
||||||
|
default="un",
|
||||||
|
max_length=3,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="platform",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
null=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="games.platform",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
34
games/migrations/0018_auto_20231106_1825.py
Normal file
34
games/migrations/0018_auto_20231106_1825.py
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 17:25
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
def rename_duplicates(apps, schema_editor):
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
|
||||||
|
duplicates = (
|
||||||
|
Edition.objects.values("name", "platform")
|
||||||
|
.annotate(name_count=models.Count("id"))
|
||||||
|
.filter(name_count__gt=1)
|
||||||
|
)
|
||||||
|
|
||||||
|
for duplicate in duplicates:
|
||||||
|
counter = 1
|
||||||
|
duplicate_editions = Edition.objects.filter(
|
||||||
|
name=duplicate["name"], platform_id=duplicate["platform"]
|
||||||
|
).order_by("id")
|
||||||
|
|
||||||
|
for edition in duplicate_editions[1:]: # Skip the first one
|
||||||
|
edition.name = f"{edition.name} {counter}"
|
||||||
|
edition.save()
|
||||||
|
counter += 1
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0017_alter_device_type_alter_purchase_platform"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(rename_duplicates),
|
||||||
|
]
|
17
games/migrations/0019_alter_edition_unique_together.py
Normal file
17
games/migrations/0019_alter_edition_unique_together.py
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 17:26
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0018_auto_20231106_1825"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name="edition",
|
||||||
|
unique_together={("name", "platform")},
|
||||||
|
),
|
||||||
|
]
|
18
games/migrations/0020_game_year.py
Normal file
18
games/migrations/0020_game_year.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 18:05
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0019_alter_edition_unique_together"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="game",
|
||||||
|
name="year",
|
||||||
|
field=models.IntegerField(blank=True, default=None, null=True),
|
||||||
|
),
|
||||||
|
]
|
24
games/migrations/0021_auto_20231106_1909.py
Normal file
24
games/migrations/0021_auto_20231106_1909.py
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
def update_game_year(apps, schema_editor):
|
||||||
|
Game = apps.get_model("games", "Game")
|
||||||
|
Edition = apps.get_model("games", "Edition")
|
||||||
|
|
||||||
|
for game in Game.objects.filter(year__isnull=True):
|
||||||
|
# Try to get the first related edition with a non-null year_released
|
||||||
|
edition = Edition.objects.filter(game=game, year_released__isnull=False).first()
|
||||||
|
if edition:
|
||||||
|
# If an edition is found, update the game's year
|
||||||
|
game.year = edition.year_released
|
||||||
|
game.save()
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("games", "0020_game_year"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RunPython(update_game_year),
|
||||||
|
]
|
18
games/migrations/0022_rename_year_game_year_released.py
Normal file
18
games/migrations/0022_rename_year_game_year_released.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 18:12
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("games", "0021_auto_20231106_1909"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RenameField(
|
||||||
|
model_name="game",
|
||||||
|
old_name="year",
|
||||||
|
new_name="year_released",
|
||||||
|
),
|
||||||
|
]
|
21
games/migrations/0023_purchase_date_finished.py
Normal file
21
games/migrations/0023_purchase_date_finished.py
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# Generated by Django 4.1.5 on 2023-11-06 18:24
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
(
|
||||||
|
"games",
|
||||||
|
"0016_alter_edition_platform_alter_edition_year_released_and_more_squashed_0022_rename_year_game_year_released",
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="purchase",
|
||||||
|
name="date_finished",
|
||||||
|
field=models.DateField(blank=True, null=True),
|
||||||
|
),
|
||||||
|
]
|
@ -10,23 +10,40 @@ from django.db.models import F, Manager, Sum
|
|||||||
|
|
||||||
class Game(models.Model):
|
class Game(models.Model):
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
wikidata = models.CharField(max_length=50)
|
year_released = models.IntegerField(null=True, blank=True, default=None)
|
||||||
|
wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
|
||||||
class Edition(models.Model):
|
class Edition(models.Model):
|
||||||
|
class Meta:
|
||||||
|
unique_together = [["name", "platform"]]
|
||||||
|
|
||||||
game = models.ForeignKey("Game", on_delete=models.CASCADE)
|
game = models.ForeignKey("Game", on_delete=models.CASCADE)
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
|
platform = models.ForeignKey(
|
||||||
year_released = models.IntegerField(default=datetime.today().year)
|
"Platform", on_delete=models.CASCADE, null=True, blank=True, default=None
|
||||||
|
)
|
||||||
|
year_released = models.IntegerField(null=True, blank=True, default=None)
|
||||||
wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
|
wikidata = models.CharField(max_length=50, null=True, blank=True, default=None)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
|
||||||
|
class PurchaseQueryset(models.QuerySet):
|
||||||
|
def refunded(self):
|
||||||
|
return self.filter(date_refunded__isnull=False)
|
||||||
|
|
||||||
|
def not_refunded(self):
|
||||||
|
return self.filter(date_refunded__isnull=True)
|
||||||
|
|
||||||
|
def finished(self):
|
||||||
|
return self.filter(date_finished__isnull=False)
|
||||||
|
|
||||||
|
|
||||||
class Purchase(models.Model):
|
class Purchase(models.Model):
|
||||||
PHYSICAL = "ph"
|
PHYSICAL = "ph"
|
||||||
DIGITAL = "di"
|
DIGITAL = "di"
|
||||||
@ -47,10 +64,15 @@ class Purchase(models.Model):
|
|||||||
(PIRATED, "Pirated"),
|
(PIRATED, "Pirated"),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
objects = PurchaseQueryset().as_manager()
|
||||||
|
|
||||||
edition = models.ForeignKey("Edition", on_delete=models.CASCADE)
|
edition = models.ForeignKey("Edition", on_delete=models.CASCADE)
|
||||||
platform = models.ForeignKey("Platform", on_delete=models.CASCADE)
|
platform = models.ForeignKey(
|
||||||
|
"Platform", on_delete=models.CASCADE, default=None, null=True, blank=True
|
||||||
|
)
|
||||||
date_purchased = models.DateField()
|
date_purchased = models.DateField()
|
||||||
date_refunded = models.DateField(blank=True, null=True)
|
date_refunded = models.DateField(blank=True, null=True)
|
||||||
|
date_finished = models.DateField(blank=True, null=True)
|
||||||
price = models.IntegerField(default=0)
|
price = models.IntegerField(default=0)
|
||||||
price_currency = models.CharField(max_length=3, default="USD")
|
price_currency = models.CharField(max_length=3, default="USD")
|
||||||
ownership_type = models.CharField(
|
ownership_type = models.CharField(
|
||||||
@ -66,7 +88,7 @@ class Purchase(models.Model):
|
|||||||
|
|
||||||
class Platform(models.Model):
|
class Platform(models.Model):
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
group = models.CharField(max_length=255)
|
group = models.CharField(max_length=255, null=True, blank=True, default=None)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
@ -89,7 +111,13 @@ class Session(models.Model):
|
|||||||
timestamp_end = models.DateTimeField(blank=True, null=True)
|
timestamp_end = models.DateTimeField(blank=True, null=True)
|
||||||
duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
|
duration_manual = models.DurationField(blank=True, null=True, default=timedelta(0))
|
||||||
duration_calculated = models.DurationField(blank=True, null=True)
|
duration_calculated = models.DurationField(blank=True, null=True)
|
||||||
device = models.ForeignKey("Device", on_delete=models.CASCADE, null=True)
|
device = models.ForeignKey(
|
||||||
|
"Device",
|
||||||
|
on_delete=models.CASCADE,
|
||||||
|
null=True,
|
||||||
|
blank=True,
|
||||||
|
default=None,
|
||||||
|
)
|
||||||
note = models.TextField(blank=True, null=True)
|
note = models.TextField(blank=True, null=True)
|
||||||
|
|
||||||
objects = SessionQuerySet.as_manager()
|
objects = SessionQuerySet.as_manager()
|
||||||
@ -126,6 +154,12 @@ class Session(models.Model):
|
|||||||
self.duration_calculated = self.timestamp_end - self.timestamp_start
|
self.duration_calculated = self.timestamp_end - self.timestamp_start
|
||||||
else:
|
else:
|
||||||
self.duration_calculated = timedelta(0)
|
self.duration_calculated = timedelta(0)
|
||||||
|
|
||||||
|
if not self.device:
|
||||||
|
default_device, _ = Device.objects.get_or_create(
|
||||||
|
type=Device.UNKNOWN, defaults={"name": "Unknown"}
|
||||||
|
)
|
||||||
|
self.device = default_device
|
||||||
super(Session, self).save(*args, **kwargs)
|
super(Session, self).save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
@ -135,15 +169,17 @@ class Device(models.Model):
|
|||||||
HANDHELD = "ha"
|
HANDHELD = "ha"
|
||||||
MOBILE = "mo"
|
MOBILE = "mo"
|
||||||
SBC = "sbc"
|
SBC = "sbc"
|
||||||
|
UNKNOWN = "un"
|
||||||
DEVICE_TYPES = [
|
DEVICE_TYPES = [
|
||||||
(PC, "PC"),
|
(PC, "PC"),
|
||||||
(CONSOLE, "Console"),
|
(CONSOLE, "Console"),
|
||||||
(HANDHELD, "Handheld"),
|
(HANDHELD, "Handheld"),
|
||||||
(MOBILE, "Mobile"),
|
(MOBILE, "Mobile"),
|
||||||
(SBC, "Single-board computer"),
|
(SBC, "Single-board computer"),
|
||||||
|
(UNKNOWN, "Unknown"),
|
||||||
]
|
]
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
type = models.CharField(max_length=3, choices=DEVICE_TYPES, default=PC)
|
type = models.CharField(max_length=3, choices=DEVICE_TYPES, default=UNKNOWN)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.name} ({self.get_type_display()})"
|
return f"{self.name} ({self.get_type_display()})"
|
||||||
|
@ -755,6 +755,10 @@ select {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.relative {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
.bottom-2 {
|
.bottom-2 {
|
||||||
bottom: 0.5rem;
|
bottom: 0.5rem;
|
||||||
}
|
}
|
||||||
@ -791,14 +795,27 @@ select {
|
|||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.my-6 {
|
||||||
|
margin-top: 1.5rem;
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
.mb-1 {
|
.mb-1 {
|
||||||
margin-bottom: 0.25rem;
|
margin-bottom: 0.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mb-10 {
|
||||||
|
margin-bottom: 2.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
.mb-4 {
|
.mb-4 {
|
||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ml-1 {
|
||||||
|
margin-left: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
.ml-2 {
|
.ml-2 {
|
||||||
margin-left: 0.5rem;
|
margin-left: 0.5rem;
|
||||||
}
|
}
|
||||||
@ -811,18 +828,14 @@ select {
|
|||||||
margin-top: 1rem;
|
margin-top: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ml-8 {
|
|
||||||
margin-left: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ml-1 {
|
|
||||||
margin-left: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.block {
|
.block {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.inline-block {
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
.inline {
|
.inline {
|
||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
@ -839,10 +852,6 @@ select {
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.h-6 {
|
|
||||||
height: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.h-4 {
|
.h-4 {
|
||||||
height: 1rem;
|
height: 1rem;
|
||||||
}
|
}
|
||||||
@ -851,26 +860,34 @@ select {
|
|||||||
height: 1.25rem;
|
height: 1.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.h-6 {
|
||||||
|
height: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
.min-h-screen {
|
.min-h-screen {
|
||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
.w-6 {
|
|
||||||
width: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.w-full {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.w-5 {
|
.w-5 {
|
||||||
width: 1.25rem;
|
width: 1.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.w-6 {
|
||||||
|
width: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
.w-7 {
|
.w-7 {
|
||||||
width: 1.75rem;
|
width: 1.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.w-auto {
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.w-full {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.max-w-screen-lg {
|
.max-w-screen-lg {
|
||||||
max-width: 1024px;
|
max-width: 1024px;
|
||||||
}
|
}
|
||||||
@ -913,6 +930,10 @@ select {
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.gap-2 {
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
.self-center {
|
.self-center {
|
||||||
align-self: center;
|
align-self: center;
|
||||||
}
|
}
|
||||||
@ -935,6 +956,10 @@ select {
|
|||||||
border-radius: 0.5rem;
|
border-radius: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.rounded-sm {
|
||||||
|
border-radius: 0.125rem;
|
||||||
|
}
|
||||||
|
|
||||||
.border-gray-200 {
|
.border-gray-200 {
|
||||||
--tw-border-opacity: 1;
|
--tw-border-opacity: 1;
|
||||||
border-color: rgb(229 231 235 / var(--tw-border-opacity));
|
border-color: rgb(229 231 235 / var(--tw-border-opacity));
|
||||||
@ -945,26 +970,26 @@ select {
|
|||||||
border-color: rgb(100 116 139 / var(--tw-border-opacity));
|
border-color: rgb(100 116 139 / var(--tw-border-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bg-gray-200 {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(229 231 235 / var(--tw-bg-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
.bg-green-600 {
|
.bg-green-600 {
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(22 163 74 / var(--tw-bg-opacity));
|
background-color: rgb(22 163 74 / var(--tw-bg-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.bg-white {
|
|
||||||
--tw-bg-opacity: 1;
|
|
||||||
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.bg-blue-600 {
|
|
||||||
--tw-bg-opacity: 1;
|
|
||||||
background-color: rgb(37 99 235 / var(--tw-bg-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.bg-violet-600 {
|
.bg-violet-600 {
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(124 58 237 / var(--tw-bg-opacity));
|
background-color: rgb(124 58 237 / var(--tw-bg-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.bg-white {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
.p-4 {
|
.p-4 {
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
}
|
}
|
||||||
@ -974,6 +999,11 @@ select {
|
|||||||
padding-right: 0.5rem;
|
padding-right: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.px-4 {
|
||||||
|
padding-left: 1rem;
|
||||||
|
padding-right: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
.py-1 {
|
.py-1 {
|
||||||
padding-top: 0.25rem;
|
padding-top: 0.25rem;
|
||||||
padding-bottom: 0.25rem;
|
padding-bottom: 0.25rem;
|
||||||
@ -992,8 +1022,8 @@ select {
|
|||||||
padding-right: 1rem;
|
padding-right: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pl-8 {
|
.pt-1 {
|
||||||
padding-left: 2rem;
|
padding-top: 0.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.text-center {
|
.text-center {
|
||||||
@ -1014,6 +1044,11 @@ select {
|
|||||||
line-height: 2.5rem;
|
line-height: 2.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.text-5xl {
|
||||||
|
font-size: 3rem;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
.text-base {
|
.text-base {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
line-height: 1.5rem;
|
line-height: 1.5rem;
|
||||||
@ -1042,6 +1077,11 @@ select {
|
|||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.text-gray-700 {
|
||||||
|
--tw-text-opacity: 1;
|
||||||
|
color: rgb(55 65 81 / var(--tw-text-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
.text-slate-300 {
|
.text-slate-300 {
|
||||||
--tw-text-opacity: 1;
|
--tw-text-opacity: 1;
|
||||||
color: rgb(203 213 225 / var(--tw-text-opacity));
|
color: rgb(203 213 225 / var(--tw-text-opacity));
|
||||||
@ -1277,16 +1317,16 @@ th label {
|
|||||||
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
|
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hover\:bg-gray-400:hover {
|
||||||
|
--tw-bg-opacity: 1;
|
||||||
|
background-color: rgb(156 163 175 / var(--tw-bg-opacity));
|
||||||
|
}
|
||||||
|
|
||||||
.hover\:bg-green-700:hover {
|
.hover\:bg-green-700:hover {
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(21 128 61 / var(--tw-bg-opacity));
|
background-color: rgb(21 128 61 / var(--tw-bg-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.hover\:bg-blue-700:hover {
|
|
||||||
--tw-bg-opacity: 1;
|
|
||||||
background-color: rgb(29 78 216 / var(--tw-bg-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.hover\:bg-violet-700:hover {
|
.hover\:bg-violet-700:hover {
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(109 40 217 / var(--tw-bg-opacity));
|
background-color: rgb(109 40 217 / var(--tw-bg-opacity));
|
||||||
@ -1312,11 +1352,6 @@ th label {
|
|||||||
--tw-ring-color: rgb(34 197 94 / var(--tw-ring-opacity));
|
--tw-ring-color: rgb(34 197 94 / var(--tw-ring-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.focus\:ring-blue-500:focus {
|
|
||||||
--tw-ring-opacity: 1;
|
|
||||||
--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.focus\:ring-violet-500:focus {
|
.focus\:ring-violet-500:focus {
|
||||||
--tw-ring-opacity: 1;
|
--tw-ring-opacity: 1;
|
||||||
--tw-ring-color: rgb(139 92 246 / var(--tw-ring-opacity));
|
--tw-ring-color: rgb(139 92 246 / var(--tw-ring-opacity));
|
||||||
@ -1334,6 +1369,10 @@ th label {
|
|||||||
--tw-ring-offset-color: #ddd6fe;
|
--tw-ring-offset-color: #ddd6fe;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.group:hover .group-hover\:block {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
:is(.dark .dark\:bg-gray-800) {
|
:is(.dark .dark\:bg-gray-800) {
|
||||||
--tw-bg-opacity: 1;
|
--tw-bg-opacity: 1;
|
||||||
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
|
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
|
||||||
@ -1399,6 +1438,10 @@ th label {
|
|||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.md\:w-1\/2 {
|
||||||
|
width: 50%;
|
||||||
|
}
|
||||||
|
|
||||||
.md\:w-auto {
|
.md\:w-auto {
|
||||||
width: auto;
|
width: auto;
|
||||||
}
|
}
|
||||||
|
@ -25,19 +25,37 @@
|
|||||||
<div class="w-full md:block md:w-auto">
|
<div class="w-full md:block md:w-auto">
|
||||||
<ul
|
<ul
|
||||||
class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
|
class="flex flex-col md:flex-row p-4 mt-4 dark:text-white">
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New Game</a></li>
|
<li class="relative group">
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_platform' %}">New Platform</a></li>
|
<a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_game' %}">New</a>
|
||||||
{% if game_available and platform_available %}
|
<ul class="absolute hidden text-gray-700 pt-1 group-hover:block w-auto whitespace-nowrap">
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_edition' %}">New Edition</a></li>
|
{% if purchase_available %}
|
||||||
{% endif %}
|
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_device' %}">Device</a></li>
|
||||||
{% if edition_available %}
|
{% endif %}
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_purchase' %}">New Purchase</a></li>
|
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_game' %}">Game</a></li>
|
||||||
{% endif %}
|
{% if game_available and platform_available %}
|
||||||
{% if purchase_available %}
|
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_edition' %}">Edition</a></li>
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_session' %}">New Session</a></li>
|
{% endif %}
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'add_device' %}">New Device</a></li>
|
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_platform' %}">Platform</a></li>
|
||||||
{% endif %}
|
{% if edition_available %}
|
||||||
|
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_purchase' %}">Purchase</a></li>
|
||||||
|
{% endif %}
|
||||||
|
{% if purchase_available %}
|
||||||
|
<li><a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'add_session' %}">Session</a></li>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
{% if session_count > 0 %}
|
{% if session_count > 0 %}
|
||||||
|
<li class="relative group">
|
||||||
|
<a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'stats_current_year' %}">Stats</a>
|
||||||
|
<ul class="absolute hidden text-gray-700 pt-1 group-hover:block">
|
||||||
|
{% for year in stats_dropdown_year_range %}
|
||||||
|
<li>
|
||||||
|
<a class="bg-gray-200 hover:bg-gray-400 py-2 px-4 block whitespace-no-wrap" href="{% url 'stats_by_year' year %}">{{ year }}</a>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
|
<li><a class="block py-2 pl-3 pr-4 hover:underline" href="{% url 'list_sessions' %}">All Sessions</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -1,10 +1,13 @@
|
|||||||
<button
|
{% comment %}
|
||||||
type="button"
|
title
|
||||||
|
text
|
||||||
|
{% endcomment %}
|
||||||
|
<a
|
||||||
|
href="{{ link }}"
|
||||||
title="{{ title }}"
|
title="{{ title }}"
|
||||||
autofocus
|
class="truncate max-w-xs py-1 px-2 text-xs bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-sm"
|
||||||
class="truncate max-w-xs sm:max-w-md lg:max-w-lg py-1 px-2 bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg"
|
|
||||||
>
|
>
|
||||||
<svg
|
{% comment %} <svg
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
fill="none"
|
fill="none"
|
||||||
viewBox="0 0 24 24"
|
viewBox="0 0 24 24"
|
||||||
@ -16,7 +19,8 @@
|
|||||||
stroke-linecap="round"
|
stroke-linecap="round"
|
||||||
stroke-linejoin="round"
|
stroke-linejoin="round"
|
||||||
d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
|
d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
|
{% endcomment %}
|
||||||
{{ text }}
|
{{ text }}
|
||||||
</button>
|
</a>
|
||||||
|
26
games/templates/components/button_start.html
Normal file
26
games/templates/components/button_start.html
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{% comment %}
|
||||||
|
title
|
||||||
|
text
|
||||||
|
{% endcomment %}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
title="{{ title }}"
|
||||||
|
autofocus
|
||||||
|
class="truncate max-w-xs sm:max-w-md lg:max-w-lg py-1 px-2 bg-green-600 hover:bg-green-700 focus:ring-green-500 focus:ring-offset-blue-200 text-white transition ease-in duration-200 text-center text-base font-semibold shadow-md focus:outline-none focus:ring-2 focus:ring-offset-2 rounded-lg"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
fill="none"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
stroke-width="1.5"
|
||||||
|
stroke="currentColor"
|
||||||
|
class="self-center w-6 h-6 inline"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
{{ text }}
|
||||||
|
</button>
|
@ -10,8 +10,8 @@
|
|||||||
<div class="mx-auto text-center my-4">
|
<div class="mx-auto text-center my-4">
|
||||||
<a
|
<a
|
||||||
id="last-session-start"
|
id="last-session-start"
|
||||||
href="{% url 'start_session' last.id %}"
|
href="{% url 'start_session_same_as_last' last.id %}"
|
||||||
hx-get="{% url 'start_session' last.id %}"
|
hx-get="{% url 'start_session_same_as_last' last.id %}"
|
||||||
hx-indicator="#indicator"
|
hx-indicator="#indicator"
|
||||||
hx-swap="afterbegin"
|
hx-swap="afterbegin"
|
||||||
hx-target=".responsive-table tbody"
|
hx-target=".responsive-table tbody"
|
||||||
@ -19,7 +19,7 @@
|
|||||||
onClick="document.querySelector('#last-session-start').classList.add('invisible')"
|
onClick="document.querySelector('#last-session-start').classList.add('invisible')"
|
||||||
class="{% if last.timestamp_end == null %}invisible{% endif %}"
|
class="{% if last.timestamp_end == null %}invisible{% endif %}"
|
||||||
>
|
>
|
||||||
{% include 'components/button.html' with text=last.purchase title="Start session of last played game" only %}
|
{% include 'components/button_start.html' with text=last.purchase title="Start session of last played game" only %}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
184
games/templates/stats.html
Normal file
184
games/templates/stats.html
Normal file
@ -0,0 +1,184 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}{{ title }}{% endblock title %}
|
||||||
|
|
||||||
|
{% load static %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="dark:text-white max-w-sm sm:max-w-xl lg:max-w-3xl mx-auto">
|
||||||
|
<div class="flex justify-center items-center">
|
||||||
|
<form method="get" class="text-center">
|
||||||
|
<label class="text-5xl text-center inline-block mb-10" for="yearSelect">Stats for:</label>
|
||||||
|
<select name="year" id="yearSelect" onchange="this.form.submit();" class="mx-2">
|
||||||
|
{% for year_item in stats_dropdown_year_range %}
|
||||||
|
<option value="{{ year_item }}" {% if year == year_item %}selected{% endif %}>{{ year_item }}</option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-column flex-wrap justify-center">
|
||||||
|
<div class="md:w-1/2">
|
||||||
|
<h1 class="text-5xl text-center my-6">Playtime</h1>
|
||||||
|
<table class="responsive-table">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Hours</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_hours }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Sessions</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_sessions }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Days</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ unique_days }} ({{ unique_days_percent }}%)</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Games</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_games }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Games ({{ year }})</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_2023_games }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Finished</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_finished_this_year.count }}</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div class="md:w-1/2">
|
||||||
|
<h1 class="text-5xl text-center my-6">Purchases</h1>
|
||||||
|
<table class="responsive-table">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Total</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_this_year.count }}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Refunded</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ all_purchased_refunded_this_year.count }} ({{ refunded_percent }}%)</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Unfinished</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchased_unfinished.count }} ({{ unfinished_purchases_percent }}%)</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Spendings ({{ total_spent_currency }})</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_spent }} ({{ spent_per_game }}/game)</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<h1 class="text-5xl text-center my-6">Top games by playtime</h1>
|
||||||
|
<table class="responsive-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Name</th>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Playtime (hours)</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for game in top_10_games_by_playtime %}
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">
|
||||||
|
<a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'view_game' game.id %}">{{ game.name }}
|
||||||
|
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ game.formatted_playtime }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<h1 class="text-5xl text-center my-6">Platforms by playtime</h1>
|
||||||
|
<table class="responsive-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Platform</th>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Playtime (hours)</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for item in total_playtime_per_platform %}
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ item.platform_name }}</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ item.formatted_playtime }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<h1 class="text-5xl text-center my-6">Finished</h1>
|
||||||
|
<table class="responsive-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for purchase in all_finished_this_year %}
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono"><a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a></td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<h1 class="text-5xl text-center my-6">Finished (2023 games)</h1>
|
||||||
|
<table class="responsive-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for purchase in this_year_finished_this_year %}
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono"><a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a></td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<h1 class="text-5xl text-center my-6">Bought and Finished ({{ year }})</h1>
|
||||||
|
<table class="responsive-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for purchase in purchased_this_year_finished_this_year %}
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono"><a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a></td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_finished | date:"d/m/Y" }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<h1 class="text-5xl text-center my-6">All Purchases</h1>
|
||||||
|
<table class="responsive-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2 purchase-name truncate max-w-20char">Name</th>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Price ({{ total_spent_currency }})</th>
|
||||||
|
<th class="px-2 sm:px-4 md:px-6 md:py-2">Date</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for purchase in all_purchased_this_year %}
|
||||||
|
<tr>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono"><a class="underline decoration-slate-500 sm:decoration-2" href="{% url 'edit_purchase' purchase.id %}">{{ purchase.edition.name }}</a></td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.price }}</td>
|
||||||
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ purchase.date_purchased | date:"d/m/Y" }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{% endblock content %}
|
@ -15,9 +15,7 @@
|
|||||||
<h2 class="text-lg my-2 ml-2">
|
<h2 class="text-lg my-2 ml-2">
|
||||||
{{ total_hours }} <span class="dark:text-slate-500">total</span>
|
{{ total_hours }} <span class="dark:text-slate-500">total</span>
|
||||||
{{ session_average }} <span class="dark:text-slate-500">avg</span>
|
{{ session_average }} <span class="dark:text-slate-500">avg</span>
|
||||||
({{ first_session.timestamp_start | date:"M Y"}}
|
({{ playrange }}) </h2>
|
||||||
—
|
|
||||||
{{ last_session.timestamp_start | date:"M Y"}}) </h2>
|
|
||||||
<hr class="border-slate-500">
|
<hr class="border-slate-500">
|
||||||
<h1 class="text-3xl mt-4 mb-1">Editions <span class="dark:text-slate-500">({{ editions.count }})</span></h1>
|
<h1 class="text-3xl mt-4 mb-1">Editions <span class="dark:text-slate-500">({{ editions.count }})</span></h1>
|
||||||
<ul>
|
<ul>
|
||||||
@ -47,7 +45,14 @@
|
|||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
<h1 class="text-3xl mt-4 mb-1">Sessions <span class="dark:text-slate-500">({{ sessions.count }})</span></h1>
|
<h1 class="text-3xl mt-4 mb-1 flex gap-2 items-center">
|
||||||
|
Sessions
|
||||||
|
<span class="dark:text-slate-500">
|
||||||
|
({{ sessions.count }})
|
||||||
|
</span>
|
||||||
|
{% url 'start_game_session' game.id as add_session_link %}
|
||||||
|
{% include 'components/button.html' with title="Start new session" text="New" link=add_session_link %}
|
||||||
|
</h1>
|
||||||
<ul>
|
<ul>
|
||||||
{% for session in sessions %}
|
{% for session in sessions %}
|
||||||
<li class="sm:pl-2 flex items-center">
|
<li class="sm:pl-2 flex items-center">
|
||||||
|
@ -19,9 +19,14 @@ urlpatterns = [
|
|||||||
name="update_session",
|
name="update_session",
|
||||||
),
|
),
|
||||||
path(
|
path(
|
||||||
"start-session/<int:last_session_id>",
|
"start-session-same-as-last/<int:last_session_id>",
|
||||||
views.start_session,
|
views.start_session_same_as_last,
|
||||||
name="start_session",
|
name="start_session_same_as_last",
|
||||||
|
),
|
||||||
|
path(
|
||||||
|
"start-session/<int:game_id>",
|
||||||
|
views.start_game_session,
|
||||||
|
name="start_game_session",
|
||||||
),
|
),
|
||||||
# path(
|
# path(
|
||||||
# "delete_session/by-id/<int:session_id>",
|
# "delete_session/by-id/<int:session_id>",
|
||||||
@ -68,4 +73,10 @@ urlpatterns = [
|
|||||||
{"filter": "ownership_type"},
|
{"filter": "ownership_type"},
|
||||||
name="list_sessions_by_ownership_type",
|
name="list_sessions_by_ownership_type",
|
||||||
),
|
),
|
||||||
|
path("stats/", views.stats, name="stats_current_year"),
|
||||||
|
path(
|
||||||
|
"stats/<int:year>",
|
||||||
|
views.stats,
|
||||||
|
name="stats_by_year",
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
199
games/views.py
199
games/views.py
@ -1,10 +1,13 @@
|
|||||||
|
from common.time import format_duration, now as now_with_tz
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from zoneinfo import ZoneInfo
|
|
||||||
|
|
||||||
from common.time import now as now_with_tz
|
|
||||||
from common.time import format_duration
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
from django.db.models import Sum, F, Count
|
||||||
|
from django.db.models.functions import TruncDate
|
||||||
|
from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
|
||||||
from django.shortcuts import redirect, render
|
from django.shortcuts import redirect, render
|
||||||
|
from django.urls import reverse
|
||||||
|
from typing import Callable, Any
|
||||||
|
from zoneinfo import ZoneInfo
|
||||||
|
|
||||||
from .forms import (
|
from .forms import (
|
||||||
GameForm,
|
GameForm,
|
||||||
@ -27,6 +30,10 @@ def model_counts(request):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def stats_dropdown_year_range(request):
|
||||||
|
return {"stats_dropdown_year_range": range(2018, 2024)}
|
||||||
|
|
||||||
|
|
||||||
def add_session(request):
|
def add_session(request):
|
||||||
context = {}
|
context = {}
|
||||||
initial = {}
|
initial = {}
|
||||||
@ -55,6 +62,25 @@ def update_session(request, session_id=None):
|
|||||||
return redirect("list_sessions")
|
return redirect("list_sessions")
|
||||||
|
|
||||||
|
|
||||||
|
def use_custom_redirect(
|
||||||
|
func: Callable[..., HttpResponse]
|
||||||
|
) -> Callable[..., HttpResponse]:
|
||||||
|
"""
|
||||||
|
Will redirect to "return_path" session variable if set.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def wrapper(request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
|
||||||
|
response = func(request, *args, **kwargs)
|
||||||
|
if isinstance(response, HttpResponseRedirect) and (
|
||||||
|
next_url := request.session.get("return_path")
|
||||||
|
):
|
||||||
|
return HttpResponseRedirect(next_url)
|
||||||
|
return response
|
||||||
|
|
||||||
|
return wrapper
|
||||||
|
|
||||||
|
|
||||||
|
@use_custom_redirect
|
||||||
def edit_session(request, session_id=None):
|
def edit_session(request, session_id=None):
|
||||||
context = {}
|
context = {}
|
||||||
session = Session.objects.get(id=session_id)
|
session = Session.objects.get(id=session_id)
|
||||||
@ -67,6 +93,7 @@ def edit_session(request, session_id=None):
|
|||||||
return render(request, "add_session.html", context)
|
return render(request, "add_session.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
@use_custom_redirect
|
||||||
def edit_purchase(request, purchase_id=None):
|
def edit_purchase(request, purchase_id=None):
|
||||||
context = {}
|
context = {}
|
||||||
purchase = Purchase.objects.get(id=purchase_id)
|
purchase = Purchase.objects.get(id=purchase_id)
|
||||||
@ -79,6 +106,7 @@ def edit_purchase(request, purchase_id=None):
|
|||||||
return render(request, "add.html", context)
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
@use_custom_redirect
|
||||||
def edit_game(request, game_id=None):
|
def edit_game(request, game_id=None):
|
||||||
context = {}
|
context = {}
|
||||||
purchase = Game.objects.get(id=game_id)
|
purchase = Game.objects.get(id=game_id)
|
||||||
@ -110,12 +138,21 @@ def view_game(request, game_id=None):
|
|||||||
# here first and last is flipped
|
# here first and last is flipped
|
||||||
# because sessions are ordered from newest to oldest
|
# because sessions are ordered from newest to oldest
|
||||||
# so the most recent are on top
|
# so the most recent are on top
|
||||||
context["last_session"] = context["sessions"].first()
|
playrange_start = context["sessions"].last().timestamp_start.strftime("%b %Y")
|
||||||
context["first_session"] = context["sessions"].last()
|
playrange_end = context["sessions"].first().timestamp_start.strftime("%b %Y")
|
||||||
|
|
||||||
|
context["playrange"] = (
|
||||||
|
playrange_start
|
||||||
|
if playrange_start == playrange_end
|
||||||
|
else f"{playrange_start} — {playrange_end}"
|
||||||
|
)
|
||||||
|
|
||||||
context["sessions_with_notes"] = context["sessions"].exclude(note="")
|
context["sessions_with_notes"] = context["sessions"].exclude(note="")
|
||||||
|
request.session["return_path"] = request.path
|
||||||
return render(request, "view_game.html", context)
|
return render(request, "view_game.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
@use_custom_redirect
|
||||||
def edit_platform(request, platform_id=None):
|
def edit_platform(request, platform_id=None):
|
||||||
context = {}
|
context = {}
|
||||||
purchase = Platform.objects.get(id=platform_id)
|
purchase = Platform.objects.get(id=platform_id)
|
||||||
@ -128,6 +165,7 @@ def edit_platform(request, platform_id=None):
|
|||||||
return render(request, "add.html", context)
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
@use_custom_redirect
|
||||||
def edit_edition(request, edition_id=None):
|
def edit_edition(request, edition_id=None):
|
||||||
context = {}
|
context = {}
|
||||||
edition = Edition.objects.get(id=edition_id)
|
edition = Edition.objects.get(id=edition_id)
|
||||||
@ -140,7 +178,25 @@ def edit_edition(request, edition_id=None):
|
|||||||
return render(request, "add.html", context)
|
return render(request, "add.html", context)
|
||||||
|
|
||||||
|
|
||||||
def start_session(request, last_session_id: int):
|
@use_custom_redirect
|
||||||
|
def start_game_session(request, game_id: int):
|
||||||
|
last_session = (
|
||||||
|
Session.objects.filter(purchase__edition__game_id=game_id)
|
||||||
|
.order_by("-timestamp_start")
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
session = SessionForm(
|
||||||
|
{
|
||||||
|
"purchase": last_session.purchase.id,
|
||||||
|
"timestamp_start": now_with_tz(),
|
||||||
|
"device": last_session.device,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
session.save()
|
||||||
|
return redirect("list_sessions")
|
||||||
|
|
||||||
|
|
||||||
|
def start_session_same_as_last(request, last_session_id: int):
|
||||||
last_session = Session.objects.get(id=last_session_id)
|
last_session = Session.objects.get(id=last_session_id)
|
||||||
session = SessionForm(
|
session = SessionForm(
|
||||||
{
|
{
|
||||||
@ -212,6 +268,135 @@ def list_sessions(
|
|||||||
return render(request, "list_sessions.html", context)
|
return render(request, "list_sessions.html", context)
|
||||||
|
|
||||||
|
|
||||||
|
def stats(request, year: int = 0):
|
||||||
|
selected_year = request.GET.get("year")
|
||||||
|
if selected_year:
|
||||||
|
return HttpResponseRedirect(reverse("stats_by_year", args=[selected_year]))
|
||||||
|
if year == 0:
|
||||||
|
year = now_with_tz().year
|
||||||
|
first_day_of_year = datetime(year, 1, 1)
|
||||||
|
last_day_of_year = datetime(year + 1, 1, 1)
|
||||||
|
year_sessions = Session.objects.filter(timestamp_start__year=year)
|
||||||
|
unique_days = (
|
||||||
|
year_sessions.annotate(date=TruncDate("timestamp_start"))
|
||||||
|
.values("date")
|
||||||
|
.distinct()
|
||||||
|
.aggregate(dates=Count("date"))
|
||||||
|
)
|
||||||
|
year_played_purchases = Purchase.objects.filter(
|
||||||
|
session__in=year_sessions
|
||||||
|
).distinct()
|
||||||
|
|
||||||
|
selected_currency = "CZK"
|
||||||
|
all_purchased_this_year = (
|
||||||
|
Purchase.objects.filter(date_purchased__year=year)
|
||||||
|
.filter(price_currency__exact=selected_currency)
|
||||||
|
.order_by("date_purchased")
|
||||||
|
)
|
||||||
|
all_purchased_without_refunded_this_year = all_purchased_this_year.not_refunded()
|
||||||
|
all_purchased_refunded_this_year = (
|
||||||
|
Purchase.objects.filter(date_purchased__year=year)
|
||||||
|
.filter(price_currency__exact=selected_currency)
|
||||||
|
.refunded()
|
||||||
|
.order_by("date_purchased")
|
||||||
|
)
|
||||||
|
|
||||||
|
purchased_unfinished = all_purchased_without_refunded_this_year.filter(
|
||||||
|
date_finished__isnull=True
|
||||||
|
)
|
||||||
|
if (
|
||||||
|
purchased_unfinished.count() == 0
|
||||||
|
or all_purchased_refunded_this_year.count() == 0
|
||||||
|
):
|
||||||
|
unfinished_purchases_percent = 0
|
||||||
|
else:
|
||||||
|
unfinished_purchases_percent = int(
|
||||||
|
purchased_unfinished.count()
|
||||||
|
/ all_purchased_refunded_this_year.count()
|
||||||
|
* 100
|
||||||
|
)
|
||||||
|
|
||||||
|
all_finished_this_year = Purchase.objects.filter(date_finished__year=year).order_by(
|
||||||
|
"date_finished"
|
||||||
|
)
|
||||||
|
this_year_finished_this_year = (
|
||||||
|
Purchase.objects.filter(date_finished__year=year)
|
||||||
|
.filter(edition__year_released=year)
|
||||||
|
.order_by("date_finished")
|
||||||
|
)
|
||||||
|
purchased_this_year_finished_this_year = (
|
||||||
|
all_purchased_without_refunded_this_year.filter(
|
||||||
|
date_finished__year=year
|
||||||
|
).order_by("date_finished")
|
||||||
|
)
|
||||||
|
|
||||||
|
this_year_spendings = all_purchased_without_refunded_this_year.aggregate(
|
||||||
|
total_spent=Sum(F("price"))
|
||||||
|
)
|
||||||
|
total_spent = this_year_spendings["total_spent"]
|
||||||
|
|
||||||
|
games_with_playtime = (
|
||||||
|
Game.objects.filter(edition__purchase__session__in=year_sessions)
|
||||||
|
.annotate(
|
||||||
|
total_playtime=Sum(
|
||||||
|
F("edition__purchase__session__duration_calculated")
|
||||||
|
+ F("edition__purchase__session__duration_manual")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.values("id", "name", "total_playtime")
|
||||||
|
)
|
||||||
|
top_10_games_by_playtime = games_with_playtime.order_by("-total_playtime")[:10]
|
||||||
|
for game in top_10_games_by_playtime:
|
||||||
|
game["formatted_playtime"] = format_duration(game["total_playtime"], "%2.0H")
|
||||||
|
|
||||||
|
total_playtime_per_platform = (
|
||||||
|
year_sessions.values("purchase__platform__name")
|
||||||
|
.annotate(total_playtime=Sum(F("duration_calculated") + F("duration_manual")))
|
||||||
|
.annotate(platform_name=F("purchase__platform__name"))
|
||||||
|
.values("platform_name", "total_playtime")
|
||||||
|
.order_by("-total_playtime")
|
||||||
|
)
|
||||||
|
for item in total_playtime_per_platform:
|
||||||
|
item["formatted_playtime"] = format_duration(item["total_playtime"], "%2.0H")
|
||||||
|
|
||||||
|
context = {
|
||||||
|
"total_hours": format_duration(
|
||||||
|
year_sessions.total_duration_unformatted(), "%2.0H"
|
||||||
|
),
|
||||||
|
"total_games": year_played_purchases.count(),
|
||||||
|
"total_2023_games": year_played_purchases.filter(
|
||||||
|
edition__year_released=year
|
||||||
|
).count(),
|
||||||
|
"top_10_games_by_playtime": top_10_games_by_playtime,
|
||||||
|
"year": year,
|
||||||
|
"total_playtime_per_platform": total_playtime_per_platform,
|
||||||
|
"total_spent": total_spent,
|
||||||
|
"total_spent_currency": selected_currency,
|
||||||
|
"all_purchased_this_year": all_purchased_without_refunded_this_year,
|
||||||
|
"spent_per_game": int(
|
||||||
|
total_spent / all_purchased_without_refunded_this_year.count()
|
||||||
|
),
|
||||||
|
"all_finished_this_year": all_finished_this_year,
|
||||||
|
"this_year_finished_this_year": this_year_finished_this_year,
|
||||||
|
"purchased_this_year_finished_this_year": purchased_this_year_finished_this_year,
|
||||||
|
"total_sessions": year_sessions.count(),
|
||||||
|
"unique_days": unique_days["dates"],
|
||||||
|
"unique_days_percent": int(unique_days["dates"] / 365 * 100),
|
||||||
|
"purchased_unfinished": purchased_unfinished,
|
||||||
|
"unfinished_purchases_percent": unfinished_purchases_percent,
|
||||||
|
"refunded_percent": int(
|
||||||
|
all_purchased_refunded_this_year.count()
|
||||||
|
/ all_purchased_this_year.count()
|
||||||
|
* 100
|
||||||
|
),
|
||||||
|
"all_purchased_refunded_this_year": all_purchased_refunded_this_year,
|
||||||
|
"all_purchased_this_year": all_purchased_this_year,
|
||||||
|
}
|
||||||
|
|
||||||
|
request.session["return_path"] = request.path
|
||||||
|
return render(request, "stats.html", context)
|
||||||
|
|
||||||
|
|
||||||
def add_purchase(request):
|
def add_purchase(request):
|
||||||
context = {}
|
context = {}
|
||||||
now = datetime.now()
|
now = datetime.now()
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "timetracker"
|
name = "timetracker"
|
||||||
version = "1.1.2"
|
version = "1.3.0"
|
||||||
description = "A simple time tracker."
|
description = "A simple time tracker."
|
||||||
authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
|
authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
|
||||||
license = "GPL"
|
license = "GPL"
|
||||||
|
@ -6,7 +6,6 @@ from common.time import format_duration
|
|||||||
|
|
||||||
class FormatDurationTest(unittest.TestCase):
|
class FormatDurationTest(unittest.TestCase):
|
||||||
def setUp(self) -> None:
|
def setUp(self) -> None:
|
||||||
|
|
||||||
return super().setUp()
|
return super().setUp()
|
||||||
|
|
||||||
def test_only_days(self):
|
def test_only_days(self):
|
||||||
@ -19,6 +18,21 @@ class FormatDurationTest(unittest.TestCase):
|
|||||||
result = format_duration(delta, "%H hours")
|
result = format_duration(delta, "%H hours")
|
||||||
self.assertEqual(result, "1 hours")
|
self.assertEqual(result, "1 hours")
|
||||||
|
|
||||||
|
def test_only_hours_fractional(self):
|
||||||
|
delta = timedelta(hours=1)
|
||||||
|
result = format_duration(delta, "%.1H hours")
|
||||||
|
self.assertEqual(result, "1.0 hours")
|
||||||
|
|
||||||
|
def test_less_than_hour_with_precision(self):
|
||||||
|
delta = timedelta(hours=0.5)
|
||||||
|
result = format_duration(delta, "%.1H hours")
|
||||||
|
self.assertEqual(result, "0.5 hours")
|
||||||
|
|
||||||
|
def test_less_than_hour_without_precision(self):
|
||||||
|
delta = timedelta(hours=0.5)
|
||||||
|
result = format_duration(delta, "%H hours")
|
||||||
|
self.assertEqual(result, "0 hours")
|
||||||
|
|
||||||
def test_overflow_hours(self):
|
def test_overflow_hours(self):
|
||||||
delta = timedelta(hours=25)
|
delta = timedelta(hours=25)
|
||||||
result = format_duration(delta, "%H hours")
|
result = format_duration(delta, "%H hours")
|
||||||
|
@ -68,6 +68,7 @@ TEMPLATES = [
|
|||||||
"django.contrib.auth.context_processors.auth",
|
"django.contrib.auth.context_processors.auth",
|
||||||
"django.contrib.messages.context_processors.messages",
|
"django.contrib.messages.context_processors.messages",
|
||||||
"games.views.model_counts",
|
"games.views.model_counts",
|
||||||
|
"games.views.stats_dropdown_year_range",
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user