mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-08-16 02:29:58 +02:00
Compare commits
1 Commits
b3ab3a3cc3
...
wei
Author | SHA1 | Date | |
---|---|---|---|
|
251bb933da |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -48,6 +48,7 @@ backups/
|
|||||||
env/
|
env/
|
||||||
venv/
|
venv/
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
|
shell.nix
|
||||||
|
|
||||||
# ansibles customs host
|
# ansibles customs host
|
||||||
ansible/host_vars/*.yaml
|
ansible/host_vars/*.yaml
|
||||||
|
@@ -32,7 +32,7 @@ class ActivityForm(forms.ModelForm):
|
|||||||
def clean_organizer(self):
|
def clean_organizer(self):
|
||||||
organizer = self.cleaned_data['organizer']
|
organizer = self.cleaned_data['organizer']
|
||||||
if not organizer.note.is_active:
|
if not organizer.note.is_active:
|
||||||
self.add_error('organizer', _('The note of this club is inactive.'))
|
self.add_error('organiser', _('The note of this club is inactive.'))
|
||||||
return organizer
|
return organizer
|
||||||
|
|
||||||
def clean_date_end(self):
|
def clean_date_end(self):
|
||||||
|
@@ -16,7 +16,8 @@ def save_user_profile(instance, created, raw, **_kwargs):
|
|||||||
|
|
||||||
|
|
||||||
def update_wei_registration_fee_on_membership_creation(sender, instance, created, **kwargs):
|
def update_wei_registration_fee_on_membership_creation(sender, instance, created, **kwargs):
|
||||||
if created:
|
if not hasattr(instance, "_no_signal") and created:
|
||||||
|
print('update_wei_registration_fee_on_membership_creation')
|
||||||
from wei.models import WEIRegistration
|
from wei.models import WEIRegistration
|
||||||
if instance.club.id == 1 or instance.club.id == 2:
|
if instance.club.id == 1 or instance.club.id == 2:
|
||||||
registrations = WEIRegistration.objects.filter(
|
registrations = WEIRegistration.objects.filter(
|
||||||
@@ -24,14 +25,16 @@ def update_wei_registration_fee_on_membership_creation(sender, instance, created
|
|||||||
wei__year=instance.date_start.year,
|
wei__year=instance.date_start.year,
|
||||||
)
|
)
|
||||||
for r in registrations:
|
for r in registrations:
|
||||||
|
r._force_save = True
|
||||||
r.save()
|
r.save()
|
||||||
|
|
||||||
|
|
||||||
def update_wei_registration_fee_on_club_change(sender, instance, **kwargs):
|
def update_wei_registration_fee_on_club_change(sender, instance, **kwargs):
|
||||||
from wei.models import WEIRegistration
|
from wei.models import WEIRegistration
|
||||||
if instance.id == 1 or instance.id == 2:
|
if not hasattr(instance, "_no_signal") and (instance.id == 1 or instance.id == 2):
|
||||||
registrations = WEIRegistration.objects.filter(
|
registrations = WEIRegistration.objects.filter(
|
||||||
wei__year=instance.membership_start.year,
|
wei__year=instance.membership_start.year,
|
||||||
)
|
)
|
||||||
for r in registrations:
|
for r in registrations:
|
||||||
|
r._force_save = True
|
||||||
r.save()
|
r.save()
|
||||||
|
@@ -69,7 +69,7 @@ class WEIRegistrationForm(forms.ModelForm):
|
|||||||
class WEIChooseBusForm(forms.Form):
|
class WEIChooseBusForm(forms.Form):
|
||||||
bus = forms.ModelMultipleChoiceField(
|
bus = forms.ModelMultipleChoiceField(
|
||||||
queryset=Bus.objects,
|
queryset=Bus.objects,
|
||||||
label=_("Bus"),
|
label=_("bus"),
|
||||||
help_text=_("This choice is not definitive. The WEI organizers are free to attribute for you a bus and a team,"
|
help_text=_("This choice is not definitive. The WEI organizers are free to attribute for you a bus and a team,"
|
||||||
+ " in particular if you are a free eletron."),
|
+ " in particular if you are a free eletron."),
|
||||||
widget=CheckboxSelectMultiple(),
|
widget=CheckboxSelectMultiple(),
|
||||||
|
@@ -3152,8 +3152,10 @@ msgid "Note transaction"
|
|||||||
msgstr "Transaction Note"
|
msgstr "Transaction Note"
|
||||||
|
|
||||||
#: apps/wei/models.py:217
|
#: apps/wei/models.py:217
|
||||||
|
#, fuzzy
|
||||||
|
#| msgid "Credit type"
|
||||||
msgid "deposit type"
|
msgid "deposit type"
|
||||||
msgstr "type de caution"
|
msgstr "Type de rechargement"
|
||||||
|
|
||||||
#: apps/wei/models.py:221 apps/wei/templates/wei/weimembership_form.html:64
|
#: apps/wei/models.py:221 apps/wei/templates/wei/weimembership_form.html:64
|
||||||
msgid "birth date"
|
msgid "birth date"
|
||||||
@@ -4093,6 +4095,14 @@ msgstr "La note est indisponible pour le moment"
|
|||||||
msgid "Thank you for your understanding -- The Respos Info of BDE"
|
msgid "Thank you for your understanding -- The Respos Info of BDE"
|
||||||
msgstr "Merci de votre compréhension -- Les Respos Info du BDE"
|
msgstr "Merci de votre compréhension -- Les Respos Info du BDE"
|
||||||
|
|
||||||
|
#: note_kfet/templates/base_search.html:15
|
||||||
|
msgid "Search by attribute such as name..."
|
||||||
|
msgstr "Chercher par un attribut tel que le nom..."
|
||||||
|
|
||||||
|
#: note_kfet/templates/base_search.html:23
|
||||||
|
msgid "There is no results."
|
||||||
|
msgstr "Il n'y a pas de résultat."
|
||||||
|
|
||||||
#: note_kfet/templates/cas/logged.html:8
|
#: note_kfet/templates/cas/logged.html:8
|
||||||
msgid ""
|
msgid ""
|
||||||
"<h3>Log In Successful</h3>You have successfully logged into the Central "
|
"<h3>Log In Successful</h3>You have successfully logged into the Central "
|
||||||
|
@@ -1,34 +0,0 @@
|
|||||||
# This is a workaround meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
|
|
||||||
#
|
|
||||||
# The nk20 javascript static location are hardcoded for imperative system.
|
|
||||||
# This make ./manage.py collectstatic hard to use with nixos.
|
|
||||||
#
|
|
||||||
# A workaround is to enter a FHSUserEnv with the static placed under /share/javascript/<static>.
|
|
||||||
# This emulate a debian like system and enable collecting static normally with ./manage.py collectstatics.
|
|
||||||
# The regular shell.nix should be enough for other configurations.
|
|
||||||
#
|
|
||||||
# Warning, you are still supposed to use pip package with a venv !
|
|
||||||
{ pkgs ? import <nixpkgs> {} }:
|
|
||||||
(pkgs.buildFHSUserEnv {
|
|
||||||
name = "pipzone";
|
|
||||||
targetPkgs = pkgs: (with pkgs;
|
|
||||||
let
|
|
||||||
fhs-static = stdenv.mkDerivation {
|
|
||||||
name = "fhs-static";
|
|
||||||
buildCommand = ''
|
|
||||||
mkdir -p $out/share/javascript/bootstrap4
|
|
||||||
mkdir -p $out/share/javascript/jquery
|
|
||||||
ln -s ${python39Packages.xstatic-bootstrap}/lib/python3.9/site-packages/xstatic/pkg/bootstrap/data/* $out/share/javascript/bootstrap4
|
|
||||||
ln -s ${python39Packages.xstatic-jquery}/lib/python3.9/site-packages/xstatic/pkg/jquery/data/* $out/share/javascript/jquery
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in [
|
|
||||||
fhs-static
|
|
||||||
python39
|
|
||||||
gettext
|
|
||||||
python39Packages.pip
|
|
||||||
python39Packages.virtualenv
|
|
||||||
python39Packages.setuptools
|
|
||||||
]);
|
|
||||||
runScript = "bash";
|
|
||||||
}).env
|
|
23
shell.nix
23
shell.nix
@@ -1,23 +0,0 @@
|
|||||||
# This is meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
|
|
||||||
#
|
|
||||||
# This shell.nix contains all dependencies require to create a venv and pip install -r requirements.txt.
|
|
||||||
#
|
|
||||||
# Please check shell-static.nix for running ./manage.py collectstatics.
|
|
||||||
{ pkgs ? import <nixpkgs> {} }:
|
|
||||||
pkgs.mkShell {
|
|
||||||
buildInputs = with pkgs; [
|
|
||||||
python39
|
|
||||||
python39Packages.pip
|
|
||||||
python39Packages.setuptools
|
|
||||||
gettext
|
|
||||||
|
|
||||||
];
|
|
||||||
shellHook = ''
|
|
||||||
# Tells pip to put packages into $PIP_PREFIX instead of the usual locations.
|
|
||||||
# See https://pip.pypa.io/en/stable/user_guide/#environment-variables.
|
|
||||||
export PIP_PREFIX=$(pwd)/_build/pip_packages
|
|
||||||
export PYTHONPATH="$PIP_PREFIX/${pkgs.python39.sitePackages}:$PYTHONPATH"
|
|
||||||
export PATH="$PIP_PREFIX/bin:$PATH"
|
|
||||||
unset SOURCE_DATE_EPOCH
|
|
||||||
'';
|
|
||||||
}
|
|
Reference in New Issue
Block a user