mirror of https://gitlab.crans.org/bde/nk20
💚 Fix linters
This commit is contained in:
parent
d9cf812074
commit
0de69cbfaf
|
@ -2,8 +2,8 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from note_kfet.admin import admin_site
|
from note_kfet.admin import admin_site
|
||||||
|
|
||||||
from .models import Activity, ActivityType, Guest, Entry
|
from .models import Activity, ActivityType, Guest, Entry
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
# Copyright (C) 2018-2020 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, datetime
|
from datetime import timedelta, datetime
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.core.management import call_command
|
|
||||||
from django.db import models
|
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
|
||||||
|
|
|
@ -16,7 +16,6 @@ from django.utils.encoding import force_bytes
|
||||||
from django.utils.http import urlsafe_base64_encode
|
from django.utils.http import urlsafe_base64_encode
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from phonenumber_field.modelfields import PhoneNumberField
|
from phonenumber_field.modelfields import PhoneNumberField
|
||||||
|
|
||||||
from permission.models import Role
|
from permission.models import Role
|
||||||
from registration.tokens import email_validation_token
|
from registration.tokens import email_validation_token
|
||||||
from note.models import MembershipTransaction
|
from note.models import MembershipTransaction
|
||||||
|
@ -329,7 +328,6 @@ class Membership(models.Model):
|
||||||
club=self.club,
|
club=self.club,
|
||||||
date_start=max(self.date_end + datetime.timedelta(days=1), self.club.membership_start),
|
date_start=max(self.date_end + datetime.timedelta(days=1), self.club.membership_start),
|
||||||
)
|
)
|
||||||
from django.forms import model_to_dict
|
|
||||||
if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
|
if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
|
||||||
new_membership._force_renew_parent = True
|
new_membership._force_renew_parent = True
|
||||||
if hasattr(self, '_soge') and self._soge:
|
if hasattr(self, '_soge') and self._soge:
|
||||||
|
@ -445,8 +443,8 @@ class Membership(models.Model):
|
||||||
)
|
)
|
||||||
transaction._force_save = True
|
transaction._force_save = True
|
||||||
if hasattr(self, '_soge') and "treasury" in settings.INSTALLED_APPS\
|
if hasattr(self, '_soge') and "treasury" in settings.INSTALLED_APPS\
|
||||||
and (self.club.name == "BDE" or self.club.name == "Kfet" or
|
and (self.club.name == "BDE" or self.club.name == "Kfet"
|
||||||
("wei" in settings.INSTALLED_APPS and hasattr(self.club, "weiclub") and self.club.weiclub)):
|
or ("wei" in settings.INSTALLED_APPS and hasattr(self.club, "weiclub") and self.club.weiclub)):
|
||||||
# If the soge pays, then the transaction is unvalidated in a first time, then submitted for control
|
# If the soge pays, then the transaction is unvalidated in a first time, then submitted for control
|
||||||
# to treasurers.
|
# to treasurers.
|
||||||
transaction.valid = False
|
transaction.valid = False
|
||||||
|
|
|
@ -455,7 +455,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
|
||||||
while c.parent_club is not None:
|
while c.parent_club is not None:
|
||||||
c = c.parent_club
|
c = c.parent_club
|
||||||
clubs_renewal.append(c)
|
clubs_renewal.append(c)
|
||||||
additional_fee_renewal += c.membership_fee_paid if user.profile.paid else c.membership_fee_unpaid
|
additional_fee_renewal += c.membership_fee_paid
|
||||||
context["clubs_renewal"] = clubs_renewal
|
context["clubs_renewal"] = clubs_renewal
|
||||||
context["additional_fee_renewal"] = additional_fee_renewal
|
context["additional_fee_renewal"] = additional_fee_renewal
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
from django.utils import timezone
|
|
||||||
from rest_framework import serializers
|
|
||||||
from rest_framework.serializers import ListSerializer
|
|
||||||
from rest_polymorphic.serializers import PolymorphicSerializer
|
|
||||||
|
|
||||||
|
from rest_framework import serializers
|
||||||
|
from rest_polymorphic.serializers import PolymorphicSerializer
|
||||||
from member.api.serializers import MembershipSerializer
|
from member.api.serializers import MembershipSerializer
|
||||||
from member.models import Membership
|
from member.models import Membership
|
||||||
from note_kfet.middlewares import get_current_authenticated_user
|
from note_kfet.middlewares import get_current_authenticated_user
|
||||||
|
|
|
@ -7,7 +7,7 @@ from django.utils import timezone
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from polymorphic.models import PolymorphicModel
|
from polymorphic.models import PolymorphicModel
|
||||||
|
|
||||||
from .notes import Note, NoteClub, NoteSpecial, NoteUser
|
from .notes import Note, NoteClub, NoteSpecial
|
||||||
from ..templatetags.pretty_money import pretty_money
|
from ..templatetags.pretty_money import pretty_money
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -10,7 +10,6 @@ from django.utils.translation import gettext_lazy as _
|
||||||
from django.views.generic import CreateView, UpdateView, DetailView
|
from django.views.generic import CreateView, UpdateView, DetailView
|
||||||
from django_tables2 import SingleTableView
|
from django_tables2 import SingleTableView
|
||||||
from django.urls import reverse_lazy
|
from django.urls import reverse_lazy
|
||||||
|
|
||||||
from activity.models import Entry
|
from activity.models import Entry
|
||||||
from note_kfet.inputs import AmountInput
|
from note_kfet.inputs import AmountInput
|
||||||
from permission.backends import PermissionBackend
|
from permission.backends import PermissionBackend
|
||||||
|
|
|
@ -5,7 +5,6 @@ import functools
|
||||||
import json
|
import json
|
||||||
import operator
|
import operator
|
||||||
from copy import copy
|
from copy import copy
|
||||||
from time import sleep
|
|
||||||
|
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.core.exceptions import ValidationError
|
from django.core.exceptions import ValidationError
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
import django_tables2 as tables
|
import django_tables2 as tables
|
||||||
from django.urls import reverse_lazy
|
from django.urls import reverse_lazy
|
||||||
from django.utils.html import format_html
|
from django.utils.html import format_html
|
||||||
|
|
||||||
from member.models import Membership
|
from member.models import Membership
|
||||||
from note_kfet.middlewares import get_current_authenticated_user
|
from note_kfet.middlewares import get_current_authenticated_user
|
||||||
from permission.backends import PermissionBackend
|
from permission.backends import PermissionBackend
|
||||||
|
|
|
@ -6,7 +6,6 @@ from django.contrib.auth.models import User
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.forms import CheckboxSelectMultiple
|
from django.forms import CheckboxSelectMultiple
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from note.models import NoteSpecial
|
from note.models import NoteSpecial
|
||||||
from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget
|
from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@ from django.contrib.auth.models import User
|
||||||
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 _
|
||||||
from phonenumber_field.modelfields import PhoneNumberField
|
from phonenumber_field.modelfields import PhoneNumberField
|
||||||
|
|
||||||
from member.models import Club, Membership
|
from member.models import Club, Membership
|
||||||
from note.models import MembershipTransaction
|
from note.models import MembershipTransaction
|
||||||
from permission.models import Role
|
from permission.models import Role
|
||||||
|
|
|
@ -7,9 +7,9 @@ from django.utils import timezone
|
||||||
from django.utils.html import format_html
|
from django.utils.html import format_html
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from django_tables2 import A
|
from django_tables2 import A
|
||||||
|
|
||||||
from note_kfet.middlewares import get_current_authenticated_user
|
from note_kfet.middlewares import get_current_authenticated_user
|
||||||
from permission.backends import PermissionBackend
|
from permission.backends import PermissionBackend
|
||||||
|
|
||||||
from .models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership
|
from .models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,6 @@ from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSp
|
||||||
from note.tables import HistoryTable
|
from note.tables import HistoryTable
|
||||||
from note_kfet.settings import BASE_DIR
|
from note_kfet.settings import BASE_DIR
|
||||||
from permission.backends import PermissionBackend
|
from permission.backends import PermissionBackend
|
||||||
from permission.models import Role
|
|
||||||
from permission.views import ProtectQuerysetMixin
|
from permission.views import ProtectQuerysetMixin
|
||||||
|
|
||||||
from .forms.registration import WEIChooseBusForm
|
from .forms.registration import WEIChooseBusForm
|
||||||
|
|
Loading…
Reference in New Issue