Ajout de la progression détaillée des objets 'Item' (jeux, figurines, etc.)

This commit is contained in:
Olivier DOSSMANN 2018-01-21 12:38:18 +01:00
parent b83f00609a
commit 110add5b0e
6 changed files with 74 additions and 12 deletions

View File

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.1\n" "Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-20 20:57+0000\n" "POT-Creation-Date: 2018-01-21 11:36+0000\n"
"PO-Revision-Date: 2018-01-20 21:59+0100\n" "PO-Revision-Date: 2018-01-21 12:36+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: fr\n" "Language: fr\n"
@ -29,11 +29,19 @@ msgstr "nom court"
msgid "New" msgid "New"
msgstr "Nouveau" msgstr "Nouveau"
#: core/models.py:49 core/models.py:82 #: core/models.py:30
msgid "achievement"
msgstr "progression"
#: core/models.py:31
msgid "out of"
msgstr "sur"
#: core/models.py:51 core/models.py:84
msgid "status" msgid "status"
msgstr "état" msgstr "état"
#: core/models.py:68 #: core/models.py:70
msgid "date" msgid "date"
msgstr "date" msgstr "date"
@ -232,9 +240,3 @@ msgstr "Carte mémoire"
#: games/templates/games/index.html:43 #: games/templates/games/index.html:43
msgid "Empty memory." msgid "Empty memory."
msgstr "Mémoire vide." msgstr "Mémoire vide."
#~ msgid "console"
#~ msgstr "console"
#~ msgid "consoles"
#~ msgstr "consoles"

View File

@ -27,6 +27,8 @@ class Item(models.Model):
DEFAULT_CHOICE = CREATED DEFAULT_CHOICE = CREATED
name = models.CharField(max_length=255, verbose_name=_('name')) name = models.CharField(max_length=255, verbose_name=_('name'))
achievement = models.PositiveIntegerField(blank=True, null=True, verbose_name=_('achievement'))
achievement_max = models.PositiveIntegerField(blank=True, null=True, verbose_name=_('out of'))
def __str__(self): def __str__(self):
return '%s' % self.name return '%s' % self.name

View File

@ -5,7 +5,8 @@ from figurines.models import Set
class FigurineInline(admin.TabularInline): class FigurineInline(admin.TabularInline):
model = Figurine model = Figurine
fields = ('name', 'kind', 'wish') fields = ('name', 'kind', 'achievement', 'achievement_max',
'wish')
extra = 2 extra = 2

View File

@ -0,0 +1,28 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.9 on 2018-01-21 11:06
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('figurines', '0004_add_figurines_kind'),
]
operations = [
migrations.AddField(
model_name='figurine',
name='achievement_max',
field=models.PositiveIntegerField(blank=True, null=True,
verbose_name='out of'),
),
migrations.AddField(
model_name='figurine',
name='achievement',
field=models.PositiveIntegerField(blank=True, null=True,
verbose_name='achievement'),
),
]

View File

@ -63,7 +63,7 @@ class GameAdmin(admin.ModelAdmin):
fieldsets = [(_('Game Information'), { fieldsets = [(_('Game Information'), {
'fields': [('name', 'collection')] 'fields': [('name', 'collection')]
}), (_('Progress'), { }), (_('Progress'), {
'fields': [('status'), ('note')] 'fields': [('status'), ('achievement', 'achievement_max'), ('note')]
}), ('', { }), ('', {
'fields': [('playing'), ('unplayed'), ('wish')] 'fields': [('playing'), ('unplayed'), ('wish')]
})] })]

View File

@ -0,0 +1,29 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.9 on 2018-01-21 11:06
from __future__ import unicode_literals
import datetime
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('games', '0011_auto_20180116_1756'),
]
operations = [
migrations.AddField(
model_name='game',
name='achievement_max',
field=models.PositiveIntegerField(blank=True, null=True,
verbose_name='out of'),
),
migrations.AddField(
model_name='game',
name='achievement',
field=models.PositiveIntegerField(blank=True, null=True,
verbose_name='achievement'),
),
]