mirror of
https://gitlab.crans.org/bde/nk20-scripts
synced 2025-10-21 20:37:56 +02:00
Compare commits
3 Commits
5b6b8a16f4
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
83fd753200 | ||
|
ac93fec326 | ||
|
9e7cef5c97 |
@@ -1,144 +0,0 @@
|
||||
# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
from datetime import date
|
||||
|
||||
from django.core.mail import send_mail
|
||||
from django.core.management import BaseCommand
|
||||
from django.db.models import Q
|
||||
from django.template.loader import render_to_string
|
||||
from django.utils.translation import activate
|
||||
from note.models import NoteUser, NoteClub
|
||||
from treasury.models import NoteSummary
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
def add_arguments(self, parser):
|
||||
parser.add_argument("--negative-amount", "-n", action='store', type=int, default=1000,
|
||||
help="Maximum amount to be considered as very negative (inclusive)")
|
||||
|
||||
def handle(self, *args, **options):
|
||||
activate('fr')
|
||||
|
||||
if options['negative_amount'] == 0:
|
||||
# Don't log empty notes
|
||||
options['negative_amount'] = 1
|
||||
|
||||
|
||||
# User notes
|
||||
positive_user_notes = NoteUser.objects.filter( Q(balance__gt=0) ).distinct()
|
||||
positive_user_notes_bde = positive_user_notes.filter( Q(user__memberships__club__name = 'BDE') & Q(user__memberships__date_end__gte = date.today()) ).distinct()
|
||||
|
||||
zero_user_notes = NoteUser.objects.filter( Q(balance=0) ).distinct()
|
||||
zero_user_notes_bde = zero_user_notes.filter( Q(user__memberships__club__name = 'BDE') & Q(user__memberships__date_end__gte = date.today()) ).distinct()
|
||||
|
||||
negative_user_notes = NoteUser.objects.filter( Q(balance__lt=0) ).distinct()
|
||||
negative_user_notes_bde = negative_user_notes.filter( Q(user__memberships__club__name = 'BDE') & Q(user__memberships__date_end__gte = date.today()) ).distinct()
|
||||
|
||||
vnegative_user_notes = NoteUser.objects.filter( Q(balance__lte=-options["negative_amount"]) ).distinct()
|
||||
vnegative_user_notes_bde = vnegative_user_notes.filter( Q(user__memberships__club__name = 'BDE') & Q(user__memberships__date_end__gte = date.today()) ).distinct()
|
||||
|
||||
|
||||
total_positive_user = positive_user_notes.count()
|
||||
balance_positive_user = sum(note.balance for note in positive_user_notes.all())
|
||||
|
||||
total_positive_user_bde = positive_user_notes_bde.count()
|
||||
balance_positive_user_bde = sum(note.balance for note in positive_user_notes_bde.all())
|
||||
|
||||
total_zero_user = zero_user_notes.count()
|
||||
|
||||
total_zero_user_bde = zero_user_notes_bde.count()
|
||||
|
||||
total_negative_user = negative_user_notes.count()
|
||||
balance_negative_user = sum(note.balance for note in negative_user_notes.all())
|
||||
|
||||
total_negative_user_bde = negative_user_notes_bde.count()
|
||||
balance_negative_user_bde = sum(note.balance for note in negative_user_notes_bde.all())
|
||||
|
||||
total_vnegative_user = vnegative_user_notes.count()
|
||||
balance_vnegative_user = sum(note.balance for note in vnegative_user_notes.all())
|
||||
|
||||
total_vnegative_user_bde = vnegative_user_notes_bde.count()
|
||||
balance_vnegative_user_bde = sum(note.balance for note in vnegative_user_notes_bde.all())
|
||||
|
||||
|
||||
|
||||
#Club notes
|
||||
positive_club_notes = NoteClub.objects.filter( Q(balance__gt=0) ).distinct()
|
||||
positive_club_notes_nbde = positive_club_notes.filter( ~Q(club__name = 'BDE') & ~Q(club__name = 'Kfet') & ~Q(club__name__iendswith = '- BDE')).distinct()
|
||||
|
||||
zero_club_notes = NoteClub.objects.filter( Q(balance=0) ).distinct()
|
||||
zero_club_notes_nbde = zero_club_notes.filter( ~Q(club__name = 'BDE') & ~Q(club__name = 'Kfet') & ~Q(club__name__iendswith = '- BDE')).distinct()
|
||||
|
||||
negative_club_notes = NoteClub.objects.filter( Q(balance__lt=0) ).distinct()
|
||||
negative_club_notes_nbde = negative_club_notes.filter( ~Q(club__name = 'BDE') & ~Q(club__name = 'Kfet') & ~Q(club__name__iendswith = '- BDE')).distinct()
|
||||
|
||||
|
||||
total_positive_club = positive_club_notes.count()
|
||||
balance_positive_club = sum(note.balance for note in positive_club_notes.all())
|
||||
|
||||
total_positive_club_nbde = positive_club_notes_nbde.count()
|
||||
balance_positive_club_nbde = sum(note.balance for note in positive_club_notes_nbde.all())
|
||||
|
||||
total_zero_club = zero_club_notes.count()
|
||||
|
||||
total_zero_club_nbde = zero_club_notes_nbde.count()
|
||||
|
||||
total_negative_club = negative_club_notes.count()
|
||||
balance_negative_club = sum(note.balance for note in negative_club_notes.all())
|
||||
|
||||
total_negative_club_nbde = negative_club_notes_nbde.count()
|
||||
balance_negative_club_nbde = sum(note.balance for note in negative_club_notes_nbde.all())
|
||||
|
||||
|
||||
last_summary = NoteSummary.objects.order_by('-date').first()
|
||||
|
||||
summary = NoteSummary.objects.create(
|
||||
total_positive_user=total_positive_user,
|
||||
balance_positive_user=balance_positive_user,
|
||||
|
||||
total_positive_user_bde=total_positive_user_bde,
|
||||
balance_positive_user_bde=balance_positive_user_bde,
|
||||
|
||||
total_zero_user=total_zero_user,
|
||||
|
||||
total_zero_user_bde=total_zero_user_bde,
|
||||
|
||||
total_negative_user=total_negative_user,
|
||||
balance_negative_user=balance_negative_user,
|
||||
|
||||
total_negative_user_bde=total_negative_user_bde,
|
||||
balance_negative_user_bde=balance_negative_user_bde,
|
||||
|
||||
total_vnegative_user=total_vnegative_user,
|
||||
balance_vnegative_user=balance_vnegative_user,
|
||||
|
||||
total_vnegative_user_bde=total_vnegative_user_bde,
|
||||
balance_vnegative_user_bde=balance_vnegative_user_bde,
|
||||
|
||||
|
||||
total_positive_club=total_positive_club,
|
||||
balance_positive_club=balance_positive_club,
|
||||
|
||||
total_positive_club_nbde=total_positive_club_nbde,
|
||||
balance_positive_club_nbde=balance_positive_club_nbde,
|
||||
|
||||
total_zero_club=total_zero_club,
|
||||
|
||||
total_zero_club_nbde=total_zero_club_nbde,
|
||||
|
||||
total_negative_club=total_negative_club,
|
||||
balance_negative_club=balance_negative_club,
|
||||
|
||||
total_negative_club_nbde=total_negative_club_nbde,
|
||||
balance_negative_club_nbde=balance_negative_club_nbde,
|
||||
)
|
||||
|
||||
balance_difference_user = (balance_positive_user - balance_negative_user) - (last_summary.balance_positive_user - last_summary.balance_negative_user)
|
||||
balance_difference_club = (balance_positive_club - balance_negative_club) - (last_summary.balance_positive_club - last_summary.balance_negative_club)
|
||||
|
||||
plain_text = render_to_string("note/mails/summary_notes_report.txt", context=dict(summary=summary, balance_difference_user=balance_difference_user, balance_difference_club=balance_difference_club))
|
||||
html = render_to_string("note/mails/summary_notes_report.html", context=dict(summary=summary, balance_difference_user=balance_difference_user, balance_difference_club=balance_difference_club))
|
||||
send_mail("[Note Kfet] Récapitulatif de trésorerie", plain_text, "Note Kfet 2020 <notekfet2020@crans.org>",
|
||||
recipient_list=["respo-info.bde@lists.crans.org", "tresorerie.bde@lists.crans.org"],
|
||||
html_message=html)
|
172
management/commands/steal.py
Normal file
172
management/commands/steal.py
Normal file
@@ -0,0 +1,172 @@
|
||||
# Copyright (C) 2018-2025 by BDE ENS-Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.db import transaction
|
||||
from django.db.models import Sum
|
||||
|
||||
from note.models import RecurrentTransaction, TransactionTemplate
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = """
|
||||
Syntax of inventory file:
|
||||
DATE_START=YYYY-MM-DD HH:MM:SS
|
||||
button_id=quantity
|
||||
"button_name"=quantity
|
||||
'button_name'=quantity
|
||||
# some comment
|
||||
...
|
||||
DATE_END=YYYY-MM-DD
|
||||
button_id=quantity
|
||||
...
|
||||
GROCERY
|
||||
button_id=quantity
|
||||
...
|
||||
Syntax of price file:
|
||||
button_id;price_ht;TVA
|
||||
"button_name";price_ht;TVA
|
||||
'button_name';price_ht;TVA
|
||||
# some comment
|
||||
button_name
|
||||
You don't need to escape internal " or ' in button_name
|
||||
"=" and ";" aren't allowed in button_name
|
||||
TVA in % (i.e 5.5, 20)
|
||||
price_ht in € (i.e 0.928, 1.045)
|
||||
"""
|
||||
|
||||
def add_arguments(self, parser):
|
||||
parser.add_argument('file', type=str)
|
||||
parser.add_argument('-t', '--type', choices=["weekend", "weekdays"],
|
||||
default="", help='Type of prices')
|
||||
parser.add_argument('-d', '--doit', action='store_true',
|
||||
help='Actually do it')
|
||||
|
||||
def handle(self, *args, **kwargs):
|
||||
prices_csv = '/var/inventory/prices.csv'
|
||||
file = open(kwargs['file'], 'r', encoding='utf-8')
|
||||
|
||||
inv_start, inv_end, inv_grocery = {}, {}, {}
|
||||
start = True
|
||||
grocery = False
|
||||
|
||||
for line in file:
|
||||
if line[0] == '#':
|
||||
continue
|
||||
if start:
|
||||
if 'DATE_START' in line:
|
||||
date_start = line.split('=')[1]
|
||||
elif 'DATE_END' in line:
|
||||
date_end = line.split('=')[1]
|
||||
start = False
|
||||
else:
|
||||
add_to_dict(line, inv_start)
|
||||
elif not grocery:
|
||||
if 'GROCERY' in line:
|
||||
grocery = True
|
||||
else:
|
||||
add_to_dict(line, inv_end)
|
||||
else:
|
||||
add_to_dict(line, inv_grocery)
|
||||
|
||||
file.close()
|
||||
|
||||
delta_real = delta_from_inv(inv_start, inv_end, inv_grocery)
|
||||
delta_th = delta_from_note(date_start, date_end, delta_real.keys())
|
||||
|
||||
steal_dict = steal(delta_real, delta_th)
|
||||
|
||||
if kwargs['verbosity'] > 0:
|
||||
for button in steal_dict:
|
||||
text = "%.2f" % steal_dict[button] + \
|
||||
f"% of steal on button: {button.name} (pk={button.pk})"
|
||||
if steal_dict[button] > 20:
|
||||
self.stdout.write(self.style.ERROR(text))
|
||||
elif steal_dict[button] > 0:
|
||||
self.stdout.write(self.style.WARNING(text))
|
||||
else:
|
||||
self.stdout.write(self.style.SUCCESS(text))
|
||||
|
||||
change = False
|
||||
if kwargs['type']:
|
||||
change = True
|
||||
prices_dict = {}
|
||||
prices = open(prices_csv, 'r', encoding='utf-8')
|
||||
for line in prices:
|
||||
if line[0] == '#':
|
||||
continue
|
||||
b, p, tva = line.split(';')
|
||||
if b[0] == "\"" or b[0] == "'":
|
||||
b = TransactionTemplate.objects.get(name=b[1:-1])
|
||||
else:
|
||||
b = TransactionTemplate.objects.get(pk=int(b))
|
||||
prices_dict[b] = float(p) * (1 + float(tva) / 100)
|
||||
prices.close()
|
||||
|
||||
if kwargs['type'] == 'weekdays':
|
||||
for b in prices_dict:
|
||||
# people steal on weekdays
|
||||
prices_dict[b] = prices_dict[b] * (1 + steal_dict[b] / 100)
|
||||
|
||||
if change:
|
||||
with transaction.atomic():
|
||||
for b in prices_dict:
|
||||
# dizaine de centime supérieures
|
||||
# sauf si les pertes sont inférieures à 1 centimes
|
||||
# 1.299€ -> 1.30€ | 1.2100€ -> 1.30€ | 1.20999€ -> 1.20€
|
||||
amount = round(int(100*(prices_dict[b] + 0.05)), -1)
|
||||
if kwargs['verbosity'] > 0:
|
||||
self.stdout.write(f"""{b.name}:
|
||||
-Old amount: {b.amount}c€
|
||||
-New amount: {amount}c€""")
|
||||
b.amount = amount
|
||||
# we don't want to flood price history each week
|
||||
b._no_signal = True
|
||||
if kwargs['doit']:
|
||||
b.save()
|
||||
return 0
|
||||
|
||||
|
||||
def add_to_dict(line, d):
|
||||
b, quantity = line.split('=')
|
||||
if b[0] == "\"" or b[0] == "'":
|
||||
button = TransactionTemplate.objects.get(name=b[1:-1])
|
||||
else:
|
||||
button = TransactionTemplate.objects.get(pk=int(b))
|
||||
d[button] = int(quantity)
|
||||
return
|
||||
|
||||
|
||||
def delta_from_note(date_start, date_end, keys):
|
||||
d = {}
|
||||
for button in keys:
|
||||
quantity = RecurrentTransaction.objects.filter(
|
||||
valid=True,
|
||||
created_at__gte=date_start,
|
||||
created_at__lte=date_end,
|
||||
template__pk=button.pk).aggregate(total=Sum('quantity'))['total']
|
||||
d[button] = quantity
|
||||
return d
|
||||
|
||||
|
||||
def delta_from_inv(s, e, g):
|
||||
d = {}
|
||||
for button in s:
|
||||
if button in g:
|
||||
if button in e:
|
||||
d[button] = s[button] + g[button] - e[button]
|
||||
else:
|
||||
d[button] = s[button] + g[button]
|
||||
else:
|
||||
if button in e:
|
||||
d[button] = s[button] - e[button]
|
||||
else:
|
||||
d[button] = s[button]
|
||||
return d
|
||||
|
||||
|
||||
def steal(real, th):
|
||||
s = {}
|
||||
for b in real:
|
||||
s[b] = 100 * (real[b] - th[b]) / real[b]
|
||||
return s
|
15
shell/oauth2_latency
Executable file
15
shell/oauth2_latency
Executable file
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/sh
|
||||
# Copyright (C) 2018-2025 by BDE ENS-Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# use this script for reduce latency with oauth2_provider (cf. https://gitlab.crans.org/bde/nk20/issues/134)
|
||||
|
||||
# Tested with django-oauth2-toolkit version 3.0.1
|
||||
|
||||
sed -i -e "s/get_all_scopes()/get_all_scopes(scopes=scopes)/g" /var/www/note_kfet/env/lib/python3.11/site-packages/oauth2_provider/views/base.py
|
||||
|
||||
sed -i -e '/get_all_scopes()/{N;s/\(.*\)\n\(.*\)/\2\n\1/;s/get_all_scopes()/get_all_scopes(scopes=token_scopes)/}' /var/www/note_kfet/env/lib/python3.11/site-packages/oauth2_provider/models.py
|
||||
|
||||
sed -i -e '/get_all_scopes()/{N;s/\(.*\)\n\(.*\)/\2\n\1/;s/get_all_scopes()/get_all_scopes(scopes=read_write_scopes)/}' /var/www/note_kfet/env/lib/python3.11/site-packages/oauth2_provider/views/mixins.py
|
||||
|
||||
sed -i -e '/get_all_scopes()/{N;s/\(.*\)\n\(.*\)/\2\n\1/;s/get_all_scopes()/get_all_scopes(scopes=read_write_scopes)/}' /var/www/note_kfet/env/lib/python3.11/site-packages/oauth2_provider/decorators.py
|
Reference in New Issue
Block a user