mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-04-21 14:22:30 +00:00
Compare commits
6 Commits
e951f7533b
...
a221b1e40e
Author | SHA1 | Date | |
---|---|---|---|
|
a221b1e40e | ||
|
7ba5c76a89 | ||
|
702ddb5679 | ||
|
5a0fe7a6f0 | ||
|
eda8460014 | ||
|
15c71ad31a |
@ -35,7 +35,7 @@ class GuestAdmin(admin.ModelAdmin):
|
|||||||
"""
|
"""
|
||||||
Admin customisation for Guest
|
Admin customisation for Guest
|
||||||
"""
|
"""
|
||||||
list_display = ('last_name', 'first_name', 'activity', 'inviter')
|
list_display = ('last_name', 'first_name', 'school', 'activity', 'inviter')
|
||||||
form = GuestForm
|
form = GuestForm
|
||||||
|
|
||||||
|
|
||||||
|
@ -51,9 +51,9 @@ class GuestViewSet(ReadProtectedModelViewSet):
|
|||||||
queryset = Guest.objects.order_by('id')
|
queryset = Guest.objects.order_by('id')
|
||||||
serializer_class = GuestSerializer
|
serializer_class = GuestSerializer
|
||||||
filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
|
filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
|
||||||
filterset_fields = ['activity', 'activity__name', 'last_name', 'first_name', 'inviter', 'inviter__alias__name',
|
filterset_fields = ['activity', 'activity__name', 'last_name', 'first_name', 'school', 'inviter', 'inviter__alias__name',
|
||||||
'inviter__alias__normalized_name', ]
|
'inviter__alias__normalized_name', ]
|
||||||
search_fields = ['$activity__name', '$last_name', '$first_name', '$inviter__user__email', '$inviter__alias__name',
|
search_fields = ['$activity__name', '$last_name', '$first_name', '$school', '$inviter__user__email', '$inviter__alias__name',
|
||||||
'$inviter__alias__normalized_name', ]
|
'$inviter__alias__normalized_name', ]
|
||||||
|
|
||||||
|
|
||||||
|
@ -107,7 +107,7 @@ class GuestForm(forms.ModelForm):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Guest
|
model = Guest
|
||||||
fields = ('last_name', 'first_name', 'inviter', )
|
fields = ('last_name', 'first_name', 'school', 'inviter', )
|
||||||
widgets = {
|
widgets = {
|
||||||
"inviter": Autocomplete(
|
"inviter": Autocomplete(
|
||||||
NoteUser,
|
NoteUser,
|
||||||
|
18
apps/activity/migrations/0006_guest_school.py
Normal file
18
apps/activity/migrations/0006_guest_school.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.2.20 on 2025-03-25 09:58
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("activity", "0005_alter_opener_options_alter_opener_opener"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="guest",
|
||||||
|
name="school",
|
||||||
|
field=models.CharField(default="", max_length=255, verbose_name="school"),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
]
|
@ -247,6 +247,11 @@ class Guest(models.Model):
|
|||||||
verbose_name=_("first name"),
|
verbose_name=_("first name"),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
school = models.CharField(
|
||||||
|
max_length=255,
|
||||||
|
verbose_name=_("school"),
|
||||||
|
)
|
||||||
|
|
||||||
inviter = models.ForeignKey(
|
inviter = models.ForeignKey(
|
||||||
NoteUser,
|
NoteUser,
|
||||||
on_delete=models.PROTECT,
|
on_delete=models.PROTECT,
|
||||||
|
@ -51,7 +51,7 @@ class GuestTable(tables.Table):
|
|||||||
}
|
}
|
||||||
model = Guest
|
model = Guest
|
||||||
template_name = 'django_tables2/bootstrap4.html'
|
template_name = 'django_tables2/bootstrap4.html'
|
||||||
fields = ("last_name", "first_name", "inviter", )
|
fields = ("last_name", "first_name", "inviter", "school")
|
||||||
|
|
||||||
def render_entry(self, record):
|
def render_entry(self, record):
|
||||||
if record.has_entry:
|
if record.has_entry:
|
||||||
|
@ -50,6 +50,7 @@ class TestActivities(TestCase):
|
|||||||
inviter=self.user.note,
|
inviter=self.user.note,
|
||||||
last_name="GUEST",
|
last_name="GUEST",
|
||||||
first_name="Guest",
|
first_name="Guest",
|
||||||
|
school="School",
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_activity_list(self):
|
def test_activity_list(self):
|
||||||
@ -156,6 +157,7 @@ class TestActivities(TestCase):
|
|||||||
inviter=self.user.note.id,
|
inviter=self.user.note.id,
|
||||||
last_name="GUEST2",
|
last_name="GUEST2",
|
||||||
first_name="Guest",
|
first_name="Guest",
|
||||||
|
school="School",
|
||||||
))
|
))
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
|
|
||||||
@ -167,6 +169,7 @@ class TestActivities(TestCase):
|
|||||||
inviter=self.user.note.id,
|
inviter=self.user.note.id,
|
||||||
last_name="GUEST2",
|
last_name="GUEST2",
|
||||||
first_name="Guest",
|
first_name="Guest",
|
||||||
|
school="School",
|
||||||
))
|
))
|
||||||
self.assertRedirects(response, reverse("activity:activity_detail", args=(self.activity.pk,)), 302, 200)
|
self.assertRedirects(response, reverse("activity:activity_detail", args=(self.activity.pk,)), 302, 200)
|
||||||
|
|
||||||
@ -200,6 +203,7 @@ class TestActivityAPI(TestAPI):
|
|||||||
inviter=self.user.note,
|
inviter=self.user.note,
|
||||||
last_name="GUEST",
|
last_name="GUEST",
|
||||||
first_name="Guest",
|
first_name="Guest",
|
||||||
|
school="School",
|
||||||
)
|
)
|
||||||
|
|
||||||
self.entry = Entry.objects.create(
|
self.entry = Entry.objects.create(
|
||||||
|
@ -168,6 +168,7 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
activity=activity,
|
activity=activity,
|
||||||
first_name="",
|
first_name="",
|
||||||
last_name="",
|
last_name="",
|
||||||
|
school="",
|
||||||
inviter=self.request.user.note,
|
inviter=self.request.user.note,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
18
apps/member/migrations/0013_auto_20240807_1409.py
Normal file
18
apps/member/migrations/0013_auto_20240807_1409.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 2.2.28 on 2024-08-07 12:09
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('member', '0012_club_add_registration_form'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='profile',
|
||||||
|
name='promotion',
|
||||||
|
field=models.PositiveSmallIntegerField(default=2024, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
|
||||||
|
),
|
||||||
|
]
|
65
apps/note/templates/note/mails/summary_notes_report.html
Normal file
65
apps/note/templates/note/mails/summary_notes_report.html
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
{% load pretty_money %}
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>[Note Kfet] Récapitulatif de trésorerie</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>
|
||||||
|
Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<h2>
|
||||||
|
Tous les utilisateur⋅rices :
|
||||||
|
</h2>
|
||||||
|
<ul>
|
||||||
|
<li>Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €</li>
|
||||||
|
<li>Neutres : {{ summary.total_zero_user }}</li>
|
||||||
|
<li>Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<h2>
|
||||||
|
Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
|
||||||
|
</h2>
|
||||||
|
<ul>
|
||||||
|
<li>Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €</li>
|
||||||
|
<li>Neutres : {{ summary.total_zero_user_bde }}</li>
|
||||||
|
<li>Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde / 100 }} €</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<h2>
|
||||||
|
Clubs :
|
||||||
|
</h2>
|
||||||
|
<ul>
|
||||||
|
<li>Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €</li>
|
||||||
|
<li>Neutres : {{ summary.total_zero_club }}</li>
|
||||||
|
<li>Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<h2>
|
||||||
|
Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
|
||||||
|
</h2>
|
||||||
|
<ul>
|
||||||
|
<li>Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €</li>
|
||||||
|
<li>Neutres : {{ summary.total_zero_club_nbde }}</li>
|
||||||
|
<li>Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<h2>
|
||||||
|
Progression :
|
||||||
|
</h2>
|
||||||
|
<ul>
|
||||||
|
<li>Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices</li>
|
||||||
|
<li>Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
--
|
||||||
|
<p>
|
||||||
|
Le BDE<br>
|
||||||
|
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
|
||||||
|
</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
33
apps/note/templates/note/mails/summary_notes_report.txt
Normal file
33
apps/note/templates/note/mails/summary_notes_report.txt
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
{% load pretty_money %}
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
|
||||||
|
|
||||||
|
Tous les utilisateur⋅rices :
|
||||||
|
- Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €
|
||||||
|
- Neutres : {{ summary.total_zero_user }}
|
||||||
|
- Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €
|
||||||
|
|
||||||
|
Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
|
||||||
|
- Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €
|
||||||
|
- Neutres : {{ summary.total_zero_user_bde }}
|
||||||
|
- Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde /100 }} €
|
||||||
|
|
||||||
|
Clubs :
|
||||||
|
- Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €
|
||||||
|
- Neutres : {{ summary.total_zero_club }}
|
||||||
|
- Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €
|
||||||
|
|
||||||
|
Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
|
||||||
|
- Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €
|
||||||
|
- Neutres : {{ summary.total_zero_club_nbde }}
|
||||||
|
- Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €
|
||||||
|
|
||||||
|
Progression :
|
||||||
|
- Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices
|
||||||
|
- Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs
|
||||||
|
|
||||||
|
--
|
||||||
|
Le BDE
|
||||||
|
|
||||||
|
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
|
@ -1 +1 @@
|
|||||||
Subproject commit f580f9b9e9beee76605975fdbc3a2014769e3c61
|
Subproject commit f76acb32487635fe28907b637955e110a37b06cc
|
@ -5,13 +5,13 @@ from django.contrib import admin
|
|||||||
from note_kfet.admin import admin_site
|
from note_kfet.admin import admin_site
|
||||||
|
|
||||||
from .forms import ProductForm
|
from .forms import ProductForm
|
||||||
from .models import RemittanceType, Remittance, SogeCredit, Invoice, Product
|
from .models import Invoice, NoteSummary, Product, RemittanceType, Remittance, SogeCredit
|
||||||
|
|
||||||
|
|
||||||
@admin.register(RemittanceType, site=admin_site)
|
@admin.register(RemittanceType, site=admin_site)
|
||||||
class RemittanceTypeAdmin(admin.ModelAdmin):
|
class RemittanceTypeAdmin(admin.ModelAdmin):
|
||||||
"""
|
"""
|
||||||
Admin customisation for RemiitanceType
|
Admin customisation for RemittanceType
|
||||||
"""
|
"""
|
||||||
list_display = ('note', )
|
list_display = ('note', )
|
||||||
|
|
||||||
@ -55,3 +55,19 @@ class InvoiceAdmin(admin.ModelAdmin):
|
|||||||
"""
|
"""
|
||||||
list_display = ('object', 'id', 'bde', 'name', 'date', 'acquitted',)
|
list_display = ('object', 'id', 'bde', 'name', 'date', 'acquitted',)
|
||||||
inlines = (ProductInline,)
|
inlines = (ProductInline,)
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(NoteSummary, site=admin_site)
|
||||||
|
class NoteSummaryAdmin(admin.ModelAdmin):
|
||||||
|
"""
|
||||||
|
Admin customisation for NoteSummary
|
||||||
|
"""
|
||||||
|
list_display = (
|
||||||
|
'date', 'total_positive_user', 'balance_positive_user', 'total_positive_user_bde',
|
||||||
|
'balance_positive_user_bde', 'total_zero_user', 'total_zero_user_bde', 'total_negative_user',
|
||||||
|
'balance_negative_user', 'total_negative_user_bde', 'balance_negative_user_bde',
|
||||||
|
'total_vnegative_user', 'balance_vnegative_user', 'total_vnegative_user_bde',
|
||||||
|
'balance_vnegative_user_bde', 'total_positive_club', 'balance_positive_club',
|
||||||
|
'total_positive_club_nbde', 'balance_positive_club_nbde', 'total_zero_club', 'total_zero_club_nbde',
|
||||||
|
'total_negative_club', 'balance_negative_club', 'total_negative_club_nbde', 'balance_negative_club_nbde',
|
||||||
|
)
|
||||||
|
49
apps/treasury/migrations/0009_notesummary.py
Normal file
49
apps/treasury/migrations/0009_notesummary.py
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
# Generated by Django 2.2.28 on 2024-08-07 12:09
|
||||||
|
|
||||||
|
import datetime
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('treasury', '0008_auto_20240322_0045'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='NoteSummary',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('date', models.DateField(default=datetime.date.today, verbose_name='Date')),
|
||||||
|
('total_positive_user', models.PositiveIntegerField(verbose_name='Total positive user')),
|
||||||
|
('balance_positive_user', models.PositiveIntegerField(verbose_name='Balance positive user')),
|
||||||
|
('total_positive_user_bde', models.PositiveIntegerField(verbose_name='Total positive user BDE')),
|
||||||
|
('balance_positive_user_bde', models.PositiveIntegerField(verbose_name='Balance positive user BDE')),
|
||||||
|
('total_zero_user', models.PositiveIntegerField(verbose_name='Total zero user')),
|
||||||
|
('total_zero_user_bde', models.PositiveIntegerField(verbose_name='Total zero user BDE')),
|
||||||
|
('total_negative_user', models.PositiveIntegerField(verbose_name='Total negative user')),
|
||||||
|
('balance_negative_user', models.PositiveIntegerField(verbose_name='Balance negative user')),
|
||||||
|
('total_negative_user_bde', models.PositiveIntegerField(verbose_name='Total negative user BDE')),
|
||||||
|
('balance_negative_user_bde', models.PositiveIntegerField(verbose_name='Balance negative user BDE')),
|
||||||
|
('total_vnegative_user', models.PositiveIntegerField(verbose_name='Total very negative user')),
|
||||||
|
('balance_vnegative_user', models.PositiveIntegerField(verbose_name='Balance very negative user')),
|
||||||
|
('total_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Total very negative user BDE')),
|
||||||
|
('balance_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Balance very negative user BDE')),
|
||||||
|
('total_positive_club', models.PositiveIntegerField(verbose_name='Total positive club')),
|
||||||
|
('balance_positive_club', models.PositiveIntegerField(verbose_name='Balance positive club')),
|
||||||
|
('total_positive_club_nbde', models.PositiveIntegerField(verbose_name='Total positive club nbde')),
|
||||||
|
('balance_positive_club_nbde', models.PositiveIntegerField(verbose_name='Balance positive club nbde')),
|
||||||
|
('total_zero_club', models.PositiveIntegerField(verbose_name='Total zero club')),
|
||||||
|
('total_zero_club_nbde', models.PositiveIntegerField(verbose_name='Total zero club nbde')),
|
||||||
|
('total_negative_club', models.PositiveIntegerField(verbose_name='Total negative club')),
|
||||||
|
('balance_negative_club', models.PositiveIntegerField(verbose_name='Balance negative club')),
|
||||||
|
('total_negative_club_nbde', models.PositiveIntegerField(verbose_name='Total negative club nbde')),
|
||||||
|
('balance_negative_club_nbde', models.PositiveIntegerField(verbose_name='Balance negative club nbde')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'verbose_name': 'Summary',
|
||||||
|
'verbose_name_plural': 'Summaries',
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
@ -460,3 +460,117 @@ class SogeCredit(models.Model):
|
|||||||
self.credit_transaction._force_save = True
|
self.credit_transaction._force_save = True
|
||||||
self.credit_transaction.save()
|
self.credit_transaction.save()
|
||||||
super().delete(**kwargs)
|
super().delete(**kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
class NoteSummary(models.Model):
|
||||||
|
"""
|
||||||
|
Summary of every notes
|
||||||
|
"""
|
||||||
|
|
||||||
|
date = models.DateField(
|
||||||
|
default=date.today,
|
||||||
|
verbose_name=_("Date"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_positive_user = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total positive user"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_positive_user = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance positive user"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_positive_user_bde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total positive user BDE"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_positive_user_bde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance positive user BDE"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_zero_user = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total zero user"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_zero_user_bde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total zero user BDE"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_negative_user = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total negative user"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_negative_user = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance negative user"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_negative_user_bde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total negative user BDE"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_negative_user_bde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance negative user BDE"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_vnegative_user = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total very negative user"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_vnegative_user = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance very negative user"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_vnegative_user_bde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total very negative user BDE"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_vnegative_user_bde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance very negative user BDE"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_positive_club = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total positive club"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_positive_club = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance positive club"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_positive_club_nbde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total positive club nbde"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_positive_club_nbde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance positive club nbde"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_zero_club = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total zero club"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_zero_club_nbde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total zero club nbde"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_negative_club = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total negative club"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_negative_club = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance negative club"),
|
||||||
|
)
|
||||||
|
|
||||||
|
total_negative_club_nbde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Total negative club nbde"),
|
||||||
|
)
|
||||||
|
|
||||||
|
balance_negative_club_nbde = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("Balance negative club nbde"),
|
||||||
|
)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = _("Summary")
|
||||||
|
verbose_name_plural = _("Summaries")
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "Note summary of {date}".format(date=self.date)
|
||||||
|
@ -55,6 +55,7 @@ Les adhérent⋅es ont la possibilité d'inviter des ami⋅es. Pour cela, les di
|
|||||||
* Activité concernée (clé étrangère)
|
* Activité concernée (clé étrangère)
|
||||||
* Nom de famille
|
* Nom de famille
|
||||||
* Prénom
|
* Prénom
|
||||||
|
* École
|
||||||
* Note de la personne ayant invité
|
* Note de la personne ayant invité
|
||||||
|
|
||||||
Certaines contraintes s'appliquent :
|
Certaines contraintes s'appliquent :
|
||||||
|
@ -7,7 +7,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: \n"
|
"Project-Id-Version: \n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2025-03-13 21:08+0100\n"
|
"POT-Creation-Date: 2025-03-25 11:16+0100\n"
|
||||||
"PO-Revision-Date: 2022-04-11 22:05+0200\n"
|
"PO-Revision-Date: 2022-04-11 22:05+0200\n"
|
||||||
"Last-Translator: bleizi <bleizi@crans.org>\n"
|
"Last-Translator: bleizi <bleizi@crans.org>\n"
|
||||||
"Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
|
"Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
|
||||||
@ -25,7 +25,7 @@ msgid "This opener already exists"
|
|||||||
msgstr "Cette amitié existe déjà"
|
msgstr "Cette amitié existe déjà"
|
||||||
|
|
||||||
#: apps/activity/apps.py:10 apps/activity/models.py:129
|
#: apps/activity/apps.py:10 apps/activity/models.py:129
|
||||||
#: apps/activity/models.py:169 apps/activity/models.py:323
|
#: apps/activity/models.py:169 apps/activity/models.py:328
|
||||||
msgid "activity"
|
msgid "activity"
|
||||||
msgstr "activité"
|
msgstr "activité"
|
||||||
|
|
||||||
@ -37,24 +37,24 @@ msgstr "La note du club est inactive."
|
|||||||
msgid "The end date must be after the start date."
|
msgid "The end date must be after the start date."
|
||||||
msgstr "La date de fin doit être après celle de début."
|
msgstr "La date de fin doit être après celle de début."
|
||||||
|
|
||||||
#: apps/activity/forms.py:83 apps/activity/models.py:271
|
#: apps/activity/forms.py:83 apps/activity/models.py:276
|
||||||
msgid "You can't invite someone once the activity is started."
|
msgid "You can't invite someone once the activity is started."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Vous ne pouvez pas inviter quelqu'un une fois que l'activité a démarré."
|
"Vous ne pouvez pas inviter quelqu'un une fois que l'activité a démarré."
|
||||||
|
|
||||||
#: apps/activity/forms.py:86 apps/activity/models.py:274
|
#: apps/activity/forms.py:86 apps/activity/models.py:279
|
||||||
msgid "This activity is not validated yet."
|
msgid "This activity is not validated yet."
|
||||||
msgstr "Cette activité n'est pas encore validée."
|
msgstr "Cette activité n'est pas encore validée."
|
||||||
|
|
||||||
#: apps/activity/forms.py:96 apps/activity/models.py:282
|
#: apps/activity/forms.py:96 apps/activity/models.py:287
|
||||||
msgid "This person has been already invited 5 times this year."
|
msgid "This person has been already invited 5 times this year."
|
||||||
msgstr "Cette personne a déjà été invitée 5 fois cette année."
|
msgstr "Cette personne a déjà été invitée 5 fois cette année."
|
||||||
|
|
||||||
#: apps/activity/forms.py:100 apps/activity/models.py:286
|
#: apps/activity/forms.py:100 apps/activity/models.py:291
|
||||||
msgid "This person is already invited."
|
msgid "This person is already invited."
|
||||||
msgstr "Cette personne est déjà invitée."
|
msgstr "Cette personne est déjà invitée."
|
||||||
|
|
||||||
#: apps/activity/forms.py:104 apps/activity/models.py:290
|
#: apps/activity/forms.py:104 apps/activity/models.py:295
|
||||||
msgid "You can't invite more than 3 people to this activity."
|
msgid "You can't invite more than 3 people to this activity."
|
||||||
msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
|
msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
|
||||||
|
|
||||||
@ -228,32 +228,36 @@ msgstr "nom de famille"
|
|||||||
msgid "first name"
|
msgid "first name"
|
||||||
msgstr "prénom"
|
msgstr "prénom"
|
||||||
|
|
||||||
#: apps/activity/models.py:254
|
#: apps/activity/models.py:252
|
||||||
|
msgid "school"
|
||||||
|
msgstr "école"
|
||||||
|
|
||||||
|
#: apps/activity/models.py:259
|
||||||
msgid "inviter"
|
msgid "inviter"
|
||||||
msgstr "hôte"
|
msgstr "hôte"
|
||||||
|
|
||||||
#: apps/activity/models.py:258
|
#: apps/activity/models.py:263
|
||||||
msgid "guest"
|
msgid "guest"
|
||||||
msgstr "invité·e"
|
msgstr "invité·e"
|
||||||
|
|
||||||
#: apps/activity/models.py:259
|
#: apps/activity/models.py:264
|
||||||
msgid "guests"
|
msgid "guests"
|
||||||
msgstr "invité·e·s"
|
msgstr "invité·e·s"
|
||||||
|
|
||||||
#: apps/activity/models.py:312
|
#: apps/activity/models.py:317
|
||||||
msgid "Invitation"
|
msgid "Invitation"
|
||||||
msgstr "Invitation"
|
msgstr "Invitation"
|
||||||
|
|
||||||
#: apps/activity/models.py:330 apps/activity/models.py:334
|
#: apps/activity/models.py:335 apps/activity/models.py:339
|
||||||
msgid "Opener"
|
msgid "Opener"
|
||||||
msgstr "Ouvreur⋅se"
|
msgstr "Ouvreur⋅se"
|
||||||
|
|
||||||
#: apps/activity/models.py:335
|
#: apps/activity/models.py:340
|
||||||
#: apps/activity/templates/activity/activity_detail.html:16
|
#: apps/activity/templates/activity/activity_detail.html:16
|
||||||
msgid "Openers"
|
msgid "Openers"
|
||||||
msgstr "Ouvreur⋅ses"
|
msgstr "Ouvreur⋅ses"
|
||||||
|
|
||||||
#: apps/activity/models.py:339
|
#: apps/activity/models.py:344
|
||||||
#, fuzzy, python-brace-format
|
#, fuzzy, python-brace-format
|
||||||
#| msgid "Entry for {note} to the activity {activity}"
|
#| msgid "Entry for {note} to the activity {activity}"
|
||||||
msgid "{opener} is opener of activity {acivity}"
|
msgid "{opener} is opener of activity {acivity}"
|
||||||
@ -463,25 +467,25 @@ msgstr "Détails de l'activité"
|
|||||||
msgid "Update activity"
|
msgid "Update activity"
|
||||||
msgstr "Modifier l'activité"
|
msgstr "Modifier l'activité"
|
||||||
|
|
||||||
#: apps/activity/views.py:177
|
#: apps/activity/views.py:178
|
||||||
msgid "Invite guest to the activity \"{}\""
|
msgid "Invite guest to the activity \"{}\""
|
||||||
msgstr "Invitation pour l'activité « {} »"
|
msgstr "Invitation pour l'activité « {} »"
|
||||||
|
|
||||||
#: apps/activity/views.py:217
|
#: apps/activity/views.py:218
|
||||||
msgid "You are not allowed to display the entry interface for this activity."
|
msgid "You are not allowed to display the entry interface for this activity."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Vous n'êtes pas autorisé·e à afficher l'interface des entrées pour cette "
|
"Vous n'êtes pas autorisé·e à afficher l'interface des entrées pour cette "
|
||||||
"activité."
|
"activité."
|
||||||
|
|
||||||
#: apps/activity/views.py:220
|
#: apps/activity/views.py:221
|
||||||
msgid "This activity does not support activity entries."
|
msgid "This activity does not support activity entries."
|
||||||
msgstr "Cette activité ne requiert pas d'entrées."
|
msgstr "Cette activité ne requiert pas d'entrées."
|
||||||
|
|
||||||
#: apps/activity/views.py:223
|
#: apps/activity/views.py:224
|
||||||
msgid "This activity is closed."
|
msgid "This activity is closed."
|
||||||
msgstr "Cette activité est fermée."
|
msgstr "Cette activité est fermée."
|
||||||
|
|
||||||
#: apps/activity/views.py:328
|
#: apps/activity/views.py:329
|
||||||
msgid "Entry for activity \"{}\""
|
msgid "Entry for activity \"{}\""
|
||||||
msgstr "Entrées pour l'activité « {} »"
|
msgstr "Entrées pour l'activité « {} »"
|
||||||
|
|
||||||
@ -1985,14 +1989,12 @@ msgstr "Historique des transactions récentes"
|
|||||||
#: apps/note/templates/note/mails/negative_balance.txt:25
|
#: apps/note/templates/note/mails/negative_balance.txt:25
|
||||||
#: apps/note/templates/note/mails/negative_notes_report.html:46
|
#: apps/note/templates/note/mails/negative_notes_report.html:46
|
||||||
#: apps/note/templates/note/mails/negative_notes_report.txt:13
|
#: apps/note/templates/note/mails/negative_notes_report.txt:13
|
||||||
|
#: apps/note/templates/note/mails/summary_notes_report.html:62
|
||||||
|
#: apps/note/templates/note/mails/summary_ntoes_report.txt:33
|
||||||
#: apps/note/templates/note/mails/weekly_report.html:51
|
#: apps/note/templates/note/mails/weekly_report.html:51
|
||||||
#: apps/note/templates/note/mails/weekly_report.txt:32
|
#: apps/note/templates/note/mails/weekly_report.txt:32
|
||||||
#: apps/registration/templates/registration/mails/email_validation_email.html:40
|
#: apps/registration/templates/registration/mails/email_validation_email.html:40
|
||||||
#: apps/registration/templates/registration/mails/email_validation_email.txt:16
|
#: apps/registration/templates/registration/mails/email_validation_email.txt:16
|
||||||
#: apps/scripts/templates/scripts/horaires.html:35
|
|
||||||
#: apps/scripts/templates/scripts/horaires.txt:17
|
|
||||||
#: apps/scripts/templates/scripts/intro_mail.html:49
|
|
||||||
#: apps/scripts/templates/scripts/intro_mail.txt:25
|
|
||||||
msgid "Mail generated by the Note Kfet on the"
|
msgid "Mail generated by the Note Kfet on the"
|
||||||
msgstr "Mail généré par la Note Kfet le"
|
msgstr "Mail généré par la Note Kfet le"
|
||||||
|
|
||||||
@ -2563,6 +2565,7 @@ msgid "Address"
|
|||||||
msgstr "Adresse"
|
msgstr "Adresse"
|
||||||
|
|
||||||
#: apps/treasury/models.py:69 apps/treasury/models.py:202
|
#: apps/treasury/models.py:69 apps/treasury/models.py:202
|
||||||
|
#: apps/treasury/models.py:472
|
||||||
msgid "Date"
|
msgid "Date"
|
||||||
msgstr "Date"
|
msgstr "Date"
|
||||||
|
|
||||||
@ -2682,6 +2685,102 @@ msgstr ""
|
|||||||
"sa note. Merci de lui demander de recharger sa note avant d'invalider ce "
|
"sa note. Merci de lui demander de recharger sa note avant d'invalider ce "
|
||||||
"crédit."
|
"crédit."
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:476
|
||||||
|
msgid "Total positive user"
|
||||||
|
msgstr "Nombre d'utilisateur⋅rices en positif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:480
|
||||||
|
msgid "Balance positive user"
|
||||||
|
msgstr "Solde des utilisateur⋅rices en positif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:484
|
||||||
|
msgid "Total positive user BDE"
|
||||||
|
msgstr "Nombre d'adhérent⋅es au BDE en positif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:488
|
||||||
|
msgid "Balance positive user BDE"
|
||||||
|
msgstr "Solde des adhérent⋅es au BDE en positif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:492
|
||||||
|
msgid "Total zero user"
|
||||||
|
msgstr "Nombre d'utilisateur⋅rices à zéro"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:496
|
||||||
|
msgid "Total zero user BDE"
|
||||||
|
msgstr "Nombre d'adhérent⋅es au BDE à zéro"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:500
|
||||||
|
msgid "Total negative user"
|
||||||
|
msgstr "Nombre d'utilisateur⋅rices en négatif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:504
|
||||||
|
msgid "Balance negative user"
|
||||||
|
msgstr "Solde des utilisateur⋅rices en négatif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:508
|
||||||
|
msgid "Total negative user BDE"
|
||||||
|
msgstr "Nombre d'adhérent⋅es au BDE en négatif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:512
|
||||||
|
msgid "Balance negative user BDE"
|
||||||
|
msgstr "Solde des adhérent⋅es au BDE en négatif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:516
|
||||||
|
msgid "Total very negative user"
|
||||||
|
msgstr "Nombre d'utilisateur⋅rices en négatif sévère"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:520
|
||||||
|
msgid "Balance very negative user"
|
||||||
|
msgstr "Solde des utilisateur⋅rices en négatif sévère"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:524
|
||||||
|
msgid "Total very negative user BDE"
|
||||||
|
msgstr "Nombre d'adhérent⋅es au BDE en négatif sévère"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:528
|
||||||
|
msgid "Balance very negative user BDE"
|
||||||
|
msgstr "Solde des adhérent⋅es au BDE en négatif sévère"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:532
|
||||||
|
msgid "Total positive club"
|
||||||
|
msgstr "Nombre de clubs en positif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:536
|
||||||
|
msgid "Balance positive club"
|
||||||
|
msgstr "Solde des clubs en positif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:540
|
||||||
|
msgid "Total positive club nbde"
|
||||||
|
msgstr "Nombre de clubs non-BDE en positif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:544
|
||||||
|
msgid "Balance positive club nbde"
|
||||||
|
msgstr "Solde des clubs non-BDE en positif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:548
|
||||||
|
msgid "Total zero club"
|
||||||
|
msgstr "Nombre de clubs à zéro"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:552
|
||||||
|
msgid "Total zero club nbde"
|
||||||
|
msgstr "Nombre de clubs non-BDE à zéro"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:556
|
||||||
|
msgid "Total negative club"
|
||||||
|
msgstr "Nombre de clubs en négatif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:560
|
||||||
|
msgid "Balance negative club"
|
||||||
|
msgstr "Solde des clubs en négatif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:564
|
||||||
|
msgid "Total negative club nbde"
|
||||||
|
msgstr "Nombre de clubs non-BDE en négatif"
|
||||||
|
|
||||||
|
#: apps/treasury/models.py:568
|
||||||
|
msgid "Balance negative club nbde"
|
||||||
|
msgstr "Solde des clubs non-BDE en négatif"
|
||||||
|
|
||||||
#: apps/treasury/tables.py:20
|
#: apps/treasury/tables.py:20
|
||||||
msgid "Invoice #{:d}"
|
msgid "Invoice #{:d}"
|
||||||
msgstr "Facture n°{:d}"
|
msgstr "Facture n°{:d}"
|
||||||
|
@ -20,6 +20,8 @@ MAILTO=notekfet2020@lists.crans.org
|
|||||||
00 5 * * 2 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
|
00 5 * * 2 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
|
||||||
# Envoyer le rapport mensuel aux trésoriers et respos info
|
# Envoyer le rapport mensuel aux trésoriers et respos info
|
||||||
00 8 * * 5 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
|
00 8 * * 5 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
|
||||||
|
# Envoyer le recap de tresorerie
|
||||||
|
00 8 * * 5 root cd /var/www/note_kfet && env/bin/python manage.py send_summary_notes_report --negative-amount 2000
|
||||||
# Envoyer les rapports aux gens
|
# Envoyer les rapports aux gens
|
||||||
55 6 * * * root cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
|
55 6 * * * root cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
|
||||||
# Mettre à jour les boutons mis en avant
|
# Mettre à jour les boutons mis en avant
|
||||||
|
Loading…
x
Reference in New Issue
Block a user