Remove unused file

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>

.ansible-lint

@@ -0,0 +1,3 @@
+skip_list:
+  - command-instead-of-shell  # Use shell only when shell functionality is required
+  - experimental  # all rules tagged as experimental

.gitlab-ci.yml

@@ -10,50 +10,22 @@ variables:
 # Debian Buster
 py37-django22:
   stage: test
-  image: debian:buster-backports
+  image: otthorn/nk20_ci_37
-  before_script:
-    - >
-        apt-get update &&
-        apt-get install --no-install-recommends -t buster-backports -y
-        python3-django python3-django-crispy-forms
-        python3-django-extensions python3-django-filters python3-django-polymorphic
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
-        python3-bs4 python3-setuptools tox texlive-xetex
   script: tox -e py37-django22
 
 # Ubuntu 20.04
 py38-django22:
   stage: test
-  image: ubuntu:20.04
+  image: otthorn/nk20_ci_38
-  before_script:
-    # Fix tzdata prompt
-    - ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone
-    - >
-        apt-get update &&
-        apt-get install --no-install-recommends -y
-        python3-django python3-django-crispy-forms
-        python3-django-extensions python3-django-filters python3-django-polymorphic
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
-        python3-bs4 python3-setuptools tox texlive-xetex
   script: tox -e py38-django22
 
 # Debian Bullseye
 py39-django22:
   stage: test
-  image: debian:bullseye
+  image: otthorn/nk20_ci_39
-  before_script:
-    - >
-        apt-get update &&
-        apt-get install --no-install-recommends -y
-        python3-django python3-django-crispy-forms
-        python3-django-extensions python3-django-filters python3-django-polymorphic
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
-        python3-bs4 python3-setuptools tox texlive-xetex
   script: tox -e py39-django22
 
+# Tox linter
 linters:
   stage: quality-assurance
   image: debian:buster-backports
@@ -64,6 +36,20 @@ linters:
   # Be nice to new contributors, but please use `tox`
   allow_failure: true
 
+# Ansible linter
+ansible-linter:
+  stage: quality-assurance
+  image: otthorn/nk20_ci_ansiblelint
+  script: ansible-lint ansible/
+
+# Docker linter
+docker-linter:
+  stage: quality-assurance
+  image: hadolint/hadolint
+  script:
+    - hadolint -c .hadolint Dockerfile
+    - hadolint -c .hadolint docker_ci/Dockerfile.*
+
 # Compile documentation
 documentation:
   stage: docs

.hadolint

@@ -0,0 +1,4 @@
+ignored:
+  - DL3008  # Do not force to pin version in apt (Debian)
+  - DL3013  # Do not force to pin version in pip (PyPI)
+  - DL3018  # Do not force to pin version in apk (Alpine)

apps/member/views.py

@@ -658,8 +658,8 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
         if club.name != "Kfet" and club.parent_club and not Membership.objects.filter(
                 user=form.instance.user,
                 club=club.parent_club,
-                date_start__gte=club.parent_club.membership_start,
+                date_start__lte=timezone.now(),
-                date_end__lte=club.parent_club.membership_end,
+                date_end__gte=club.parent_club.membership_end,
         ).exists():
             form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name)
             error = True

apps/note/models/transactions.py

@@ -223,7 +223,8 @@ class Transaction(PolymorphicModel):
         # Check that the amounts stay between big integer bounds
         diff_source, diff_dest = self.validate()
 
-        if not self.source.is_active or not self.destination.is_active:
+        if not (hasattr(self, '_force_save') and self._force_save) \
+                and (not self.source.is_active or not self.destination.is_active):
             raise ValidationError(_("The transaction can't be saved since the source note "
                                     "or the destination note is not active."))
 
@@ -271,7 +272,7 @@ class RecurrentTransaction(Transaction):
     )
 
     def clean(self):
-        if self.template.destination != self.destination:
+        if self.template.destination != self.destination and not (hasattr(self, '_force_save') and self._force_save):
             raise ValidationError(
                 _("The destination of this transaction must equal to the destination of the template."))
         return super().clean()

apps/note/signals.py

@@ -43,4 +43,5 @@ def delete_transaction(instance, **_kwargs):
     """
     if not hasattr(instance, "_no_signal"):
         instance.valid = False
+        instance._force_save = True
         instance.save()

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

@@ -223,13 +223,14 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca
         const newBalance = source.balance - quantity * amount
         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)
+              'but the emitter note %s is very negative.'), [source_alias, source_alias]), 'danger', 30000)
         } else if (newBalance < 0) {
           addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' +
-              'but the emitter note %s is negative.', [source_alias, source_alias])), 'warning', 30000)
+              'but the emitter note %s is negative.'), [source_alias, source_alias]), 'warning', 30000)
         }
         if (source.membership && source.membership.date_end < new Date().toISOString()) {
-          addMsg(interpolate(gettext('Warning, the emitter note %s is no more a BDE member.', [source_alias])), 'danger', 30000)
+          addMsg(interpolate(gettext('Warning, the emitter note %s is no more a BDE member.'), [source_alias]),
+              'danger', 30000)
         }
       }
       reset()

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

@@ -302,7 +302,7 @@ $('#btn_transfer').click(function () {
             addMsg(interpolate(gettext('Warning, the emitter note %s is no more a BDE member.'), [source.name]), 'danger', 30000)
           }
           if (dest.note.membership && dest.note.membership.date_end < new Date().toISOString()) {
-            addMsg(interpolate(gettext('Warning, the destination note %s is no more a BDE member.'), [source.name]), 'danger', 30000)
+            addMsg(interpolate(gettext('Warning, the destination note %s is no more a BDE member.'), [dest.name]), 'danger', 30000)
           }
 
           if (!isNaN(source.note.balance)) {

apps/permission/fixtures/initial.json

@@ -3024,7 +3024,9 @@
 				24,
 				25,
 				26,
-				27
+				27,
+				30,
+				33
 			]
 		}
 	},

apps/treasury/models.py

@@ -381,6 +381,11 @@ class SogeCredit(models.Model):
             tr.valid = True
             tr.created_at = timezone.now()
             tr.save()
+        if self.credit_transaction:
+            # If the soge credit is deleted while the user is not validated yet,
+            # there is not credit transaction.
+            # There is a credit transaction iff the user declares that no bank account
+            # was opened after the validation of the account.
             self.credit_transaction.valid = False
             self.credit_transaction.reason += " (invalide)"
             self.credit_transaction.save()

docker_ci/Dockerfile.37

@@ -0,0 +1,18 @@
+FROM debian:buster-backports
+
+LABEL maintainer="otthorn@crans.org"
+LABEL description="Debian Buster backports image with django and tox \
+installed for testing purposes"
+
+RUN apt-get update \
+        && apt-get install --no-install-recommends -t buster-backports -y \
+        python3-django python3-django-crispy-forms \
+        python3-django-extensions python3-django-filters \
+		python3-django-polymorphic \
+        python3-djangorestframework python3-django-oauth-toolkit \
+		python3-psycopg2 python3-pil \
+        python3-babel python3-lockfile python3-pip python3-phonenumbers \
+		python3-memcache \
+        python3-bs4 python3-setuptools tox texlive-xetex \
+		&&  apt-get clean \
+		&& rm -rf /var/lib/apt/lists/*

docker_ci/Dockerfile.38

@@ -0,0 +1,22 @@
+FROM ubuntu:20.04
+
+LABEL maintainer="otthorn@crans.org"
+LABEL description="Ubuntu 20.04 image with django and tox \
+installed for testing purposes"
+
+# fix tzdata prompt
+RUN ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone
+
+RUN apt-get update \
+        && apt-get install --no-install-recommends -y \
+        python3-django python3-django-crispy-forms \
+        python3-django-extensions python3-django-filters \
+		python3-django-polymorphic \
+        python3-djangorestframework python3-django-oauth-toolkit \
+		python3-psycopg2 python3-pil \
+        python3-babel python3-lockfile python3-pip python3-phonenumbers \
+		python3-memcache \
+        python3-bs4 python3-setuptools tox texlive-xetex \
+		&&  apt-get clean \
+		&& rm -rf /var/lib/apt/lists/*
+

docker_ci/Dockerfile.39

@@ -0,0 +1,18 @@
+FROM debian:bullseye
+
+LABEL maintainer="otthorn@crans.org"
+LABEL description="Debian Bulleye image with django and tox \
+installed for testing purposes"
+
+RUN apt-get update \
+        && apt-get install --no-install-recommends -y \
+        python3-django python3-django-crispy-forms \
+        python3-django-extensions python3-django-filters \
+		python3-django-polymorphic \
+        python3-djangorestframework python3-django-oauth-toolkit \
+		python3-psycopg2 python3-pil \
+        python3-babel python3-lockfile python3-pip python3-phonenumbers \
+		python3-memcache \
+        python3-bs4 python3-setuptools tox texlive-xetex \
+		&&  apt-get clean \
+		&& rm -rf /var/lib/apt/lists/*

docker_ci/Dockerfile.ansiblelint

@@ -0,0 +1,10 @@
+FROM python:3.9-alpine
+
+LABEL maintainer="otthorn@crans.org"
+LABEL description="Alpine image with ansible-lint and yamllint \
+installed for linting purposes"
+
+RUN apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev cargo
+RUN pip install --no-cache-dir "yamllint>=1.26.0,<2.0"
+RUN pip install --no-cache-dir "ansible-lint==5.0.0"
+RUN pip install --no-cache-dir "ansible>=2.10,<2.11"

docker_ci/Dockerfile.tox

@@ -0,0 +1,8 @@
+FROM alpine:3.13
+
+LABEL maintainer="otthorn@crans.org"
+LABEL description="Alpine image with tox \
+installed for linting purposes"
+
+RUN apk --no-cache add py3-pip=20.3.4-r0
+RUN pip install --no-cache-dir tox==3.22.0

docker_ci/README.md

@@ -0,0 +1,21 @@
+# Docker CI
+
+Ce dossier contient les images docker à construire pour la CI.  L'idée est
+d'avoir une image pré-construire, au dessus laquel il y a besoin de faire
+tourner uniquement les commandes qui nous intéresse. Cela permet notamment de
+réduire drastiquement le temps que nécessite chaque test car seul la dernière
+couche (layer) de l'image a besoin d'etre éxécuter.
+
+## Build les images
+
+Pour build les images il suffit de lancer les commandes suivantes
+
+```
+cd docker_ci/
+docker build -t nk20_ci_37 -f Dockerfile.37 .
+docker build -t nk20_ci_38 -f Dockerfile.38 .
+docker build -t nk20_ci_39 -f Dockerfile.39 .
+```
+
+Elles sont acutellement build et disponible sur dockerhub
+https://hub.docker.com/otthorn/nk20_ci_37

note_kfet/static/js/jsi18n/_default.js

@@ -1,5 +1,5 @@
 /*
-* You should never see this file.
+* If you are not using the main language, you should never see this file.
 * It is here only for compatibility reasons in case of the command `compilejsmessages` was never executed.
 * Please execute this command to generate translation strings.
 */
@@ -9,14 +9,7 @@
   var django = globals.django || (globals.django = {});
 
 
-  django.pluralidx = function(n) {
+  django.pluralidx = function(count) { return (count == 1) ? 0 : 1; };
-    var v=(n != 1);
-    if (typeof(v) == 'boolean') {
-      return v ? 1 : 0;
-    } else {
-      return v;
-    }
-  };
 
 
   /* gettext library */
@@ -73,39 +66,41 @@
     /* formatting library */
 
     django.formats = {
-    "DATETIME_FORMAT": "j \\d\\e F \\d\\e Y \\a \\l\\a\\s H:i",
+    "DATETIME_FORMAT": "N j, Y, P",
     "DATETIME_INPUT_FORMATS": [
-      "%d/%m/%Y %H:%M:%S",
-      "%d/%m/%Y %H:%M:%S.%f",
-      "%d/%m/%Y %H:%M",
-      "%d/%m/%y %H:%M:%S",
-      "%d/%m/%y %H:%M:%S.%f",
-      "%d/%m/%y %H:%M",
       "%Y-%m-%d %H:%M:%S",
       "%Y-%m-%d %H:%M:%S.%f",
       "%Y-%m-%d %H:%M",
-      "%Y-%m-%d"
+      "%Y-%m-%d",
+      "%m/%d/%Y %H:%M:%S",
+      "%m/%d/%Y %H:%M:%S.%f",
+      "%m/%d/%Y %H:%M",
+      "%m/%d/%Y",
+      "%m/%d/%y %H:%M:%S",
+      "%m/%d/%y %H:%M:%S.%f",
+      "%m/%d/%y %H:%M",
+      "%m/%d/%y"
     ],
-    "DATE_FORMAT": "j \\d\\e F \\d\\e Y",
+    "DATE_FORMAT": "N j, Y",
     "DATE_INPUT_FORMATS": [
-      "%d/%m/%Y",
+      "%Y-%m-%d",
-      "%d/%m/%y",
+      "%m/%d/%Y",
-      "%Y-%m-%d"
+      "%m/%d/%y"
     ],
-    "DECIMAL_SEPARATOR": ",",
+    "DECIMAL_SEPARATOR": ".",
-    "FIRST_DAY_OF_WEEK": 1,
+    "FIRST_DAY_OF_WEEK": 0,
-    "MONTH_DAY_FORMAT": "j \\d\\e F",
+    "MONTH_DAY_FORMAT": "F j",
     "NUMBER_GROUPING": 3,
-    "SHORT_DATETIME_FORMAT": "d/m/Y H:i",
+    "SHORT_DATETIME_FORMAT": "m/d/Y P",
-    "SHORT_DATE_FORMAT": "d/m/Y",
+    "SHORT_DATE_FORMAT": "m/d/Y",
-    "THOUSAND_SEPARATOR": ".",
+    "THOUSAND_SEPARATOR": ",",
-    "TIME_FORMAT": "H:i",
+    "TIME_FORMAT": "P",
     "TIME_INPUT_FORMATS": [
       "%H:%M:%S",
       "%H:%M:%S.%f",
       "%H:%M"
     ],
-    "YEAR_MONTH_FORMAT": "F \\d\\e Y"
+    "YEAR_MONTH_FORMAT": "F Y"
   };
 
     django.get_format = function(format_type) {

note_kfet/static/js/jsi18n/en.js

@@ -0,0 +1,134 @@
+/*
+* You should never see this file.
+* It is here only for compatibility reasons in case of the command `compilejsmessages` was never executed.
+* Please execute this command to generate translation strings.
+*/
+
+(function(globals) {
+
+  var django = globals.django || (globals.django = {});
+
+
+  django.pluralidx = function(n) {
+    var v=(n != 1);
+    if (typeof(v) == 'boolean') {
+      return v ? 1 : 0;
+    } else {
+      return v;
+    }
+  };
+
+
+  /* gettext library */
+
+  django.catalog = django.catalog || {};
+
+
+  if (!django.jsi18n_initialized) {
+    django.gettext = function(msgid) {
+      var value = django.catalog[msgid];
+      if (typeof(value) == 'undefined') {
+        return msgid;
+      } else {
+        return (typeof(value) == 'string') ? value : value[0];
+      }
+    };
+
+    django.ngettext = function(singular, plural, count) {
+      var value = django.catalog[singular];
+      if (typeof(value) == 'undefined') {
+        return (count == 1) ? singular : plural;
+      } else {
+        return value.constructor === Array ? value[django.pluralidx(count)] : value;
+      }
+    };
+
+    django.gettext_noop = function(msgid) { return msgid; };
+
+    django.pgettext = function(context, msgid) {
+      var value = django.gettext(context + '\x04' + msgid);
+      if (value.indexOf('\x04') != -1) {
+        value = msgid;
+      }
+      return value;
+    };
+
+    django.npgettext = function(context, singular, plural, count) {
+      var value = django.ngettext(context + '\x04' + singular, context + '\x04' + plural, count);
+      if (value.indexOf('\x04') != -1) {
+        value = django.ngettext(singular, plural, count);
+      }
+      return value;
+    };
+
+    django.interpolate = function(fmt, obj, named) {
+      if (named) {
+        return fmt.replace(/%\(\w+\)s/g, function(match){return String(obj[match.slice(2,-2)])});
+      } else {
+        return fmt.replace(/%s/g, function(match){return String(obj.shift())});
+      }
+    };
+
+
+    /* formatting library */
+
+    django.formats = {
+    "DATETIME_FORMAT": "j \\d\\e F \\d\\e Y \\a \\l\\a\\s H:i",
+    "DATETIME_INPUT_FORMATS": [
+      "%d/%m/%Y %H:%M:%S",
+      "%d/%m/%Y %H:%M:%S.%f",
+      "%d/%m/%Y %H:%M",
+      "%d/%m/%y %H:%M:%S",
+      "%d/%m/%y %H:%M:%S.%f",
+      "%d/%m/%y %H:%M",
+      "%Y-%m-%d %H:%M:%S",
+      "%Y-%m-%d %H:%M:%S.%f",
+      "%Y-%m-%d %H:%M",
+      "%Y-%m-%d"
+    ],
+    "DATE_FORMAT": "j \\d\\e F \\d\\e Y",
+    "DATE_INPUT_FORMATS": [
+      "%d/%m/%Y",
+      "%d/%m/%y",
+      "%Y-%m-%d"
+    ],
+    "DECIMAL_SEPARATOR": ",",
+    "FIRST_DAY_OF_WEEK": 1,
+    "MONTH_DAY_FORMAT": "j \\d\\e F",
+    "NUMBER_GROUPING": 3,
+    "SHORT_DATETIME_FORMAT": "d/m/Y H:i",
+    "SHORT_DATE_FORMAT": "d/m/Y",
+    "THOUSAND_SEPARATOR": ".",
+    "TIME_FORMAT": "H:i",
+    "TIME_INPUT_FORMATS": [
+      "%H:%M:%S",
+      "%H:%M:%S.%f",
+      "%H:%M"
+    ],
+    "YEAR_MONTH_FORMAT": "F \\d\\e Y"
+  };
+
+    django.get_format = function(format_type) {
+      var value = django.formats[format_type];
+      if (typeof(value) == 'undefined') {
+        return format_type;
+      } else {
+        return value;
+      }
+    };
+
+    /* add to global namespace */
+    globals.pluralidx = django.pluralidx;
+    globals.gettext = django.gettext;
+    globals.ngettext = django.ngettext;
+    globals.gettext_noop = django.gettext_noop;
+    globals.pgettext = django.pgettext;
+    globals.npgettext = django.npgettext;
+    globals.interpolate = django.interpolate;
+    globals.get_format = django.get_format;
+
+    django.jsi18n_initialized = true;
+  }
+
+}(this));
+