Merge branch 'nix-shell' into 'main'

Nix shell

See merge request bde/nk20!201

.gitignore

@@ -42,12 +42,12 @@ map.json
 backups/
 /static/
 /media/
+/tmp/
 
 # Virtualenv
 env/
 venv/
 db.sqlite3
-shell.nix
 
 # ansibles customs host
 ansible/host_vars/*.yaml

apps/activity/fixtures/initial.json

@@ -6,7 +6,7 @@
             "name": "Pot",
             "manage_entries": true,
             "can_invite": true,
-            "guest_entry_fee": 1000
+            "guest_entry_fee": 500
         }
     },
     {
@@ -28,25 +28,5 @@
             "can_invite": false,
             "guest_entry_fee": 0
         }
-    },
-    {
-        "model": "activity.activitytype",
-        "pk": 5,
-        "fields": {
-            "name": "Soir\u00e9e avec entrées",
-            "manage_entries": true,
-            "can_invite": false,
-            "guest_entry_fee": 0
-        }
-    },
-    {
-        "model": "activity.activitytype",
-        "pk": 7,
-        "fields": {
-            "name": "Soir\u00e9e avec invitations",
-            "manage_entries": true,
-            "can_invite": true,
-            "guest_entry_fee": 0
-        }
     }
 ]

apps/member/migrations/0009_auto_20220904_2325.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.26 on 2022-09-04 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('member', '0008_auto_20211005_1544'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='promotion',
+            field=models.PositiveSmallIntegerField(default=2022, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
+        ),
+    ]

apps/note/static/note/js/consos.js

@@ -221,7 +221,7 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca
     .done(function () {
       if (!isNaN(source.balance)) {
         const newBalance = source.balance - quantity * amount
-        if (newBalance <= -2000) {
+        if (newBalance <= -5000) {
           addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' +
               'but the emitter note %s is very negative.'), [source_alias, source_alias]), 'danger', 30000)
         } else if (newBalance < 0) {

apps/note/static/note/js/transfer.js

@@ -314,7 +314,7 @@ $('#btn_transfer').click(function () {
 
           if (!isNaN(source.note.balance)) {
             const newBalance = source.note.balance - source.quantity * dest.quantity * amount
-            if (newBalance <= -2000) {
+            if (newBalance <= -5000) {
               addMsg(interpolate(gettext('Warning, the transaction of %s from the note %s to the note %s succeed, but the emitter note %s is very negative.'),
                   [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, source.name]), 'danger', 10000)
               reset()

apps/permission/migrations/0002_club_not_required.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.2.28 on 2023-07-24 10:15
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('permission', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='role',
-            name='for_club',
-            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='member.Club', verbose_name='for club'),
-        ),
-    ]

apps/permission/models.py

@@ -339,7 +339,6 @@ class Role(models.Model):
         "member.Club",
         verbose_name=_("for club"),
         on_delete=models.PROTECT,
-        blank=True,
         null=True,
         default=None,
     )

apps/treasury/migrations/0005_auto_20230129_2348.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-01-29 22:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('treasury', '0004_auto_20211005_1544'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invoice',
+            name='bde',
+            field=models.CharField(choices=[('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='TotalistSpies', max_length=32, verbose_name='BDE'),
+        ),
+    ]

apps/treasury/models.py

@@ -28,8 +28,9 @@ class Invoice(models.Model):
 
     bde = models.CharField(
         max_length=32,
-        default='Saperlistpopette',
+        default='TotalistSpies',
         choices=(
+	    ('TotalistSpies', 'Tota[list]Spies'),
             ('Saperlistpopette', 'Saper[list]popette'),
             ('Finalist', 'Fina[list]'),
             ('Listorique', '[List]orique'),
@@ -95,7 +96,7 @@ class Invoice(models.Model):
         products = self.products.all()
 
         self.place = "Gif-sur-Yvette"
-        self.my_name = "BDE ENS Cachan"
+        self.my_name = "BDE ENS Paris Saclay"
         self.my_address_street = "4 avenue des Sciences"
         self.my_city = "91190 Gif-sur-Yvette"
         self.bank_code = 30003

apps/treasury/views.py

@@ -108,7 +108,7 @@ class InvoiceListView(LoginRequiredMixin, SingleTableView):
             name="",
             address="",
         )
-        if not PermissionBackend.check_perm(self.request, "treasury.view_invoice", sample_invoice):
+        if not PermissionBackend.check_perm(self.request, "treasury.add_invoice", sample_invoice):
             raise PermissionDenied(_("You are not able to see the treasury interface."))
         return super().dispatch(request, *args, **kwargs)
 

apps/wei/migrations/0004_auto_20220904_2325.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.26 on 2022-09-04 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0003_bus_size'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='weiclub',
+            name='year',
+            field=models.PositiveIntegerField(default=2022, unique=True, verbose_name='year'),
+        ),
+    ]

apps/wei/migrations/0005_auto_20230128_1850.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-01-28 17:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0004_auto_20220904_2325'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='weiclub',
+            name='year',
+            field=models.PositiveIntegerField(default=2023, unique=True, verbose_name='year'),
+        ),
+    ]

docs/apps/permission.rst

@@ -118,13 +118,13 @@ Exemples
          {"F": [
            "ADD",
            ["F", "source__balance"],
-           2000]
+           5000]
          }
        }
     ]
 
-  | si la destination est la note du club dont on est membre et si le montant est inférieur au solde de la source + 20 €,
-    autrement dit le solde final est au-dessus de -20 €.
+  | si la destination est la note du club dont on est membre et si le montant est inférieur au solde de la source + 50 €,
+    autrement dit le solde final est au-dessus de -50 €.
 
 
 Masques de permissions

docs/faq.rst

@@ -83,6 +83,13 @@ Je suis trésorier d'un club, qu'ai-je le droit de faire ?
    bien sûr permis pour faciliter des transferts. Tout abus de droits constaté
    pourra mener à des sanctions prises par le bureau du BDE.
 
+.. warning::
+   Une fonctionnalité pour permettre de gérer plus proprement les remboursements
+   entre amis est en cours de développement. Temporairement et pour des raisons
+   de confort, les trésoriers de clubs ont le droit de prélever n'importe quelle
+   adhérente vers n'importe quelle autre note adhérente, tant que la source ne
+   descend pas sous ``- 50 €``. Ces droits seront retirés d'ici quelques semaines.
+
 
 Je suis trésorier d'un club, je n'arrive pas à voir le solde du club / faire des transactions
 ---------------------------------------------------------------------------------------------------

note.cron

@@ -18,7 +18,7 @@ MAILTO=notekfet2020@lists.crans.org
 # Spammer les gens en négatif
  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
- 00  8     6   *   *     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 les rapports aux gens
  55  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
 # Mettre à jour les boutons mis en avant

note_kfet/static/css/custom.css

@@ -65,7 +65,10 @@ mark {
 
 /* Last BDE colors */
 .bg-primary {
-    background-color: rgb(102, 83, 105) !important;
+/*    background-color: rgb(18, 67, 4) !important; */
+/* MODE VIEUXCON=ON */
+/*    background-color: rgb(166, 0, 2) !important; */
+    background-color: rgb(0, 0, 0) !important;
 }
 
 html {
@@ -80,15 +83,15 @@ body {
 .btn-outline-primary:hover,
 .btn-outline-primary:not(:disabled):not(.disabled).active,
 .btn-outline-primary:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: rgb(102, 83, 105);
-    border-color: rgb(102, 83, 105);
+   color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);
 }
 
 .btn-outline-primary {
-    color: rgb(102, 83, 105);
-    background-color: rgba(248, 249, 250, 0.9);
-    border-color: rgb(102, 83, 105);
+    color: #fff;
+    background-color: #000;
+    border-color: #464647;
 }
 
 .turbolinks-progress-bar {
@@ -98,36 +101,63 @@ body {
 .btn-primary:hover,
 .btn-primary:not(:disabled):not(.disabled).active,
 .btn-primary:not(:disabled):not(.disabled):active {
-    color: #fff;
-    background-color: rgb(102, 83, 105);
-    border-color: rgb(102, 83, 105);
+    color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);
 }
 
 .btn-primary {
-    color: rgba(248, 249, 250, 0.9); 
-    background-color: rgb(102, 83, 105);
-    border-color: rgb(102, 83, 105);
+    color:  #fff; 
+    background-color: #000;
+    border-color: #adb5bd;
 }
 
 .border-primary {
-    border-color: rgb(115, 15, 115) !important; 
+    border-color: rgb(228, 35, 132) !important; 
 }
 
+.btn-secondary {
+    color:  #fff;
+    background-color: #000;
+    border-color: #adb5bd;
+}
+
+.btn-secondary:hover,
+.btn-secondary:not(:disabled):not(.disabled).active,
+.btn-secondary:not(:disabled):not(.disabled):active {
+    color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);
+}
+
+
+.btn-outline-dark {
+    color: #343a40;
+    border-color: #343a40;
+}
+
+.btn-outline-dark:hover,
+.btn-outline-dark:not(:disabled):not(.disabled).active,
+.btn-outline-dark:not(:disabled):not(.disabled):active {
+    color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);
+}
+
+
 a {
-    color: rgb(102, 83, 105);
+    color: rgb(228, 35, 132);
 }
 
 a:hover {
-    color: rgb(200, 30, 200);
+    color: rgb(228, 35, 132);
 }
 
 .form-control:focus {
-    box-shadow: 0 0 0 0.25rem rgba(200, 30, 200, 0.25);
-    border-color: rgb(200, 30, 200);
+    box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 50%);
+    border-color: rgb(228, 35, 132);
 }
 
 .btn-outline-primary.focus {
-  box-shadow: 0 0 0 0.25rem rgba(200, 30, 200, 0.5);
+  box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 10%);
 }
-
-

note_kfet/static/js/base.js

@@ -96,7 +96,7 @@ function displayStyle (note) {
   if (!note) { return '' }
   const balance = note.balance
   var css = ''
-  if (balance < -2000) { css += ' text-danger bg-dark' } 
+  if (balance < -5000) { css += ' text-danger bg-dark' } 
   else if (balance < -1000) { css += ' text-danger' } 
   else if (balance < 0) { css += ' text-warning' }
   if (!note.email_confirmed) { css += ' bg-primary' }

shell-static.nix

@@ -0,0 +1,34 @@
+# 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

shell.nix

@@ -0,0 +1,23 @@
+# 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
+  '';
+}