Compare commits
6 Commits
1.3.0
...
cdc6ca1324
Author | SHA1 | Date | |
---|---|---|---|
cdc6ca1324 | |||
e7ed349356 | |||
5052ca7dbf | |||
f408bfd927 | |||
666dee33ba | |||
e0b09e051a |
28
CHANGELOG.md
28
CHANGELOG.md
@ -1,3 +1,31 @@
|
|||||||
|
## 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
|
## 1.3.0 / 2023-11-05 15:09+01:00
|
||||||
|
|
||||||
### New
|
### New
|
||||||
|
@ -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()})"
|
||||||
|
@ -1438,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;
|
||||||
}
|
}
|
||||||
|
@ -16,27 +16,62 @@
|
|||||||
</select>
|
</select>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<table class="responsive-table">
|
<div class="flex flex-column flex-wrap justify-center">
|
||||||
<thead>
|
<div class="md:w-1/2">
|
||||||
<tr>
|
<h1 class="text-5xl text-center my-6">Playtime</h1>
|
||||||
<th class="px-2 sm:px-4 md:px-6 md:py-2">Hours</th>
|
<table class="responsive-table">
|
||||||
<th class="px-2 sm:px-4 md:px-6 md:py-2">Games</th>
|
<tbody>
|
||||||
<th class="px-2 sm:px-4 md:px-6 md:py-2">Games ({{ year }})</th>
|
<tr>
|
||||||
<th class="px-2 sm:px-4 md:px-6 md:py-2">Purchases</th>
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Hours</td>
|
||||||
<th class="px-2 sm:px-4 md:px-6 md:py-2">Spendings ({{ total_spent_currency }})</th>
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_hours }}</td>
|
||||||
<th class="px-2 sm:px-4 md:px-6 md:py-2">{{ total_spent_currency }}/game</th>
|
</tr>
|
||||||
</tr>
|
<tr>
|
||||||
<tbody>
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Sessions</td>
|
||||||
<tr>
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_sessions }}</td>
|
||||||
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_hours }}</td>
|
</tr>
|
||||||
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_games }}</td>
|
<tr>
|
||||||
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_2023_games }}</td>
|
<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">{{ all_purchased_this_year.count }}</td>
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ unique_days }} ({{ unique_days_percent }}%)</td>
|
||||||
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_spent }}</td>
|
</tr>
|
||||||
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ spent_per_game }}</td>
|
<tr>
|
||||||
</tr>
|
<td class="px-2 sm:px-4 md:px-6 md:py-2">Games</td>
|
||||||
</tbody>
|
<td class="px-2 sm:px-4 md:px-6 md:py-2 font-mono">{{ total_games }}</td>
|
||||||
</table>
|
</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>
|
<h1 class="text-5xl text-center my-6">Top games by playtime</h1>
|
||||||
<table class="responsive-table">
|
<table class="responsive-table">
|
||||||
<thead>
|
<thead>
|
||||||
@ -75,7 +110,58 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<h1 class="text-5xl text-center my-6">Purchases</h1>
|
<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">
|
<table class="responsive-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -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>
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
from common.time import format_duration, now as now_with_tz
|
from common.time import format_duration, now as now_with_tz
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.db.models import Sum, F
|
from django.db.models import Sum, F, Count
|
||||||
|
from django.db.models.functions import TruncDate
|
||||||
from django.http import HttpRequest, HttpResponse, HttpResponseRedirect
|
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 django.urls import reverse
|
||||||
@ -137,8 +138,15 @@ 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
|
request.session["return_path"] = request.path
|
||||||
return render(request, "view_game.html", context)
|
return render(request, "view_game.html", context)
|
||||||
@ -269,6 +277,12 @@ def stats(request, year: int = 0):
|
|||||||
first_day_of_year = datetime(year, 1, 1)
|
first_day_of_year = datetime(year, 1, 1)
|
||||||
last_day_of_year = datetime(year + 1, 1, 1)
|
last_day_of_year = datetime(year + 1, 1, 1)
|
||||||
year_sessions = Session.objects.filter(timestamp_start__year=year)
|
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(
|
year_played_purchases = Purchase.objects.filter(
|
||||||
session__in=year_sessions
|
session__in=year_sessions
|
||||||
).distinct()
|
).distinct()
|
||||||
@ -277,11 +291,48 @@ def stats(request, year: int = 0):
|
|||||||
all_purchased_this_year = (
|
all_purchased_this_year = (
|
||||||
Purchase.objects.filter(date_purchased__year=year)
|
Purchase.objects.filter(date_purchased__year=year)
|
||||||
.filter(price_currency__exact=selected_currency)
|
.filter(price_currency__exact=selected_currency)
|
||||||
.filter(date_refunded__exact=None)
|
.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")
|
.order_by("date_purchased")
|
||||||
)
|
)
|
||||||
|
|
||||||
this_year_spendings = all_purchased_this_year.aggregate(total_spent=Sum(F("price")))
|
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"]
|
total_spent = this_year_spendings["total_spent"]
|
||||||
|
|
||||||
games_with_playtime = (
|
games_with_playtime = (
|
||||||
@ -321,8 +372,25 @@ def stats(request, year: int = 0):
|
|||||||
"total_playtime_per_platform": total_playtime_per_platform,
|
"total_playtime_per_platform": total_playtime_per_platform,
|
||||||
"total_spent": total_spent,
|
"total_spent": total_spent,
|
||||||
"total_spent_currency": selected_currency,
|
"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,
|
"all_purchased_this_year": all_purchased_this_year,
|
||||||
"spent_per_game": int(total_spent / all_purchased_this_year.count()),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
request.session["return_path"] = request.path
|
request.session["return_path"] = request.path
|
||||||
|
Reference in New Issue
Block a user