ynerant
/
med
mirror of https://gitlab.crans.org/mediatek/med.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Translate borrows

This commit is contained in:
Yohann D'ANELLO 2021-11-14 14:26:41 +01:00
parent aceb0d893c
commit d0877f5cdc
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
17 changed files with 213 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
med/admin.py
View File

@ -7,7 +7,7 @@ from django.contrib.auth.admin import Group, GroupAdmin
from django.contrib.sites.admin import Site, SiteAdmin from django.contrib.sites.admin import Site, SiteAdmin
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.views.decorators.cache import never_cache from django.views.decorators.cache import never_cache
from media.models import Emprunt from media.models import Borrow
class DatabaseAdmin(AdminSite): class DatabaseAdmin(AdminSite):
@ -22,8 +22,8 @@ class DatabaseAdmin(AdminSite):
# User is always authenticated # User is always authenticated
# Get currently borrowed items # Get currently borrowed items
user_borrowed = Emprunt.objects.filter(user=request.user, user_borrowed = Borrow.objects.filter(user=request.user,
date_rendu=None) given_back=None)
response.context_data["borrowed_items"] = user_borrowed response.context_data["borrowed_items"] = user_borrowed
return response return response

2
med/settings.py
View File

@ -167,8 +167,6 @@ PAGINATION_NUMBER = 25
AUTH_USER_MODEL = 'users.User' AUTH_USER_MODEL = 'users.User'
MAX_EMPRUNT = 5 # Max emprunts
# AUTHLIB CLIENTS # AUTHLIB CLIENTS
AUTHLIB_OAUTH_CLIENTS = { AUTHLIB_OAUTH_CLIENTS = {
'notekfet': { 'notekfet': {

2
med/urls.py
View File

@ -21,7 +21,7 @@ router.register(r'media/vinyl', media.views.VinylViewSet)
router.register(r'media/novel', media.views.NovelViewSet) router.register(r'media/novel', media.views.NovelViewSet)
router.register(r'media/review', media.views.ReviewViewSet) router.register(r'media/review', media.views.ReviewViewSet)
router.register(r'media/future', media.views.FutureMediumViewSet) router.register(r'media/future', media.views.FutureMediumViewSet)
router.register(r'borrowed_items', media.views.EmpruntViewSet) router.register(r'borrowed_items', media.views.BorrowViewSet)
router.register(r'games', media.views.GameViewSet) router.register(r'games', media.views.GameViewSet)
router.register(r'users', users.views.UserViewSet) router.register(r'users', users.views.UserViewSet)
router.register(r'groups', users.views.GroupViewSet) router.register(r'groups', users.views.GroupViewSet)

39
media/admin.py
View File

@ -11,7 +11,7 @@ from med.admin import admin_site
from reversion.admin import VersionAdmin from reversion.admin import VersionAdmin
from .forms import MediaAdminForm from .forms import MediaAdminForm
from .models import Author, Borrowable, CD, Comic, Emprunt, FutureMedium, \ from .models import Author, Borrow, Borrowable, CD, Comic, FutureMedium, \
Game, Manga, Novel, Review, Vinyl Game, Manga, Novel, Review, Vinyl
@ -120,30 +120,15 @@ class ReviewAdmin(VersionAdmin, PolymorphicChildModelAdmin):
show_in_index = True show_in_index = True
class EmpruntAdmin(VersionAdmin): class BorrowAdmin(VersionAdmin):
list_display = ('media', 'user', 'date_emprunt', 'date_rendu', list_display = ('borrowable', 'user', 'borrow_date', 'borrowed_with',
'permanencier_emprunt', 'permanencier_rendu_custom') 'given_back_to')
search_fields = ('media__title', 'media__side_identifier', search_fields = ('borrowable__isbn', 'borrowable__title',
'user__username', 'date_emprunt', 'date_rendu') 'borrowable__medium__side_identifier',
date_hierarchy = 'date_emprunt' 'user__username', 'borrow_date', 'given_back')
autocomplete_fields = ('media', 'user', 'permanencier_emprunt', date_hierarchy = 'borrow_date'
'permanencier_rendu') autocomplete_fields = ('borrowable', 'user', 'borrowed_with',
'given_back_to')
def permanencier_rendu_custom(self, obj):
"""
Show a button if item has not been returned yet
"""
if obj.permanencier_rendu:
return obj.permanencier_rendu
else:
return format_html(
'<a class="button" href="{}">{}</a>',
reverse('media:retour-emprunt', args=[obj.pk]),
_('Turn back')
)
permanencier_rendu_custom.short_description = _('given back to')
permanencier_rendu_custom.allow_tags = True
def add_view(self, request, form_url='', extra_context=None): def add_view(self, request, form_url='', extra_context=None):
""" """
@ -151,7 +136,7 @@ class EmpruntAdmin(VersionAdmin):
""" """
# Make GET data mutable # Make GET data mutable
data = request.GET.copy() data = request.GET.copy()
data['permanencier_emprunt'] = request.user data['borrowed_with'] = request.user
request.GET = data request.GET = data
return super().add_view(request, form_url, extra_context) return super().add_view(request, form_url, extra_context)
@ -173,5 +158,5 @@ admin_site.register(CD, CDAdmin)
admin_site.register(Vinyl, VinylAdmin) admin_site.register(Vinyl, VinylAdmin)
admin_site.register(Review, ReviewAdmin) admin_site.register(Review, ReviewAdmin)
admin_site.register(FutureMedium, FutureMediumAdmin) admin_site.register(FutureMedium, FutureMediumAdmin)
admin_site.register(Emprunt, EmpruntAdmin) admin_site.register(Borrow, BorrowAdmin)
admin_site.register(Game, GameAdmin) admin_site.register(Game, GameAdmin)

195
media/locale/fr/LC_MESSAGES/django.po
View File

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-26 15:14+0200\n" "POT-Creation-Date: 2021-11-14 14:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -13,8 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: admin.py:46 admin.py:102 admin.py:114 models.py:30 models.py:77 #: admin.py:46 admin.py:102 admin.py:114 models.py:30 models.py:85
#: models.py:149 models.py:221 models.py:290 models.py:348 models.py:394
msgid "authors" msgid "authors"
msgstr "auteurs" msgstr "auteurs"
@ -22,55 +21,47 @@ msgstr "auteurs"
msgid "external url" msgid "external url"
msgstr "URL externe" msgstr "URL externe"
#: admin.py:142
msgid "Turn back"
msgstr "Rendre"
#: admin.py:145 models.py:574
msgid "given back to"
msgstr "rendu à"
#: fields.py:17 #: fields.py:17
msgid "ISBN-10 or ISBN-13" msgid "ISBN-10 or ISBN-13"
msgstr "ISBN-10 ou ISBN-13" msgstr "ISBN-10 ou ISBN-13"
#: forms.py:301 #: forms.py:302
msgid "This ISBN is not found." msgid "This ISBN is not found."
msgstr "L'ISBN n'a pas été trouvé." msgstr "L'ISBN n'a pas été trouvé."
#: management/commands/migrate_to_new_format.py:52 models.py:408 models.py:415 #: management/commands/migrate_to_new_format.py:57 models.py:156
msgid "CDs" msgid "CDs"
msgstr "CDs" msgstr "CDs"
#: management/commands/migrate_to_new_format.py:52 models.py:407 models.py:414 #: management/commands/migrate_to_new_format.py:57 models.py:155
msgid "CD" msgid "CD"
msgstr "CD" msgstr "CD"
#: management/commands/migrate_to_new_format.py:68 models.py:362 models.py:377 #: management/commands/migrate_to_new_format.py:73 models.py:149
msgid "vinyls" msgid "vinyls"
msgstr "vinyles" msgstr "vinyles"
#: management/commands/migrate_to_new_format.py:68 models.py:361 models.py:376 #: management/commands/migrate_to_new_format.py:73 models.py:148
msgid "vinyl" msgid "vinyl"
msgstr "vinyle" msgstr "vinyle"
#: management/commands/migrate_to_new_format.py:86 models.py:466 models.py:506 #: management/commands/migrate_to_new_format.py:91 models.py:196
msgid "reviews" msgid "reviews"
msgstr "revues" msgstr "revues"
#: management/commands/migrate_to_new_format.py:86 models.py:465 models.py:505 #: management/commands/migrate_to_new_format.py:91 models.py:195
msgid "review" msgid "review"
msgstr "revue" msgstr "revue"
#: management/commands/migrate_to_new_format.py:106 models.py:629 models.py:670 #: management/commands/migrate_to_new_format.py:111 models.py:315
msgid "games" msgid "games"
msgstr "jeux" msgstr "jeux"
#: management/commands/migrate_to_new_format.py:106 models.py:628 models.py:669 #: management/commands/migrate_to_new_format.py:111 models.py:314
msgid "game" msgid "game"
msgstr "jeu" msgstr "jeu"
#: models.py:17 models.py:598 #: models.py:17
msgid "name" msgid "name"
msgstr "nom" msgstr "nom"
@ -82,63 +73,59 @@ msgstr "note"
msgid "author" msgid "author"
msgstr "auteur" msgstr "auteur"
#: models.py:37 models.py:127 models.py:199 models.py:268 models.py:329 #: models.py:36 models.py:202
#: models.py:383 models.py:421
msgid "title"
msgstr "titre"
#: models.py:41 models.py:165 models.py:237 models.py:306 models.py:352
#: models.py:398 models.py:456 models.py:530
msgid "present"
msgstr "présent"
#: models.py:42 models.py:166 models.py:238 models.py:307 models.py:353
#: models.py:399 models.py:457 models.py:531
msgid "Tell that the medium is present in the Mediatek."
msgstr "Indique que le medium est présent à la Mediatek."
#: models.py:60
msgid "borrowable"
msgstr "empruntable"
#: models.py:61
msgid "borrowables"
msgstr "empruntables"
#: models.py:66 models.py:138 models.py:210 models.py:279
msgid "external URL"
msgstr "URL externe"
#: models.py:71 models.py:143 models.py:215 models.py:284 models.py:334
#: models.py:388
msgid "side identifier"
msgstr "côte"
#: models.py:81
msgid "medium"
msgstr "medium"
#: models.py:82
msgid "media"
msgstr "media"
#: models.py:87 models.py:119 models.py:191 models.py:260 models.py:512
msgid "ISBN" msgid "ISBN"
msgstr "ISBN" msgstr "ISBN"
#: models.py:88 models.py:120 models.py:192 models.py:261 models.py:513 #: models.py:37 models.py:203
msgid "You may be able to scan it from a bar code." msgid "You may be able to scan it from a bar code."
msgstr "Peut souvent être scanné à partir du code barre." msgstr "Peut souvent être scanné à partir du code barre."
#: models.py:95 models.py:132 models.py:204 models.py:273 #: models.py:45
msgid "title"
msgstr "titre"
#: models.py:49 models.py:220
msgid "present"
msgstr "présent"
#: models.py:50 models.py:221
msgid "Tell that the medium is present in the Mediatek."
msgstr "Indique que le medium est présent à la Mediatek."
#: models.py:68
msgid "borrowable"
msgstr "empruntable"
#: models.py:69
msgid "borrowables"
msgstr "empruntables"
#: models.py:74
msgid "external URL"
msgstr "URL externe"
#: models.py:79
msgid "side identifier"
msgstr "côte"
#: models.py:89
msgid "medium"
msgstr "medium"
#: models.py:90
msgid "media"
msgstr "media"
#: models.py:95
msgid "subtitle" msgid "subtitle"
msgstr "sous-titre" msgstr "sous-titre"
#: models.py:101 models.py:153 models.py:225 models.py:294 #: models.py:101
msgid "number of pages" msgid "number of pages"
msgstr "nombre de pages" msgstr "nombre de pages"
#: models.py:107 models.py:159 models.py:231 models.py:300 #: models.py:107
msgid "publish date" msgid "publish date"
msgstr "date de publication" msgstr "date de publication"
@ -150,135 +137,143 @@ msgstr "livre"
msgid "books" msgid "books"
msgstr "livres" msgstr "livres"
#: models.py:177 models.py:184 #: models.py:119
msgid "comic" msgid "comic"
msgstr "BD" msgstr "BD"
#: models.py:178 models.py:185 #: models.py:120
msgid "comics" msgid "comics"
msgstr "BDs" msgstr "BDs"
#: models.py:246 models.py:253 #: models.py:126
msgid "manga" msgid "manga"
msgstr "manga" msgstr "manga"
#: models.py:247 models.py:254 #: models.py:127
msgid "mangas" msgid "mangas"
msgstr "mangas" msgstr "mangas"
#: models.py:315 models.py:322 #: models.py:133
msgid "novel" msgid "novel"
msgstr "roman" msgstr "roman"
#: models.py:316 models.py:323 #: models.py:134
msgid "novels" msgid "novels"
msgstr "romans" msgstr "romans"
#: models.py:339 models.py:368 #: models.py:140
msgid "rounds per minute" msgid "rounds per minute"
msgstr "tours par minute" msgstr "tours par minute"
#: models.py:341 models.py:370 #: models.py:142
msgid "33 RPM" msgid "33 RPM"
msgstr "33 TPM" msgstr "33 TPM"
#: models.py:342 models.py:371 #: models.py:143
msgid "45 RPM" msgid "45 RPM"
msgstr "45 TPM" msgstr "45 TPM"
#: models.py:426 models.py:472 #: models.py:162
msgid "number" msgid "number"
msgstr "nombre" msgstr "nombre"
#: models.py:430 models.py:476 #: models.py:166
msgid "year" msgid "year"
msgstr "année" msgstr "année"
#: models.py:437 models.py:483 #: models.py:173
msgid "month" msgid "month"
msgstr "mois" msgstr "mois"
#: models.py:444 models.py:490 #: models.py:180
msgid "day" msgid "day"
msgstr "jour" msgstr "jour"
#: models.py:451 models.py:497 #: models.py:187
msgid "double" msgid "double"
msgstr "double" msgstr "double"
#: models.py:520 #: models.py:210
msgid "type" msgid "type"
msgstr "type" msgstr "type"
#: models.py:522 #: models.py:212
msgid "Comic" msgid "Comic"
msgstr "BD" msgstr "BD"
#: models.py:523 #: models.py:213
msgid "Manga" msgid "Manga"
msgstr "Manga" msgstr "Manga"
#: models.py:524 #: models.py:214
msgid "Roman" msgid "Roman"
msgstr "Roman" msgstr "Roman"
#: models.py:536 #: models.py:226
msgid "future medium" msgid "future medium"
msgstr "medium à importer" msgstr "medium à importer"
#: models.py:537 #: models.py:227
msgid "future media" msgid "future media"
msgstr "medias à importer" msgstr "medias à importer"
#: models.py:551 #: models.py:237
msgid "object"
msgstr "objet"
#: models.py:242
msgid "borrower" msgid "borrower"
msgstr "emprunteur" msgstr "emprunteur"
#: models.py:554 #: models.py:245
msgid "borrowed on" msgid "borrowed on"
msgstr "emprunté le" msgstr "emprunté le"
#: models.py:559 #: models.py:250
msgid "given back on" msgid "given back on"
msgstr "rendu le" msgstr "rendu le"
#: models.py:565 #: models.py:256
msgid "borrowed with" msgid "borrowed with"
msgstr "emprunté avec" msgstr "emprunté avec"
#: models.py:566 #: models.py:257
msgid "The keyholder that registered this borrowed item." msgid "The keyholder that registered this borrowed item."
msgstr "Le permanencier qui enregistre cet emprunt." msgstr "Le permanencier qui enregistre cet emprunt."
#: models.py:575 #: models.py:265
msgid "given back to"
msgstr "rendu à"
#: models.py:266
msgid "The keyholder to whom this item was given back." msgid "The keyholder to whom this item was given back."
msgstr "Le permanencier à qui l'emprunt a été rendu." msgstr "Le permanencier à qui l'emprunt a été rendu."
#: models.py:582 #: models.py:273
msgid "borrowed item" msgid "borrowed item"
msgstr "emprunt" msgstr "emprunt"
#: models.py:583 #: models.py:274
msgid "borrowed items" msgid "borrowed items"
msgstr "emprunts" msgstr "emprunts"
#: models.py:603 models.py:644 #: models.py:289
msgid "owner" msgid "owner"
msgstr "propriétaire" msgstr "propriétaire"
#: models.py:608 models.py:649 #: models.py:294
msgid "duration" msgid "duration"
msgstr "durée" msgstr "durée"
#: models.py:612 models.py:653 #: models.py:298
msgid "minimum number of players" msgid "minimum number of players"
msgstr "nombre minimum de joueurs" msgstr "nombre minimum de joueurs"
#: models.py:616 models.py:657 #: models.py:302
msgid "maximum number of players" msgid "maximum number of players"
msgstr "nombre maximum de joueurs" msgstr "nombre maximum de joueurs"
#: models.py:621 models.py:662 #: models.py:307
msgid "comment" msgid "comment"
msgstr "commentaire" msgstr "commentaire"
@ -306,6 +301,6 @@ msgstr "ISBN invalide : mauvaise longueur"
msgid "Invalid ISBN: Only upper case allowed" msgid "Invalid ISBN: Only upper case allowed"
msgstr "ISBN invalide : seulement les majuscules sont autorisées" msgstr "ISBN invalide : seulement les majuscules sont autorisées"
#: views.py:47 #: views.py:25
msgid "Welcome to the Mediatek database" msgid "Welcome to the Mediatek database"
msgstr "Bienvenue sur la base de données de la Mediatek" msgstr "Bienvenue sur la base de données de la Mediatek"

36
media/migrations/0045_auto_20211114_1423.py Normal file
View File

@ -0,0 +1,36 @@
# Generated by Django 2.2.24 on 2021-11-14 13:23
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('media', '0044_auto_20211102_1254'),
]
operations = [
migrations.CreateModel(
name='Borrow',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('borrow_date', models.DateTimeField(verbose_name='borrowed on')),
('given_back', models.DateTimeField(blank=True, null=True, verbose_name='given back on')),
('borrowable', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='media.Borrowable', verbose_name='object')),
('borrowed_with', models.ForeignKey(help_text='The keyholder that registered this borrowed item.', on_delete=django.db.models.deletion.PROTECT, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='borrowed with')),
('given_back_to', models.ForeignKey(blank=True, help_text='The keyholder to whom this item was given back.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='given back to')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='borrower')),
],
options={
'verbose_name': 'borrowed item',
'verbose_name_plural': 'borrowed items',
'ordering': ['-borrow_date'],
},
),
migrations.DeleteModel(
name='Emprunt',
),
]

31
media/models.py
View File

@ -1,7 +1,7 @@
# -*- mode: python; coding: utf-8 -*- # -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2017-2019 by BDE ENS Paris-Saclay # Copyright (C) 2017-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
from django.conf import settings
from django.core.validators import MinValueValidator from django.core.validators import MinValueValidator
from django.db import models from django.db import models
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
@ -230,35 +230,36 @@ class FutureMedium(models.Model):
return "Future medium (ISBN: {isbn})".format(isbn=self.isbn, ) return "Future medium (ISBN: {isbn})".format(isbn=self.isbn, )
class Emprunt(models.Model): class Borrow(models.Model):
media = models.ForeignKey( borrowable = models.ForeignKey(
'media.Borrowable', 'media.Borrowable',
on_delete=models.PROTECT, on_delete=models.PROTECT,
verbose_name=_('object'),
) )
user = models.ForeignKey( user = models.ForeignKey(
'users.User', settings.AUTH_USER_MODEL,
on_delete=models.PROTECT, on_delete=models.PROTECT,
verbose_name=_("borrower"), verbose_name=_("borrower"),
) )
date_emprunt = models.DateTimeField( borrow_date = models.DateTimeField(
verbose_name=_('borrowed on'), verbose_name=_('borrowed on'),
) )
date_rendu = models.DateTimeField( given_back = models.DateTimeField(
blank=True, blank=True,
null=True, null=True,
verbose_name=_('given back on'), verbose_name=_('given back on'),
) )
permanencier_emprunt = models.ForeignKey( borrowed_with = models.ForeignKey(
'users.User', settings.AUTH_USER_MODEL,
on_delete=models.PROTECT, on_delete=models.PROTECT,
related_name='user_permanencier_emprunt', related_name='+',
verbose_name=_('borrowed with'), verbose_name=_('borrowed with'),
help_text=_('The keyholder that registered this borrowed item.') help_text=_('The keyholder that registered this borrowed item.')
) )
permanencier_rendu = models.ForeignKey( given_back_to = models.ForeignKey(
'users.User', settings.AUTH_USER_MODEL,
on_delete=models.PROTECT, on_delete=models.PROTECT,
related_name='user_permanencier_rendu', related_name='+',
blank=True, blank=True,
null=True, null=True,
verbose_name=_('given back to'), verbose_name=_('given back to'),
@ -266,12 +267,12 @@ class Emprunt(models.Model):
) )
def __str__(self): def __str__(self):
return str(self.media) + str(self.user) return str(self.borrowable) + str(self.user)
class Meta: class Meta:
verbose_name = _("borrowed item") verbose_name = _("borrowed item")
verbose_name_plural = _("borrowed items") verbose_name_plural = _("borrowed items")
ordering = ['-date_emprunt'] ordering = ['-borrow_date']
class Game(Borrowable): class Game(Borrowable):

12
media/serializers.py
View File

@ -1,6 +1,6 @@
from rest_framework import serializers from rest_framework import serializers
from .models import Author, CD, Comic, FutureMedium, Manga, Emprunt, Game, \ from .models import Author, Borrow, CD, Comic, FutureMedium, Manga, Game, \
Novel, Review, Vinyl Novel, Review, Vinyl
@ -52,15 +52,13 @@ class FutureMediumSerializer(serializers.ModelSerializer):
fields = '__all__' fields = '__all__'
class EmpruntSerializer(serializers.HyperlinkedModelSerializer): class BorrowSerializer(serializers.HyperlinkedModelSerializer):
class Meta: class Meta:
model = Emprunt model = Borrow
fields = ['url', 'media', 'user', 'date_emprunt', 'date_rendu', fields = '__all__'
'permanencier_emprunt', 'permanencier_rendu']
class GameSerializer(serializers.HyperlinkedModelSerializer): class GameSerializer(serializers.HyperlinkedModelSerializer):
class Meta: class Meta:
model = Game model = Game
fields = ['url', 'name', 'proprietaire', 'duree', 'nombre_joueurs_min', fields = '__all__'
'nombre_joueurs_max', 'comment']

8
media/tests/test_templates.py
View File

@ -55,10 +55,10 @@ class TemplateTests(TestCase):
), data=data) ), data=data)
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
def test_comic_emprunt_changelist(self): def test_comic_borrow_changelist(self):
response = self.client.get(reverse('admin:media_emprunt_changelist')) response = self.client.get(reverse('admin:media_borrow_changelist'))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
def test_comic_emprunt_add(self): def test_comic_borrow_add(self):
response = self.client.get(reverse('admin:media_emprunt_add')) response = self.client.get(reverse('admin:media_borrow_add'))
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)

3
media/urls.py
View File

@ -2,15 +2,12 @@
# Copyright (C) 2017-2019 by BDE ENS Paris-Saclay # Copyright (C) 2017-2019 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
from django.conf.urls import url
from django.urls import path from django.urls import path
from . import views from . import views
app_name = 'media' app_name = 'media'
urlpatterns = [ urlpatterns = [
url(r'^retour_emprunt/(?P<empruntid>[0-9]+)$', views.retour_emprunt,
name='retour-emprunt'),
path('find/', views.FindMediumView.as_view(), name="find"), path('find/', views.FindMediumView.as_view(), name="find"),
path('mark-as-present/comic/<int:pk>/', path('mark-as-present/comic/<int:pk>/',
views.MarkComicAsPresent.as_view(), views.MarkComicAsPresent.as_view(),

36
media/views.py
View File

@ -2,42 +2,20 @@
# Copyright (C) 2017-2019 by BDE ENS Paris-Saclay # Copyright (C) 2017-2019 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
from django.contrib import messages
from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.mixins import LoginRequiredMixin
from django.http import HttpResponse from django.http import HttpResponse
from django_filters.rest_framework import DjangoFilterBackend from django_filters.rest_framework import DjangoFilterBackend
from django.db import transaction
from django.shortcuts import redirect from django.shortcuts import redirect
from django.utils import timezone
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.views.generic import TemplateView, DetailView from django.views.generic import TemplateView, DetailView
from rest_framework import viewsets from rest_framework import viewsets
from rest_framework.filters import SearchFilter from rest_framework.filters import SearchFilter
from reversion import revisions as reversion
from .models import Author, CD, Comic, Emprunt, FutureMedium, Game, Manga,\ from .models import Author, Borrow, CD, Comic, FutureMedium, Game, Manga,\
Novel, Review, Vinyl Novel, Review, Vinyl
from .serializers import AuthorSerializer, ComicSerializer, CDSerializer,\ from .serializers import AuthorSerializer, BorrowSerializer, ComicSerializer, \
EmpruntSerializer, FutureMediumSerializer, GameSerializer, \ CDSerializer, FutureMediumSerializer, GameSerializer, MangaSerializer, \
MangaSerializer, NovelSerializer, ReviewSerializer, VinylSerializer NovelSerializer, ReviewSerializer, VinylSerializer
@login_required
@permission_required('media.change_emprunt')
def retour_emprunt(request, empruntid):
try:
emprunt_instance = Emprunt.objects.get(pk=empruntid)
except Emprunt.DoesNotExist:
messages.error(request, u"Entrée inexistante")
return redirect("admin:media_emprunt_changelist")
with transaction.atomic(), reversion.create_revision():
emprunt_instance.permanencier_rendu = request.user
emprunt_instance.date_rendu = timezone.now()
emprunt_instance.save()
reversion.set_user(request.user)
messages.success(request, "Retour enregistré")
return redirect("admin:media_emprunt_changelist")
class IndexView(TemplateView): class IndexView(TemplateView):
@ -181,12 +159,12 @@ class FutureMediumViewSet(viewsets.ModelViewSet):
search_fields = ["=isbn"] search_fields = ["=isbn"]
class EmpruntViewSet(viewsets.ModelViewSet): class BorrowViewSet(viewsets.ModelViewSet):
""" """
API endpoint that allows borrowed items to be viewed or edited. API endpoint that allows borrowed items to be viewed or edited.
""" """
queryset = Emprunt.objects.all() queryset = Borrow.objects.all()
serializer_class = EmpruntSerializer serializer_class = BorrowSerializer
class GameViewSet(viewsets.ModelViewSet): class GameViewSet(viewsets.ModelViewSet):

7
theme/templates/admin/index.html
View File

@ -64,10 +64,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
<li><strong>{% trans 'date joined' %}</strong> : {{ user.date_joined }}</li> <li><strong>{% trans 'date joined' %}</strong> : {{ user.date_joined }}</li>
<li><strong>{% trans 'last login' %}</strong> : {{ user.last_login }}</li> <li><strong>{% trans 'last login' %}</strong> : {{ user.last_login }}</li>
<li><strong>{% trans 'address' %}</strong> : {{ user.address }}</li> <li><strong>{% trans 'address' %}</strong> : {{ user.address }}</li>
<li><strong>{% trans 'phone number' %}</strong> : {{ user.telephone }}</li> <li><strong>{% trans 'phone number' %}</strong> : {{ user.phone_number }}</li>
<li><strong>{% trans 'groups' %}</strong> : {% for g in user.groups.all %}{{ g.name }} {% endfor %} <li><strong>{% trans 'groups' %}</strong> : {% for g in user.groups.all %}{{ g.name }} {% endfor %}
</li> </li>
<li><strong>{% trans 'maximum borrowed' %}</strong> : {{ user.maxemprunt }}</li>
<li> <li>
<strong>{% trans 'membership for current year' %}</strong> : <strong>{% trans 'membership for current year' %}</strong> :
{% if user.is_member %} {% if user.is_member %}
@ -81,8 +80,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
<h3>{% trans 'Current borrowed items' %}</h3> <h3>{% trans 'Current borrowed items' %}</h3>
{% if borrowed_items %} {% if borrowed_items %}
<ul> <ul>
{% for emprunt in borrowed_items %} {% for borrow in borrowed_items %}
<li>{{ emprunt.media }} ({% trans 'since' %} {{ emprunt.date_emprunt }})</li> <li>{{ borrow.object }} ({% trans 'since' %} {{ borrow.borrow_date }})</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}

20
users/admin.py
View File

@ -12,7 +12,6 @@ from django.utils.translation import ugettext_lazy as _
from reversion.admin import VersionAdmin from reversion.admin import VersionAdmin
from med.admin import admin_site from med.admin import admin_site
from .forms import UserCreationAdminForm
from .models import User from .models import User
@ -35,28 +34,17 @@ class UserAdmin(VersionAdmin, BaseUserAdmin):
fieldsets = ( fieldsets = (
(None, {'fields': ('username', 'password')}), (None, {'fields': ('username', 'password')}),
(_('Personal info'), {'fields': ('first_name', 'last_name', 'email', (_('Personal info'), {'fields': ('first_name', 'last_name', 'email',
'telephone', 'address', 'comment')}), 'phone_number', 'address',
'comment')}),
(_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser', (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
'groups', 'user_permissions', 'groups', 'user_permissions')}),
'maxemprunt')}),
(_('Important dates'), {'fields': ('last_login', 'date_joined')}), (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
) )
list_display = ('username', 'email', 'first_name', 'last_name', list_display = ('username', 'email', 'first_name', 'last_name',
'maxemprunt', 'is_member', 'is_staff') 'is_member', 'is_staff')
list_filter = (IsMemberFilter, 'is_staff', 'is_superuser', 'is_active', list_filter = (IsMemberFilter, 'is_staff', 'is_superuser', 'is_active',
'groups') 'groups')
# Customize required initial fields
add_form_template = 'admin/change_form.html'
add_form = UserCreationAdminForm
add_fieldsets = (
(None, {
'classes': ('wide',),
'fields': ("username", "email", "first_name", "last_name",
"address", "telephone"),
}),
)
def save_model(self, request, obj, form, change): def save_model(self, request, obj, form, change):
""" """
On creation, send a password init mail On creation, send a password init mail

57
users/forms.py
View File

@ -1,57 +0,0 @@
# -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2017-2019 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django import forms
from django.contrib.auth.forms import UsernameField
from django.core.validators import MinLengthValidator
from django.forms import ModelForm
from .models import User
class PassForm(forms.Form):
passwd1 = forms.CharField(
label=u'Nouveau mot de passe',
max_length=255,
validators=[MinLengthValidator(8)],
widget=forms.PasswordInput,
)
passwd2 = forms.CharField(
label=u'Saisir à nouveau le mot de passe',
max_length=255,
validators=[MinLengthValidator(8)],
widget=forms.PasswordInput
)
class BaseInfoForm(ModelForm):
class Meta:
model = User
fields = [
'username',
'email',
'first_name',
'last_name',
'address',
'telephone',
]
class UserCreationAdminForm(ModelForm):
"""
A form that creates a user, with no privileges,
from the given information.
"""
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields['email'].required = True
self.fields['first_name'].required = True
self.fields['last_name'].required = True
class Meta:
model = User
fields = ("username", "email", "first_name", "last_name", "address",
"telephone")
field_classes = {'username': UsernameField}

22
users/migrations/0045_auto_20211114_1423.py Normal file
View File

@ -0,0 +1,22 @@
# Generated by Django 2.2.24 on 2021-11-14 13:23
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('users', '0044_membership'),
]
operations = [
migrations.RenameField(
model_name='user',
old_name='telephone',
new_name='phone_number',
),
migrations.RemoveField(
model_name='user',
name='maxemprunt',
),
]

15
users/models.py
View File

@ -1,5 +1,5 @@
# -*- mode: python; coding: utf-8 -*- # -*- mode: python; coding: utf-8 -*-
# Copyright (C) 2017-2019 by BDE ENS Paris-Saclay # Copyright (C) 2017-2021 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
from datetime import datetime from datetime import datetime
@ -12,11 +12,10 @@ from django.db import models
from django.db.models import Q from django.db.models import Q
from django.utils import timezone from django.utils import timezone
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from med.settings import MAX_EMPRUNT
class User(AbstractUser): class User(AbstractUser):
telephone = models.CharField( phone_number = models.CharField(
verbose_name=_('phone number'), verbose_name=_('phone number'),
max_length=15, max_length=15,
blank=True, blank=True,
@ -26,12 +25,6 @@ class User(AbstractUser):
max_length=255, max_length=255,
blank=True, blank=True,
) )
maxemprunt = models.IntegerField(
verbose_name=_('maximum borrowed'),
help_text=_('Maximal amount of simultaneous borrowed item '
'authorized.'),
default=MAX_EMPRUNT,
)
comment = models.CharField( comment = models.CharField(
verbose_name=_('comment'), verbose_name=_('comment'),
help_text=_('Promotion...'), help_text=_('Promotion...'),
@ -39,7 +32,7 @@ class User(AbstractUser):
blank=True, blank=True,
) )
date_joined = models.DateTimeField( date_joined = models.DateTimeField(
_('date joined'), verbose_name=_('date joined'),
default=timezone.now, default=timezone.now,
null=True, null=True,
) )
@ -69,7 +62,7 @@ class User(AbstractUser):
self.email = data['email'] self.email = data['email']
self.first_name = data['first_name'] self.first_name = data['first_name']
self.last_name = data['last_name'] self.last_name = data['last_name']
self.telephone = data['profile']['phone_number'] self.phone_number = data['profile']['phone_number']
self.address = data['profile']['address'] self.address = data['profile']['address']
self.comment = data['profile']['section'] self.comment = data['profile']['section']

2
users/serializers.py
View File

@ -8,7 +8,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
class Meta: class Meta:
model = User model = User
fields = ['url', 'username', 'first_name', 'last_name', 'email', fields = ['url', 'username', 'first_name', 'last_name', 'email',
'groups', 'telephone', 'address', 'maxemprunt', 'comment', 'groups', 'phone_number', 'address', 'comment',
'date_joined'] 'date_joined']