Merge branch 'l_eveil_du_nanax' into 'master'
L'eveil du nanax See merge request bde/nk20-scripts!2
This commit is contained in:
commit
c518b3dddb
1
apps.py
1
apps.py
|
@ -2,7 +2,6 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
from django.apps import AppConfig
|
from django.apps import AppConfig
|
||||||
from django.core.signals import got_request_exception
|
|
||||||
|
|
||||||
|
|
||||||
class ScriptsConfig(AppConfig):
|
class ScriptsConfig(AppConfig):
|
||||||
|
|
|
@ -5,10 +5,9 @@ import json
|
||||||
import time
|
import time
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
|
||||||
from django.apps import apps
|
from django.apps import apps
|
||||||
|
from django.core.management.base import BaseCommand
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
|
|
||||||
from polymorphic.models import PolymorphicModel
|
from polymorphic.models import PolymorphicModel
|
||||||
|
|
||||||
|
|
||||||
|
@ -16,6 +15,7 @@ def timed(method):
|
||||||
""""
|
""""
|
||||||
A simple decorator to measure time elapsed in class function (hence the args[0])
|
A simple decorator to measure time elapsed in class function (hence the args[0])
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def _timed(*args, **kw):
|
def _timed(*args, **kw):
|
||||||
ts = time.time()
|
ts = time.time()
|
||||||
result = method(*args, **kw)
|
result = method(*args, **kw)
|
||||||
|
|
|
@ -13,6 +13,7 @@ class Command(BaseCommand):
|
||||||
"""
|
"""
|
||||||
Generate Javascript translation files
|
Generate Javascript translation files
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def handle(self, *args, **kwargs):
|
def handle(self, *args, **kwargs):
|
||||||
for code, _ in settings.LANGUAGES:
|
for code, _ in settings.LANGUAGES:
|
||||||
if code == settings.LANGUAGE_CODE:
|
if code == settings.LANGUAGE_CODE:
|
||||||
|
|
|
@ -5,9 +5,7 @@ from datetime import date
|
||||||
|
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.core.management import BaseCommand
|
from django.core.management import BaseCommand
|
||||||
from django.db.models import Q
|
from member.models import Club, Membership
|
||||||
from member.models import Membership, Club
|
|
||||||
from wei.models import WEIClub
|
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
|
|
|
@ -11,7 +11,6 @@ from django.core.management.base import BaseCommand
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.test import override_settings
|
from django.test import override_settings
|
||||||
|
|
||||||
from note.models import Alias, Transaction
|
from note.models import Alias, Transaction
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,23 +1,19 @@
|
||||||
# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
|
# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
import psycopg2 as pg
|
|
||||||
import psycopg2.extras as pge
|
|
||||||
import datetime
|
import datetime
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from django.template.loader import render_to_string
|
import psycopg2 as pg
|
||||||
from django.utils.timezone import make_aware, now
|
import psycopg2.extras as pge
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
|
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
|
from django.utils.timezone import make_aware
|
||||||
from note.models import Note, NoteUser, NoteClub
|
|
||||||
from note.models import Alias
|
|
||||||
from member.models import Club, Profile
|
from member.models import Club, Profile
|
||||||
|
from note.models import Alias, Note, NoteClub, NoteUser
|
||||||
|
|
||||||
from ._import_utils import ImportCommand, BulkCreateManager, timed
|
from ._import_utils import BulkCreateManager, ImportCommand, timed
|
||||||
|
|
||||||
M_DURATION = 396
|
M_DURATION = 396
|
||||||
M_START = datetime.date(2019, 8, 1)
|
M_START = datetime.date(2019, 8, 1)
|
||||||
|
|
|
@ -3,32 +3,30 @@
|
||||||
|
|
||||||
import psycopg2 as pg
|
import psycopg2 as pg
|
||||||
import psycopg2.extras as pge
|
import psycopg2.extras as pge
|
||||||
import datetime
|
from activity.models import Activity, ActivityType, Entry, Guest
|
||||||
import copy
|
|
||||||
|
|
||||||
from django.utils.timezone import make_aware
|
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
|
from django.utils.timezone import make_aware
|
||||||
from activity.models import ActivityType, Activity, Guest, Entry
|
|
||||||
from member.models import Club
|
from member.models import Club
|
||||||
from note.models import Note, NoteUser
|
from note.models import Note, NoteUser
|
||||||
from ._import_utils import ImportCommand, BulkCreateManager, timed
|
|
||||||
|
from ._import_utils import BulkCreateManager, ImportCommand, timed
|
||||||
|
|
||||||
MAP_ACTIVITY = dict()
|
MAP_ACTIVITY = dict()
|
||||||
|
|
||||||
CLUB_RELOU = [
|
CLUB_RELOU = [
|
||||||
0, # BDE
|
0, # BDE
|
||||||
4771, # Kataclist
|
4771, # Kataclist
|
||||||
5162, # Assurance BDE ?!
|
5162, # Assurance BDE ?!
|
||||||
5164, # S & L
|
5164, # S & L
|
||||||
625, # Aspique
|
625, # Aspique
|
||||||
5154, # Frekens
|
5154, # Frekens
|
||||||
3944, # DiskJok[ENS]
|
3944, # DiskJok[ENS]
|
||||||
5153, # Monopo[list]
|
5153, # Monopo[list]
|
||||||
2351, # JdRM
|
2351, # JdRM
|
||||||
2365, # Pot Vieux
|
2365, # Pot Vieux
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
class Command(ImportCommand):
|
class Command(ImportCommand):
|
||||||
"""
|
"""
|
||||||
Import command for Activities Base Data (Comptes, and Aliases)
|
Import command for Activities Base Data (Comptes, and Aliases)
|
||||||
|
@ -50,7 +48,7 @@ class Command(ImportCommand):
|
||||||
row["responsable"] = 3508
|
row["responsable"] = 3508
|
||||||
note = self.MAP_IDBDE[row["responsable"]]
|
note = self.MAP_IDBDE[row["responsable"]]
|
||||||
if note == 6244:
|
if note == 6244:
|
||||||
# Licorne magique ne doit pas utiliser son compte club pour proposer des activités
|
# Licorne magique ne doit pas utiliser son compte club pour proposer des activités
|
||||||
note = Note.objects.get(pk=self.MAP_IDBDE[6524])
|
note = Note.objects.get(pk=self.MAP_IDBDE[6524])
|
||||||
note = note.id
|
note = note.id
|
||||||
organizer = Club.objects.filter(name=row["signature"])
|
organizer = Club.objects.filter(name=row["signature"])
|
||||||
|
|
|
@ -3,15 +3,15 @@
|
||||||
|
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
|
||||||
from django.core.management import call_command
|
from django.core.management import call_command
|
||||||
|
|
||||||
from ._import_utils import ImportCommand
|
from ._import_utils import ImportCommand
|
||||||
|
|
||||||
|
|
||||||
class Command(ImportCommand):
|
class Command(ImportCommand):
|
||||||
"""
|
"""
|
||||||
Command for importing the database of NK15.
|
Command for importing the database of NK15.
|
||||||
Need to be run by a user with a registered role in postgres for the database nk15.
|
Need to be run by a user with a registered role in postgres for the database nk15.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def handle(self, *args, **kwargs):
|
def handle(self, *args, **kwargs):
|
||||||
|
|
|
@ -1,31 +1,25 @@
|
||||||
# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
|
# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
import copy
|
||||||
|
import datetime
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
import pytz
|
||||||
import psycopg2 as pg
|
import psycopg2 as pg
|
||||||
import psycopg2.extras as pge
|
import psycopg2.extras as pge
|
||||||
import pytz
|
from activity.models import Entry, GuestTransaction
|
||||||
import datetime
|
|
||||||
import copy
|
|
||||||
|
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.utils.timezone import make_aware
|
|
||||||
from django.db import transaction
|
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
|
from django.db import transaction
|
||||||
from note.models import (TemplateCategory,
|
from django.utils.timezone import make_aware
|
||||||
TransactionTemplate,
|
|
||||||
Transaction,
|
|
||||||
RecurrentTransaction,
|
|
||||||
SpecialTransaction,
|
|
||||||
MembershipTransaction,
|
|
||||||
)
|
|
||||||
from note.models import Note, NoteClub
|
|
||||||
from activity.models import Guest, GuestTransaction, Entry
|
|
||||||
|
|
||||||
from member.models import Membership
|
from member.models import Membership
|
||||||
from treasury.models import Remittance, SpecialTransactionProxy, SogeCredit
|
from note.models import (MembershipTransaction, Note, NoteClub,
|
||||||
from ._import_utils import ImportCommand, BulkCreateManager, timed
|
RecurrentTransaction, SpecialTransaction,
|
||||||
|
TemplateCategory, Transaction, TransactionTemplate)
|
||||||
|
from treasury.models import Remittance, SogeCredit, SpecialTransactionProxy
|
||||||
|
|
||||||
|
from ._import_utils import BulkCreateManager, ImportCommand, timed
|
||||||
|
|
||||||
MAP_TRANSACTION = dict()
|
MAP_TRANSACTION = dict()
|
||||||
MAP_REMITTANCE = dict()
|
MAP_REMITTANCE = dict()
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
from django.core.management import BaseCommand
|
|
||||||
from django.urls import reverse
|
|
||||||
from django.utils import timezone
|
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from urllib.request import Request, urlopen
|
from urllib.request import Request, urlopen
|
||||||
|
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
from activity.models import Activity
|
from activity.models import Activity
|
||||||
|
from django.core.management import BaseCommand
|
||||||
|
from django.urls import reverse
|
||||||
|
from django.utils import timezone
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
|
|
|
@ -6,7 +6,6 @@ from datetime import timedelta
|
||||||
from django.core.management.base import BaseCommand
|
from django.core.management.base import BaseCommand
|
||||||
from django.db.models import Count
|
from django.db.models import Count
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
from note.models import RecurrentTransaction, TransactionTemplate
|
from note.models import RecurrentTransaction, TransactionTemplate
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,7 @@ from django.core.management import BaseCommand
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.template.loader import render_to_string
|
from django.template.loader import render_to_string
|
||||||
from django.utils.translation import activate
|
from django.utils.translation import activate
|
||||||
|
from note.models import Note
|
||||||
from note.models import NoteUser, Note
|
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
|
|
|
@ -1,14 +1,11 @@
|
||||||
# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
|
# Copyright (C) 2018-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 timedelta
|
|
||||||
|
|
||||||
from django.core.management import BaseCommand
|
from django.core.management import BaseCommand
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.template.loader import render_to_string
|
from django.template.loader import render_to_string
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.utils.translation import activate
|
from django.utils.translation import activate
|
||||||
|
|
||||||
from note.models import NoteUser, Transaction
|
from note.models import NoteUser, Transaction
|
||||||
from note.tables import HistoryTable
|
from note.tables import HistoryTable
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
|
# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
|
||||||
from django.apps import apps
|
from django.apps import apps
|
||||||
|
from django.core.management.base import BaseCommand
|
||||||
from django.db import connection
|
from django.db import connection
|
||||||
|
|
||||||
|
|
||||||
from polymorphic.models import PolymorphicModel
|
from polymorphic.models import PolymorphicModel
|
||||||
|
|
||||||
NO_SEQ = [
|
NO_SEQ = [
|
||||||
|
@ -14,6 +12,7 @@ NO_SEQ = [
|
||||||
"WEIRole", # dirty fix
|
"WEIRole", # dirty fix
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
"""
|
"""
|
||||||
Command to synchronise primary sequence of postgres after bulk insert of django.
|
Command to synchronise primary sequence of postgres after bulk insert of django.
|
||||||
|
|
Loading…
Reference in New Issue