.dockerignore

@@ -1,5 +1,3 @@
 __pycache__
 media
 db.sqlite3
-.tox
-.coverage

.gitignore

@@ -47,3 +47,6 @@ backups/
 env/
 venv/
 db.sqlite3
+
+# Ignore migrations during first phase dev
+migrations/

.gitlab-ci.yml

@@ -1,48 +1,25 @@
+image: python:3.8
+
 stages:
   - test
   - quality-assurance
 
-# Also fetch submodules
-variables:
-  GIT_SUBMODULE_STRATEGY: recursive
-
-# Debian Buster
-py37-django22:
-  stage: test
-  image: debian:buster-backports
 before_script:
-    - >
+  - pip install tox
-        apt-get update &&
+
-        apt-get install --no-install-recommends -t buster-backports -y
+py37-django22:
-        python3-django python3-django-crispy-forms
+  image: python:3.7
-        python3-django-extensions python3-django-filters python3-django-polymorphic
+  stage: test
-        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:
+  image: python:3.8
   stage: test
-  image: ubuntu:20.04
-  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
 
 linters:
+  image: python:3.8
   stage: quality-assurance
-  image: debian:buster-backports
-  before_script:
-    - apt-get update && apt-get install -y tox
   script: tox -e linters
 
   # Be nice to new contributors, but please use `tox`

Dockerfile

@@ -1,27 +1,27 @@
-FROM debian:buster-backports
+FROM python:3-alpine
 
-# Force the stdout and stderr streams to be unbuffered
 ENV PYTHONUNBUFFERED 1
 
-# Install Django, external apps, LaTeX and dependencies
+# Install LaTeX requirements
-RUN apt-get update && \
+RUN apk add --no-cache gettext texlive texmf-dist-latexextra texmf-dist-fontsextra nginx gcc libc-dev libffi-dev postgresql-dev libxml2-dev libxslt-dev jpeg-dev
-    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 ipython3 \
-    python3-bs4 python3-setuptools \
-    uwsgi uwsgi-plugin-python3 \
-    texlive-xetex gettext libjs-bootstrap4 fonts-font-awesome && \
-    rm -rf /var/lib/apt/lists/*
 
-# Instal PyPI requirements
+RUN apk add --no-cache bash
-COPY requirements.txt /var/www/note_kfet/
-RUN pip3 install -r /var/www/note_kfet/requirements.txt --no-cache-dir
 
-# Copy code
+RUN mkdir /code
-WORKDIR /var/www/note_kfet
+WORKDIR /code
-COPY . /var/www/note_kfet/
+COPY requirements /code/requirements
+RUN pip install gunicorn ptpython --no-cache-dir
+RUN pip install -r requirements/base.txt -r requirements/cas.txt -r requirements/production.txt --no-cache-dir
 
-EXPOSE 8080
+COPY . /code/
-ENTRYPOINT ["/var/www/note_kfet/entrypoint.sh"]
+
+# Configure nginx
+RUN mkdir /run/nginx
+RUN ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log
+RUN ln -sf /code/nginx_note.conf_docker /etc/nginx/conf.d/nginx_note.conf
+RUN rm /etc/nginx/conf.d/default.conf
+
+ENTRYPOINT ["/code/entrypoint.sh"]
+EXPOSE 80
+
+CMD ["./manage.py", "shell_plus", "--ptpython"]

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -4,118 +4,43 @@
 [![pipeline status](https://gitlab.crans.org/bde/nk20/badges/master/pipeline.svg)](https://gitlab.crans.org/bde/nk20/commits/master)
 [![coverage report](https://gitlab.crans.org/bde/nk20/badges/master/coverage.svg)](https://gitlab.crans.org/bde/nk20/commits/master)
 
-## Table des matières
+## Installation sur un serveur
 
-  - [Installation d'une instance de développement](#installation-dune-instance-de-développement)
+On supposera pour la suite que vous utilisez une installation de Debian Buster ou Ubuntu 20.04 fraîche ou bien configuré.
-  - [Installation d'une instance de production](#installation-dune-instance-de-production)
-
-## Installation d'une instance de développement
-
-L'instance de développement installe la majorité des dépendances dans un environnement Python isolé.
-Bien que cela permette de créer une instance sur toutes les distributions,
-**cela veut dire que vos dépendances ne seront pas mises à jour automatiquement.**
-
-1.  **Installation des dépendances de la distribution.**
-    Il y a quelques dépendances qui ne sont pas trouvable dans PyPI.
-    On donne ci-dessous l'exemple pour une distribution basée sur Debian, mais vous pouvez facilement adapter pour ArchLinux ou autre.
-
-    ```bash
-    $ sudo apt update
-    $ sudo apt install --no-install-recommends -y \
-        ipython3 python3-setuptools python3-venv python3-dev \
-        texlive-xetex gettext libjs-bootstrap4 fonts-font-awesome git
-    ```
-
-2.  **Clonage du dépot** là où vous voulez :
-
-    ```bash
-    $ git clone git@gitlab.crans.org:bde/nk20.git --recursive && cd nk20
-    ```
-
-3.  **Création d'un environment de travail Python décorrélé du système.**
-    On n'utilise pas `--system-site-packages` ici pour ne pas avoir des clashs de versions de modules avec le système.
-
-    ```bash
-    $ python3 -m venv env
-    $ source env/bin/activate  # entrer dans l'environnement
-    (env)$ pip3 install -r requirements.txt
-    (env)$ deactivate  # sortir de l'environnement
-    ```
-
-4.  **Variable d'environnement.**
-    Copier le fichier `.env_example` vers `.env` à la racine du projet et mettre à jour
-    ce qu'il faut.
-
-5.  **Migrations et chargement des données initiales.**
-    Pour initialiser la base de données avec de quoi travailler.
-
-    ```bash
-    (env)$ ./manage.py collectstatic --noinput
-    (env)$ ./manage.py compilemessages
-    (env)$ ./manage.py makemigrations
-    (env)$ ./manage.py migrate
-    (env)$ ./manage.py loaddata initial
-    (env)$ ./manage.py createsuperuser  # Création d'un utilisateur initial
-    ```
-
-6.  Enjoy :
-
-    ```bash
-    (env)$ ./manage.py runserver 0.0.0.0:8000
-    ```
-
-En mettant `0.0.0.0:8000` après `runserver`, vous rendez votre instance Django
-accessible depuis l'ensemble de votre réseau, pratique pour tester le rendu
-de la note sur un téléphone !
-
-## Installation d'une instance de production
-
-**En production on souhaite absolument utiliser les modules Python packagées dans le gestionnaire de paquet.**
-Cela permet de mettre à jour facilement les dépendances critiques telles que Django.
-
-L'installation d'une instance de production néccessite **une installation de Debian Buster ou d'Ubuntu 20.04**.
 
 Pour aller vite vous pouvez lancer le Playbook Ansible fournit dans ce dépôt en l'adaptant.
-Sinon vous pouvez suivre les étapes décrites ci-dessous.
+Sinon vous pouvez suivre les étapes ici.
 
-0.  Sous Debian Buster, **activer Debian Backports.** En effet Django 2.2 LTS n'est que disponible dans les backports.
+### Installation avec Debian/Ubuntu
-
-    ```bash
-    $ echo "deb http://deb.debian.org/debian buster-backports main" | sudo tee /etc/apt/sources.list.d/deb_debian_org_debian.list
-    ```
 
 1.  **Installation des dépendances APT.**
-    On tire les dépendances le plus possible à partir des dépôts de Debian.
-    On a besoin d'un environnement LaTeX pour générer les factures.
 
     ```bash
-    $ sudo apt update
+    $ sudo apt install nginx python3 python3-pip python3-dev uwsgi uwsgi-plugin-python3 python3-venv git acl
-    $ sudo apt install --no-install-recommends -t buster-backports -y \
+    ```
-        python3-django python3-django-crispy-forms \
+
-        python3-django-extensions python3-django-filters python3-django-polymorphic \
+    La génération des factures de l'application trésorerie nécessite une installation de LaTeX suffisante,
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil \
+
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache ipython3 \
+    ```bash
-        python3-bs4 python3-setuptools python3-docutils \
+    $ sudo apt install texlive-latex-extra texlive-fonts-extra texlive-lang-french
-        memcached uwsgi uwsgi-plugin-python3 \
-        texlive-xetex gettext libjs-bootstrap4 fonts-font-awesome \
-        nginx python3-venv git acl
     ```
 
 2.  **Clonage du dépot** dans `/var/www/note_kfet`,
 
     ```bash
-    $ sudo mkdir -p /var/www/note_kfet && cd /var/www/note_kfet
+    $ mkdir -p /var/www/note_kfet && cd /var/www/note_kfet
     $ sudo chown www-data:www-data .
     $ sudo chmod g+rwx .
-    $ sudo -u www-data git clone https://gitlab.crans.org/bde/nk20.git --recursive
+    $ sudo -u www-data git clone git@gitlab.crans.org:bde/nk20.git .
     ```
 
 3.  **Création d'un environment de travail Python décorrélé du système.**
 
     ```bash
-    $ python3 -m venv env --system-site-packages
+    $ python3 -m venv env
-    $ source env/bin/activate  # entrer dans l'environnement
+    $ source env/bin/activate
-    (env)$ pip3 install -r requirements.txt
+    (env)$ pip3 install -r requirements/base.txt
+    (env)$ pip3 install -r requirements/prod.txt  # uniquement en prod, nécessite une base postgres
     (env)$ deactivate  # sortir de l'environnement
     ```
 
@@ -143,7 +68,8 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
 
 5.  **Base de données.** En production on utilise PostgreSQL. 
 
-        $ sudo apt-get install postgresql postgresql-contrib
+        $ sudo apt-get install postgresql postgresql-contrib libpq-dev
+        (env)$ pip3 install psycopg2
 
     La config de la base de donnée se fait comme suit:
 
@@ -193,6 +119,7 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
         DJANGO_SECRET_KEY=CHANGE_ME
         DJANGO_SETTINGS_MODULE="note_kfet.settings
         NOTE_URL=localhost # URL où accéder à la note
+        DOMAIN=localhost # note.example.com
         CONTACT_EMAIL=tresorerie.bde@localhost
         # Le reste n'est utile qu'en production, pour configurer l'envoi des mails
         NOTE_MAIL=notekfet@localhost
@@ -208,6 +135,7 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
 
         $ source /env/bin/activate
         (env)$ ./manage.py check # pas de bêtise qui traine
+        (env)$ ./manage.py makemigrations
         (env)$ ./manage.py migrate
 
 7.  *Enjoy \o/*
@@ -216,43 +144,67 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
 
 Il est possible de travailler sur une instance Docker.
 
-Pour construire l'image Docker `nk20`,
+1.  Cloner le dépôt là où vous voulez :
 
-```
+        $ git clone git@gitlab.crans.org:bde/nk20.git
-git clone https://gitlab.crans.org/bde/nk20/ --recursive && cd nk20
-docker build . -t nk20
-```
 
-Ensuite pour lancer la note Kfet en tant que vous (option `-u`),
+2.  Copiez le fichier `.env_example` à la racine du projet vers le fichier `.env`,
-l'exposer sur son port 80 (option `-p`) et monter le code en écriture (option `-v`),
+    et  mettez à jour vos variables d'environnement
 
-```
+3.  Dans le fichier `docker_compose.yml`, qu'on suppose déjà configuré,
-docker run -it --rm -u $(id -u):$(id -g) -v "$(pwd):/var/www/note_kfet/" -p 80:8080 nk20
+    ajouter les lignes suivantes, en les adaptant à la configuration voulue :
-```
 
-Si vous souhaitez lancer une commande spéciale, vous pouvez l'ajouter à la fin, par exemple,
-
-```
-docker run -it --rm -u $(id -u):$(id -g) -v "$(pwd):/var/www/note_kfet/" -p 80:8080 nk20 python3 ./manage.py createsuperuser
-```
-
-#### Avec Docker Compose
-
-On vous conseilles de faire un fichier d'environnement `.env` en prenant exemple sur `.env_example`.
-
-Pour par exemple utiliser le Docker de la note Kfet avec Traefik pour réaliser le HTTPS,
-
-```YAML
          nk20:
-  build: /chemin/vers/le/code/nk20
+           build: /chemin/vers/nk20
            volumes:
-    - /chemin/vers/le/code/nk20:/var/www/note_kfet/
+             - /chemin/vers/nk20:/code/
-  env_file: /chemin/vers/le/code/nk20/.env
+           env_file: /chemin/vers/nk20/.env
            restart: always
            labels:
-    - "traefik.http.routers.nk20.rule=Host(`ndd.example.com`)"
+             - traefik.domain=ndd.example.com
-    - "traefik.http.services.nk20.loadbalancer.server.port=8080"
+             - traefik.frontend.rule=Host:ndd.example.com
-```
+             - traefik.port=8000
+
+4.  Enjoy :
+
+        $ docker-compose up -d nk20
+
+### Lancer un serveur de développement
+
+Avec `./manage.py runserver` il est très rapide de mettre en place
+un serveur de développement par exemple sur son ordinateur.
+
+1.  Cloner le dépôt là où vous voulez :
+
+        $ git clone git@gitlab.crans.org:bde/nk20.git && cd nk20
+
+2.  Créer un environnement Python isolé
+    pour ne pas interférer avec les versions de paquets systèmes :
+
+         $ python3 -m venv venv
+         $ source venv/bin/activate
+         (env)$ pip install -r requirements/base.txt
+
+3.  Copier le fichier `.env_example` vers `.env` à la racine du projet et mettre à jour
+    ce qu'il faut
+
+4.  Migrations et chargement des données initiales :
+
+        (env)$ ./manage.py makemigrations
+        (env)$ ./manage.py migrate
+        (env)$ ./manage.py loaddata initial
+
+5.  Créer un super-utilisateur :
+
+        (env)$ ./manage.py createsuperuser
+
+6.  Enjoy :
+
+        (env)$ ./manage.py runserver 0.0.0.0:8000
+
+En mettant `0.0.0.0:8000` après `runserver`, vous rendez votre instance Django
+accessible depuis l'ensemble de votre réseau, pratique pour tester le rendu
+de la note sur un téléphone !
 
 ## Documentation
 

ansible/base.yml

@@ -1,18 +1,16 @@
 #!/usr/bin/env ansible-playbook
 ---
 
-- hosts: all
+- hosts: bde-nk20-beta.adh.crans.org
   vars_prompt:
     - name: DB_PASSWORD
-      prompt: "Password of the database (leave it blank to skip database init)"
+      prompt: "Password of the database"
       private: yes
-  vars:
-    mirror: deb.debian.org
   roles:
     - 1-apt-basic
     - 2-nk20
     - 3-pip
-    - 4-certbot
+    - 4-nginx
-    - 5-nginx
+    - 5-certbot
     - 6-psql
     - 7-postinstall

ansible/host_vars/bde-nk20-beta.adh.crans.org.yml

@@ -1,5 +0,0 @@
----
-note:
-  server_name: note-beta.crans.org
-  git_branch: beta
-  cron_enabled: false

ansible/host_vars/bde-note.adh.crans.org.yml

@@ -1,5 +0,0 @@
----
-note:
-  server_name: note.crans.org
-  git_branch: master
-  cron_enabled: true

ansible/host_vars/bde3-virt.adh.crans.org.yml

@@ -1,5 +0,0 @@
----
-note:
-  server_name: note-dev.crans.org
-  git_branch: beta
-  cron_enabled: false

ansible/hosts

@@ -1,9 +1,5 @@
-[dev]
+[server]
-bde3-virt.adh.crans.org
 bde-nk20-beta.adh.crans.org
 
-[prod]
-bde-note.adh.crans.org
-
 [all:vars]
 ansible_python_interpreter=/usr/bin/python3

ansible/roles/1-apt-basic/tasks/main.yml

@@ -1,52 +1,21 @@
 ---
-- name: Add buster-backports to apt sources
+- name: Install basic APT packages
-  apt_repository:
-    repo: deb http://{{ mirror }}/debian buster-backports main
-    state: present
-
-- name: Install note_kfet APT dependencies
   apt:
     update_cache: true
-    default_release: buster-backports
-    install_recommends: false
     name:
-      # Common tools
+      - nginx
-      - gettext
+      - python3
-      - git
-      - ipython3
-
-      # Front-end dependencies
-      - fonts-font-awesome
-      - libjs-bootstrap4
-
-      # Python dependencies
-      - python3-babel
-      - python3-bs4
-      - python3-django
-      - python3-django-crispy-forms
-      - python3-django-extensions
-      - python3-django-filters
-      - python3-django-oauth-toolkit
-      - python3-django-polymorphic
-      - python3-djangorestframework
-      - python3-lockfile
-      - python3-memcache
-      - python3-phonenumbers
-      - python3-pil
       - python3-pip
-      - python3-psycopg2
+      - python3-dev
-      - python3-setuptools
-      - python3-venv
-
-      # LaTeX (PDF generation)
-      - texlive-xetex
-
-      # Cache server
-      - memcached
-
-      # WSGI server
       - uwsgi
       - uwsgi-plugin-python3
+      - python3-venv
+      - git
+      - acl
+      - gettext
+      - texlive-latex-extra
+      - texlive-fonts-extra
+      - texlive-lang-french
   register: pkg_result
   retries: 3
   until: pkg_result is succeeded

ansible/roles/2-nk20/tasks/main.yml

@@ -11,7 +11,7 @@
   git:
     repo: https://gitlab.crans.org/bde/nk20.git
     dest: /var/www/note_kfet
-    version: "{{ note.git_branch }}"
+    version: beta
     force: true
 
 - name: Use default env vars (should be updated!)
@@ -30,9 +30,20 @@
     group: www-data
 
 - name: Setup cron jobs
-  when: "note.cron_enabled"
+  file:
-  template:
+    src: /var/www/note_kfet/note.cron
-    src: note.cron.j2
     dest: /etc/cron.d/note
+    state: link
     owner: root
     group: root
+
+- name: Restart cron service
+  systemd:
+    name: cron
+    state: restarted
+
+- name: Update permissions for the cron file
+  file:
+    path: /var/www/note_kfet/note.cron
+    owner: root
+    group: www-data

ansible/roles/2-nk20/templates/note.cron.j2

@@ -1 +0,0 @@
-../../../../note.cron

ansible/roles/3-pip/tasks/main.yml

@@ -1,8 +1,14 @@
 ---
 - name: Install PIP basic dependencies
   pip:
-    requirements: /var/www/note_kfet/requirements.txt
+    requirements: /var/www/note_kfet/requirements/base.txt
+    virtualenv: /var/www/note_kfet/env
+    virtualenv_command: /usr/bin/python3 -m venv
+  become_user: www-data
+
+- name: Install PIP production dependencies
+  pip:
+    requirements: /var/www/note_kfet/requirements/production.txt
     virtualenv: /var/www/note_kfet/env
     virtualenv_command: /usr/bin/python3 -m venv
-    virtualenv_site_packages: true
   become_user: www-data

ansible/roles/4-nginx/tasks/main.yml

@@ -1,11 +1,4 @@
 ---
-- name: Install NGINX
-  apt:
-    name: nginx
-  register: pkg_result
-  retries: 3
-  until: pkg_result is succeeded
-
 - name: Copy conf of Nginx
   template:
     src: "nginx_note.conf"

ansible/roles/4-nginx/templates/nginx_note.conf

@@ -9,7 +9,7 @@ server {
     listen [::]:80 default_server;
 
     location / {
-        return 301 https://{{ note.server_name }}$request_uri;
+        return 301 https://nk20-beta.crans.org$request_uri;
     }
 }
 
@@ -19,11 +19,11 @@ server {
     listen [::]:443 ssl default_server;
 
     location / {
-        return 301 https://{{ note.server_name }}$request_uri;
+        return 301 https://nk20-beta.crans.org$request_uri;
     }
 
-    ssl_certificate /etc/letsencrypt/live/{{ note.server_name }}/fullchain.pem;
+    ssl_certificate /etc/letsencrypt/live/nk20-beta.crans.org/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/{{ note.server_name }}/privkey.pem;
+    ssl_certificate_key /etc/letsencrypt/live/nk20-beta.crans.org/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 }
@@ -35,7 +35,7 @@ server {
 
     # the port your site will be served on
     # the domain name it will serve for
-    server_name {{ note.server_name }}; # substitute your machine's IP address or FQDN
+    server_name nk20-beta.crans.org; # substitute your machine's IP address or FQDN
     charset     utf-8;
 
     # max upload size
@@ -53,11 +53,11 @@ server {
     # Finally, send all non-media requests to the Django server.
     location / {
         uwsgi_pass note;
-        include /etc/nginx/uwsgi_params;
+        include     /var/www/note_kfet/uwsgi_params; # the uwsgi_params file you installed
     }
 
-    ssl_certificate /etc/letsencrypt/live/{{ note.server_name }}/fullchain.pem;
+    ssl_certificate /etc/letsencrypt/live/nk20-beta.crans.org/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/{{ note.server_name }}/privkey.pem;
+    ssl_certificate_key /etc/letsencrypt/live/nk20-beta.crans.org/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 }

ansible/roles/6-psql/tasks/main.yml

@@ -10,15 +10,17 @@
   retries: 3
   until: pkg_result is succeeded
 
+- name: Install Psycopg2
+  pip:
+    name: psycopg2-binary
+
 - name: Create role note
-  when: "DB_PASSWORD|bool"    # If the password is not defined, skip the installation
   postgresql_user:
     name: note
     password: "{{ DB_PASSWORD }}"
   become_user: postgres
 
 - name: Create NK20 database
-  when: "DB_PASSWORD|bool"
   postgresql_db:
     name: note_db
     owner: note

ansible/roles/7-postinstall/tasks/main.yml

@@ -1,4 +1,10 @@
 ---
+- name: Make Django migrations
+  command: /var/www/note_kfet/env/bin/python manage.py makemigrations
+  args:
+    chdir: /var/www/note_kfet
+  become_user: www-data
+
 - name: Migrate Django database
   command: /var/www/note_kfet/env/bin/python manage.py migrate
   args:
@@ -16,9 +22,3 @@
   args:
     chdir: /var/www/note_kfet
   become_user: postgres
-
-- name: Collect static files
-  command: /var/www/note_kfet/env/bin/python manage.py collectstatic --noinput
-  args:
-    chdir: /var/www/note_kfet
-  become_user: www-data

apps/activity/admin.py

@@ -4,7 +4,6 @@
 from django.contrib import admin
 from note_kfet.admin import admin_site
 
-from .forms import GuestForm
 from .models import Activity, ActivityType, Entry, Guest
 
 
@@ -36,7 +35,6 @@ class GuestAdmin(admin.ModelAdmin):
     Admin customisation for Guest
     """
     list_display = ('last_name', 'first_name', 'activity', 'inviter')
-    form = GuestForm
 
 
 @admin.register(Entry, site=admin_site)

apps/activity/fixtures/initial.json

@@ -18,15 +18,5 @@
       "can_invite": false,
       "guest_entry_fee": 0
     }
-    },
-    {
-        "model": "activity.activitytype",
-        "pk": 3,
-        "fields": {
-            "name": "Autre",
-            "manage_entries": false,
-            "can_invite": false,
-            "guest_entry_fee": 0
-        }
   }
 ]

apps/activity/forms.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import timedelta
-from random import shuffle
 
 from django import forms
 from django.contrib.contenttypes.models import ContentType
@@ -11,30 +10,11 @@ from django.utils.translation import gettext_lazy as _
 from member.models import Club
 from note.models import Note, NoteUser
 from note_kfet.inputs import Autocomplete, DateTimePickerInput
-from note_kfet.middlewares import get_current_authenticated_user
-from permission.backends import PermissionBackend
 
 from .models import Activity, Guest
 
 
 class ActivityForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # By default, the Kfet club is attended
-        self.fields["attendees_club"].initial = Club.objects.get(name="Kfet")
-        self.fields["attendees_club"].widget.attrs["placeholder"] = "Kfet"
-        clubs = list(Club.objects.filter(PermissionBackend
-                                         .filter_queryset(get_current_authenticated_user(), Club, "view")).all())
-        shuffle(clubs)
-        self.fields["organizer"].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
-
-    def clean_date_end(self):
-        date_end = self.cleaned_data["date_end"]
-        date_start = self.cleaned_data["date_start"]
-        if date_end < date_start:
-            self.add_error("date_end", _("The end date must be after the start date."))
-        return date_end
-
     class Meta:
         model = Activity
         exclude = ('creater', 'valid', 'open', )
@@ -61,15 +41,6 @@ class ActivityForm(forms.ModelForm):
 
 class GuestForm(forms.ModelForm):
     def clean(self):
-        """
-        Someone can be invited as a Guest to an Activity if:
-        - the activity has not already started.
-        - the activity is validated.
-        - the Guest has not already been invited more than 5 times.
-        - the Guest is already invited.
-        - the inviter already invited 3 peoples.
-        """
-
         cleaned_data = super().clean()
 
         if timezone.now() > timezone.localtime(self.activity.date_start):
@@ -84,8 +55,9 @@ class GuestForm(forms.ModelForm):
             first_name__iexact=cleaned_data["first_name"],
             last_name__iexact=cleaned_data["last_name"],
             activity__date_start__gte=self.activity.date_start - one_year,
+            entry__isnull=False,
         )
-        if qs.filter(entry__isnull=False).count() >= 5:
+        if qs.count() >= 5:
             self.add_error("last_name", _("This person has been already invited 5 times this year."))
 
         qs = qs.filter(activity=self.activity)

apps/activity/migrations/0001_initial.py

@@ -1,69 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-04 21:41
-
-from django.db import migrations, models
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Activity',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, verbose_name='name')),
-                ('description', models.TextField(verbose_name='description')),
-                ('location', models.CharField(blank=True, default='', help_text='Place where the activity is organized, eg. Kfet.', max_length=255, verbose_name='location')),
-                ('date_start', models.DateTimeField(verbose_name='start date')),
-                ('date_end', models.DateTimeField(verbose_name='end date')),
-                ('valid', models.BooleanField(default=False, verbose_name='valid')),
-                ('open', models.BooleanField(default=False, verbose_name='open')),
-            ],
-            options={
-                'verbose_name': 'activity',
-                'verbose_name_plural': 'activities',
-            },
-        ),
-        migrations.CreateModel(
-            name='ActivityType',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, verbose_name='name')),
-                ('manage_entries', models.BooleanField(default=False, help_text='Enable the support of entries for this activity.', verbose_name='manage entries')),
-                ('can_invite', models.BooleanField(default=False, verbose_name='can invite')),
-                ('guest_entry_fee', models.PositiveIntegerField(default=0, verbose_name='guest entry fee')),
-            ],
-            options={
-                'verbose_name': 'activity type',
-                'verbose_name_plural': 'activity types',
-            },
-        ),
-        migrations.CreateModel(
-            name='Entry',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('time', models.DateTimeField(default=django.utils.timezone.now, verbose_name='entry time')),
-            ],
-            options={
-                'verbose_name': 'entry',
-                'verbose_name_plural': 'entries',
-            },
-        ),
-        migrations.CreateModel(
-            name='Guest',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('last_name', models.CharField(max_length=255, verbose_name='last name')),
-                ('first_name', models.CharField(max_length=255, verbose_name='first name')),
-            ],
-            options={
-                'verbose_name': 'guest',
-                'verbose_name_plural': 'guests',
-            },
-        ),
-    ]

apps/activity/migrations/0002_auto_20200904_2341.py

@@ -1,89 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-04 21:41
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('activity', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('member', '0001_initial'),
-        ('note', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='GuestTransaction',
-            fields=[
-                ('transaction_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='note.Transaction')),
-                ('entry', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to='activity.Entry')),
-            ],
-            options={
-                'abstract': False,
-                'base_manager_name': 'objects',
-            },
-            bases=('note.transaction',),
-        ),
-        migrations.AddField(
-            model_name='guest',
-            name='activity',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='activity.Activity'),
-        ),
-        migrations.AddField(
-            model_name='guest',
-            name='inviter',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='guests', to='note.NoteUser', verbose_name='inviter'),
-        ),
-        migrations.AddField(
-            model_name='entry',
-            name='activity',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='entries', to='activity.Activity', verbose_name='activity'),
-        ),
-        migrations.AddField(
-            model_name='entry',
-            name='guest',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.PROTECT, to='activity.Guest'),
-        ),
-        migrations.AddField(
-            model_name='entry',
-            name='note',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='note.NoteUser', verbose_name='note'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='activity_type',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='activity.ActivityType', verbose_name='type'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='attendees_club',
-            field=models.ForeignKey(help_text='Club that is authorized to join the activity. Mostly the Kfet club.', on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='attendees club'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='creater',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='user'),
-        ),
-        migrations.AddField(
-            model_name='activity',
-            name='organizer',
-            field=models.ForeignKey(help_text='Club that organizes the activity. The entry fees will go to this club.', on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='organizer'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='guest',
-            unique_together={('activity', 'last_name', 'first_name')},
-        ),
-        migrations.AlterUniqueTogether(
-            name='entry',
-            unique_together={('activity', 'note', 'guest')},
-        ),
-        migrations.AlterUniqueTogether(
-            name='activity',
-            unique_together={('name', 'date_start', 'date_end')},
-        ),
-    ]

apps/activity/models.py

@@ -1,13 +1,12 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import os
 from datetime import timedelta
 from threading import Thread
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.db import models, transaction
+from django.db import models
 from django.db.models import Q
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -73,7 +72,6 @@ class Activity(models.Model):
         max_length=255,
         blank=True,
         default="",
-        help_text=_("Place where the activity is organized, eg. Kfet."),
     )
 
     activity_type = models.ForeignKey(
@@ -94,7 +92,6 @@ class Activity(models.Model):
         on_delete=models.PROTECT,
         related_name='+',
         verbose_name=_('organizer'),
-        help_text=_("Club that organizes the activity. The entry fees will go to this club."),
     )
 
     attendees_club = models.ForeignKey(
@@ -102,7 +99,6 @@ class Activity(models.Model):
         on_delete=models.PROTECT,
         related_name='+',
         verbose_name=_('attendees club'),
-        help_text=_("Club that is authorized to join the activity. Mostly the Kfet club."),
     )
 
     date_start = models.DateTimeField(
@@ -123,25 +119,17 @@ class Activity(models.Model):
         verbose_name=_('open'),
     )
 
-    @transaction.atomic
     def save(self, *args, **kwargs):
         """
         Update the activity wiki page each time the activity is updated (validation, change description, ...)
         """
-        if self.date_end < self.date_start:
-            raise ValidationError(_("The end date must be after the start date."))
-
         ret = super().save(*args, **kwargs)
-        if not settings.DEBUG and self.pk and "scripts" in settings.INSTALLED_APPS:
+        if self.pk and "scripts" in settings.INSTALLED_APPS:
             def refresh_activities():
                 from scripts.management.commands.refresh_activities import Command as RefreshActivitiesCommand
-                # Consider that we can update the wiki iff the WIKI_PASSWORD env var is not empty
+                RefreshActivitiesCommand.refresh_human_readable_wiki_page("Modification de l'activité " + self.name)
-                RefreshActivitiesCommand.refresh_human_readable_wiki_page("Modification de l'activité " + self.name,
+                RefreshActivitiesCommand.refresh_raw_wiki_page("Modification de l'activité " + self.name)
-                                                                          False, os.getenv("WIKI_PASSWORD"))
+            Thread(daemon=True, target=refresh_activities).start()
-                RefreshActivitiesCommand.refresh_raw_wiki_page("Modification de l'activité " + self.name,
-                                                               False, os.getenv("WIKI_PASSWORD"))
-            Thread(daemon=True, target=refresh_activities).start()\
-                if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else refresh_activities()
         return ret
 
     def __str__(self):
@@ -150,7 +138,6 @@ class Activity(models.Model):
     class Meta:
         verbose_name = _("activity")
         verbose_name_plural = _("activities")
-        unique_together = ("name", "date_start", "date_end",)
 
 
 class Entry(models.Model):
@@ -189,14 +176,8 @@ class Entry(models.Model):
         verbose_name = _("entry")
         verbose_name_plural = _("entries")
 
-    def __str__(self):
-        return _("Entry for {guest}, invited by {note} to the activity {activity}").format(
-            guest=str(self.guest), note=str(self.note), activity=str(self.activity)) if self.guest \
-            else _("Entry for {note} to the activity {activity}").format(
-            guest=str(self.guest), note=str(self.note), activity=str(self.activity))
-
-    @transaction.atomic
     def save(self, *args, **kwargs):
+
         qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest)
         if qs.exists():
             raise ValidationError(_("Already entered on ") + _("{:%Y-%m-%d %H:%M:%S}").format(qs.get().time, ))
@@ -261,7 +242,6 @@ class Guest(models.Model):
         except AttributeError:
             return False
 
-    @transaction.atomic
     def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
         one_year = timedelta(days=365)
 
@@ -277,7 +257,7 @@ class Guest(models.Model):
                 last_name__iexact=self.last_name,
                 activity__date_start__gte=self.activity.date_start - one_year,
             )
-            if qs.filter(entry__isnull=False).count() >= 5:
+            if qs.count() >= 5:
                 raise ValidationError(_("This person has been already invited 5 times this year."))
 
             qs = qs.filter(activity=self.activity)

apps/activity/tables.py

@@ -20,11 +20,6 @@ class ActivityTable(tables.Table):
         attrs = {
             'class': 'table table-condensed table-striped table-hover'
         }
-        row_attrs = {
-            'class': lambda record: 'bg-success' if record.open else ('' if record.valid else 'bg-warning'),
-            'title': lambda record: _("The activity is currently open.") if record.open else
-            ('' if record.valid else _("The validation of the activity is pending.")),
-        }
         model = Activity
         template_name = 'django_tables2/bootstrap4.html'
         fields = ('name', 'activity_type', 'organizer', 'attendees_club', 'date_start', 'date_end', )
@@ -33,17 +28,22 @@ class ActivityTable(tables.Table):
 class GuestTable(tables.Table):
     inviter = tables.LinkColumn(
         'member:user_detail',
-        args=[A('inviter__user__pk'), ],
+        args=[A('inviter.user.pk'), ],
     )
 
     entry = tables.Column(
         empty_values=(),
-        verbose_name=_("Remove"),
+        attrs={
+            "td": {
+                "class": lambda record: "" if record.has_entry else "validate btn btn-danger",
+                "onclick": lambda record: "" if record.has_entry else "remove_guest(" + str(record.pk) + ")"
+            }
+        }
     )
 
     class Meta:
         attrs = {
-            'class': 'table table-condensed table-striped'
+            'class': 'table table-condensed table-striped table-hover'
         }
         model = Guest
         template_name = 'django_tables2/bootstrap4.html'
@@ -52,8 +52,7 @@ class GuestTable(tables.Table):
     def render_entry(self, record):
         if record.has_entry:
             return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(record.entry.time, )))
-        return format_html('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
+        return _("remove").capitalize()
-                           '{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))
 
 
 def get_row_class(record):

apps/activity/templates/activity/activity_detail.html

@@ -1,24 +1,22 @@
 {% extends "base.html" %}
-{% comment %}
+{% load static %}
-SPDX-License-Identifier: GPL-3.0-or-later
+{% load i18n %}
-{% endcomment %}
-{% load i18n perms %}
 {% load render_table from django_tables2 %}
+{% load pretty_money %}
+{% load perms %}
 
 {% block content %}
-<h1 class="text-white">{{ title }}</h1>
+
-{% include "activity/includes/activity_info.html" %}
+    {% include "activity/activity_info.html" %}
 
     {% if guests.data %}
-<div class="card bg-white mb-3">
+        <hr>
-    <h3 class="card-header text-center">
+        <h2>{% trans "Guests list" %}</h2>
-        {% trans "Guests list" %}
-    </h3>
         <div id="guests_table">
             {% render_table guests %}
         </div>
-</div>
     {% endif %}
+
 {% endblock %}
 
 {% block extrajavascript %}

apps/activity/templates/activity/activity_entry.html

@@ -1,15 +1,14 @@
 {% extends "base.html" %}
-{% comment %}
+{% load static %}
-SPDX-License-Identifier: GPL-3.0-or-later
+{% load i18n %}
-{% endcomment %}
-{% load static i18n pretty_money perms %}
 {% load render_table from django_tables2 %}
+{% load pretty_money %}
+{% load perms %}
 
 {% block content %}
-<h1 class="text-white">{{ title }}</h1>
     <div class="row">
         <div class="col-xl-12">
-        <div class="btn-group btn-group-toggle bg-light" style="width: 100%">
+            <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0" data-toggle="buttons">
                 <a href="{% url "note:transfer" %}#transfer" class="btn btn-sm btn-outline-primary">
                     {% trans "Transfer" %}
                 </a>
@@ -17,13 +16,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     <a href="{% url "note:transfer" %}#credit" class="btn btn-sm btn-outline-primary">
                         {% trans "Credit" %}
                     </a>
-            <a href="{% url "note:transfer" %}#debit" class="btn btn-sm btn-outline-primary">
-                {% trans "Debit" %}
-            </a>
                 {% endif %}
                 {% for a in activities_open %}
-            <a href="{% url "activity:activity_entry" pk=a.pk %}"
+                    <a href="{% url "activity:activity_entry" pk=a.pk %}" class="btn btn-sm btn-outline-primary{% if a.pk == activity.pk %} active{% endif %}">
-                class="btn btn-sm btn-outline-primary{% if a.pk == activity.pk %} active{% endif %}">
                         {% trans "Entries" %} {{ a.name }}
                     </a>
                 {% endfor %}
@@ -31,8 +26,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
         </div>
     </div>
 
-<hr>
-
     <a href="{% url "activity:activity_detail" pk=activity.pk %}">
         <button class="btn btn-light">{% trans "Return to activity page" %}</button>
     </a>
@@ -41,9 +34,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
     <hr>
 
-<div class="card" id="entry_table">
+    <div id="entry_table">
-    <h2 class="text-center">{{ entries.count }}
+        <h2 class="text-center">{{ entries.count }} {% if entries.count >= 2 %}{% trans "entries" %}{% else %}{% trans "entry" %}{% endif %}</h2>
-        {% if entries.count >= 2 %}{% trans "entries" %}{% else %}{% trans "entry" %}{% endif %}</h2>
         {% render_table table %}
     </div>
 {% endblock %}
@@ -85,16 +77,15 @@ SPDX-License-Identifier: GPL-3.0-or-later
                         guest: null
                     }).done(function () {
                         if (target.hasClass("table-info"))
-                        addMsg(
+                            addMsg("Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.", "warning", 10000);
-                            "Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.",
-                            "warning", 10000);
                         else
                             addMsg("Entrée effectuée !", "success", 4000);
                         reloadTable(true);
                     }).fail(function(xhr) {
                         errMsg(xhr.responseJSON, 4000);
                     });
-            } else {
+                }
+                else {
                     let line_obj = $("#buttons_guest_" + id);
                     if (line_obj.length || target.attr('class').includes("table-success")) {
                         line_obj.remove();
@@ -103,12 +94,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
                     let tr = "<tr class='text-center'>" +
                         "<td id='buttons_guest_" + id + "' style='table-danger center' colspan='5'>" +
-                    "<button id='transaction_guest_" + id +
+                        "<button id='transaction_guest_" + id + "' class='btn btn-secondary'>Payer avec la note de l'hôte</button> " +
-                    "' class='btn btn-secondary'>Payer avec la note de l'hôte</button> " +
+                        "<button id='transaction_guest_" + id + "_especes' class='btn btn-secondary'>Payer en espèces</button> " +
-                    "<button id='transaction_guest_" + id +
+                        "<button id='transaction_guest_" + id + "_cb' class='btn btn-secondary'>Payer en CB</button></td>" +
-                    "_especes' class='btn btn-secondary'>Payer en espèces</button> " +
-                    "<button id='transaction_guest_" + id +
-                    "_cb' class='btn btn-secondary'>Payer en CB</button></td>" +
                         "<tr>";
                     $(tr).insertAfter(target);
 
@@ -120,9 +108,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                             guest: id
                         }).done(function () {
                             if (target.hasClass("table-info"))
-                            addMsg(
+                                addMsg("Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.", "warning", 10000);
-                                "Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.",
-                                "warning", 10000);
                             else
                                 addMsg("Entrée effectuée !", "success", 4000);
                             reloadTable(true);
@@ -133,12 +119,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
                     let credit = function(credit_id, credit_name) {
                         return function() {
-                        $.post("/api/note/transaction/transaction/", {
+                            $.post("/api/note/transaction/transaction/",
+                                {
                                     "csrfmiddlewaretoken": CSRF_TOKEN,
                                     "quantity": 1,
                                     "amount": {{ activity.activity_type.guest_entry_fee }},
-                            "reason": "Crédit " + credit_name +
+                                    "reason": "Crédit " + credit_name + " (invitation {{ activity.name }})",
-                                " (invitation {{ activity.name }})",
                                     "valid": true,
                                     "polymorphic_ctype": {{ notespecial_ctype }},
                                     "resourcetype": "SpecialTransaction",

apps/activity/templates/activity/activity_form.html

@@ -1,20 +1,11 @@
 {% extends "base.html" %}
-{% comment %}
+{% load static %}
-SPDX-License-Identifier: GPL-3.0-or-later
+{% load i18n %}
-{% endcomment %}
+{% load crispy_forms_tags %}
-{% load i18n crispy_forms_tags %}
-
 {% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body">
 <form method="post">
 {% csrf_token %}
 {{form|crispy}}
 <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
 </form>
-  </div>
-</div>
 {% endblock %}

apps/activity/templates/activity/activity_info.html

@@ -1,10 +1,10 @@
-{% comment %}
+{% load i18n %}
-SPDX-License-Identifier: GPL-3.0-or-later
+{% load perms %}
-{% endcomment %}
+{% load pretty_money %}
-{% load i18n perms pretty_money %}
+
 {% url 'activity:activity_detail' activity.pk as activity_detail_url %}
 
-<div id="activity_info" class="card bg-light shadow mb-3">
+<div id="activity_info" class="card bg-light shadow">
     <div class="card-header text-center">
         <h4>
             {% if request.path_info != activity_detail_url %}
@@ -17,7 +17,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <div class="card-body" id="profile_infos">
         <dl class="row">
             <dt class="col-xl-6">{% trans 'description'|capfirst %}</dt>
-            <dd class="col-xl-6"> {{ activity.description|linebreaks }}</dd>
+            <dd class="col-xl-6"> {{ activity.description }}</dd>
 
             <dt class="col-xl-6">{% trans 'type'|capfirst %}</dt>
             <dd class="col-xl-6"> {{ activity.activity_type }}</dd>
@@ -28,7 +28,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
             <dt class="col-xl-6">{% trans 'end date'|capfirst %}</dt>
             <dd class="col-xl-6">{{ activity.date_end }}</dd>
 
-            {% if "activity.change_activity_valid"|has_perm:activity %}
+            {% if ".view_"|has_perm:activity.creater %}
                 <dt class="col-xl-6">{% trans 'creater'|capfirst %}</dt>
                 <dd class="col-xl-6"><a href="{% url "member:user_detail" pk=activity.creater.pk %}">{{ activity.creater }}</a></dd>
             {% endif %}

apps/activity/templates/activity/activity_invite.html

@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% load render_table from django_tables2 %}
+{% load i18n crispy_forms_tags %}
+{% block content %}
+    <form method="post">
+        {% csrf_token %}
+        {{ form|crispy }}
+        <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
+    </form>
+{% endblock %}
+
+{% block extrajavascript %}
+    <script type="text/javascript">
+    </script>
+{% endblock %}

apps/activity/templates/activity/activity_list.html

@@ -1,49 +1,41 @@
 {% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
 {% load render_table from django_tables2 %}
-{% load i18n %}
+{% load i18n crispy_forms_tags%}
-
 {% block content %}
     {% if started_activities %}
-<div class="card bg-secondary text-white mb-3">
+        <h2>{% trans "Current activity" %}</h2>
-    <h3 class="card-header text-center">
-        {% trans "Current activity" %}
-    </h3>
-    <div class="card-body text-dark">
         {% for activity in started_activities %}
-        {% include "activity/includes/activity_info.html" %}
+            {% include "activity/activity_info.html" %}
+            <hr>
         {% endfor %}
-    </div>
-</div>
     {% endif %}
 
-<div class="card bg-light mb-3">
+    <h2>{% trans "Upcoming activities" %}</h2>
-    <h3 class="card-header text-center">
-        {% trans "Upcoming activities" %}
-    </h3>
     {% if upcoming.data %}
         {% render_table upcoming %}
     {% else %}
-    <div class="card-body">
         <div class="alert alert-warning">
             {% trans "There is no planned activity." %}
         </div>
-    </div>
     {% endif %}
-    <div class="card-footer">
-        <a class="btn btn-sm btn-success" href="{% url 'activity:activity_create' %}" data-turbolinks="false">
-            <i class="fa fa-calendar-plus-o" aria-hidden="true"></i>
-            {% trans 'New activity' %}
-        </a>
-    </div>
-</div>
 
-<div class="card bg-light mb-3">
+    <a class="btn btn-primary" href="{% url 'activity:activity_create' %}" data-turbolinks="false">{% trans 'New activity' %}</a>
-    <h3 class="card-header text-center">
+
-        {% trans "All activities" %}
+    <hr>
-    </h3>
+
+    <h2>{% trans "All activities" %}</h2>
+
     {% render_table table %}
-</div>
+{% endblock %}
+
+{% block extrajavascript %}
+<script type="text/javascript">
+
+$(document).ready(function($) {
+    $(".table-row").click(function() {
+        window.document.location = $(this).data("href");
+    });
+});
+
+</script>
 {% endblock %}

apps/activity/tests/test_activities.py

@@ -1,175 +0,0 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from datetime import timedelta
-
-from django.contrib.auth.models import User
-from django.test import TestCase
-from django.urls import reverse
-from django.utils import timezone
-from activity.models import Activity, ActivityType, Guest, Entry
-from member.models import Club
-
-
-class TestActivities(TestCase):
-    """
-    Test activities
-    """
-    fixtures = ('initial',)
-
-    def setUp(self):
-        self.user = User.objects.create_superuser(
-            username="admintoto",
-            password="tototototo",
-            email="toto@example.com"
-        )
-        self.client.force_login(self.user)
-
-        sess = self.client.session
-        sess["permission_mask"] = 42
-        sess.save()
-
-        self.activity = Activity.objects.create(
-            name="Activity",
-            description="This is a test activity\non two very very long lines\nbecause this is very important.",
-            location="Earth",
-            activity_type=ActivityType.objects.get(name="Pot"),
-            creater=self.user,
-            organizer=Club.objects.get(name="Kfet"),
-            attendees_club=Club.objects.get(name="Kfet"),
-            date_start=timezone.now(),
-            date_end=timezone.now() + timedelta(days=2),
-            valid=True,
-        )
-
-        self.guest = Guest.objects.create(
-            activity=self.activity,
-            inviter=self.user.note,
-            last_name="GUEST",
-            first_name="Guest",
-        )
-
-    def test_activity_list(self):
-        """
-        Display the list of all activities
-        """
-        response = self.client.get(reverse("activity:activity_list"))
-        self.assertEqual(response.status_code, 200)
-
-    def test_activity_create(self):
-        """
-        Create a new activity
-        """
-        response = self.client.get(reverse("activity:activity_create"))
-        self.assertEqual(response.status_code, 200)
-
-        response = self.client.post(reverse("activity:activity_create"), data=dict(
-            name="Activity created",
-            description="This activity was successfully created.",
-            location="Earth",
-            activity_type=ActivityType.objects.get(name="Soirée de club").id,
-            creater=self.user.id,
-            organizer=Club.objects.get(name="Kfet").id,
-            attendees_club=Club.objects.get(name="Kfet").id,
-            date_start="{:%Y-%m-%d %H:%M}".format(timezone.now()),
-            date_end="{:%Y-%m-%d %H:%M}".format(timezone.now() + timedelta(days=2)),
-            valid=True,
-        ))
-        self.assertTrue(Activity.objects.filter(name="Activity created").exists())
-        activity = Activity.objects.get(name="Activity created")
-        self.assertRedirects(response, reverse("activity:activity_detail", args=(activity.pk,)), 302, 200)
-
-    def test_activity_detail(self):
-        """
-        Display the detail of an activity
-        """
-        response = self.client.get(reverse("activity:activity_detail", args=(self.activity.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-    def test_activity_update(self):
-        """
-        Update an activity
-        """
-        response = self.client.get(reverse("activity:activity_update", args=(self.activity.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-        response = self.client.post(reverse("activity:activity_update", args=(self.activity.pk,)), data=dict(
-            name=str(self.activity) + " updated",
-            description="This activity was successfully updated.",
-            location="Earth",
-            activity_type=ActivityType.objects.get(name="Autre").id,
-            creater=self.user.id,
-            organizer=Club.objects.get(name="Kfet").id,
-            attendees_club=Club.objects.get(name="Kfet").id,
-            date_start="{:%Y-%m-%d %H:%M}".format(timezone.now()),
-            date_end="{:%Y-%m-%d %H:%M}".format(timezone.now() + timedelta(days=2)),
-            valid=True,
-        ))
-        self.assertTrue(Activity.objects.filter(name="Activity updated").exists())
-        self.assertRedirects(response, reverse("activity:activity_detail", args=(self.activity.pk,)), 302, 200)
-
-    def test_activity_entry(self):
-        """
-        Create some entries
-        """
-        self.activity.open = True
-        self.activity.save()
-
-        response = self.client.get(reverse("activity:activity_entry", args=(self.activity.pk,)))
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(reverse("activity:activity_entry", args=(self.activity.pk,)) + "?search=guest")
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(reverse("activity:activity_entry", args=(self.activity.pk,)) + "?search=admin")
-        self.assertEqual(response.status_code, 200)
-
-        # User entry
-        response = self.client.post("/api/activity/entry/", data=dict(
-            activity=self.activity.id,
-            note=self.user.note.id,
-            guest="",
-        ))
-        self.assertEqual(response.status_code, 201)     # 201 = Created
-        self.assertTrue(Entry.objects.filter(note=self.user.note, guest=None, activity=self.activity).exists())
-
-        # Guest entry
-        response = self.client.post("/api/activity/entry/", data=dict(
-            activity=self.activity.id,
-            note=self.user.note.id,
-            guest=self.guest.id,
-        ))
-        self.assertEqual(response.status_code, 201)     # 201 = Created
-        self.assertTrue(Entry.objects.filter(note=self.user.note, guest=self.guest.id, activity=self.activity).exists())
-
-    def test_activity_invite(self):
-        """
-        Try to invite people to an activity
-        """
-        response = self.client.get(reverse("activity:activity_invite", args=(self.activity.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-        # The activity is started, can't invite
-        response = self.client.post(reverse("activity:activity_invite", args=(self.activity.pk,)), data=dict(
-            activity=self.activity.id,
-            inviter=self.user.note.id,
-            last_name="GUEST2",
-            first_name="Guest",
-        ))
-        self.assertEqual(response.status_code, 200)
-
-        self.activity.date_start += timedelta(days=1)
-        self.activity.save()
-
-        response = self.client.post(reverse("activity:activity_invite", args=(self.activity.pk,)), data=dict(
-            activity=self.activity.id,
-            inviter=self.user.note.id,
-            last_name="GUEST2",
-            first_name="Guest",
-        ))
-        self.assertRedirects(response, reverse("activity:activity_detail", args=(self.activity.pk,)), 302, 200)
-
-    def test_activity_ics(self):
-        """
-        Render the ICS calendar
-        """
-        response = self.client.get(reverse("activity:calendar_ics"))
-        self.assertEqual(response.status_code, 200)

apps/activity/urls.py

@@ -14,5 +14,4 @@ urlpatterns = [
     path('<int:pk>/entry/', views.ActivityEntryView.as_view(), name='activity_entry'),
     path('<int:pk>/update/', views.ActivityUpdateView.as_view(), name='activity_update'),
     path('new/', views.ActivityCreateView.as_view(), name='activity_create'),
-    path('calendar.ics', views.CalendarView.as_view(), name='calendar_ics'),
 ]

apps/activity/views.py

@@ -1,53 +1,29 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from hashlib import md5
-
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import PermissionDenied
-from django.db import transaction
 from django.db.models import F, Q
-from django.http import HttpResponse
 from django.urls import reverse_lazy
 from django.utils import timezone
-from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
-from django.views import View
+from django.views.generic import CreateView, DetailView, TemplateView, UpdateView
-from django.views.decorators.cache import cache_page
-from django.views.generic import DetailView, TemplateView, UpdateView
 from django_tables2.views import SingleTableView
 from note.models import Alias, NoteSpecial, NoteUser
 from permission.backends import PermissionBackend
-from permission.views import ProtectQuerysetMixin, ProtectedCreateView
+from permission.views import ProtectQuerysetMixin
 
 from .forms import ActivityForm, GuestForm
 from .models import Activity, Entry, Guest
 from .tables import ActivityTable, EntryTable, GuestTable
 
 
-class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+class ActivityCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
-    """
-    View to create a new Activity
-    """
     model = Activity
     form_class = ActivityForm
     extra_context = {"title": _("Create new activity")}
 
-    def get_sample_object(self):
-        return Activity(
-            name="",
-            description="",
-            creater=self.request.user,
-            activity_type_id=1,
-            organizer_id=1,
-            attendees_club_id=1,
-            date_start=timezone.now(),
-            date_end=timezone.now(),
-        )
-
-    @transaction.atomic
     def form_valid(self, form):
         form.instance.creater = self.request.user
         return super().form_valid(form)
@@ -58,9 +34,6 @@ class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
 
 
 class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
-    """
-    Displays all Activities, and classify if they are on-going or upcoming ones.
-    """
     model = Activity
     table_class = ActivityTable
     ordering = ('-date_start',)
@@ -87,9 +60,6 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView
 
 
 class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
-    """
-    Shows details about one activity. Add guest to context
-    """
     model = Activity
     context_object_name = "activity"
     extra_context = {"title": _("Activity detail")}
@@ -107,9 +77,6 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
 
 
 class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    Updates one Activity
-    """
     model = Activity
     form_class = ActivityForm
     extra_context = {"title": _("Update activity")}
@@ -118,23 +85,10 @@ class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
 
 
-class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
+class ActivityInviteView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
-    """
-    Invite a Guest, The rules to invites someone are defined in `forms:activity.GuestForm`
-    """
     model = Guest
     form_class = GuestForm
-    template_name = "activity/activity_form.html"
+    template_name = "activity/activity_invite.html"
-
-    def get_sample_object(self):
-        """ Creates a standart Guest binds to the Activity"""
-        activity = Activity.objects.get(pk=self.kwargs["pk"])
-        return Guest(
-            activity=activity,
-            first_name="",
-            last_name="",
-            inviter=self.request.user.note,
-        )
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -146,10 +100,8 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
         form = super().get_form(form_class)
         form.activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\
             .get(pk=self.kwargs["pk"])
-        form.fields["inviter"].initial = self.request.user.note
         return form
 
-    @transaction.atomic
     def form_valid(self, form):
         form.instance.activity = Activity.objects\
             .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")).get(pk=self.kwargs["pk"])
@@ -160,33 +112,16 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
 
 
 class ActivityEntryView(LoginRequiredMixin, TemplateView):
-    """
-    Manages entry to an activity
-    """
     template_name = "activity/activity_entry.html"
 
-    def dispatch(self, request, *args, **kwargs):
+    def get_context_data(self, **kwargs):
-        """
+        context = super().get_context_data(**kwargs)
-        Don't display the entry interface if the user has no right to see it (no right to add an entry for itself),
-        it is closed or doesn't manage entries.
-        """
-        activity = Activity.objects.get(pk=self.kwargs["pk"])
 
-        sample_entry = Entry(activity=activity, note=self.request.user.note)
+        activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\
-        if not PermissionBackend.check_perm(self.request.user, "activity.add_entry", sample_entry):
+            .distinct().get(pk=self.kwargs["pk"])
-            raise PermissionDenied(_("You are not allowed to display the entry interface for this activity."))
+        context["activity"] = activity
 
-        if not activity.activity_type.manage_entries:
+        matched = []
-            raise PermissionDenied(_("This activity does not support activity entries."))
-
-        if not activity.open:
-            raise PermissionDenied(_("This activity is closed."))
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_invited_guest(self, activity):
-        """
-        Retrieves all Guests to the activity
-        """
 
         guest_qs = Guest.objects\
             .annotate(balance=F("inviter__balance"), note_name=F("inviter__user__username"))\
@@ -199,20 +134,19 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
             if pattern[0] != "^":
                 pattern = "^" + pattern
             guest_qs = guest_qs.filter(
-                Q(first_name__iregex=pattern)
+                Q(first_name__regex=pattern)
-                | Q(last_name__iregex=pattern)
+                | Q(last_name__regex=pattern)
-                | Q(inviter__alias__name__iregex=pattern)
+                | Q(inviter__alias__name__regex=pattern)
-                | Q(inviter__alias__normalized_name__iregex=Alias.normalize(pattern))
+                | Q(inviter__alias__normalized_name__regex=Alias.normalize(pattern))
             )
         else:
+            pattern = None
             guest_qs = guest_qs.none()
-        return guest_qs
 
-    def get_invited_note(self, activity):
+        for guest in guest_qs:
-        """
+            guest.type = "Invité"
-        Retrieves all Note that can attend the activity,
+            matched.append(guest)
-        they need to have an up-to-date membership in the attendees_club.
+
-        """
         note_qs = Alias.objects.annotate(last_name=F("note__noteuser__user__last_name"),
                                          first_name=F("note__noteuser__user__first_name"),
                                          username=F("note__noteuser__user__username"),
@@ -232,41 +166,25 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
         # Filter with permission backend
         note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view"))
 
-        if "search" in self.request.GET and self.request.GET["search"]:
+        if pattern:
-            pattern = self.request.GET["search"]
             note_qs = note_qs.filter(
-                Q(note__noteuser__user__first_name__iregex=pattern)
+                Q(note__noteuser__user__first_name__regex=pattern)
-                | Q(note__noteuser__user__last_name__iregex=pattern)
+                | Q(note__noteuser__user__last_name__regex=pattern)
-                | Q(name__iregex=pattern)
+                | Q(name__regex=pattern)
-                | Q(normalized_name__iregex=Alias.normalize(pattern))
+                | Q(normalized_name__regex=Alias.normalize(pattern))
             )
         else:
             note_qs = note_qs.none()
 
+        if settings.DATABASES[note_qs.db]["ENGINE"] == 'django.db.backends.postgresql_psycopg2':
+            note_qs = note_qs.distinct('note__pk')[:20]
+        else:
             # SQLite doesn't support distinct fields. For compatibility reason (in dev mode), the note list will only
             # have distinct aliases rather than distinct notes with a SQLite DB, but it can fill the result page.
             # In production mode, please use PostgreSQL.
-        note_qs = note_qs.distinct('note__pk')[:20]\
+            note_qs = note_qs.distinct()[:20]
-            if settings.DATABASES[note_qs.db]["ENGINE"] == 'django.db.backends.postgresql' else note_qs.distinct()[:20]
-        return note_qs
 
-    def get_context_data(self, **kwargs):
+        for note in note_qs:
-        """
-        Query the list of Guest and Note to the activity and add information to makes entry with JS.
-        """
-        context = super().get_context_data(**kwargs)
-
-        activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\
-            .distinct().get(pk=self.kwargs["pk"])
-        context["activity"] = activity
-
-        matched = []
-
-        for guest in self.get_invited_guest(activity):
-            guest.type = "Invité"
-            matched.append(guest)
-
-        for note in self.get_invited_note(activity):
             note.type = "Adhérent"
             note.activity = activity
             matched.append(note)
@@ -288,62 +206,3 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
                                                                       Entry(activity=a, note=self.request.user.note,))]
 
         return context
-
-
-# Cache for 1 hour
-@method_decorator(cache_page(60 * 60), name='dispatch')
-class CalendarView(View):
-    """
-    Render an ICS calendar with all valid activities.
-    """
-
-    def multilines(self, string, maxlength, offset=0):
-        newstring = string[:maxlength - offset]
-        string = string[maxlength - offset:]
-        while string:
-            newstring += "\r\n "
-            newstring += string[:maxlength - 1]
-            string = string[maxlength - 1:]
-        return newstring
-
-    def get(self, request, *args, **kwargs):
-        ics = """BEGIN:VCALENDAR
-VERSION: 2.0
-PRODID:Note Kfet 2020
-X-WR-CALNAME:Kfet Calendar
-NAME:Kfet Calendar
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-X-LIC-LOCATION:Europe/Berlin
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-"""
-        for activity in Activity.objects.filter(valid=True).order_by("-date_start").all():
-            ics += f"""BEGIN:VEVENT
-DTSTAMP:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}Z
-UID:{md5((activity.name + "$" + str(activity.id) + str(activity.date_start)).encode("UTF-8")).hexdigest()}
-SUMMARY;CHARSET=UTF-8:{self.multilines(activity.name, 75, 22)}
-DTSTART;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}
-DTEND;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_end)}
-LOCATION:{self.multilines(activity.location, 75, 9) if activity.location else "Kfet"}
-DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + """
- -- {activity.organizer.name}
-END:VEVENT
-"""
-        ics += "END:VCALENDAR"
-        ics = ics.replace("\r", "").replace("\n", "\r\n")
-        return HttpResponse(ics, content_type="text/calendar; charset=UTF-8")

apps/api/serializers.py

@@ -1,33 +0,0 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.auth.models import User
-from rest_framework.serializers import ModelSerializer
-
-
-class UserSerializer(ModelSerializer):
-    """
-    REST API Serializer for Users.
-    The djangorestframework plugin will analyse the model `User` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = User
-        exclude = (
-            'password',
-            'groups',
-            'user_permissions',
-        )
-
-
-class ContentTypeSerializer(ModelSerializer):
-    """
-    REST API Serializer for Users.
-    The djangorestframework plugin will analyse the model `User` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = ContentType
-        fields = '__all__'

apps/api/urls.py

@@ -1,44 +1,84 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.conf import settings
 from django.conf.urls import url, include
-from rest_framework import routers
+from django.contrib.auth.models import User
+from django.contrib.contenttypes.models import ContentType
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework import routers, serializers
+from rest_framework.filters import SearchFilter
+from rest_framework.viewsets import ReadOnlyModelViewSet
+from activity.api.urls import register_activity_urls
+from api.viewsets import ReadProtectedModelViewSet
+from member.api.urls import register_members_urls
+from note.api.urls import register_note_urls
+from treasury.api.urls import register_treasury_urls
+from logs.api.urls import register_logs_urls
+from permission.api.urls import register_permission_urls
+from wei.api.urls import register_wei_urls
+
+
+class UserSerializer(serializers.ModelSerializer):
+    """
+    REST API Serializer for Users.
+    The djangorestframework plugin will analyse the model `User` and parse all fields in the API.
+    """
+
+    class Meta:
+        model = User
+        exclude = (
+            'password',
+            'groups',
+            'user_permissions',
+        )
+
+
+class ContentTypeSerializer(serializers.ModelSerializer):
+    """
+    REST API Serializer for Users.
+    The djangorestframework plugin will analyse the model `User` and parse all fields in the API.
+    """
+
+    class Meta:
+        model = ContentType
+        fields = '__all__'
+
+
+class UserViewSet(ReadProtectedModelViewSet):
+    """
+    REST API View set.
+    The djangorestframework plugin will get all `User` objects, serialize it to JSON with the given serializer,
+    then render it on /api/users/
+    """
+    queryset = User.objects.all()
+    serializer_class = UserSerializer
+    filter_backends = [DjangoFilterBackend, SearchFilter]
+    filterset_fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_superuser', 'is_staff', 'is_active', ]
+    search_fields = ['$username', '$first_name', '$last_name', '$note__alias__name', '$note__alias__normalized_name', ]
+
+
+# This ViewSet is the only one that is accessible from all authenticated users!
+class ContentTypeViewSet(ReadOnlyModelViewSet):
+    """
+    REST API View set.
+    The djangorestframework plugin will get all `User` objects, serialize it to JSON with the given serializer,
+    then render it on /api/users/
+    """
+    queryset = ContentType.objects.all()
+    serializer_class = ContentTypeSerializer
 
-from .viewsets import ContentTypeViewSet, UserViewSet
 
 # Routers provide an easy way of automatically determining the URL conf.
 # Register each app API router and user viewset
 router = routers.DefaultRouter()
 router.register('models', ContentTypeViewSet)
 router.register('user', UserViewSet)
-
-if "member" in settings.INSTALLED_APPS:
-    from member.api.urls import register_members_urls
 register_members_urls(router, 'members')
-
-if "member" in settings.INSTALLED_APPS:
-    from activity.api.urls import register_activity_urls
 register_activity_urls(router, 'activity')
-
-if "note" in settings.INSTALLED_APPS:
-    from note.api.urls import register_note_urls
 register_note_urls(router, 'note')
-
-if "treasury" in settings.INSTALLED_APPS:
-    from treasury.api.urls import register_treasury_urls
 register_treasury_urls(router, 'treasury')
-
-if "permission" in settings.INSTALLED_APPS:
-    from permission.api.urls import register_permission_urls
 register_permission_urls(router, 'permission')
-
-if "logs" in settings.INSTALLED_APPS:
-    from logs.api.urls import register_logs_urls
 register_logs_urls(router, 'logs')
-
-if "wei" in settings.INSTALLED_APPS:
-    from wei.api.urls import register_wei_urls
 register_wei_urls(router, 'wei')
 
 app_name = 'api'

apps/api/viewsets.py

@@ -2,19 +2,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.contrib.contenttypes.models import ContentType
-from django_filters.rest_framework import DjangoFilterBackend
-from django.db.models import Q
-from django.conf import settings
-from django.contrib.auth.models import User
-from rest_framework.viewsets import ReadOnlyModelViewSet, ModelViewSet
 from permission.backends import PermissionBackend
+from rest_framework import viewsets
 from note_kfet.middlewares import get_current_session
-from note.models import Alias
-
-from .serializers import UserSerializer, ContentTypeSerializer
 
 
-class ReadProtectedModelViewSet(ModelViewSet):
+class ReadProtectedModelViewSet(viewsets.ModelViewSet):
     """
     Protect a ModelViewSet by filtering the objects that the user cannot see.
     """
@@ -26,10 +19,10 @@ class ReadProtectedModelViewSet(ModelViewSet):
     def get_queryset(self):
         user = self.request.user
         get_current_session().setdefault("permission_mask", 42)
-        return self.queryset.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
+        return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
 
 
-class ReadOnlyProtectedModelViewSet(ReadOnlyModelViewSet):
+class ReadOnlyProtectedModelViewSet(viewsets.ReadOnlyModelViewSet):
     """
     Protect a ReadOnlyModelViewSet by filtering the objects that the user cannot see.
     """
@@ -41,72 +34,4 @@ class ReadOnlyProtectedModelViewSet(ReadOnlyModelViewSet):
     def get_queryset(self):
         user = self.request.user
         get_current_session().setdefault("permission_mask", 42)
-        return self.queryset.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
+        return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
-
-
-class UserViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `User` objects, serialize it to JSON with the given serializer,
-    then render it on /api/users/
-    """
-    queryset = User.objects.all()
-    serializer_class = UserSerializer
-    filter_backends = [DjangoFilterBackend]
-    filterset_fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_superuser', 'is_staff', 'is_active', ]
-
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        # Sqlite doesn't support ORDER BY in subqueries
-        queryset = queryset.order_by("username") \
-            if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' else queryset
-
-        if "search" in self.request.GET:
-            pattern = self.request.GET["search"]
-
-            # Filter with different rules
-            # We use union-all to keep each filter rule sorted in result
-            queryset = queryset.filter(
-                # Match without normalization
-                note__alias__name__iregex="^" + pattern
-            ).union(
-                queryset.filter(
-                    # Match with normalization
-                    Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
-                    & ~Q(note__alias__name__iregex="^" + pattern)
-                ),
-                all=True,
-            ).union(
-                queryset.filter(
-                    # Match on lower pattern
-                    Q(note__alias__normalized_name__iregex="^" + pattern.lower())
-                    & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
-                    & ~Q(note__alias__name__iregex="^" + pattern)
-                ),
-                all=True,
-            ).union(
-                queryset.filter(
-                    # Match on firstname or lastname
-                    (Q(last_name__iregex="^" + pattern) | Q(first_name__iregex="^" + pattern))
-                    & ~Q(note__alias__normalized_name__iregex="^" + pattern.lower())
-                    & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
-                    & ~Q(note__alias__name__iregex="^" + pattern)
-                ),
-                all=True,
-            )
-
-        queryset = queryset if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' \
-            else queryset.order_by("username")
-
-        return queryset
-
-
-# This ViewSet is the only one that is accessible from all authenticated users!
-class ContentTypeViewSet(ReadOnlyModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `User` objects, serialize it to JSON with the given serializer,
-    then render it on /api/users/
-    """
-    queryset = ContentType.objects.all()
-    serializer_class = ContentTypeSerializer

apps/logs/api/views.py

@@ -19,5 +19,5 @@ class ChangelogViewSet(ReadOnlyProtectedModelViewSet):
     serializer_class = ChangelogSerializer
     filter_backends = [DjangoFilterBackend, OrderingFilter]
     filterset_fields = ['model', 'action', "instance_pk", 'user', 'ip', ]
-    ordering_fields = ['timestamp', 'id', ]
+    ordering_fields = ['timestamp', ]
-    ordering = ['-id', ]
+    ordering = ['-timestamp', ]

apps/logs/migrations/0001_initial.py

@@ -1,37 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-04 21:41
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('contenttypes', '0002_remove_content_type_name'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Changelog',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('ip', models.GenericIPAddressField(blank=True, null=True, verbose_name='IP Address')),
-                ('instance_pk', models.CharField(max_length=255, verbose_name='identifier')),
-                ('previous', models.TextField(null=True, verbose_name='previous data')),
-                ('data', models.TextField(null=True, verbose_name='new data')),
-                ('action', models.CharField(choices=[('create', 'create'), ('edit', 'edit'), ('delete', 'delete')], default='edit', max_length=16, verbose_name='action')),
-                ('timestamp', models.DateTimeField(default=django.utils.timezone.now, verbose_name='timestamp')),
-                ('model', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.ContentType', verbose_name='model')),
-                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='user')),
-            ],
-            options={
-                'verbose_name': 'changelog',
-                'verbose_name_plural': 'changelogs',
-            },
-        ),
-    ]

apps/logs/migrations/0002_replace_null_by_blank.py

@@ -1,17 +0,0 @@
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('logs', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RunSQL(
-            "UPDATE logs_changelog SET previous = '' WHERE previous IS NULL;"
-        ),
-        migrations.RunSQL(
-            "UPDATE logs_changelog SET data = '' WHERE data IS NULL;"
-        ),
-    ]

apps/logs/migrations/0003_remove_null_tag_on_charfields.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-06 19:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('logs', '0002_replace_null_by_blank'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='changelog',
-            name='data',
-            field=models.TextField(blank=True, default='', verbose_name='new data'),
-        ),
-        migrations.AlterField(
-            model_name='changelog',
-            name='previous',
-            field=models.TextField(blank=True, default='', verbose_name='previous data'),
-        ),
-    ]

apps/logs/models.py

@@ -44,14 +44,12 @@ class Changelog(models.Model):
     )
 
     previous = models.TextField(
-        blank=True,
+        null=True,
-        default="",
         verbose_name=_('previous data'),
     )
 
     data = models.TextField(
-        blank=True,
+        null=True,
-        default="",
         verbose_name=_('new data'),
     )
 
@@ -82,7 +80,3 @@ class Changelog(models.Model):
     class Meta:
         verbose_name = _("changelog")
         verbose_name_plural = _("changelogs")
-
-    def __str__(self):
-        return _("Changelog of type \"{action}\" for model {model} at {timestamp}").format(
-            action=self.get_action_display(), model=str(self.model), timestamp=str(self.timestamp))

apps/logs/signals.py

@@ -50,7 +50,10 @@ def save_object(sender, instance, **kwargs):
     in order to store each modification made
     """
     # noinspection PyProtectedMember
-    if instance._meta.label_lower in EXCLUDED or hasattr(instance, "_no_signal"):
+    if instance._meta.label_lower in EXCLUDED:
+        return
+
+    if hasattr(instance, "_no_log"):
         return
 
     # noinspection PyProtectedMember
@@ -78,30 +81,19 @@ def save_object(sender, instance, **kwargs):
         if instance.last_login != previous.last_login:
             return
 
-    changed_fields = '__all__'
+    # On crée notre propre sérialiseur JSON pour pouvoir sauvegarder les modèles
-    if previous:
-        # On ne garde que les champs modifiés
-        changed_fields = []
-        for field in instance._meta.fields:
-            if field.name.endswith("_ptr"):
-                # A field ending with _ptr is a OneToOneRel with a subclass, e.g. NoteClub.note_ptr -> Note
-                continue
-            if getattr(instance, field.name) != getattr(previous, field.name):
-                changed_fields.append(field.name)
-
-    if len(changed_fields) == 0:
-        # Pas de log s'il n'y a pas de modification
-        return
-
-    # On crée notre propre sérialiseur JSON pour pouvoir sauvegarder les modèles avec uniquement les champs modifiés
     class CustomSerializer(ModelSerializer):
         class Meta:
             model = instance.__class__
-            fields = changed_fields
+            fields = '__all__'
 
-    previous_json = JSONRenderer().render(CustomSerializer(previous).data).decode("UTF-8") if previous else ""
+    previous_json = JSONRenderer().render(CustomSerializer(previous).data).decode("UTF-8") if previous else None
     instance_json = JSONRenderer().render(CustomSerializer(instance).data).decode("UTF-8")
 
+    if previous_json == instance_json:
+        # Pas de log s'il n'y a pas de modification
+        return
+
     Changelog.objects.create(user=user,
                              ip=ip,
                              model=ContentType.objects.get_for_model(instance),
@@ -117,7 +109,10 @@ def delete_object(sender, instance, **kwargs):
     Each time a model is deleted, an entry in the table `Changelog` is added in the database
     """
     # noinspection PyProtectedMember
-    if instance._meta.label_lower in EXCLUDED or hasattr(instance, "_no_signal"):
+    if instance._meta.label_lower in EXCLUDED:
+        return
+
+    if hasattr(instance, "_no_log"):
         return
 
     # Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP
@@ -149,6 +144,6 @@ def delete_object(sender, instance, **kwargs):
                              model=ContentType.objects.get_for_model(instance),
                              instance_pk=instance.pk,
                              previous=instance_json,
-                             data="",
+                             data=None,
                              action="delete"
                              ).save()

apps/member/admin.py

@@ -31,7 +31,9 @@ class CustomUserAdmin(UserAdmin):
         """
         When creating a new user don't show profile one the first step
         """
-        return super().get_inline_instances(request, obj) if obj else []
+        if not obj:
+            return list()
+        return super().get_inline_instances(request, obj)
 
 
 @admin.register(Club, site=admin_site)

apps/member/fixtures/initial.json

@@ -0,0 +1,31 @@
+[
+    {
+        "model": "member.club",
+        "pk": 1,
+        "fields": {
+            "name": "BDE",
+            "email": "tresorerie.bde@example.com",
+            "require_memberships":  true,
+            "membership_fee_paid": 500,
+            "membership_fee_unpaid": 500,
+            "membership_duration": 396,
+            "membership_start": "2019-08-31",
+            "membership_end": "2020-09-30"
+        }
+    },
+    {
+        "model": "member.club",
+        "pk": 2,
+        "fields": {
+            "name": "Kfet",
+            "email": "tresorerie.bde@example.com",
+            "parent_club": 1,
+            "require_memberships":  true,
+            "membership_fee_paid": 3500,
+            "membership_fee_unpaid": 3500,
+            "membership_duration": 396,
+            "membership_start": "2019-08-31",
+            "membership_end": "2020-09-30"
+        }
+    }
+]

apps/member/forms.py

@@ -1,16 +1,10 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import io
-
-from PIL import Image, ImageSequence
 from django import forms
-from django.conf import settings
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.models import User
-from django.db import transaction
 from django.forms import CheckboxSelectMultiple
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, Alias
 from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput
@@ -21,7 +15,7 @@ from .models import Profile, Club, Membership
 
 class CustomAuthenticationForm(AuthenticationForm):
     permission_mask = forms.ModelChoiceField(
-        label=_("Permission mask"),
+        label="Masque de permissions",
         queryset=PermissionMask.objects.order_by("rank"),
         empty_label=None,
     )
@@ -47,18 +41,10 @@ class ProfileForm(forms.ModelForm):
 
     last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
 
-    def clean_promotion(self):
-        promotion = self.cleaned_data["promotion"]
-        if promotion > timezone.now().year:
-            self.add_error("promotion", _("You can't register to the note if you come from the future."))
-        return promotion
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['address'].widget.attrs.update({"placeholder": "4 avenue des Sciences, 91190 GIF-SUR-YVETTE"})
-        self.fields['promotion'].widget.attrs.update({"max": timezone.now().year})
 
-    @transaction.atomic
     def save(self, commit=True):
         if not self.instance.section or (("department" in self.changed_data
                                          or "promotion" in self.changed_data) and "section" not in self.changed_data):
@@ -71,67 +57,6 @@ class ProfileForm(forms.ModelForm):
         exclude = ('user', 'email_confirmed', 'registration_valid', )
 
 
-class ImageForm(forms.Form):
-    """
-    Form used for the js interface for profile picture
-    """
-    image = forms.ImageField(required=False,
-                             label=_('select an image'),
-                             help_text=_('Maximal size: 2MB'))
-    x = forms.FloatField(widget=forms.HiddenInput())
-    y = forms.FloatField(widget=forms.HiddenInput())
-    width = forms.FloatField(widget=forms.HiddenInput())
-    height = forms.FloatField(widget=forms.HiddenInput())
-
-    def clean(self):
-        """
-        Load image and crop
-
-        In the future, when Pillow will support APNG we will be able to
-        simplify this code to save only PNG/APNG.
-        """
-        cleaned_data = super().clean()
-
-        # Image size is limited by Django DATA_UPLOAD_MAX_MEMORY_SIZE
-        image = cleaned_data.get('image')
-        if image:
-            # Let Pillow detect and load image
-            # If it is an animation, then there will be multiple frames
-            try:
-                im = Image.open(image)
-            except OSError:
-                # Rare case in which Django consider the upload file as an image
-                # but Pil is unable to load it
-                raise forms.ValidationError(_('This image cannot be loaded.'))
-
-            # Crop each frame
-            x = cleaned_data.get('x', 0)
-            y = cleaned_data.get('y', 0)
-            w = cleaned_data.get('width', 200)
-            h = cleaned_data.get('height', 200)
-            frames = []
-            for frame in ImageSequence.Iterator(im):
-                frame = frame.crop((x, y, x + w, y + h))
-                frame = frame.resize(
-                    (settings.PIC_WIDTH, settings.PIC_RATIO * settings.PIC_WIDTH),
-                    Image.ANTIALIAS,
-                )
-                frames.append(frame)
-
-            # Save
-            om = frames.pop(0)  # Get first frame
-            om.info = im.info  # Copy metadata
-            image.file = io.BytesIO()
-            if len(frames) > 1:
-                # Save as GIF
-                om.save(image.file, "GIF", save_all=True, append_images=list(frames), loop=0)
-            else:
-                # Save as PNG
-                om.save(image.file, "PNG")
-
-        return cleaned_data
-
-
 class ClubForm(forms.ModelForm):
     def clean(self):
         cleaned_data = super().clean()
@@ -150,7 +75,6 @@ class ClubForm(forms.ModelForm):
             "membership_fee_unpaid": AmountInput(),
             "parent_club": Autocomplete(
                 Club,
-                resetable=True,
                 attrs={
                     'api_url': '/api/members/club/',
                 }
@@ -164,7 +88,7 @@ class MembershipForm(forms.ModelForm):
     soge = forms.BooleanField(
         label=_("Inscription paid by Société Générale"),
         required=False,
-        help_text=_("Check this case if the Société Générale paid the inscription."),
+        help_text=_("Check this case is the Société Générale paid the inscription."),
     )
 
     credit_type = forms.ModelChoiceField(

apps/member/migrations/0001_initial.py

@@ -1,76 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-04 21:41
-
-import datetime
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-import phonenumber_field.modelfields
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Club',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, unique=True, verbose_name='name')),
-                ('email', models.EmailField(max_length=254, verbose_name='email')),
-                ('require_memberships', models.BooleanField(default=True, help_text="Uncheck if this club don't require memberships.", verbose_name='require memberships')),
-                ('membership_fee_paid', models.PositiveIntegerField(default=0, verbose_name='membership fee (paid students)')),
-                ('membership_fee_unpaid', models.PositiveIntegerField(default=0, verbose_name='membership fee (unpaid students)')),
-                ('membership_duration', models.PositiveIntegerField(blank=True, help_text='The longest time (in days) a membership can last (NULL = infinite).', null=True, verbose_name='membership duration')),
-                ('membership_start', models.DateField(blank=True, help_text='Date from which the members can renew their membership.', null=True, verbose_name='membership start')),
-                ('membership_end', models.DateField(blank=True, help_text='Maximal date of a membership, after which members must renew it.', null=True, verbose_name='membership end')),
-            ],
-            options={
-                'verbose_name': 'club',
-                'verbose_name_plural': 'clubs',
-            },
-        ),
-        migrations.CreateModel(
-            name='Profile',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('phone_number', phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=50, null=True, region=None, verbose_name='phone number')),
-                ('section', models.CharField(blank=True, help_text='e.g. "1A0", "9A♥", "SAPHIRE"', max_length=255, null=True, verbose_name='section')),
-                ('department', models.CharField(choices=[('A0', 'Informatics (A0)'), ('A1', 'Mathematics (A1)'), ('A2', 'Physics (A2)'), ("A'2", "Applied physics (A'2)"), ('A2', "Chemistry (A''2)"), ('A3', 'Biology (A3)'), ('B1234', 'SAPHIRE (B1234)'), ('B1', 'Mechanics (B1)'), ('B2', 'Civil engineering (B2)'), ('B3', 'Mechanical engineering (B3)'), ('B4', 'EEA (B4)'), ('C', 'Design (C)'), ('D2', 'Economy-management (D2)'), ('D3', 'Social sciences (D3)'), ('E', 'English (E)'), ('EXT', 'External (EXT)')], max_length=8, verbose_name='department')),
-                ('promotion', models.PositiveSmallIntegerField(default=2020, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion')),
-                ('address', models.CharField(blank=True, max_length=255, null=True, verbose_name='address')),
-                ('paid', models.BooleanField(default=False, help_text='Tells if the user receive a salary.', verbose_name='paid')),
-                ('ml_events_registration', models.CharField(blank=True, choices=[(None, 'No'), ('fr', 'Yes (receive them in french)'), ('en', 'Yes (receive them in english)')], default=None, max_length=2, null=True, verbose_name='Register on the mailing list to stay informed of the events of the campus (1 mail/week)')),
-                ('ml_sport_registration', models.BooleanField(default=False, verbose_name='Register on the mailing list to stay informed of the sport events of the campus (1 mail/week)')),
-                ('ml_art_registration', models.BooleanField(default=False, verbose_name='Register on the mailing list to stay informed of the art events of the campus (1 mail/week)')),
-                ('report_frequency', models.PositiveSmallIntegerField(default=0, verbose_name='report frequency (in days)')),
-                ('last_report', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last report date')),
-                ('email_confirmed', models.BooleanField(default=False, verbose_name='email confirmed')),
-                ('registration_valid', models.BooleanField(default=False, verbose_name='registration valid')),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'user profile',
-                'verbose_name_plural': 'user profile',
-            },
-        ),
-        migrations.CreateModel(
-            name='Membership',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('date_start', models.DateField(default=datetime.date.today, verbose_name='membership starts on')),
-                ('date_end', models.DateField(null=True, verbose_name='membership ends on')),
-                ('fee', models.PositiveIntegerField(verbose_name='fee')),
-                ('club', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='member.Club', verbose_name='club')),
-            ],
-            options={
-                'verbose_name': 'membership',
-                'verbose_name_plural': 'memberships',
-            },
-        ),
-    ]

apps/member/migrations/0002_auto_20200904_2341.py

@@ -1,42 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-04 21:41
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('permission', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('member', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='membership',
-            name='roles',
-            field=models.ManyToManyField(to='permission.Role', verbose_name='roles'),
-        ),
-        migrations.AddField(
-            model_name='membership',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to=settings.AUTH_USER_MODEL, verbose_name='user'),
-        ),
-        migrations.AddField(
-            model_name='club',
-            name='parent_club',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='member.Club', verbose_name='parent club'),
-        ),
-        migrations.AddIndex(
-            model_name='profile',
-            index=models.Index(fields=['user'], name='member_prof_user_id_30c316_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='membership',
-            index=models.Index(fields=['user'], name='member_memb_user_id_945dbc_idx'),
-        ),
-    ]

apps/member/migrations/0003_create_bde_and_kfet.py

@@ -1,71 +0,0 @@
-from django.db import migrations
-
-
-def create_bde_and_kfet(apps, schema_editor):
-    """
-    The clubs BDE and Kfet are pre-injected.
-    """
-    Club = apps.get_model("member", "club")
-    NoteClub = apps.get_model("note", "noteclub")
-    Alias = apps.get_model("note", "alias")
-    ContentType = apps.get_model('contenttypes', 'ContentType')
-    polymorphic_ctype_id = ContentType.objects.get_for_model(NoteClub).id
-
-    Club.objects.get_or_create(
-        id=1,
-        name="BDE",
-        email="tresorerie.bde@example.com",
-        require_memberships=True,
-        membership_fee_paid=500,
-        membership_fee_unpaid=500,
-        membership_duration=396,
-        membership_start="2020-08-01",
-        membership_end="2021-09-30",
-    )
-    Club.objects.get_or_create(
-        id=2,
-        name="Kfet",
-        parent_club_id=1,
-        email="tresorerie.bde@example.com",
-        require_memberships=True,
-        membership_fee_paid=3500,
-        membership_fee_unpaid=3500,
-        membership_duration=396,
-        membership_start="2020-08-01",
-        membership_end="2021-09-30",
-    )
-
-    NoteClub.objects.get_or_create(
-        id=5,
-        club_id=1,
-        polymorphic_ctype_id=polymorphic_ctype_id,
-    )
-    NoteClub.objects.get_or_create(
-        id=6,
-        club_id=2,
-        polymorphic_ctype_id=polymorphic_ctype_id,
-    )
-
-    Alias.objects.get_or_create(
-        id=5,
-        note_id=5,
-        name="BDE",
-        normalized_name="bde",
-    )
-    Alias.objects.get_or_create(
-        id=6,
-        note_id=6,
-        name="Kfet",
-        normalized_name="kfet",
-    )
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('member', '0002_auto_20200904_2341'),
-        ('note', '0002_create_special_notes'),
-    ]
-
-    operations = [
-        migrations.RunPython(create_bde_and_kfet),
-    ]

apps/member/migrations/0004_replace_null_by_blank.py

@@ -1,20 +0,0 @@
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0003_create_bde_and_kfet'),
-    ]
-
-    operations = [
-        migrations.RunSQL(
-            "UPDATE member_profile SET address = '' WHERE address IS NULL;",
-        ),
-        migrations.RunSQL(
-            "UPDATE member_profile SET ml_events_registration = '' WHERE ml_events_registration IS NULL;",
-        ),
-        migrations.RunSQL(
-            "UPDATE member_profile SET section = '' WHERE section IS NULL;",
-        ),
-    ]

apps/member/migrations/0005_remove_null_tag_on_charfields.py

@@ -1,28 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-06 19:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0004_replace_null_by_blank'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='address',
-            field=models.CharField(blank=True, default='', max_length=255, verbose_name='address'),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='ml_events_registration',
-            field=models.CharField(blank=True, choices=[('', 'No'), ('fr', 'Yes (receive them in french)'), ('en', 'Yes (receive them in english)')], default='', max_length=2, verbose_name='Register on the mailing list to stay informed of the events of the campus (1 mail/week)'),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='section',
-            field=models.CharField(blank=True, default='', help_text='e.g. "1A0", "9A♥", "SAPHIRE"', max_length=255, verbose_name='section'),
-        ),
-    ]

apps/member/migrations/0006_create_note_account_bde_membership.py

@@ -1,50 +0,0 @@
-import sys
-
-from django.db import migrations
-
-
-def give_note_account_permissions(apps, schema_editor):
-    """
-    Automatically manage the membership of the Note account.
-    """
-    User = apps.get_model("auth", "user")
-    Membership = apps.get_model("member", "membership")
-    Role = apps.get_model("permission", "role")
-
-    note = User.objects.filter(username="note")
-    if not note.exists():
-        # We are in a test environment, don't log error message
-        if len(sys.argv) > 1 and sys.argv[1] == 'test':
-            return
-        print("Warning: Note account was not found. The note account was not imported.")
-        print("Make sure you have imported the NK15 database. The new import script handles correctly the permissions.")
-        print("This migration will be ignored, you can re-run it if you forgot the note account or ignore it if you "
-              "don't want this account.")
-        return
-
-    note = note.get()
-
-    # Set for the two clubs a large expiration date and the correct role.
-    for m in Membership.objects.filter(user_id=note.id).all():
-        m.date_end = "3142-12-12"
-        m.roles.set(Role.objects.filter(name="PC Kfet").all())
-        m.save()
-    # By default, the note account is only authorized to be logged from localhost.
-    note.password = "ipbased$127.0.0.1"
-    note.is_active = True
-    note.save()
-    # Ensure that the note of the account is disabled
-    note.note.inactivity_reason = 'forced'
-    note.note.is_active = False
-    note.save()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('member', '0005_remove_null_tag_on_charfields'),
-        ('permission', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RunPython(give_note_account_permissions),
-    ]

apps/member/models.py

@@ -7,7 +7,7 @@ import os
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
-from django.db import models, transaction
+from django.db import models
 from django.db.models import Q
 from django.template import loader
 from django.urls import reverse, reverse_lazy
@@ -46,7 +46,7 @@ class Profile(models.Model):
         help_text=_('e.g. "1A0", "9A♥", "SAPHIRE"'),
         max_length=255,
         blank=True,
-        default="",
+        null=True,
     )
 
     department = models.CharField(
@@ -72,7 +72,7 @@ class Profile(models.Model):
         ]
     )
 
-    promotion = models.PositiveSmallIntegerField(
+    promotion = models.PositiveIntegerField(
         null=True,
         default=datetime.date.today().year,
         verbose_name=_("promotion"),
@@ -83,7 +83,7 @@ class Profile(models.Model):
         verbose_name=_('address'),
         max_length=255,
         blank=True,
-        default="",
+        null=True,
     )
 
     paid = models.BooleanField(
@@ -92,28 +92,6 @@ class Profile(models.Model):
         default=False,
     )
 
-    ml_events_registration = models.CharField(
-        blank=True,
-        default='',
-        max_length=2,
-        choices=[
-            ('', _("No")),
-            ('fr', _("Yes (receive them in french)")),
-            ('en', _("Yes (receive them in english)")),
-        ],
-        verbose_name=_("Register on the mailing list to stay informed of the events of the campus (1 mail/week)"),
-    )
-
-    ml_sport_registration = models.BooleanField(
-        default=False,
-        verbose_name=_("Register on the mailing list to stay informed of the sport events of the campus (1 mail/week)"),
-    )
-
-    ml_art_registration = models.BooleanField(
-        default=False,
-        verbose_name=_("Register on the mailing list to stay informed of the art events of the campus (1 mail/week)"),
-    )
-
     report_frequency = models.PositiveSmallIntegerField(
         verbose_name=_("report frequency (in days)"),
         default=0,
@@ -171,21 +149,19 @@ class Profile(models.Model):
 
     def send_email_validation_link(self):
         subject = "[Note Kfet] " + str(_("Activate your Note Kfet account"))
-        token = email_validation_token.make_token(self.user)
-        uid = urlsafe_base64_encode(force_bytes(self.user_id))
         message = loader.render_to_string('registration/mails/email_validation_email.txt',
                                           {
                                               'user': self.user,
                                               'domain': os.getenv("NOTE_URL", "note.example.com"),
-                                              'token': token,
+                                              'token': email_validation_token.make_token(self.user),
-                                              'uid': uid,
+                                              'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
                                           })
         html = loader.render_to_string('registration/mails/email_validation_email.html',
                                        {
                                            'user': self.user,
                                            'domain': os.getenv("NOTE_URL", "note.example.com"),
-                                           'token': token,
+                                           'token': email_validation_token.make_token(self.user),
-                                           'uid': uid,
+                                           'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
                                        })
         self.user.email_user(subject, message, html_message=html)
 
@@ -271,7 +247,6 @@ class Club(models.Model):
             self._force_save = True
             self.save(force_update=True)
 
-    @transaction.atomic
     def save(self, force_insert=False, force_update=False, using=None,
              update_fields=None):
         if not self.require_memberships:
@@ -341,15 +316,13 @@ class Membership(models.Model):
             return self.date_start.toordinal() <= datetime.datetime.now().toordinal()
 
     def renew(self):
-        """
+        if Membership.objects.filter(
-        If the current membership comes to expiration, create a new membership that starts immediately after this one.
-        """
-        if not Membership.objects.filter(
                 user=self.user,
                 club=self.club,
                 date_start__gte=self.club.membership_start,
         ).exists():
-            # Membership is not renewed yet
+            # Membership is already renewed
+            return
         new_membership = Membership(
             user=self.user,
             club=self.club,
@@ -365,10 +338,36 @@ class Membership(models.Model):
         new_membership.roles.set(self.roles.all())
         new_membership.save()
 
-    def renew_parent(self):
+    def save(self, *args, **kwargs):
         """
-        Ensure that the parent membership is renewed, and renew/create it if needed.
+        Calculate fee and end date before saving the membership and creating the transaction if needed.
         """
+
+        if self.pk:
+            for role in self.roles.all():
+                club = role.for_club
+                if club is not None:
+                    if club.pk != self.club_id:
+                        raise ValidationError(_('The role {role} does not apply to the club {club}.')
+                                              .format(role=role.name, club=club.name))
+
+        created = not self.pk
+        if created:
+            if Membership.objects.filter(
+                    user=self.user,
+                    club=self.club,
+                    date_start__lte=self.date_start,
+                    date_end__gte=self.date_start,
+            ).exists():
+                raise ValidationError(_('User is already a member of the club'))
+
+        if self.club.parent_club is not None:
+            if not Membership.objects.filter(
+                user=self.user,
+                club=self.club.parent_club,
+                date_start__gte=self.club.parent_club.membership_start,
+            ).exists():
+                if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
                     parent_membership = Membership.objects.filter(
                         user=self.user,
                         club=self.club.parent_club,
@@ -406,46 +405,19 @@ class Membership(models.Model):
                         else:
                             parent_membership.roles.set(Role.objects.filter(name="Membre de club").all())
                         parent_membership.save()
-
-    @transaction.atomic
-    def save(self, *args, **kwargs):
-        """
-        Calculate fee and end date before saving the membership and creating the transaction if needed.
-        """
-        created = not self.pk
-        if not created:
-            for role in self.roles.all():
-                club = role.for_club
-                if club is not None:
-                    if club.pk != self.club_id:
-                        raise ValidationError(_('The role {role} does not apply to the club {club}.')
-                                              .format(role=role.name, club=club.name))
-        else:
-            if Membership.objects.filter(
-                    user=self.user,
-                    club=self.club,
-                    date_start__lte=self.date_start,
-                    date_end__gte=self.date_start,
-            ).exists():
-                raise ValidationError(_('User is already a member of the club'))
-
-            if self.club.parent_club is not None:
-                # Check that the user is already a member of the parent club if the membership is created
-                if not Membership.objects.filter(
-                    user=self.user,
-                    club=self.club.parent_club,
-                    date_start__gte=self.club.parent_club.membership_start,
-                ).exists():
-                    if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
-                        self.renew_parent()
                 else:
                     raise ValidationError(_('User is not a member of the parent club')
                                           + ' ' + self.club.parent_club.name)
 
-            self.fee = self.club.membership_fee_paid if self.user.profile.paid else self.club.membership_fee_unpaid
+        if self.user.profile.paid:
+            self.fee = self.club.membership_fee_paid
+        else:
+            self.fee = self.club.membership_fee_unpaid
 
-            self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) \
+        if self.club.membership_duration is not None:
-                if self.club.membership_duration is not None else self.date_start + datetime.timedelta(days=424242)
+            self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration)
+        else:
+            self.date_end = self.date_start + datetime.timedelta(days=424242)
         if self.club.membership_end is not None and self.date_end > self.club.membership_end:
             self.date_end = self.club.membership_end
 
@@ -477,12 +449,7 @@ class Membership(models.Model):
                 # to treasurers.
                 transaction.valid = False
                 from treasury.models import SogeCredit
-                if SogeCredit.objects.filter(user=self.user).exists():
+                soge_credit = SogeCredit.objects.get_or_create(user=self.user)[0]
-                    soge_credit = SogeCredit.objects.get(user=self.user)
-                else:
-                    soge_credit = SogeCredit(user=self.user)
-                    soge_credit._force_save = True
-                    soge_credit.save(force_insert=True)
                 soge_credit.refresh_from_db()
                 transaction.save(force_insert=True)
                 transaction.refresh_from_db()

apps/member/signals.py

@@ -6,10 +6,11 @@ def save_user_profile(instance, created, raw, **_kwargs):
     """
     Hook to create and save a profile when an user is updated if it is not registered with the signup form
     """
-    if not raw and created and instance.is_active and not hasattr(instance, "_no_signal"):
+    if raw:
+        # When provisionning data, do not try to autocreate
+        return
+
+    if created and instance.is_active:
         from .models import Profile
         Profile.objects.get_or_create(user=instance)
-        if instance.is_superuser:
-            instance.profile.email_confirmed = True
-            instance.profile.registration_valid = True
         instance.profile.save()

apps/member/static/member/js/alias.js

@@ -1,43 +0,0 @@
-/**
- * On form submit, create a new alias
- */
-function create_alias (e) {
-  // Do not submit HTML form
-  e.preventDefault()
-
-  // Get data and send to API
-  const formData = new FormData(e.target)
-  $.post('/api/note/alias/', {
-    csrfmiddlewaretoken: formData.get('csrfmiddlewaretoken'),
-    name: formData.get('name'),
-    note: formData.get('note')
-  }).done(function () {
-    // Reload table
-    $('#alias_table').load(location.pathname + ' #alias_table')
-    addMsg('Alias ajouté', 'success')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}
-
-/**
- * On click of "delete", delete the alias
- * @param Integer button_id Alias id to remove
- */
-function delete_button (button_id) {
-  $.ajax({
-    url: '/api/note/alias/' + button_id + '/',
-    method: 'DELETE',
-    headers: { 'X-CSRFTOKEN': CSRF_TOKEN }
-  }).done(function () {
-    addMsg('Alias supprimé', 'success')
-    $('#alias_table').load(location.pathname + ' #alias_table')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}
-
-$(document).ready(function () {
-  // Attach event
-  document.getElementById('form_alias').addEventListener('submit', create_alias)
-})

apps/member/tables.py

@@ -1,10 +1,9 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from datetime import date
-
 import django_tables2 as tables
 from django.contrib.auth.models import User
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.urls import reverse_lazy
 from django.utils.html import format_html
@@ -41,9 +40,9 @@ class UserTable(tables.Table):
     """
     alias = tables.Column()
 
-    section = tables.Column(accessor='profile__section')
+    section = tables.Column(accessor='profile.section')
 
-    balance = tables.Column(accessor='note__balance', verbose_name=_("Balance"))
+    balance = tables.Column(accessor='note.balance', verbose_name=_("Balance"))
 
     def render_balance(self, record, value):
         return pretty_money(value)\
@@ -96,8 +95,8 @@ class MembershipTable(tables.Table):
         t = pretty_money(value)
 
         # If it is required and if the user has the right, the renew button is displayed.
-        if record.club.membership_start is not None \
+        if record.club.membership_start is not None:
-                and record.date_start < record.club.membership_start:
+            if record.date_start < record.club.membership_start:  # If the renew is available
                 if not Membership.objects.filter(
                         club=record.club,
                         user=record.user,
@@ -107,19 +106,15 @@ class MembershipTable(tables.Table):
                     empty_membership = Membership(
                         club=record.club,
                         user=record.user,
-                    date_start=date.today(),
+                        date_start=timezone.now().date(),
-                    date_end=date.today(),
+                        date_end=timezone.now().date(),
                         fee=0,
                     )
                     if PermissionBackend.check_perm(get_current_authenticated_user(),
-                                                "member.add_membership", empty_membership):  # If the user has right
+                                                    "member:add_membership", empty_membership):  # If the user has right
-                    renew_url = reverse_lazy('member:club_renew_membership',
+                        t = format_html(t + ' <a class="btn btn-warning" href="{url}">{text}</a>',
-                                             kwargs={"pk": record.pk})
+                                        url=reverse_lazy('member:club_renew_membership',
-                    t = format_html(
+                                                         kwargs={"pk": record.pk}), text=_("Renew"))
-                        t + ' <a class="btn btn-sm btn-warning" title="{text}"'
-                        ' href="{renew_url}"><i class="fa fa-repeat"></i></a>',
-                        renew_url=renew_url, text=_("Renew")
-                    )
         return t
 
     def render_roles(self, record):
@@ -165,5 +160,5 @@ class ClubManagerTable(tables.Table):
             'style': 'table-layout: fixed;'
         }
         template_name = 'django_tables2/bootstrap4.html'
-        fields = ('user', 'user__first_name', 'user__last_name', 'roles', )
+        fields = ('user', 'user.first_name', 'user.last_name', 'roles', )
         model = Membership

apps/member/templates/member/add_members.html

@@ -1,41 +1,26 @@
-{% extends "member/base.html" %}
+{% extends "member/noteowner_detail.html" %}
-{% comment %}
+{% load crispy_forms_tags %}
-SPDX-License-Identifier: GPL-3.0-or-later
+{% load static %}
-{% endcomment %}
+{% load i18n %}
-{% load crispy_forms_tags i18n pretty_money %}
+{% load pretty_money %}
+
+{% block profile_info %}
+{% include "member/club_info.html" %}
+{% endblock %}
 
 {% block profile_content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
     {% if additional_fee_renewal %}
         <div class="alert alert-warning">
             {% if renewal %}
-                {% if club.name == "Kfet" %} {# Auto-renewal #}
                 {% blocktrans trimmed with clubs=clubs_renewal|join:", " pretty_fee=additional_fee_renewal|pretty_money %}
                     The user is not a member of the club·s {{ clubs }}. An additional fee of {{ pretty_fee }}
                     will be charged to renew automatically the membership in this/these club·s.
                 {% endblocktrans %}
             {% else %}
-                    {% blocktrans trimmed with clubs=clubs_renewal|join:", " pretty_fee=additional_fee_renewal|pretty_money %}
-                        The user is not a member of the club·s {{ clubs }}. Please create the required memberships,
-                        otherwise it will fail.
-                    {% endblocktrans %}
-                {% endif %}
-            {% else %}
-                {% if club.name == "Kfet" %}
                 {% blocktrans trimmed with clubs=clubs_renewal|join:", " pretty_fee=additional_fee_renewal|pretty_money %}
                     This club has parents {{ clubs }}. An additional fee of {{ pretty_fee }}
                     will be charged to adhere automatically to this/these club·s.
                 {% endblocktrans %}
-                {% else %}
-                    {% blocktrans trimmed with clubs=clubs_renewal|join:", " pretty_fee=additional_fee_renewal|pretty_money %}
-                        This club has parents {{ clubs }}. Please make sure that the user is a member of this or these club·s,
-                        otherwise the creation of this membership will fail.
-                    {% endblocktrans %}
-                {% endif %}
             {% endif %}
         </div>
     {% endif %}
@@ -45,8 +30,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
         {{ form|crispy }}
         <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
     </form>
-    </div>
-</div>
 {% endblock %}
 
 {% block extrajavascript %}
@@ -55,8 +38,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
             $("#id_last_name").val(user.last_name);
             $("#id_first_name").val(user.first_name);
             $.getJSON("/api/members/profile/" + user.id + "/", function(profile) {
-            let fee = profile.paid ? "{{ club.membership_fee_paid }}" : "{{ club.membership_fee_unpaid }}";
+                let fee = profile.paid ? {{ club.membership_fee_paid }} : {{ club.membership_fee_unpaid }};
-            $("#id_credit_amount").val((Number(fee) / 100).toFixed(2));
+                $("#id_credit_amount").val((fee / 100).toFixed(2));
             });
         }
 

apps/member/templates/member/alias_update.html

@@ -0,0 +1,12 @@
+{% load django_tables2 crispy_forms_tags i18n %}
+<div class="d-flex justify-content-center">
+    <input id="alias_input" type="text" value=""/>
+    <button id="alias_submit" class="btn btn-primary mx-2" onclick="create_alias( {{ object.note.pk }} )" type="submit">
+        {% trans "Add alias" %}
+    </button>
+</div>
+<div class="card bg-light shadow">
+    <div class="card-body">
+        {% render_table aliases %}
+    </div>
+</div>

apps/member/templates/member/autocomplete_model.html

@@ -1,7 +1,4 @@
 {% load i18n %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
 
 <input type="hidden" name="{{ widget.name }}" {% if widget.attrs.model_pk %}value="{{ widget.attrs.model_pk }}"{% endif %} id="{{ widget.attrs.id }}_pk">
 <input type="text"

apps/member/templates/member/base.html

@@ -1,184 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n perms %}
-
-{# Use a fluid-width container #}
-{% block containertype %}container-fluid{% endblock %}
-
-{% block content %}
-<div class="row mt-4">
-    <div class="col-xl-4">
-        {% block profile_info %}
-        <div class="card bg-light" id="card-infos">
-            <h4 class="card-header text-center">
-                {% if user_object %}
-                {% trans "Account #" %}{{ user_object.pk }}
-                {% elif club %}
-                Club {{ club.name }}
-                {% endif %}
-            </h4>
-            <div class="text-center">
-                {% if user_object %}
-                <a href="{% url 'member:user_update_pic' user_object.pk  %}">
-                    <img src="{{ user_object.note.display_image.url }}" class="img-thumbnail mt-2">
-                </a>
-                {% elif club %}
-                <a href="{% url 'member:club_update_pic' club.pk  %}">
-                    <img src="{{ club.note.display_image.url }}" class="img-thumbnail mt-2">
-                </a>
-                {% endif %}
-            </div>
-            {% if note.inactivity_reason %}
-                <div class="alert alert-danger polymorphic-add-choice">
-                    {{ note.get_inactivity_reason_display }}
-                </div>
-            {% endif %}
-            <div class="card-body" id="profile_infos">
-                {% if user_object %}
-                {% include "member/includes/profile_info.html" %}
-                {% elif club %}
-                {% include "member/includes/club_info.html" %}
-                {% endif %}
-            </div>
-            <div class="card-footer">
-                {% if user_object %}
-                <a class="btn btn-sm btn-secondary" href="{% url 'member:user_update_profile' user_object.pk %}">
-                    <i class="fa fa-edit"></i> {% trans 'Update Profile' %}
-                </a>
-                {% url 'member:user_detail' user_object.pk as user_profile_url %}
-                {% if request.path_info != user_profile_url %}
-                <a class="btn btn-sm btn-primary" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>
-                {% endif %}
-                {% elif club and not club.weiclub %}
-                {% if can_add_members %}
-                <a class="btn btn-sm btn-success" href="{% url 'member:club_add_member' club_pk=club.pk %}"
-                   data-turbolinks="false"> {% trans "Add member" %}</a>
-                {% endif %}
-                {% if ".change_"|has_perm:club %}
-                <a class="btn btn-sm btn-secondary" href="{% url 'member:club_update' pk=club.pk %}"
-                   data-turbolinks="false">
-                    <i class="fa fa-edit"></i> {% trans 'Update Profile' %}
-                </a>
-                {% endif %}
-                {% url 'member:club_detail' club.pk as club_detail_url %}
-                {% if request.path_info != club_detail_url %}
-                <a class="btn btn-sm btn-primary" href="{{ club_detail_url }}">{% trans 'View Profile' %}</a>
-                {% endif %}
-                {% endif %}
-                {% if can_lock_note %}
-                <button class="btn btn-sm btn-danger" data-toggle="modal" data-target="#lock-note-modal">
-                    <i class="fa fa-ban"></i> {% trans 'Lock note' %}
-                </button>
-                {% elif can_unlock_note %}
-                <button class="btn btn-sm btn-success" data-toggle="modal" data-target="#unlock-note-modal">
-                    <i class="fa fa-check-circle"></i> {% trans 'Unlock note' %}
-                </button>
-                {% endif %}
-            </div>
-        </div>
-        {% endblock %}
-    </div>
-    <div class="col-xl-8">
-        {% block profile_content %}{% endblock %}
-    </div>
-
-    {# Popup to confirm the action of locking the note. Managed by a button #}
-    <div class="modal fade" id="lock-note-modal" tabindex="-1" role="dialog" aria-labelledby="lockNote"
-         aria-hidden="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="lockNote">{% trans "Lock note" %}</h5>
-                    <button type="button" class="close btn-modal" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    {% blocktrans trimmed %}
-                        Are you sure you want to lock this note? This will prevent any transaction that would be performed,
-                        until the note is unlocked.
-                    {% endblocktrans %}
-                    {% if can_force_lock %}
-                    {% blocktrans trimmed %}
-                        If you use the force mode, the user won't be able to unlock the note by itself.
-                    {% endblocktrans %}
-                    {% endif %}
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary btn-modal" data-dismiss="modal">{% trans "Close" %}</button>
-                    {% if can_force_lock %}
-                    <button type="button" class="btn btn-danger btn-modal" onclick="lock_note(true, 'forced')">{% trans "Force mode" %}</button>
-                    {% endif %}
-                    <button type="button" class="btn btn-warning btn-modal" onclick="lock_note(true, 'manual')">{% trans "Lock note" %}</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    {# Popup to confirm the action of unlocking the note. Managed by a button #}
-    <div class="modal fade" id="unlock-note-modal" tabindex="-1" role="dialog" aria-labelledby="unlockNote"
-         aria-hidden="true">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="unlockNote">{% trans "Unlock note" %}</h5>
-                    <button type="button" class="close btn-modal" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    {% blocktrans trimmed %}
-                        Are you sure you want to unlock this note? Transactions will be re-enabled.
-                    {% endblocktrans %}
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary btn-modal" data-dismiss="modal">{% trans "Close" %}</button>
-                    <button type="button" class="btn btn-success btn-modal" onclick="lock_note(false, null)">{% trans "Unlock note" %}</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
-
-{% block extrajavascript %}
-<script>
-    function refreshHistory() {
-        {% if user_object %}
-        $("#history_list").load("{% url 'member:user_detail' pk=user_object.pk %} #history_list");
-        $("#profile_infos").load("{% url 'member:user_detail' pk=user_object.pk %} #profile_infos");
-        {% else %}
-        $("#history_list").load("{% url 'member:club_detail' pk=club.pk %} #history_list");
-        $("#profile_infos").load("{% url 'member:club_detail' pk=club.pk %} #profile_infos");
-        {% endif %}
-    }
-
-    function lock_note(locked, mode) {
-        $("button.btn-modal").attr("disabled", "disabled");
-        $.ajax({
-            url: "/api/note/note/{{ note.pk }}/",
-            type: "PATCH",
-            dataType: "json",
-            headers: {
-                "X-CSRFTOKEN": CSRF_TOKEN
-            },
-            data: {
-                is_active: !locked,
-                inactivity_reason: mode,
-                resourcetype: "{% if user_object %}NoteUser{% else %}NoteClub{% endif %}"
-            }
-        }).done(function () {
-            $("#card-infos").load("#card-infos #card-infos", function () {
-                $(".modal").modal("hide");
-                $("button.btn-modal").removeAttr("disabled");
-            });
-        }).fail(function(xhr, textStatus, error) {
-            $(".modal").modal("hide");
-            $("button.btn-modal").removeAttr("disabled");
-            errMsg(xhr.responseJSON);
-        });
-    }
-</script>
-{% endblock %}

apps/member/templates/member/club_alias.html

@@ -1,31 +1,10 @@
-{% extends "member/base.html" %}
+{% extends "member/club_detail.html" %}
-{% comment %}
+{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load static django_tables2 i18n %}
 
 {% block profile_content %}
-<div class="card bg-light">
+{% include "member/alias_update.html" %}
-    <h3 class="card-header text-center">
-        {% trans "Note aliases" %}
-    </h3>
-
-    <div class="card-body">
-        {% if can_create %}
-            <form class="input-group" method="POST" id="form_alias">
-                {% csrf_token %}
-                <input type="hidden" name="note" value="{{ object.note.pk }}">
-                <input type="text" name="name" class="form-control">
-                <div class="input-group-append">
-                    <input type="submit" class="btn btn-success" value="{% trans "Add" %}">
-                </div>
-            </form>
-        {% endif %}
-    </div>
-    {% render_table aliases %}
-</div>
 {% endblock %}
 
 {% block extrajavascript %}
-<script src="{% static "member/js/alias.js" %}"></script>
+<script src="/static/js/alias.js"></script>
 {% endblock%}

apps/member/templates/member/club_detail.html

@@ -1,48 +1,18 @@
-{% extends "member/base.html" %}
+{% extends "member/noteowner_detail.html" %}
-{% comment %}
+
-SPDX-License-Identifier: GPL-3.0-or-later
+{% block profile_info %}
-{% endcomment %}
+{% include "member/club_info.html" %}
-{% load render_table from django_tables2 %}
+{% endblock %}
-{% load i18n perms %}
 
 {% block profile_content %}
-{% if managers.data %}
+{% include "member/club_tables.html" %}
-<div class="card">
+{% endblock %}
-    <div class="card-header position-relative" id="clubListHeading">
+
-        <a class="font-weight-bold">
+{% block extrajavascript %}
-            <i class="fa fa-users"></i> {% trans "Club managers" %}
+    <script>
-        </a>
+        function refreshHistory() {
-    </div>
+            $("#history_list").load("{% url 'member:club_detail' pk=object.pk %} #history_list");
-    {% render_table managers %}
+            $("#profile_infos").load("{% url 'member:club_detail' pk=object.pk %} #profile_infos");
-</div>
+        }
-
+    </script>
-<hr>
-{% endif %}
-
-{% if member_list.data %}
-<div class="card">
-    <div class="card-header position-relative" id="clubListHeading">
-        <a class="stretched-link font-weight-bold" href="{% url 'member:club_members' pk=club.pk %}">
-            <i class="fa fa-users"></i> {% trans "Club members" %}
-        </a>
-    </div>
-    {% render_table member_list %}
-</div>
-
-<hr>
-{% endif %}
-
-{% if history_list.data %}
-<div class="card">
-    <div class="card-header position-relative" id="historyListHeading">
-        <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:club.note %}
-            href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
-            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
-        </a>
-    </div>
-    <div id="history_list">
-        {% render_table history_list %}
-    </div>
-</div>
-{% endif %}
 {% endblock %}

apps/member/templates/member/club_form.html

@@ -1,22 +1,13 @@
-{% extends "member/base.html" %}
+{% extends "base.html" %}
-{% comment %}
+{% load static %}
-SPDX-License-Identifier: GPL-3.0-or-later
+{% load i18n %}
-{% endcomment %}
+{% load crispy_forms_tags %}
-{% load i18n crispy_forms_tags %}
+{% block content %}
-
-{% block profile_content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
 <form method="post">
 {% csrf_token %}
 {{form|crispy}}
 <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
 </form>
-    </div>
-</div>
 {% endblock %}
 
 {% block extrajavascript %}

apps/member/templates/member/club_info.html

@@ -0,0 +1,75 @@
+{% load i18n static pretty_money perms %}
+<div class="card bg-light shadow">
+    <div class="card-header text-center">
+        <h4> Club {{ club.name }} </h4>
+    </div>
+    <div class="card-top text-center">
+        <a  href="{% url 'member:club_update_pic' club.pk  %}">
+            <img src="{{ club.note.display_image.url }}" class="img-thumbnail mt-2" >
+        </a>
+    </div>
+    <div class="card-body" id="profile_infos">
+        <dl class="row">
+            <dt class="col-xl-6">{% trans 'name'|capfirst %}</dt>
+            <dd class="col-xl-6">{{ club.name }}</dd>
+
+            {% if club.parent_club %}
+                <dt class="col-xl-6"><a href="{% url 'member:club_detail' club.parent_club.pk %}">{% trans 'Club Parent'|capfirst %}</a></dt>
+                <dd class="col-xl-6"> {{ club.parent_club.name }}</dd>
+            {% endif %}
+
+            {% if club.require_memberships %}
+                {% if club.membership_start %}
+                    <dt class="col-xl-6">{% trans 'membership start'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ club.membership_start }}</dd>
+                {% endif %}
+
+                {% if club.membership_end %}
+                    <dt class="col-xl-6">{% trans 'membership end'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ club.membership_end }}</dd>
+                {% endif %}
+
+                {% if club.membership_duration %}
+                    <dt class="col-xl-6">{% trans 'membership duration'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ club.membership_duration }} {% trans "days" %}</dd>
+                {% endif %}
+
+                {% if club.membership_fee_paid == club.membership_fee_unpaid %}
+                    <dt class="col-xl-6">{% trans 'membership fee'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
+                {% else %}
+                    <dt class="col-xl-6">{% trans 'membership fee (paid students)'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
+
+                    <dt class="col-xl-6">{% trans 'membership fee (unpaid students)'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }}</dd>
+                {% endif %}
+            {% endif %}
+
+            {% if "note.view_note"|has_perm:club.note %}
+                <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ club.note.balance | pretty_money }}</dd>
+            {% endif %}
+            
+            <dt class="col-xl-6"><a href="{% url 'member:club_alias' club.pk %}">{% trans 'aliases'|capfirst %}</a></dt>
+            <dd class="col-xl-6 text-truncate">{{ club.note.alias_set.all|join:", " }}</dd>
+
+            <dt class="col-xl-4">{% trans 'email'|capfirst %}</dt>
+            <dd class="col-xl-8"><a href="mailto:{{ club.email }}">{{ club.email }}</a></dd>
+        </dl>
+    </div>
+    {% if not club.weiclub %}
+        <div class="card-footer text-center">
+            {% if can_add_members %}
+                <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' club_pk=club.pk %}" data-turbolinks="false"> {% trans "Add member" %}</a>
+            {% endif %}
+            {% if ".change_"|has_perm:club %}
+                <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_update' pk=club.pk %}" data-turbolinks="false"> {% trans "Edit" %}</a>
+            {% endif %}
+            {% url 'member:club_detail' club.pk as club_detail_url %}
+            {%if request.path_info != club_detail_url %}
+                <a class="btn btn-primary btn-sm my-1" href="{{ club_detail_url }}">{% trans 'View Profile' %}</a>
+            {% endif %}
+        </div>
+    {% endif %}
+</div>

apps/member/templates/member/club_list.html

@@ -1,16 +1,56 @@
-{% extends "base_search.html" %}
+{% extends "base.html" %}
-{% comment %}
+{% load render_table from django_tables2 %}
-SPDX-License-Identifier: GPL-3.0-or-later
+{% load i18n %}
-{% endcomment %}
-{% load i18n perms %}
-
 {% block content %}
-{% if can_add_club %}
+<div class="row justify-content-center mb-4">
-<a class="btn btn-block btn-success mb-3" href="{% url 'member:club_create' %}" data-turbolinks="false">
+    <div class="col-md-10 text-center">
-    {% trans "Create club" %}
+        <input class="form-control mx-auto w-25" type="text" id="search_field"/>
-</a>
+        <hr>
-{% endif %}
+        <a class="btn btn-primary text-center my-4" href="{% url 'member:club_create' %}" data-turbolinks="false">{% trans "Create club" %}</a>
+    </div>
+</div>
+<div class="row justify-content-center">   
+    <div class="col-md-10">
+        <div class="card card-border shadow">
+            <div class="card-header text-center">
+                <h5> {% trans "Club listing" %}</h5>
+            </div>
+            <div class="card-body px-0 py-0" id="club_table">
+                {% render_table table %}
+            </div>
+        </div>
+    </div>
+</div>
 
-{# Search panel #}
+{% endblock %}
-{{ block.super }}
+{% block extrajavascript %}
+<script type="text/javascript">
+    $(document).ready(function() {
+        let old_pattern = null;
+        let searchbar_obj = $("#search_field");
+        var timer_on = false;
+        var timer;
+
+        function reloadTable() {
+            let pattern = searchbar_obj.val();
+            $("#club_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #club_table", init);
+        }
+
+        searchbar_obj.keyup(function() {
+            if (timer_on)
+                clearTimeout(timer);
+            timer_on = true;
+            setTimeout(reloadTable, 0);
+        });
+
+        function init() {
+            $(".table-row").click(function() {
+                window.document.location = $(this).data("href");
+                timer_on = false;
+            });
+        }
+
+        init();
+    });
+</script>
 {% endblock %}

apps/member/templates/member/club_members.html

@@ -1,17 +1,14 @@
-{% extends "member/base.html" %}
+{% extends "member/noteowner_detail.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
+{% block profile_info %}
+    {% include "member/club_info.html" %}
+{% endblock %}
+
 {% block profile_content %}
-<div class="card bg-light">
+    <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note ...">
-    <h3 class="card-header text-center">
+    <div class="form-group">
-        {{ title }}
-    </h3>
-    <div class="card-body">
-        <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note…">
         <div class="form-check">
             <label class="form-check-label" for="only_active">
                 <input type="checkbox" class="checkboxinput form-check-input" id="only_active"
@@ -19,8 +16,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 {% trans "Display only active memberships" %}
             </label>
         </div>
-        <div id="div_id_roles">
+    </div>
-            <label for="roles" class="col-form-label">{% trans "Filter roles:" %}</label>
+    <div id="div_id_roles" class="form-group">
+        <label for="id_roles" class="col-form-label">{% trans "Filter roles:" %}</label>
+        <div class="">
             <select name="roles" class="selectmultiple form-control" id="roles" multiple="">
                 {% for role in applicable_roles %}
                     <option value="{{ role.id }}" selected>{{ role.name }}</option>
@@ -28,6 +27,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
             </select>
         </div>
     </div>
+    <hr>
+
     <div id="memberships_table">
         {% if table.data %}
             {% render_table table %}
@@ -37,7 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
             </div>
         {% endif %}
     </div>
-</div>
 {% endblock %}
 
 {% block extrajavascript %}
@@ -56,9 +56,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 });
                 let roles_str = roles.join(',');
 
-            $("#memberships_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") +
+                $("#memberships_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20")
-                "&only_active=" + (only_active_obj.is(':checked') ? '1' : '0') +
+                    + "&only_active=" + (only_active_obj.is(':checked') ? '1' : '0')
-                "&roles=" + roles_str + " #memberships_table");
+                    + "&roles=" + roles_str + " #memberships_table");
             }
 
             searchbar_obj.keyup(reloadTable);

apps/member/templates/member/club_picture_update.html

@@ -0,0 +1,6 @@
+{% extends "member/club_detail.html" %}
+{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
+
+{% block profile_content%}
+{% include "member/picture_update.html" %}
+{% endblock%}

apps/member/templates/member/club_tables.html

@@ -0,0 +1,42 @@
+{% load render_table from django_tables2 %}
+{% load i18n %}
+{% load perms %}
+
+{% if managers.data %}
+    <div class="card">
+        <div class="card-header position-relative" id="clubListHeading">
+            <a class="font-weight-bold">
+                <i class="fa fa-users"></i> {% trans "Club managers" %}
+            </a>
+        </div>
+        {% render_table managers %}
+    </div>
+
+    <hr>
+{% endif %}
+
+{% if member_list.data %}
+    <div class="card">
+        <div class="card-header position-relative" id="clubListHeading">
+            <a class="stretched-link font-weight-bold" href="{% url 'member:club_members' pk=club.pk %}">
+                <i class="fa fa-users"></i> {% trans "Club members" %}
+            </a>
+        </div>
+        {% render_table member_list %}
+    </div>
+
+    <hr>
+{% endif %}
+
+{% if history_list.data %}
+    <div class="card">
+        <div class="card-header position-relative" id="historyListHeading">
+            <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:club.note %} href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
+                <i class="fa fa-euro"></i> {% trans "Transaction history" %}
+            </a>
+        </div>
+        <div id="history_list">
+            {% render_table history_list %}
+        </div>
+    </div>
+{% endif %}

apps/member/templates/member/includes/club_info.html

@@ -1,57 +0,0 @@
-{% load i18n pretty_money perms %}
-
-<dl class="row">
-    <dt class="col-xl-6">{% trans 'name'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ club.name }}</dd>
-
-    {% if club.parent_club %}
-    <dt class="col-xl-6">
-        <a href="{% url 'member:club_detail' club.parent_club.pk %}">{% trans 'Club Parent'|capfirst %}</a>
-    </dt>
-    <dd class="col-xl-6"> {{ club.parent_club.name }}</dd>
-    {% endif %}
-
-    {% if club.require_memberships %}
-    {% if club.membership_start %}
-    <dt class="col-xl-6">{% trans 'membership start'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ club.membership_start }}</dd>
-    {% endif %}
-
-    {% if club.membership_end %}
-    <dt class="col-xl-6">{% trans 'membership end'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ club.membership_end }}</dd>
-    {% endif %}
-
-    {% if club.membership_duration %}
-    <dt class="col-xl-6">{% trans 'membership duration'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ club.membership_duration }} {% trans "days" %}</dd>
-    {% endif %}
-
-    {% if club.membership_fee_paid == club.membership_fee_unpaid %}
-    <dt class="col-xl-6">{% trans 'membership fee'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
-    {% else %}
-    <dt class="col-xl-6">{% trans 'membership fee (paid students)'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
-
-    <dt class="col-xl-6">{% trans 'membership fee (unpaid students)'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }}</dd>
-    {% endif %}
-    {% endif %}
-
-    {% if "note.view_note"|has_perm:club.note %}
-    <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ club.note.balance | pretty_money }}</dd>
-    {% endif %}
-
-    <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt>
-    <dd class="col-xl-6">
-        <a class="badge badge-secondary" href="{% url 'member:club_alias' club.pk %}">
-            <i class="fa fa-edit"></i>
-            {% trans 'Manage aliases' %} ({{ club.note.alias_set.all|length }})
-        </a>
-    </dd>
-
-    <dt class="col-xl-4">{% trans 'email'|capfirst %}</dt>
-    <dd class="col-xl-8"><a href="mailto:{{ club.email }}">{{ club.email }}</a></dd>
-</dl>

apps/member/templates/member/includes/profile_info.html

@@ -1,56 +0,0 @@
-{% load i18n pretty_money perms %}
-
-<dl class="row">
-    <dt class="col-xl-6">{% trans 'name'|capfirst %}, {% trans 'first name' %}</dt>
-    <dd class="col-xl-6">{{ user_object.last_name }} {{ user_object.first_name }}</dd>
-
-    <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ user_object.username }}</dd>
-
-    {% if user_object.pk == user.pk %}
-    <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
-    <dd class="col-xl-6">
-        <a class="badge badge-secondary" href="{% url 'password_change' %}">
-            <i class="fa fa-lock"></i>
-            {% trans 'Change password' %}
-        </a>
-    </dd>
-    {% endif %}
-
-    <dt class="col-xl-6">{% trans 'aliases'|capfirst %}</dt>
-    <dd class="col-xl-6">
-        <a class="badge badge-secondary" href="{% url 'member:user_alias' user_object.pk %}">
-            <i class="fa fa-edit"></i>
-            {% trans 'Manage aliases' %} ({{ user_object.note.alias_set.all|length }})
-        </a>
-    </dd>
-
-    <dt class="col-xl-6">{% trans 'section'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ user_object.profile.section }}</dd>
-
-    <dt class="col-xl-6">{% trans 'email'|capfirst %}</dt>
-    <dd class="col-xl-6"><a href="mailto:{{ user_object.email }}">{{ user_object.email }}</a></dd>
-
-    <dt class="col-xl-6">{% trans 'phone number'|capfirst %}</dt>
-    <dd class="col-xl-6"><a href="tel:{{ user_object.profile.phone_number }}">{{ user_object.profile.phone_number }}</a>
-    </dd>
-
-    <dt class="col-xl-6">{% trans 'address'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ user_object.profile.address }}</dd>
-
-    {% if user_object.note and "note.view_note"|has_perm:user_object.note %}
-    <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ user_object.note.balance | pretty_money }}</dd>
-
-    <dt class="col-xl-6">{% trans 'paid'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ user_object.profile.paid|yesno }}</dd>
-    {% endif %}
-</dl>
-
-{% if user_object.pk == user.pk %}
-    <div class="text-center">
-        <a class="small badge badge-secondary" href="{% url 'member:auth_token' %}">
-            <i class="fa fa-cogs"></i>{% trans 'API token' %}
-        </a>
-    </div>
-{% endif %}

apps/member/templates/member/manage_auth_tokens.html

@@ -1,8 +1,5 @@
 {% extends "base.html" %}
-{% comment %}
+{% load i18n static pretty_money django_tables2 %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
 
 {% block content %}
     <div class="alert alert-info">

apps/member/templates/member/noteowner_detail.html

@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+{% load static %}
+{% load i18n %}
+{% load render_table from django_tables2 %}
+{% load pretty_money %}
+
+{% block content %}
+<div class="row mt-4">
+    <div class="col-xl-4">
+        {% block profile_info %}
+        {% endblock %}
+    </div>
+    <div class="col-xl-8">
+        {% block profile_content %}
+        {% endblock %}
+    </div>
+</div>
+{% endblock %}
+
+{% block extrajavascript %}
+    <script>
+        {% if object %}
+            function refreshHistory() {
+                $("#history_list").load("{% url 'member:user_detail' pk=object.pk %} #history_list");
+                $("#profile_infos").load("{% url 'member:user_detail' pk=object.pk %} #profile_infos");
+            }
+        {% endif %}
+    </script>
+{% endblock %}

apps/member/templates/member/picture_update.html

@@ -1,15 +1,5 @@
-{% extends "member/base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
 {% load i18n crispy_forms_tags %}
-
 {% block profile_content %}
-<div class="card bg-light">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body">
 <div class="text-center">
 <form method="post" enctype="multipart/form-data" id="formUpload">
   {% csrf_token %}
@@ -32,16 +22,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
             <span class="glyphicon glyphicon-zoom-out"></span>
           </button>
         </div>
-            <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Nevermind" %}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Nevermind</button>
-            <button type="button" class="btn btn-primary js-crop-and-upload">{% trans "Crop and upload" %}</button>
+        <button type="button" class="btn btn-primary js-crop-and-upload">Crop and upload</button>
-          </div>
-        </div>
       </div>
     </div>
   </div>
 </div>
 {% endblock %}
-
 {% block extracss %}
     <link href="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.css" rel="stylesheet">
 {% endblock %}
@@ -55,11 +42,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
          /* SCRIPT TO OPEN THE MODAL WITH THE PREVIEW */
          $("#id_image").change(function (e) {
              if (this.files && this.files[0]) {
-        // Check the image size
-        if (this.files[0].size > 2*1024*1024) {
-          alert("Ce fichier est trop volumineux.")
-	} else {
-          // Read the selected image file
                  var reader = new FileReader();
                  reader.onload = function (e) {
                      $("#modal-image").attr("src", e.target.result);
@@ -67,7 +49,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                  }
                  reader.readAsDataURL(this.files[0]);
              }
-      }
          });
 
          /* SCRIPTS TO HANDLE THE CROPPER BOX */
@@ -108,6 +89,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
              $("#id_width").val(cropData["width"]);
              $("#formUpload").submit();
          });
+
      });
     </script>
 {% endblock %}

apps/member/templates/member/profile_alias.html

@@ -1,30 +1,10 @@
-{% extends "member/base.html" %}
+{% extends "member/profile_detail.html" %}
-{% comment %}
+{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load static django_tables2 i18n %}
 
 {% block profile_content %}
-<div class="card bg-light">
+{% include "member/alias_update.html"%}
-    <h3 class="card-header text-center">
-        {% trans "Note aliases" %}
-    </h3>
-    <div class="card-body">
-        {% if can_create %}
-            <form class="input-group" method="POST" id="form_alias">
-                {% csrf_token %}
-                <input type="hidden" name="note" value="{{ object.note.pk }}">
-                <input type="text" name="name" class="form-control">
-                <div class="input-group-append">
-                    <input type="submit" class="btn btn-success" value="{% trans "Add" %}">
-                </div>
-            </form>
-        {% endif %}
-    </div>
-    {% render_table aliases %}
-</div>
 {% endblock %}
 
 {% block extrajavascript %}
-<script src="{% static "member/js/alias.js" %}"></script>
+<script src="/static/js/alias.js"></script>
 {% endblock%}

apps/member/templates/member/profile_detail.html

@@ -1,39 +1,21 @@
-{% extends "member/base.html" %}
+{% extends "member/noteowner_detail.html" %}
-{% comment %}
+
-SPDX-License-Identifier: GPL-3.0-or-later
+{# Use a fluid-width container #}
-{% endcomment %}
+{% block containertype %}container-fluid{% endblock %}
-{% load render_table from django_tables2 %}
+
-{% load i18n perms %}
+{% block profile_info %}
+{% include "member/profile_info.html" %}
+{% endblock %}
 
 {% block profile_content %}
-{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:user_object.profile %}
+{% include "member/profile_tables.html" %}
-<div class="alert alert-warning">
+{% endblock %}
-    {% trans "This user doesn't have confirmed his/her e-mail address." %}
+
-    <a href="{% url "registration:email_validation_resend" pk=user_object.pk %}">
+{% block extrajavascript %}
-        {% trans "Click here to resend a validation link." %}
+    <script>
-    </a>
+        function refreshHistory() {
-</div>
+            $("#history_list").load("{% url 'member:user_detail' pk=user_object.pk %} #history_list");
-{% endif %}
+            $("#profile_infos").load("{% url 'member:user_detail' pk=user_object.pk %} #profile_infos");
-
+        }
-<div class="card bg-light mb-3">
+    </script>
-    <div class="card-header position-relative" id="clubListHeading">
-        <a class="font-weight-bold">
-            <i class="fa fa-users"></i> {% trans "View my memberships" %}
-        </a>
-    </div>
-    {% render_table club_list %}
-</div>
-
-<div class="card bg-light">
-    <div class="card-header position-relative" id="historyListHeading">
-        <a class="stretched-link font-weight-bold text-decoration-none"
-            {% if "note.view_note"|has_perm:user_object.note %}
-            href="{% url 'note:transactions' pk=user_object.note.pk %}" {% endif %}>
-            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
-        </a>
-    </div>
-    <div id="history_list">
-        {% render_table history_list %}
-    </div>
-</div>
 {% endblock %}

apps/member/templates/member/profile_info.html

@@ -0,0 +1,55 @@
+{% load i18n static pretty_money perms %}
+
+<div class="card bg-light shadow">
+    <div class="card-header text-center" >
+        <h4> {% trans "Account #" %}  {{ user_object.pk }}</h4>
+    </div>
+    <div class="card-top text-center">
+        <a  href="{% url 'member:user_update_pic' user_object.pk  %}">
+            <img src="{{ user_object.note.display_image.url }}" class="img-thumbnail mt-2" >
+        </a>
+    </div>
+    <div class="card-body" id="profile_infos">
+        <dl class="row">
+            <dt class="col-xl-6">{% trans 'name'|capfirst %}, {% trans 'first name' %}</dt>
+            <dd class="col-xl-6">{{ user_object.last_name }} {{ user_object.first_name }}</dd>
+
+            <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt>
+            <dd class="col-xl-6">{{ user_object.username }}</dd>
+
+            {% if user_object.pk == user_object.pk %}
+                <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
+                <dd class="col-xl-6">
+                    <a class="small" href="{% url 'password_change' %}">
+                        {% trans 'Change password' %}
+                    </a>
+                </dd>
+            {% endif %}
+
+            <dt class="col-xl-6">{% trans 'section'|capfirst %}</dt>
+            <dd class="col-xl-6">{{ user_object.profile.section }}</dd>
+
+            <dt class="col-xl-6">{% trans 'address'|capfirst %}</dt>
+            <dd class="col-xl-6">{{ user_object.profile.address }}</dd>
+
+            {% if "note.view_note"|has_perm:user_object.note %}
+                <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ user_object.note.balance | pretty_money }}</dd>
+            {% endif %}
+
+            <dt class="col-xl-6"> <a href="{% url 'member:user_alias' user_object.pk %}">{% trans 'aliases'|capfirst %}</a></dt>
+            <dd class="col-xl-6 text-truncate">{{ user_object.note.alias_set.all|join:", " }}</dd>
+        </dl>
+
+        {% if user_object.pk == user_object.pk %}
+        <a class="small" href="{% url 'member:auth_token' %}">{% trans 'Manage auth token' %}</a>
+        {% endif %}
+    </div>
+    <div class="card-footer text-center">
+        <a class="btn btn-primary btn-sm" href="{% url 'member:user_update_profile' user_object.pk %}">{% trans 'Update Profile' %}</a>
+        {% url 'member:user_detail' user_object.pk as user_profile_url %}
+        {%if request.path_info != user_profile_url %}
+        <a class="btn btn-primary btn-sm" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>
+        {% endif %}
+    </div>
+</div>

apps/member/templates/member/profile_picture_update.html

@@ -0,0 +1,6 @@
+{% extends "member/profile_detail.html" %}
+{% load i18n static pretty_money django_tables2 crispy_forms_tags %}
+
+{% block profile_content%}
+{% include "member/picture_update.html" %}
+{% endblock%}

apps/member/templates/member/profile_tables.html

@@ -0,0 +1,32 @@
+{% load render_table from django_tables2 %}
+{% load i18n %}
+{% load perms %}
+
+{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:user_object.profile %}
+    <div class="alert alert-warning">
+        {% trans "This user doesn't have confirmed his/her e-mail address." %}
+        <a href="{% url "registration:email_validation_resend" pk=user_object.pk %}">{% trans "Click here to resend a validation link." %}</a>
+    </div>
+{% endif %}
+
+<div class="card">
+    <div class="card-header position-relative" id="clubListHeading">
+        <a class="font-weight-bold">
+            <i class="fa fa-users"></i> {% trans "View my memberships" %}
+        </a>
+    </div>
+    {% render_table club_list %}
+</div>
+
+<hr>
+
+<div class="card">
+    <div class="card-header position-relative" id="historyListHeading">
+            <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:user_object.note %} href="{% url 'note:transactions' pk=user_object.note.pk %}" {% endif %}>
+            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
+        </a>
+    </div>
+    <div id="history_list">
+        {% render_table history_list %}
+    </div>
+</div>

apps/member/templates/member/profile_update.html

@@ -1,15 +1,10 @@
-{% extends "member/base.html" %}
+{% extends "base.html" %}
+{% load i18n crispy_forms_tags %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
-{% load i18n crispy_forms_tags %}
 
-{% block profile_content %}
+{% block content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
 <form method="post">
     {% csrf_token %}
     {{ form|crispy }}
@@ -18,6 +13,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
         {% trans "Save Changes" %}
     </button>
 </form>
-    </div>
-</div>
 {% endblock %}

apps/member/templates/member/user_list.html

@@ -1,16 +1,71 @@
-{% extends "base_search.html" %}
+{% extends "base.html" %}
-{% comment %}
+{% load render_table from django_tables2 %}
-SPDX-License-Identifier: GPL-3.0-or-later
+{% load crispy_forms_tags %}
-{% endcomment %}
+{% load i18n %}
-{% load i18n perms %}
+{% load perms %}
 
 {% block content %}
+    <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note/section ...">
+
+    <hr>
+
+    <div id="user_table">
+        {% if table.data %}
+            {% render_table table %}
+        {% else %}
+            <div class="alert alert-warning">
+                {% trans "There is no user with this pattern." %}
+            </div>
+        {% endif %}
+    </div>
+
+    <hr>
+
     {% if "member.change_profile_registration_valid"|has_perm:user %}
-<a class="btn btn-block btn-secondary mb-3" href="{% url 'registration:future_user_list' %}">
+        <a class="btn btn-block btn-secondary" href="{% url 'registration:future_user_list' %}">
-    <i class="fa fa-user-plus"></i> {% trans "Registrations" %}
+            <i class="fas fa-user-plus"></i> {% trans "Registrations" %}
         </a>
     {% endif %}
-
+{% endblock %}
-{# Search panel #}
+
-{{ block.super }}
+{% block extrajavascript %}
+<script type="text/javascript">
+    $(document).ready(function() {
+        let old_pattern = null;
+        let searchbar_obj = $("#searchbar");
+        var timer_on = false;
+        var timer;
+
+        function reloadTable() {
+            let pattern = searchbar_obj.val();
+
+            if (pattern === old_pattern || pattern === "")
+                return;
+
+            $("#user_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
+        }
+
+        searchbar_obj.keyup(function() {
+            if (timer_on)
+                clearTimeout(timer);
+            timer_on = true;
+            setTimeout(reloadTable, 0);
+        });
+
+        function init() {
+            $(".table-row").click(function() {
+                window.document.location = $(this).data("href");
+                timer_on = false;
+            });
+
+            $("tr").each(function() {
+                $(this).find("td:eq(0), td:eq(1), td:eq(2), td:eq(3), td:eq(5)").each(function() {
+                    $(this).html($(this).text().replace(new RegExp(searchbar_obj.val(), 'i'), "<mark>$&</mark>"));
+                });
+            });
+        }
+
+        init();
+    });
+</script>
 {% endblock %}

apps/member/templatetags/memberinfo.py

@@ -1,22 +0,0 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from datetime import date
-
-from django import template
-from django.contrib.auth.models import User
-
-from ..models import Club, Membership
-
-
-def is_member(user, club):
-    if isinstance(user, str):
-        club = User.objects.get(username=user)
-    if isinstance(club, str):
-        club = Club.objects.get(name=club)
-    return Membership.objects\
-        .filter(user=user, club=club, date_start__lte=date.today(), date_end__gte=date.today()).exists()
-
-
-register = template.Library()
-register.filter("is_member", is_member)

apps/member/tests/test_login.py

@@ -1,9 +1,8 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-from django.conf import settings
+
 from django.contrib.auth.models import User
 from django.test import TestCase
-from django.urls import reverse
 
 """
 Test that login page still works
@@ -17,8 +16,6 @@ class TemplateLoggedOutTests(TestCase):
 
 
 class TemplateLoggedInTests(TestCase):
-    fixtures = ('initial', )
-
     def setUp(self):
         self.user = User.objects.create_superuser(
             username="admin",
@@ -31,20 +28,7 @@ class TemplateLoggedInTests(TestCase):
         sess.save()
 
     def test_login_page(self):
-        response = self.client.get(reverse("login"))
+        response = self.client.get('/accounts/login/')
-        self.assertEqual(response.status_code, 200)
-
-        self.client.logout()
-
-        response = self.client.post('/accounts/login/', data=dict(
-            username="admin",
-            password="adminadmin",
-            permission_mask=3,
-        ))
-        self.assertRedirects(response, settings.LOGIN_REDIRECT_URL, 302, 302)
-
-    def test_logout(self):
-        response = self.client.get(reverse("logout"))
         self.assertEqual(response.status_code, 200)
 
     def test_admin_index(self):
@@ -54,3 +38,15 @@ class TemplateLoggedInTests(TestCase):
     def test_accounts_password_reset(self):
         response = self.client.get('/accounts/password_reset/')
         self.assertEqual(response.status_code, 200)
+
+    def test_logout_page(self):
+        response = self.client.get('/accounts/logout/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_transfer_page(self):
+        response = self.client.get('/note/transfer/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_consos_page(self):
+        response = self.client.get('/note/consos/')
+        self.assertEqual(response.status_code, 200)

apps/member/tests/test_memberships.py

@@ -1,405 +0,0 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import hashlib
-import os
-from datetime import date, timedelta
-
-from django.contrib.auth.models import User
-from django.core.files.uploadedfile import SimpleUploadedFile
-from django.db.models import Q
-from django.test import TestCase
-from django.urls import reverse
-from django.utils import timezone
-from member.models import Club, Membership, Profile
-from note.models import Alias, NoteSpecial
-from permission.models import Role
-from treasury.models import SogeCredit
-
-"""
-Create some users and clubs and test that all pages are rendering properly
-and that memberships are working.
-"""
-
-
-class TestMemberships(TestCase):
-    fixtures = ('initial', )
-
-    def setUp(self) -> None:
-        """
-        Create a sample superuser, a club and a membership for all tests.
-        """
-        self.user = User.objects.create_superuser(
-            username="toto",
-            email="toto@example.com",
-            password="toto",
-        )
-        self.user.profile.registration_valid = True
-        self.user.profile.email_confirmed = True
-        self.user.profile.save()
-        self.client.force_login(self.user)
-
-        sess = self.client.session
-        sess["permission_mask"] = 42
-        sess.save()
-
-        self.club = Club.objects.create(name="totoclub", parent_club=Club.objects.get(name="BDE"))
-        self.bde_membership = Membership.objects.create(user=self.user, club=Club.objects.get(name="BDE"))
-        self.membership = Membership.objects.create(user=self.user, club=self.club)
-        self.membership.roles.add(Role.objects.get(name="Bureau de club"))
-        self.membership.save()
-
-    def test_admin_pages(self):
-        """
-        Check that Django Admin pages for the member app are loading successfully.
-        """
-        response = self.client.get(reverse("admin:index") + "member/membership/")
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(reverse("admin:index") + "member/club/")
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(reverse("admin:index") + "auth/user/")
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(reverse("admin:index") + "auth/user/" + str(self.user.pk) + "/change/")
-        self.assertEqual(response.status_code, 200)
-
-    def test_render_club_list(self):
-        """
-        Render the list of all clubs, with a search.
-        """
-        response = self.client.get(reverse("member:club_list"))
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(reverse("member:club_list") + "?search=toto")
-        self.assertEqual(response.status_code, 200)
-
-    def test_render_club_create(self):
-        """
-        Try to create a new club.
-        """
-        response = self.client.get(reverse("member:club_create"))
-        self.assertEqual(response.status_code, 200)
-
-        response = self.client.post(reverse("member:club_create"), data=dict(
-            name="Club toto",
-            email="clubtoto@example.com",
-            parent_club=self.club.pk,
-            require_memberships=False,
-            membership_fee_paid=0,
-            membership_fee_unpaid=0,
-        ))
-        self.assertTrue(Club.objects.filter(name="Club toto").exists())
-        club = Club.objects.get(name="Club toto")
-        self.assertRedirects(response, club.get_absolute_url(), 302, 200)
-
-    def test_render_club_detail(self):
-        """
-        Display the detail of a club.
-        """
-        response = self.client.get(reverse("member:club_detail", args=(self.club.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-    def test_render_club_update(self):
-        """
-        Try to update the information about a club.
-        """
-        response = self.client.get(reverse("member:club_update", args=(self.club.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-        response = self.client.post(reverse("member:club_update", args=(self.club.pk, )), data=dict(
-            name="Toto club updated",
-            email="clubtoto@example.com",
-            require_memberships=True,
-            membership_fee_paid=0,
-            membership_fee_unpaid=0,
-        ))
-        self.assertRedirects(response, self.club.get_absolute_url(), 302, 200)
-        self.assertTrue(Club.objects.exclude(name="Toto club updated"))
-
-    def test_render_club_update_picture(self):
-        """
-        Try to update the picture of the note of a club.
-        """
-        response = self.client.get(reverse("member:club_update_pic", args=(self.club.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-        old_pic = self.club.note.display_image
-
-        with open("apps/member/static/member/img/default_picture.png", "rb") as f:
-            image = SimpleUploadedFile("image.png", f.read(), "image/png")
-            response = self.client.post(reverse("member:club_update_pic", args=(self.club.pk,)), dict(
-                image=image,
-                x=0,
-                y=0,
-                width=200,
-                height=200,
-            ))
-            self.assertRedirects(response, self.club.get_absolute_url(), 302, 200)
-
-        self.club.note.refresh_from_db()
-        self.assertTrue(os.path.exists(self.club.note.display_image.path))
-        os.remove(self.club.note.display_image.path)
-
-        self.club.note.display_image = old_pic
-        self.club.note.save()
-
-    def test_render_club_aliases(self):
-        """
-        Display the list of the aliases of a club.
-        """
-        # Alias creation and deletion is already tested in the note app
-        response = self.client.get(reverse("member:club_alias", args=(self.club.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-    def test_render_club_members(self):
-        """
-        Display the list of the members of a club.
-        """
-        response = self.client.get(reverse("member:club_members", args=(self.club.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-        response = self.client.get(reverse("member:club_members", args=(self.club.pk,)) + "?search=toto&roles="
-                                   + ",".join([str(role.pk) for role in
-                                               Role.objects.filter(weirole__isnull=True).all()]))
-        self.assertEqual(response.status_code, 200)
-
-    def test_render_club_add_member(self):
-        """
-        Try to add memberships and renew them.
-        """
-        response = self.client.get(reverse("member:club_add_member", args=(Club.objects.get(name="BDE").pk,)))
-        self.assertEqual(response.status_code, 200)
-
-        user = User.objects.create(username="totototo")
-        user.profile.registration_valid = True
-        user.profile.email_confirmed = True
-        user.profile.save()
-        user.save()
-
-        # We create a club without any parent and one club with parent BDE (that is the club Kfet)
-        for bde_parent in False, True:
-            if bde_parent:
-                club = Club.objects.get(name="Kfet")
-            else:
-                club = Club.objects.create(
-                    name="Second club " + ("with BDE" if bde_parent else "without BDE"),
-                    parent_club=None,
-                    email="newclub@example.com",
-                    require_memberships=True,
-                    membership_fee_paid=1000,
-                    membership_fee_unpaid=500,
-                    membership_start=date.today(),
-                    membership_end=date.today() + timedelta(days=366),
-                    membership_duration=366,
-                )
-
-            response = self.client.get(reverse("member:club_add_member", args=(club.pk,)))
-            self.assertEqual(response.status_code, 200)
-
-            # Create a new membership
-            response = self.client.post(reverse("member:club_add_member", args=(club.pk,)), data=dict(
-                user=user.pk,
-                date_start="{:%Y-%m-%d}".format(date.today()),
-                soge=False,
-                credit_type=NoteSpecial.objects.get(special_type="Espèces").id,
-                credit_amount=4200,
-                last_name="TOTO",
-                first_name="Toto",
-                bank="Le matelas",
-            ))
-            self.assertRedirects(response, user.profile.get_absolute_url(), 302, 200)
-
-            self.assertTrue(Membership.objects.filter(user=user, club=club).exists())
-
-            # Membership is sent to the past to check renewals
-            membership = Membership.objects.get(user=user, club=club)
-            self.assertTrue(membership.valid)
-            membership.date_start = date(year=2000, month=1, day=1)
-            membership.date_end = date(year=2000, month=12, day=31)
-            membership.save()
-            self.assertFalse(membership.valid)
-
-            response = self.client.get(reverse("member:club_members", args=(club.pk,)) + "?only_active=0")
-            self.assertEqual(response.status_code, 200)
-
-            bde_membership = self.bde_membership
-            if bde_parent:
-                bde_membership = Membership.objects.get(club__name="BDE", user=user)
-                bde_membership.date_start = date(year=2000, month=1, day=1)
-                bde_membership.date_end = date(year=2000, month=12, day=31)
-                bde_membership.save()
-
-            response = self.client.get(reverse("member:club_renew_membership", args=(bde_membership.pk,)))
-            self.assertEqual(response.status_code, 200)
-
-            response = self.client.get(reverse("member:club_renew_membership", args=(membership.pk,)))
-            self.assertEqual(response.status_code, 200)
-
-            # Renew membership
-            response = self.client.post(reverse("member:club_renew_membership", args=(membership.pk,)), data=dict(
-                user=user.pk,
-                date_start="{:%Y-%m-%d}".format(date.today()),
-                soge=bde_parent,
-                credit_type=NoteSpecial.objects.get(special_type="Chèque").id,
-                credit_amount=14242,
-                last_name="TOTO",
-                first_name="Toto",
-                bank="Bank",
-            ))
-            self.assertRedirects(response, user.profile.get_absolute_url(), 302, 200)
-
-            response = self.client.get(club.get_absolute_url())
-            self.assertEqual(response.status_code, 200)
-
-    def test_auto_join_kfet_when_join_bde_with_soge(self):
-        """
-        When we join the BDE club with a Soge registration, a Kfet membership is automatically created.
-        We check that it is the case.
-        """
-        user = User.objects.create(username="new1A")
-        user.profile.registration_valid = True
-        user.profile.email_confirmed = True
-        user.profile.save()
-        user.save()
-
-        bde = Club.objects.get(name="BDE")
-        kfet = Club.objects.get(name="Kfet")
-
-        response = self.client.post(reverse("member:club_add_member", args=(bde.pk,)), data=dict(
-            user=user.pk,
-            date_start="{:%Y-%m-%d}".format(date.today()),
-            soge=True,
-            credit_type=NoteSpecial.objects.get(special_type="Virement bancaire").id,
-            credit_amount=(bde.membership_fee_paid + kfet.membership_fee_paid) / 100,
-            last_name="TOTO",
-            first_name="Toto",
-            bank="Société générale",
-        ))
-        self.assertRedirects(response, user.profile.get_absolute_url(), 302, 200)
-
-        self.assertTrue(Membership.objects.filter(user=user, club=bde).exists())
-        self.assertTrue(Membership.objects.filter(user=user, club=kfet).exists())
-        self.assertTrue(SogeCredit.objects.filter(user=user).exists())
-
-    def test_change_roles(self):
-        """
-        Check to change the roles of a membership.
-        """
-        response = self.client.get(reverse("member:club_manage_roles", args=(self.membership.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-        response = self.client.post(reverse("member:club_manage_roles", args=(self.membership.pk,)), data=dict(
-            roles=[role.id for role in Role.objects.filter(
-                Q(name="Membre de club") | Q(name="Trésorier·ère de club") | Q(name="Bureau de club")).all()],
-        ))
-        self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
-        self.membership.refresh_from_db()
-        self.assertEqual(self.membership.roles.count(), 3)
-
-    def test_render_user_list(self):
-        """
-        Display the user search page.
-        """
-        response = self.client.get(reverse("member:user_list"))
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(reverse("member:user_list") + "?search=toto")
-        self.assertEqual(response.status_code, 200)
-
-    def test_render_user_detail(self):
-        """
-        Display the user detail page.
-        """
-        response = self.client.get(self.user.profile.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
-
-    def test_render_user_update(self):
-        """
-        Update some data about the user.
-        """
-        response = self.client.get(reverse("member:user_update_profile", args=(self.user.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-        response = self.client.post(reverse("member:user_update_profile", args=(self.user.pk,)), data=dict(
-            first_name="Toto",
-            last_name="Toto",
-            username="toto changed",
-            email="updated@example.com",
-            phone_number="+33600000000",
-            section="",
-            department="A0",
-            promotion=timezone.now().year,
-            address="Earth",
-            paid=True,
-            ml_events_registration="en",
-            ml_sports_registration=True,
-            ml_art_registration=True,
-            report_frequency=7,
-        ))
-        self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
-        self.assertTrue(User.objects.filter(username="toto changed").exists())
-        self.assertTrue(Profile.objects.filter(address="Earth").exists())
-        self.assertTrue(Alias.objects.filter(normalized_name="totochanged").exists())
-
-    def test_render_user_update_picture(self):
-        """
-        Update the note picture of the user.
-        """
-        response = self.client.get(reverse("member:user_update_pic", args=(self.user.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-        old_pic = self.user.note.display_image
-
-        with open("apps/member/static/member/img/default_picture.png", "rb") as f:
-            image = SimpleUploadedFile("image.png", f.read(), "image/png")
-            response = self.client.post(reverse("member:user_update_pic", args=(self.user.pk,)), dict(
-                image=image,
-                x=0,
-                y=0,
-                width=200,
-                height=200,
-            ))
-            self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
-
-        self.user.note.refresh_from_db()
-        self.assertTrue(os.path.exists(self.user.note.display_image.path))
-        os.remove(self.user.note.display_image.path)
-
-        self.user.note.display_image = old_pic
-        self.user.note.save()
-
-    def test_render_user_aliases(self):
-        """
-        Display the list of aliases of the user.
-        """
-        # Alias creation and deletion is already tested in the note app
-        response = self.client.get(reverse("member:user_alias", args=(self.user.pk,)))
-        self.assertEqual(response.status_code, 200)
-
-    def test_manage_auth_token(self):
-        """
-        Display the page to see the API authentication token, see it and regenerate it.
-        :return:
-        """
-        response = self.client.get(reverse("member:auth_token"))
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(reverse("member:auth_token") + "?view")
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(reverse("member:auth_token") + "?regenerate")
-        self.assertRedirects(response, reverse("member:auth_token") + "?view", 302, 200)
-
-    def test_random_coverage(self):
-        # Useless, only for coverage
-        self.assertEqual(str(self.user), str(self.user.profile))
-        self.user.profile.promotion = None
-        self.assertEqual(self.user.profile.ens_year, 0)
-        self.membership.date_end = None
-        self.assertTrue(self.membership.valid)
-
-    def test_nk15_hasher(self):
-        """
-        Test that NK15 passwords are successfully imported.
-        """
-        salt = "42"
-        password = "strongpassword42"
-        hashed = hashlib.sha256((salt + password).encode("utf-8")).hexdigest()
-        self.user.password = "custom_nk15$1$" + salt + "|" + hashed
-        self.user.save()
-        self.assertTrue(self.user.check_password(password))

apps/member/views.py

@@ -1,33 +1,34 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from datetime import timedelta, date
+import io
+from datetime import datetime, timedelta
 
+from PIL import Image
 from django.conf import settings
 from django.contrib.auth import logout
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
 from django.contrib.auth.views import LoginView
-from django.db import transaction
 from django.db.models import Q, F
 from django.shortcuts import redirect
 from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import DetailView, UpdateView, TemplateView
+from django.views.generic import CreateView, DetailView, UpdateView, TemplateView
 from django.views.generic.edit import FormMixin
 from django_tables2.views import SingleTableView
 from rest_framework.authtoken.models import Token
+from note.forms import ImageForm
 from note.models import Alias, NoteUser
 from note.models.transactions import Transaction, SpecialTransaction
 from note.tables import HistoryTable, AliasTable
 from note_kfet.middlewares import _set_current_user_and_ip
 from permission.backends import PermissionBackend
 from permission.models import Role
-from permission.views import ProtectQuerysetMixin, ProtectedCreateView
+from permission.views import ProtectQuerysetMixin
 
-from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm,\
+from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm, UserForm, MembershipRolesForm
-    CustomAuthenticationForm, MembershipRolesForm
 from .models import Club, Membership
 from .tables import ClubTable, UserTable, MembershipTable, ClubManagerTable
 
@@ -38,7 +39,6 @@ class CustomLoginView(LoginView):
     """
     form_class = CustomAuthenticationForm
 
-    @transaction.atomic
     def form_valid(self, form):
         logout(self.request)
         _set_current_user_and_ip(form.get_user(), self.request.session, None)
@@ -49,7 +49,6 @@ class CustomLoginView(LoginView):
 class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     """
     Update the user information.
-    On this view both `:models:member.User` and `:models:member.Profile` are updated through forms
     """
     model = User
     form_class = UserForm
@@ -77,13 +76,15 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
 
         return context
 
-    @transaction.atomic
     def form_valid(self, form):
-        """
+        new_username = form.data['username']
-        Check if ProfileForm is correct
+        # Si l'utilisateur cherche à modifier son pseudo, le nouveau pseudo ne doit pas être proche d'un alias existant
-        then check if username is not already taken by someone else or by the user,
+        note = NoteUser.objects.filter(
-        then check if email has changed, and if so ask for new validation.
+            alias__normalized_name=Alias.normalize(new_username))
-        """
+        if note.exists() and note.get().user != self.object:
+            form.add_error('username',
+                           _("An alias with a similar name already exists."))
+            return super().form_invalid(form)
 
         profile_form = ProfileForm(
             data=self.request.POST,
@@ -92,34 +93,31 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         profile_form.full_clean()
         if not profile_form.is_valid():
             return super().form_invalid(form)
+
         new_username = form.data['username']
-        # Check if the new username is not already taken as an alias of someone else.
-        note = NoteUser.objects.filter(
-            alias__normalized_name=Alias.normalize(new_username))
-        if note.exists() and note.get().user != self.object:
-            form.add_error('username', _("An alias with a similar name already exists."))
-            return super().form_invalid(form)
-        # Check if the username is one of user's aliases.
         alias = Alias.objects.filter(name=new_username)
+        # Si le nouveau pseudo n'est pas un de nos alias,
+        # on supprime éventuellement un alias similaire pour le remplacer
         if not alias.exists():
             similar = Alias.objects.filter(
                 normalized_name=Alias.normalize(new_username))
             if similar.exists():
                 similar.delete()
+
         olduser = User.objects.get(pk=form.instance.pk)
 
         user = form.save(commit=False)
-
-        if olduser.email != user.email:
-            # If the user changed her/his email, then it is unvalidated and a confirmation link is sent.
-            user.profile.email_confirmed = False
-            user.profile.send_email_validation_link()
-
         profile = profile_form.save(commit=False)
         profile.user = user
         profile.save()
         user.save()
 
+        if olduser.email != user.email:
+            # If the user changed her/his email, then it is unvalidated and a confirmation link is sent.
+            user.profile.email_confirmed = False
+            user.profile.save()
+            user.profile.send_email_validation_link()
+
         return super().form_valid(form)
 
     def get_success_url(self, **kwargs):
@@ -129,7 +127,7 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
 
 class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
-    Display all information about a user.
+    Affiche les informations sur un utilisateur, sa note, ses clubs...
     """
     model = User
     context_object_name = "user_object"
@@ -140,15 +138,11 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         """
         We can't display information of a not registered user.
         """
-        return super().get_queryset(**kwargs).filter(profile__registration_valid=True)
+        return super().get_queryset().filter(profile__registration_valid=True)
 
     def get_context_data(self, **kwargs):
-        """
-        Add history of transaction and list of membership of user.
-        """
         context = super().get_context_data(**kwargs)
         user = context['user_object']
-        context["note"] = user.note
         history_list = \
             Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note))\
             .order_by("-created_at")\
@@ -157,40 +151,11 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         history_table.paginate(per_page=20, page=self.request.GET.get("transaction-page", 1))
         context['history_list'] = history_table
 
-        club_list = Membership.objects.filter(user=user, date_end__gte=date.today() - timedelta(days=15))\
+        club_list = Membership.objects.filter(user=user, date_end__gte=datetime.today())\
-            .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view"))\
+            .filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view"))
-            .order_by("club__name", "-date_start")
-        # Display only the most recent membership
-        club_list = club_list.distinct("club__name")\
-            if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else club_list
         membership_table = MembershipTable(data=club_list, prefix='membership-')
         membership_table.paginate(per_page=10, page=self.request.GET.get("membership-page", 1))
         context['club_list'] = membership_table
-
-        # Check permissions to see if the authenticated user can lock/unlock the note
-        with transaction.atomic():
-            modified_note = NoteUser.objects.get(pk=user.note.pk)
-            # Don't log these tests
-            modified_note._no_signal = True
-            modified_note.is_active = True
-            modified_note.inactivity_reason = 'manual'
-            context["can_lock_note"] = user.note.is_active and PermissionBackend\
-                                           .check_perm(self.request.user, "note.change_noteuser_is_active",
-                                                       modified_note)
-            old_note = NoteUser.objects.select_for_update().get(pk=user.note.pk)
-            modified_note.inactivity_reason = 'forced'
-            modified_note._force_save = True
-            modified_note.save()
-            context["can_force_lock"] = user.note.is_active and PermissionBackend\
-                .check_perm(self.request.user, "note.change_note_is_active", modified_note)
-            old_note._force_save = True
-            old_note._no_signal = True
-            old_note.save()
-            modified_note.refresh_from_db()
-            modified_note.is_active = True
-            context["can_unlock_note"] = not user.note.is_active and PermissionBackend\
-                .check_perm(self.request.user, "note.change_note_is_active", modified_note)
-
         return context
 
 
@@ -207,32 +172,27 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
         """
         Filter the user list with the given pattern.
         """
-        qs = super().get_queryset().annotate(alias=F("note__alias__name"))\
+        qs = super().get_queryset().distinct("pk").annotate(alias=F("note__alias__name"))\
             .annotate(normalized_alias=F("note__alias__normalized_name"))\
             .filter(profile__registration_valid=True)
-
+        if "search" in self.request.GET:
-        # Sqlite doesn't support order by in subqueries
-        qs = qs.order_by("username").distinct("username")\
-            if settings.DATABASES[qs.db]["ENGINE"] == 'django.db.backends.postgresql' else qs.distinct()
-
-        if "search" in self.request.GET and self.request.GET["search"]:
             pattern = self.request.GET["search"]
 
+            if not pattern:
+                return qs.none()
+
             qs = qs.filter(
-                username__iregex="^" + pattern
+                Q(first_name__iregex=pattern)
-            ).union(
+                | Q(last_name__iregex=pattern)
-                qs.filter(
+                | Q(profile__section__iregex=pattern)
-                    (Q(alias__iregex="^" + pattern)
+                | Q(username__iregex=pattern)
-                     | Q(normalized_alias__iregex="^" + Alias.normalize(pattern))
+                | Q(alias__iregex=pattern)
-                     | Q(last_name__iregex="^" + pattern)
+                | Q(normalized_alias__iregex=Alias.normalize(pattern))
-                     | Q(first_name__iregex="^" + pattern)
+            )
-                     | Q(email__istartswith=pattern))
-                    & ~Q(username__iregex="^" + pattern)
-                ), all=True)
         else:
             qs = qs.none()
 
-        return qs
+        return qs[:20]
 
 
 class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
@@ -247,13 +207,7 @@ class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         note = context['object'].note
-        context["aliases"] = AliasTable(note.alias_set.filter(PermissionBackend
+        context["aliases"] = AliasTable(note.alias_set.all())
-                                                              .filter_queryset(self.request.user, Alias, "view")).all())
-        context["can_create"] = PermissionBackend.check_perm(self.request.user, "note.add_alias", Alias(
-            note=context["object"].note,
-            name="",
-            normalized_name="",
-        ))
         return context
 
 
@@ -270,35 +224,47 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
         return context
 
     def get_success_url(self):
-        """Redirect to profile page after upload"""
         return reverse_lazy('member:user_detail', kwargs={'pk': self.object.id})
 
     def post(self, request, *args, **kwargs):
         form = self.get_form()
         self.object = self.get_object()
-        return self.form_valid(form) if form.is_valid() else self.form_invalid(form)
+        if form.is_valid():
-
+            return self.form_valid(form)
-    @transaction.atomic
-    def form_valid(self, form):
-        """Save image to note"""
-        image = form.cleaned_data['image']
-
-        # Rename as a PNG or GIF
-        extension = image.name.split(".")[-1]
-        if extension == "gif":
-            image.name = "{}_pic.gif".format(self.object.note.pk)
         else:
-            image.name = "{}_pic.png".format(self.object.note.pk)
+            print('is_invalid')
+            print(form)
+            return self.form_invalid(form)
 
-        # Save
+    def form_valid(self, form):
-        self.object.note.display_image = image
+        image_field = form.cleaned_data['image']
+        x = form.cleaned_data['x']
+        y = form.cleaned_data['y']
+        w = form.cleaned_data['width']
+        h = form.cleaned_data['height']
+        # image crop and resize
+        image_file = io.BytesIO(image_field.read())
+        # ext = image_field.name.split('.')[-1].lower()
+        # TODO: support GIF format
+        image = Image.open(image_file)
+        image = image.crop((x, y, x + w, y + h))
+        image_clean = image.resize((settings.PIC_WIDTH,
+                                    settings.PIC_RATIO * settings.PIC_WIDTH),
+                                   Image.ANTIALIAS)
+        image_file = io.BytesIO()
+        image_clean.save(image_file, "PNG")
+        image_field.file = image_file
+        # renaming
+        filename = "{}_pic.png".format(self.object.note.pk)
+        image_field.name = filename
+        self.object.note.display_image = image_field
         self.object.note.save()
         return super().form_valid(form)
 
 
 class ProfilePictureUpdateView(PictureUpdateView):
     model = User
-    template_name = 'member/picture_update.html'
+    template_name = 'member/profile_picture_update.html'
     context_object_name = 'user_object'
 
 
@@ -313,7 +279,8 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView):
     def get(self, request, *args, **kwargs):
         if 'regenerate' in request.GET and Token.objects.filter(user=request.user).exists():
             Token.objects.get(user=self.request.user).delete()
-            return redirect(reverse_lazy('member:auth_token') + "?show")
+            return redirect(reverse_lazy('member:auth_token') + "?show",
+                            permanent=True)
 
         return super().get(request, *args, **kwargs)
 
@@ -328,7 +295,7 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView):
 # ******************************* #
 
 
-class ClubCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+class ClubCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     """
     Create Club
     """
@@ -337,15 +304,8 @@ class ClubCreateView(ProtectQuerysetMixin, ProtectedCreateView):
     success_url = reverse_lazy('member:club_list')
     extra_context = {"title": _("Create new club")}
 
-    def get_sample_object(self):
+    def form_valid(self, form):
-        return Club(
+        return super().form_valid(form)
-            name="",
-            email="",
-        )
-
-    def get_success_url(self):
-        self.object.refresh_from_db()
-        return reverse_lazy("member:club_detail", kwargs={"pk": self.object.pk})
 
 
 class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
@@ -372,14 +332,6 @@ class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
 
         return qs
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["can_add_club"] = PermissionBackend.check_perm(self.request.user, "member.add_club", Club(
-            name="",
-            email="club@example.com",
-        ))
-        return context
-
 
 class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
@@ -390,35 +342,26 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     extra_context = {"title": _("Club detail")}
 
     def get_context_data(self, **kwargs):
-        """
-        Add list of managers (peoples with Permission/Roles in this club), history of transactions and members list
-        """
         context = super().get_context_data(**kwargs)
 
         club = context["club"]
         if PermissionBackend.check_perm(self.request.user, "member.change_club_membership_start", club):
             club.update_membership_dates()
-        # managers list
+
-        managers = Membership.objects.filter(club=self.object, roles__name="Bureau de club",
+        managers = Membership.objects.filter(club=self.object, roles__name="Bureau de club")\
-                                             date_start__lte=date.today(), date_end__gte=date.today())\
             .order_by('user__last_name').all()
         context["managers"] = ClubManagerTable(data=managers, prefix="managers-")
-        # transaction history
+
         club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\
             .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view"))\
             .order_by('-created_at')
         history_table = HistoryTable(club_transactions, prefix="history-")
         history_table.paginate(per_page=20, page=self.request.GET.get('history-page', 1))
         context['history_list'] = history_table
-        # member list
         club_member = Membership.objects.filter(
             club=club,
-            date_end__gte=date.today() - timedelta(days=15),
+            date_end__gte=datetime.today(),
-        ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view"))\
+        ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view"))
-            .order_by("user__username", "-date_start")
-        # Display only the most recent membership
-        club_member = club_member.distinct("user__username")\
-            if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else club_member
 
         membership_table = MembershipTable(data=club_member, prefix="membership-")
         membership_table.paginate(per_page=5, page=self.request.GET.get('membership-page', 1))
@@ -428,8 +371,8 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         empty_membership = Membership(
             club=club,
             user=User.objects.first(),
-            date_start=date.today(),
+            date_start=datetime.now().date(),
-            date_end=date.today(),
+            date_end=datetime.now().date(),
             fee=0,
         )
         context["can_add_members"] = PermissionBackend()\
@@ -450,13 +393,7 @@ class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         note = context['object'].note
-        context["aliases"] = AliasTable(note.alias_set.filter(PermissionBackend
+        context["aliases"] = AliasTable(note.alias_set.all())
-                                                              .filter_queryset(self.request.user, Alias, "view")).all())
-        context["can_create"] = PermissionBackend.check_perm(self.request.user, "note.add_alias", Alias(
-            note=context["object"].note,
-            name="",
-            normalized_name="",
-        ))
         return context
 
 
@@ -488,14 +425,14 @@ class ClubPictureUpdateView(PictureUpdateView):
     Update the profile picture of a club.
     """
     model = Club
-    template_name = 'member/picture_update.html'
+    template_name = 'member/club_picture_update.html'
     context_object_name = 'club'
 
     def get_success_url(self):
         return reverse_lazy('member:club_detail', kwargs={'pk': self.object.id})
 
 
-class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
+class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     """
     Add a membership to a club.
     """
@@ -504,33 +441,16 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
     template_name = 'member/add_members.html'
     extra_context = {"title": _("Add new member to the club")}
 
-    def get_sample_object(self):
-        if "club_pk" in self.kwargs:
-            club = Club.objects.get(pk=self.kwargs["club_pk"])
-        else:
-            club = Membership.objects.get(pk=self.kwargs["pk"]).club
-        return Membership(
-            user=self.request.user,
-            club=club,
-            fee=0,
-            date_start=timezone.now(),
-            date_end=timezone.now() + timedelta(days=1),
-        )
-
     def get_context_data(self, **kwargs):
-        """
-        Membership can be created, or renewed
-        In case of creation the url is /club/<club_pk>/add_member
-        For a renewal it will be `club/renew_membership/<pk>`
-        """
         context = super().get_context_data(**kwargs)
         form = context['form']
 
-        if "club_pk" in self.kwargs:  # We create a new membership.
+        if "club_pk" in self.kwargs:
+            # We create a new membership.
             club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\
                 .get(pk=self.kwargs["club_pk"], weiclub=None)
             form.fields['credit_amount'].initial = club.membership_fee_paid
-            # Ensure that the user is member of the parent club and all its the family tree.
+
             c = club
             clubs_renewal = []
             additional_fee_renewal = 0
@@ -551,7 +471,8 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
                 kfet = Club.objects.get(name="Kfet")
                 fee += kfet.membership_fee_paid
                 context["total_fee"] = "{:.02f}".format(fee / 100, )
-        else:  # This is a renewal. Fields can be pre-completed.
+        else:
+            # This is a renewal. Fields can be pre-completed.
             context["renewal"] = True
 
             old_membership = self.get_queryset().get(pk=self.kwargs["pk"])
@@ -563,7 +484,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
             additional_fee_renewal = 0
             while c.parent_club is not None:
                 c = c.parent_club
-                # check if a valid membership exists for the parent club
                 if c.membership_start and not Membership.objects.filter(
                         club=c,
                         user=user,
@@ -582,7 +502,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
             form.fields['last_name'].initial = user.last_name
             form.fields['first_name'].initial = user.first_name
 
-            # If this is a renewal of a BDE membership, Société générale can pays, if it has not been already done.
+            # If this is a renewal of a BDE membership, Société générale can pays, if it is not yet done
             if (club.name != "BDE" and club.name != "Kfet") or user.profile.soge:
                 del form.fields['soge']
             else:
@@ -607,89 +527,16 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
 
         return context
 
-    def perform_verifications(self, form, user, club, fee):
-        """
-        Make some additional verifications to check that the membership can be created.
-        :return: True if the form is clean, False if there is an error.
-        """
-        error = False
-
-        # Retrieve form data
-        credit_type = form.cleaned_data["credit_type"]
-        credit_amount = form.cleaned_data["credit_amount"]
-        last_name = form.cleaned_data["last_name"]
-        first_name = form.cleaned_data["first_name"]
-        bank = form.cleaned_data["bank"]
-        soge = form.cleaned_data["soge"] and not user.profile.soge and (club.name == "BDE" or club.name == "Kfet")
-
-        if not credit_type:
-            credit_amount = 0
-
-        if not soge and user.note.balance + credit_amount < fee and not Membership.objects.filter(
-                club__name="Kfet",
-                user=user,
-                date_start__lte=date.today(),
-                date_end__gte=date.today(),
-        ).exists():
-            # Users without a valid Kfet membership can't have a negative balance.
-            # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note
-            form.add_error('user',
-                           _("This user don't have enough money to join this club, and can't have a negative balance."))
-            error = True
-
-        if Membership.objects.filter(
-                user=form.instance.user,
-                club=club,
-                date_start__lte=form.instance.date_start,
-                date_end__gte=form.instance.date_start,
-        ).exists():
-            form.add_error('user', _('User is already a member of the club'))
-            error = True
-
-        # Must join the parent club before joining this club, except for the Kfet club where it can be at the same time.
-        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_end__lte=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
-
-        if club.membership_start and form.instance.date_start < club.membership_start:
-            form.add_error('user', _("The membership must start after {:%m-%d-%Y}.")
-                           .format(form.instance.club.membership_start))
-            error = True
-
-        if club.membership_end and form.instance.date_start > club.membership_end:
-            form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.")
-                           .format(form.instance.club.membership_end))
-            error = True
-
-        if credit_amount:
-            if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"):
-                if not last_name:
-                    form.add_error('last_name', _("This field is required."))
-                if not first_name:
-                    form.add_error('first_name', _("This field is required."))
-                if not bank and credit_type.special_type == "Chèque":
-                    form.add_error('bank', _("This field is required."))
-                return self.form_invalid(form)
-
-        return not error
-
-    @transaction.atomic
     def form_valid(self, form):
         """
         Create membership, check that all is good, make transactions
         """
         # Get the club that is concerned by the membership
-        if "club_pk" in self.kwargs:  # get from url of new membership
+        if "club_pk" in self.kwargs:
             club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view")) \
                 .get(pk=self.kwargs["club_pk"])
             user = form.instance.user
-            old_membership = None
+        else:
-        else:  # get from url for renewal
             old_membership = self.get_queryset().get(pk=self.kwargs["pk"])
             club = old_membership.club
             user = old_membership.user
@@ -698,7 +545,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
 
         # Get form data
         credit_type = form.cleaned_data["credit_type"]
-        # but with this way users can customize their section as they want.
         credit_amount = form.cleaned_data["credit_amount"]
         last_name = form.cleaned_data["last_name"]
         first_name = form.cleaned_data["first_name"]
@@ -716,7 +562,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
 
         fee = 0
         c = club
-        # collect the fees required to be paid
         while c is not None and c.membership_start:
             if not Membership.objects.filter(
                     club=c,
@@ -726,20 +571,57 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
                 fee += c.membership_fee_paid if user.profile.paid else c.membership_fee_unpaid
             c = c.parent_club
 
-        # Make some verifications about the form, and if there is an error, then assume that the form is invalid
+        if user.note.balance + credit_amount < fee and not Membership.objects.filter(
-        if not self.perform_verifications(form, user, club, fee):
+                club__name="Kfet",
-            return self.form_invalid(form)
+                user=user,
+                date_start__lte=datetime.now().date(),
+                date_end__gte=datetime.now().date(),
+        ).exists():
+            # Users without a valid Kfet membership can't have a negative balance.
+            # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note
+            form.add_error('user',
+                           _("This user don't have enough money to join this club, and can't have a negative balance."))
+            return super().form_invalid(form)
+
+        if Membership.objects.filter(
+                user=form.instance.user,
+                club=club,
+                date_start__lte=form.instance.date_start,
+                date_end__gte=form.instance.date_start,
+        ).exists():
+            form.add_error('user', _('User is already a member of the club'))
+            return super().form_invalid(form)
+
+        if club.membership_start and form.instance.date_start < club.membership_start:
+            form.add_error('user', _("The membership must start after {:%m-%d-%Y}.")
+                           .format(form.instance.club.membership_start))
+            return super().form_invalid(form)
+
+        if club.membership_end and form.instance.date_start > club.membership_end:
+            form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.")
+                           .format(form.instance.club.membership_start))
+            return super().form_invalid(form)
 
         # Now, all is fine, the membership can be created.
 
         if club.name == "BDE" or club.name == "Kfet":
-            # When we renew the BDE membership, we update the profile section
+            # When we renew the BDE membership, we update the profile section.
-            # that should happens at least once a year.
+            # We could automate that and remove the section field from the Profile model,
+            # but with this way users can customize their section as they want.
             user.profile.section = user.profile.section_generated
             user.profile.save()
 
         # Credit note before the membership is created.
         if credit_amount > 0:
+            if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"):
+                if not last_name:
+                    form.add_error('last_name', _("This field is required."))
+                if not first_name:
+                    form.add_error('first_name', _("This field is required."))
+                if not bank and credit_type.special_type == "Chèque":
+                    form.add_error('bank', _("This field is required."))
+                return self.form_invalid(form)
+
             transaction = SpecialTransaction(
                 source=credit_type,
                 destination=user.note,
@@ -754,41 +636,46 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
             transaction._force_save = True
             transaction.save()
 
-        # Parent club memberships are automatically renewed / created.
-        # For example, a Kfet membership creates a BDE membership if it does not exist.
         form.instance._force_renew_parent = True
 
         ret = super().form_valid(form)
 
-        member_role = Role.objects.filter(Q(name="Adhérent BDE") | Q(name="Membre de club")).all() \
+        if club.name == "BDE":
-            if club.name == "BDE" else Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all() \
+            member_role = Role.objects.filter(Q(name="Adhérent BDE") | Q(name="Membre de club")).all()
-            if club.name == "Kfet"else Role.objects.filter(name="Membre de club").all()
+        elif club.name == "Kfet":
-        # Set the same roles as before
+            member_role = Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all()
-        if old_membership:
+        else:
-            member_role = member_role.union(old_membership.roles.all())
+            member_role = Role.objects.filter(name="Membre de club").all()
         form.instance.roles.set(member_role)
         form.instance._force_save = True
         form.instance.save()
 
         # If Société générale pays, then we assume that this is the BDE membership, and we auto-renew the
         # Kfet membership.
-        if soge and club.name == "BDE":
+        if soge:
+            # If not already done, create BDE and Kfet memberships
+            bde = Club.objects.get(name="BDE")
             kfet = Club.objects.get(name="Kfet")
-            fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
+
+            soge_clubs = [bde, kfet]
+            for club in soge_clubs:
+                fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
 
                 # Get current membership, to get the end date
                 old_membership = Membership.objects.filter(
-                club=kfet,
+                    club=club,
                     user=user,
                 ).order_by("-date_start")
 
-            if not old_membership.filter(date_start__gte=kfet.membership_start).exists():
+                if old_membership.filter(date_start__gte=club.membership_start).exists():
-                # If the membership is not already renewed
+                    # Membership is already renewed
+                    continue
+
                 membership = Membership(
-                    club=kfet,
+                    club=club,
                     user=user,
                     fee=fee,
-                    date_start=max(old_membership.first().date_end + timedelta(days=1), kfet.membership_start)
+                    date_start=max(old_membership.first().date_end + timedelta(days=1), club.membership_start)
                     if old_membership.exists() else form.instance.date_start,
                 )
                 membership._force_save = True
@@ -797,13 +684,16 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
                 membership.refresh_from_db()
                 if old_membership.exists():
                     membership.roles.set(old_membership.get().roles.all())
+                elif c.name == "BDE":
+                    membership.roles.set(Role.objects.filter(Q(name="Adhérent BDE") | Q(name="Membre de club")).all())
+                elif c.name == "Kfet":
                     membership.roles.set(Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all())
                 membership.save()
 
         return ret
 
     def get_success_url(self):
-        return reverse_lazy('member:user_detail', kwargs={'pk': self.object.user.id})
+        return reverse_lazy('member:club_detail', kwargs={'pk': self.object.club.id})
 
 
 class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
@@ -857,7 +747,9 @@ class ClubMembersListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableV
             qs = qs.filter(date_start__lte=timezone.now().today(), date_end__gte=timezone.now().today())
 
         if "roles" in self.request.GET:
-            roles_str = self.request.GET["roles"].replace(' ', '').split(',') if self.request.GET["roles"] else ['0']
+            if not self.request.GET["roles"]:
+                return qs.none()
+            roles_str = self.request.GET["roles"].replace(' ', '').split(',')
             roles_int = map(int, roles_str)
             qs = qs.filter(roles__in=roles_int)
 

apps/note/admin.py

@@ -119,6 +119,10 @@ class TransactionAdmin(PolymorphicParentModelAdmin):
     list_display = ('created_at', 'poly_source', 'poly_destination',
                     'quantity', 'amount', 'valid')
     list_filter = ('valid',)
+    readonly_fields = (
+        'source',
+        'destination',
+    )
 
     def poly_source(self, obj):
         """
@@ -141,7 +145,10 @@ class TransactionAdmin(PolymorphicParentModelAdmin):
         Only valid can be edited after creation
         Else the amount of money would not be transferred
         """
-        return 'created_at', 'source', 'destination', 'quantity', 'amount' if obj else ()
+        if obj:  # user is editing an existing object
+            return 'created_at', 'source', 'destination', 'quantity', \
+                   'amount'
+        return []
 
 
 @admin.register(MembershipTransaction, site=admin_site)
@@ -150,13 +157,6 @@ class MembershipTransactionAdmin(PolymorphicChildModelAdmin):
     Admin customisation for MembershipTransaction
     """
 
-    def get_readonly_fields(self, request, obj=None):
-        """
-        Only valid can be edited after creation
-        Else the amount of money would not be transferred
-        """
-        return ('created_at', 'source', 'destination', 'quantity', 'amount') if obj else ()
-
 
 @admin.register(RecurrentTransaction, site=admin_site)
 class RecurrentTransactionAdmin(PolymorphicChildModelAdmin):
@@ -164,13 +164,6 @@ class RecurrentTransactionAdmin(PolymorphicChildModelAdmin):
     Admin customisation for RecurrentTransaction
     """
 
-    def get_readonly_fields(self, request, obj=None):
-        """
-        Only valid can be edited after creation
-        Else the amount of money would not be transferred
-        """
-        return ('created_at', 'source', 'destination', 'quantity', 'amount') if obj else ()
-
 
 @admin.register(SpecialTransaction, site=admin_site)
 class SpecialTransactionAdmin(PolymorphicChildModelAdmin):
@@ -178,13 +171,6 @@ class SpecialTransactionAdmin(PolymorphicChildModelAdmin):
     Admin customisation for SpecialTransaction
     """
 
-    def get_readonly_fields(self, request, obj=None):
-        """
-        Only valid can be edited after creation
-        Else the amount of money would not be transferred
-        """
-        return ('created_at', 'source', 'destination', 'quantity', 'amount') if obj else ()
-
 
 @admin.register(TransactionTemplate, site=admin_site)
 class TransactionTemplateAdmin(admin.ModelAdmin):

apps/note/api/serializers.py

@@ -1,10 +1,7 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.conf import settings
-from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
-from rest_framework.exceptions import ValidationError
 from rest_polymorphic.serializers import PolymorphicSerializer
 from member.api.serializers import MembershipSerializer
 from member.models import Membership
@@ -26,7 +23,7 @@ class NoteSerializer(serializers.ModelSerializer):
     class Meta:
         model = Note
         fields = '__all__'
-        read_only_fields = ('balance', 'last_negative', 'created_at', )  # Note balances are read-only protected
+        read_only_fields = [f.name for f in model._meta.get_fields()]  # Notes are read-only protected
 
 
 class NoteClubSerializer(serializers.ModelSerializer):
@@ -39,7 +36,7 @@ class NoteClubSerializer(serializers.ModelSerializer):
     class Meta:
         model = NoteClub
         fields = '__all__'
-        read_only_fields = ('note', 'club', 'balance', 'last_negative', 'created_at', )
+        read_only_fields = ('note', 'club', )
 
     def get_name(self, obj):
         return str(obj)
@@ -55,7 +52,7 @@ class NoteSpecialSerializer(serializers.ModelSerializer):
     class Meta:
         model = NoteSpecial
         fields = '__all__'
-        read_only_fields = ('note', 'balance', 'last_negative', 'created_at', )
+        read_only_fields = ('note', )
 
     def get_name(self, obj):
         return str(obj)
@@ -71,7 +68,7 @@ class NoteUserSerializer(serializers.ModelSerializer):
     class Meta:
         model = NoteUser
         fields = '__all__'
-        read_only_fields = ('note', 'user', 'balance', 'last_negative', 'created_at', )
+        read_only_fields = ('note', 'user', )
 
     def get_name(self, obj):
         return str(obj)
@@ -125,14 +122,9 @@ class ConsumerSerializer(serializers.ModelSerializer):
         Display information about the associated note
         """
         # If the user has no right to see the note, then we only display the note identifier
-        return NotePolymorphicSerializer().to_representation(obj.note)\
+        if PermissionBackend.check_perm(get_current_authenticated_user(), "note.view_note", obj.note):
-            if PermissionBackend.check_perm(get_current_authenticated_user(), "note.view_note", obj.note)\
+            return NotePolymorphicSerializer().to_representation(obj.note)
-            else dict(
+        return dict(id=obj.note.id, name=str(obj.note))
-            id=obj.note.id,
-            name=str(obj.note),
-            is_active=obj.note.is_active,
-            display_image=obj.note.display_image.url,
-        )
 
     def get_email_confirmed(self, obj):
         if isinstance(obj.note, NoteUser):
@@ -178,24 +170,13 @@ class TransactionSerializer(serializers.ModelSerializer):
     REST API Serializer for Transactions.
     The djangorestframework plugin will analyse the model `Transaction` and parse all fields in the API.
     """
-    def validate_source(self, value):
-        if not value.is_active:
-            raise ValidationError(_("The transaction can't be saved since the source note "
-                                    "or the destination note is not active."))
-        return value
-
-    def validate_destination(self, value):
-        if not value.is_active:
-            raise ValidationError(_("The transaction can't be saved since the source note "
-                                    "or the destination note is not active."))
-        return value
 
     class Meta:
         model = Transaction
         fields = '__all__'
 
 
-class RecurrentTransactionSerializer(TransactionSerializer):
+class RecurrentTransactionSerializer(serializers.ModelSerializer):
     """
     REST API Serializer for Transactions.
     The djangorestframework plugin will analyse the model `RecurrentTransaction` and parse all fields in the API.
@@ -206,7 +187,7 @@ class RecurrentTransactionSerializer(TransactionSerializer):
         fields = '__all__'
 
 
-class MembershipTransactionSerializer(TransactionSerializer):
+class MembershipTransactionSerializer(serializers.ModelSerializer):
     """
     REST API Serializer for Membership transactions.
     The djangorestframework plugin will analyse the model `MembershipTransaction` and parse all fields in the API.
@@ -217,7 +198,7 @@ class MembershipTransactionSerializer(TransactionSerializer):
         fields = '__all__'
 
 
-class SpecialTransactionSerializer(TransactionSerializer):
+class SpecialTransactionSerializer(serializers.ModelSerializer):
     """
     REST API Serializer for Special transactions.
     The djangorestframework plugin will analyse the model `SpecialTransaction` and parse all fields in the API.
@@ -237,10 +218,12 @@ class TransactionPolymorphicSerializer(PolymorphicSerializer):
         SpecialTransaction: SpecialTransactionSerializer,
     }
 
-    if "activity" in settings.INSTALLED_APPS:
+    try:
         from activity.models import GuestTransaction
         from activity.api.serializers import GuestTransactionSerializer
         model_serializer_mapping[GuestTransaction] = GuestTransactionSerializer
+    except ImportError:  # Activity app is not loaded
+        pass
 
     def validate(self, attrs):
         resource_type = attrs.pop(self.resource_type_field_name)

apps/note/api/views.py

@@ -1,7 +1,6 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.conf import settings
 from django.db.models import Q
 from django.core.exceptions import ValidationError
 from django_filters.rest_framework import DjangoFilterBackend
@@ -19,7 +18,7 @@ from ..models.notes import Note, Alias
 from ..models.transactions import TransactionTemplate, Transaction, TemplateCategory
 
 
-class NotePolymorphicViewSet(ReadProtectedModelViewSet):
+class NotePolymorphicViewSet(ReadOnlyProtectedModelViewSet):
     """
     REST API View set.
     The djangorestframework plugin will get all `Note` objects (with polymorhism), serialize it to JSON with the given serializer,
@@ -37,16 +36,15 @@ class NotePolymorphicViewSet(ReadProtectedModelViewSet):
         Parse query and apply filters.
         :return: The filtered set of requested notes
         """
-        queryset = super().get_queryset().distinct()
+        queryset = super().get_queryset()
 
         alias = self.request.query_params.get("alias", ".*")
         queryset = queryset.filter(
-            Q(alias__name__iregex="^" + alias)
+            Q(alias__name__regex="^" + alias)
-            | Q(alias__normalized_name__iregex="^" + Alias.normalize(alias))
+            | Q(alias__normalized_name__regex="^" + Alias.normalize(alias))
-            | Q(alias__normalized_name__iregex="^" + alias.lower())
+            | Q(alias__normalized_name__regex="^" + alias.lower()))
-        )
 
-        return queryset.order_by("id")
+        return queryset.distinct()
 
 
 class AliasViewSet(ReadProtectedModelViewSet):
@@ -57,9 +55,8 @@ class AliasViewSet(ReadProtectedModelViewSet):
     """
     queryset = Alias.objects.all()
     serializer_class = AliasSerializer
-    filter_backends = [SearchFilter, DjangoFilterBackend, OrderingFilter]
+    filter_backends = [SearchFilter, OrderingFilter]
     search_fields = ['$normalized_name', '$name', '$note__polymorphic_ctype__model', ]
-    filterset_fields = ['note']
     ordering_fields = ['name', 'normalized_name']
 
     def get_serializer_class(self):
@@ -74,6 +71,7 @@ class AliasViewSet(ReadProtectedModelViewSet):
         try:
             self.perform_destroy(instance)
         except ValidationError as e:
+            print(e)
             return Response({e.code: e.message}, status.HTTP_400_BAD_REQUEST)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -83,34 +81,22 @@ class AliasViewSet(ReadProtectedModelViewSet):
         :return: The filtered set of requested aliases
         """
 
-        queryset = super().get_queryset().distinct()
+        queryset = super().get_queryset()
 
-        alias = self.request.query_params.get("alias", None)
+        alias = self.request.query_params.get("alias", ".*")
-        if alias:
         queryset = queryset.filter(
-                name__iregex="^" + alias
+            Q(name__regex="^" + alias)
-            ).union(
+            | Q(normalized_name__regex="^" + Alias.normalize(alias))
-                queryset.filter(
+            | Q(normalized_name__regex="^" + alias.lower()))
-                    Q(normalized_name__iregex="^" + Alias.normalize(alias))
-                    & ~Q(name__iregex="^" + alias)
-                ),
-                all=True).union(
-                queryset.filter(
-                    Q(normalized_name__iregex="^" + alias.lower())
-                    & ~Q(normalized_name__iregex="^" + Alias.normalize(alias))
-                    & ~Q(name__iregex="^" + alias)
-                ),
-                all=True)
 
-        return queryset.order_by("name")
+        return queryset
 
 
 class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
     queryset = Alias.objects.all()
     serializer_class = ConsumerSerializer
-    filter_backends = [SearchFilter, OrderingFilter, DjangoFilterBackend]
+    filter_backends = [SearchFilter, OrderingFilter]
     search_fields = ['$normalized_name', '$name', '$note__polymorphic_ctype__model', ]
-    filterset_fields = ['note']
     ordering_fields = ['name', 'normalized_name']
 
     def get_queryset(self):
@@ -119,36 +105,16 @@ class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
         :return: The filtered set of requested aliases
         """
 
-        queryset = super().get_queryset().distinct()
+        queryset = super().get_queryset()
-        # Sqlite doesn't support ORDER BY in subqueries
-        queryset = queryset.order_by("name") \
-            if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' else queryset
 
-        alias = self.request.query_params.get("alias", None)
+        alias = self.request.query_params.get("alias", ".*")
-        queryset = queryset.prefetch_related('note')
-
-        if alias:
-            # We match first an alias if it is matched without normalization,
-            # then if the normalized pattern matches a normalized alias.
         queryset = queryset.filter(
-                name__iregex="^" + alias
+            Q(name__regex="^" + alias)
-            ).union(
+            | Q(normalized_name__regex="^" + Alias.normalize(alias))
-                queryset.filter(
+            | Q(normalized_name__regex="^" + alias.lower()))\
-                    Q(normalized_name__iregex="^" + Alias.normalize(alias))
+            .order_by('name').prefetch_related('note')
-                    & ~Q(name__iregex="^" + alias)
-                ),
-                all=True).union(
-                queryset.filter(
-                    Q(normalized_name__iregex="^" + alias.lower())
-                    & ~Q(normalized_name__iregex="^" + Alias.normalize(alias))
-                    & ~Q(name__iregex="^" + alias)
-                ),
-                all=True)
 
-        queryset = queryset if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' \
+        return queryset
-            else queryset.order_by("name")
-
-        return queryset.distinct()
 
 
 class TemplateCategoryViewSet(ReadProtectedModelViewSet):
@@ -157,7 +123,7 @@ class TemplateCategoryViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `TemplateCategory` objects, serialize it to JSON with the given serializer,
     then render it on /api/note/transaction/category/
     """
-    queryset = TemplateCategory.objects.order_by("name").all()
+    queryset = TemplateCategory.objects.all()
     serializer_class = TemplateCategorySerializer
     filter_backends = [SearchFilter]
     search_fields = ['$name', ]
@@ -169,7 +135,7 @@ class TransactionTemplateViewSet(viewsets.ModelViewSet):
     The djangorestframework plugin will get all `TransactionTemplate` objects, serialize it to JSON with the given serializer,
     then render it on /api/note/transaction/template/
     """
-    queryset = TransactionTemplate.objects.order_by("name").all()
+    queryset = TransactionTemplate.objects.all()
     serializer_class = TransactionTemplateSerializer
     filter_backends = [SearchFilter, DjangoFilterBackend]
     filterset_fields = ['name', 'amount', 'display', 'category', ]
@@ -182,13 +148,10 @@ class TransactionViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Transaction` objects, serialize it to JSON with the given serializer,
     then render it on /api/note/transaction/transaction/
     """
-    queryset = Transaction.objects.order_by("-created_at").all()
+    queryset = Transaction.objects.all()
     serializer_class = TransactionPolymorphicSerializer
-    filter_backends = [SearchFilter, DjangoFilterBackend, OrderingFilter]
+    filter_backends = [SearchFilter]
-    filterset_fields = ["source", "source_alias", "destination", "destination_alias", "quantity",
-                        "polymorphic_ctype", "amount", "created_at", ]
     search_fields = ['$reason', ]
-    ordering_fields = ['created_at', 'amount']
 
     def get_queryset(self):
         user = self.request.user

apps/note/apps.py

@@ -3,7 +3,7 @@
 
 from django.apps import AppConfig
 from django.conf import settings
-from django.db.models.signals import pre_delete, pre_save, post_save
+from django.db.models.signals import post_save
 from django.utils.translation import gettext_lazy as _
 
 from . import signals
@@ -17,15 +17,6 @@ class NoteConfig(AppConfig):
         """
         Define app internal signals to interact with other apps
         """
-        pre_save.connect(
-            signals.pre_save_note,
-            sender="note.noteuser",
-        )
-        pre_save.connect(
-            signals.pre_save_note,
-            sender="note.noteclub",
-        )
-
         post_save.connect(
             signals.save_user_note,
             sender=settings.AUTH_USER_MODEL,
@@ -34,8 +25,3 @@ class NoteConfig(AppConfig):
             signals.save_club_note,
             sender='member.Club',
         )
-
-        pre_delete.connect(
-            signals.delete_transaction,
-            sender='note.transaction',
-        )

apps/note/fixtures/initial.json

@@ -0,0 +1,188 @@
+[
+  {
+    "model": "note.note",
+    "pk": 1,
+    "fields": {
+      "polymorphic_ctype": [
+        "note",
+        "notespecial"
+      ],
+      "balance": 0,
+      "last_negative": null,
+      "is_active": true,
+      "display_image": "",
+      "created_at": "2020-02-20T20:02:48.778Z"
+    }
+  },
+  {
+    "model": "note.note",
+    "pk": 2,
+    "fields": {
+      "polymorphic_ctype": [
+        "note",
+        "notespecial"
+      ],
+      "balance": 0,
+      "last_negative": null,
+      "is_active": true,
+      "display_image": "",
+      "created_at": "2020-02-20T20:06:39.546Z"
+    }
+  },
+  {
+    "model": "note.note",
+    "pk": 3,
+    "fields": {
+      "polymorphic_ctype": [
+        "note",
+        "notespecial"
+      ],
+      "balance": 0,
+      "last_negative": null,
+      "is_active": true,
+      "display_image": "",
+      "created_at": "2020-02-20T20:06:43.049Z"
+    }
+  },
+  {
+    "model": "note.note",
+    "pk": 4,
+    "fields": {
+      "polymorphic_ctype": [
+        "note",
+        "notespecial"
+      ],
+      "balance": 0,
+      "last_negative": null,
+      "is_active": true,
+      "display_image": "",
+      "created_at": "2020-02-20T20:06:50.996Z"
+    }
+  },
+  {
+    "model": "note.note",
+    "pk": 5,
+    "fields": {
+      "polymorphic_ctype": [
+        "note",
+        "noteclub"
+      ],
+      "balance": 0,
+      "last_negative": null,
+      "is_active": true,
+      "display_image": "pic/default.png",
+      "created_at": "2020-02-20T20:09:38.615Z"
+    }
+  },
+  {
+    "model": "note.note",
+    "pk": 6,
+    "fields": {
+      "polymorphic_ctype": [
+        "note",
+        "noteclub"
+      ],
+      "balance": 0,
+      "last_negative": null,
+      "is_active": true,
+      "display_image": "pic/default.png",
+      "created_at": "2020-02-20T20:16:14.753Z"
+    }
+  },
+  {
+    "model": "note.noteclub",
+    "pk": 5,
+    "fields": {
+      "club": 1
+    }
+  },
+  {
+    "model": "note.noteclub",
+    "pk": 6,
+    "fields": {
+      "club": 2
+    }
+  },
+  {
+    "model": "note.notespecial",
+    "pk": 1,
+    "fields": {
+      "special_type": "Esp\u00e8ces"
+    }
+  },
+  {
+    "model": "note.notespecial",
+    "pk": 2,
+    "fields": {
+      "special_type": "Carte bancaire"
+    }
+  },
+  {
+    "model": "note.notespecial",
+    "pk": 3,
+    "fields": {
+      "special_type": "Ch\u00e8que"
+    }
+  },
+  {
+    "model": "note.notespecial",
+    "pk": 4,
+    "fields": {
+      "special_type": "Virement bancaire"
+    }
+  },
+  {
+    "model": "note.alias",
+    "pk": 1,
+    "fields": {
+      "name": "Esp\u00e8ces",
+      "normalized_name": "especes",
+      "note": 1
+    }
+  },
+  {
+    "model": "note.alias",
+    "pk": 2,
+    "fields": {
+      "name": "Carte bancaire",
+      "normalized_name": "cartebancaire",
+      "note": 2
+    }
+  },
+  {
+    "model": "note.alias",
+    "pk": 3,
+    "fields": {
+      "name": "Ch\u00e8que",
+      "normalized_name": "cheque",
+      "note": 3
+    }
+  },
+  {
+    "model": "note.alias",
+    "pk": 4,
+    "fields": {
+      "name": "Virement bancaire",
+      "normalized_name": "virementbancaire",
+      "note": 4
+    }
+  },
+  {
+    "model": "note.alias",
+    "pk": 5,
+    "fields": {
+      "name": "BDE",
+      "normalized_name": "bde",
+      "note": 5
+    }
+  },
+  {
+    "model": "note.alias",
+    "pk": 6,
+    "fields": {
+      "name": "Kfet",
+      "normalized_name": "kfet",
+      "note": 6
+    }
+  }
+]

apps/note/forms.py

@@ -1,17 +1,25 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-from datetime import datetime
 
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.forms import CheckboxSelectMultiple
-from django.utils.timezone import make_aware
 from django.utils.translation import gettext_lazy as _
 from note_kfet.inputs import Autocomplete, AmountInput, DateTimePickerInput
 
 from .models import TransactionTemplate, NoteClub, Alias
 
 
+class ImageForm(forms.Form):
+    image = forms.ImageField(required=False,
+                             label=_('select an image'),
+                             help_text=_('Maximal size: 2MB'))
+    x = forms.FloatField(widget=forms.HiddenInput())
+    y = forms.FloatField(widget=forms.HiddenInput())
+    width = forms.FloatField(widget=forms.HiddenInput())
+    height = forms.FloatField(widget=forms.HiddenInput())
+
+
 class TransactionTemplateForm(forms.ModelForm):
     class Meta:
         model = TransactionTemplate
@@ -95,16 +103,16 @@ class SearchTransactionForm(forms.Form):
         widget=AmountInput(),
     )
 
-    created_after = forms.DateTimeField(
+    created_after = forms.Field(
         label=_("Created after"),
-        initial=make_aware(datetime(year=2000, month=1, day=1, hour=0, minute=0)),
+        initial="2000-01-01 00:00",
         required=False,
         widget=DateTimePickerInput(),
     )
 
-    created_before = forms.DateTimeField(
+    created_before = forms.Field(
         label=_("Created before"),
-        initial=make_aware(datetime(year=2042, month=12, day=31, hour=21, minute=42)),
+        initial="2042-12-31 21:42",
         required=False,
         widget=DateTimePickerInput(),
     )

apps/note/migrations/0001_initial.py

@@ -1,209 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-04 21:41
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('member', '0001_initial'),
-        ('contenttypes', '0002_remove_content_type_name'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Note',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('balance', models.BigIntegerField(default=0, help_text='in centimes, money credited for this instance', verbose_name='account balance')),
-                ('last_negative', models.DateTimeField(blank=True, help_text='last time the balance was negative', null=True, verbose_name='last negative date')),
-                ('display_image', models.ImageField(default='pic/default.png', max_length=255, upload_to='pic/', verbose_name='display image')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='created at')),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this note should be treated as active. Unselect this instead of deleting notes.', verbose_name='active')),
-                ('inactivity_reason', models.CharField(choices=[('manual', 'The user blocked his/her note manually, eg. when he/she left the school for holidays. It can be reactivated at any time.'), ('forced', "The note is blocked by the the BDE and can't be manually reactivated.")], default=None, max_length=255, null=True)),
-                ('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_note.note_set+', to='contenttypes.ContentType')),
-            ],
-            options={
-                'verbose_name': 'note',
-                'verbose_name_plural': 'notes',
-            },
-        ),
-        migrations.CreateModel(
-            name='TemplateCategory',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=31, unique=True, verbose_name='name')),
-            ],
-            options={
-                'verbose_name': 'transaction category',
-                'verbose_name_plural': 'transaction categories',
-            },
-        ),
-        migrations.CreateModel(
-            name='Transaction',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('source_alias', models.CharField(default='', max_length=255, verbose_name='used alias')),
-                ('destination_alias', models.CharField(default='', max_length=255, verbose_name='used alias')),
-                ('created_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='created at')),
-                ('quantity', models.PositiveIntegerField(default=1, verbose_name='quantity')),
-                ('amount', models.PositiveIntegerField(verbose_name='amount')),
-                ('reason', models.CharField(max_length=255, verbose_name='reason')),
-                ('valid', models.BooleanField(default=True, verbose_name='valid')),
-                ('invalidity_reason', models.CharField(blank=True, default=None, max_length=255, null=True, verbose_name='invalidity reason')),
-                ('destination', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='note.Note', verbose_name='destination')),
-                ('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_note.transaction_set+', to='contenttypes.ContentType')),
-                ('source', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='note.Note', verbose_name='source')),
-            ],
-            options={
-                'verbose_name': 'transaction',
-                'verbose_name_plural': 'transactions',
-            },
-        ),
-        migrations.CreateModel(
-            name='MembershipTransaction',
-            fields=[
-                ('transaction_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='note.Transaction')),
-            ],
-            options={
-                'verbose_name': 'membership transaction',
-                'verbose_name_plural': 'membership transactions',
-            },
-            bases=('note.transaction',),
-        ),
-        migrations.CreateModel(
-            name='NoteClub',
-            fields=[
-                ('note_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='note.Note')),
-            ],
-            options={
-                'verbose_name': 'club note',
-                'verbose_name_plural': 'clubs notes',
-            },
-            bases=('note.note',),
-        ),
-        migrations.CreateModel(
-            name='NoteSpecial',
-            fields=[
-                ('note_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='note.Note')),
-                ('special_type', models.CharField(max_length=255, unique=True, verbose_name='type')),
-            ],
-            options={
-                'verbose_name': 'special note',
-                'verbose_name_plural': 'special notes',
-            },
-            bases=('note.note',),
-        ),
-        migrations.CreateModel(
-            name='NoteUser',
-            fields=[
-                ('note_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='note.Note')),
-            ],
-            options={
-                'verbose_name': "one's note",
-                'verbose_name_plural': 'users note',
-            },
-            bases=('note.note',),
-        ),
-        migrations.CreateModel(
-            name='RecurrentTransaction',
-            fields=[
-                ('transaction_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='note.Transaction')),
-            ],
-            options={
-                'verbose_name': 'recurrent transaction',
-                'verbose_name_plural': 'recurrent transactions',
-            },
-            bases=('note.transaction',),
-        ),
-        migrations.CreateModel(
-            name='SpecialTransaction',
-            fields=[
-                ('transaction_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='note.Transaction')),
-                ('last_name', models.CharField(max_length=255, verbose_name='name')),
-                ('first_name', models.CharField(max_length=255, verbose_name='first_name')),
-                ('bank', models.CharField(blank=True, max_length=255, verbose_name='bank')),
-            ],
-            options={
-                'verbose_name': 'Special transaction',
-                'verbose_name_plural': 'Special transactions',
-            },
-            bases=('note.transaction',),
-        ),
-        migrations.CreateModel(
-            name='Alias',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, unique=True, verbose_name='name')),
-                ('normalized_name', models.CharField(editable=False, max_length=255, unique=True)),
-                ('note', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='note.Note')),
-            ],
-            options={
-                'verbose_name': 'alias',
-                'verbose_name_plural': 'aliases',
-            },
-        ),
-        migrations.CreateModel(
-            name='TransactionTemplate',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(error_messages={'unique': 'A template with this name already exist'}, max_length=255, unique=True, verbose_name='name')),
-                ('amount', models.PositiveIntegerField(verbose_name='amount')),
-                ('display', models.BooleanField(default=True, verbose_name='display')),
-                ('highlighted', models.BooleanField(default=False, verbose_name='highlighted')),
-                ('description', models.CharField(blank=True, max_length=255, verbose_name='description')),
-                ('category', models.ForeignKey(max_length=31, on_delete=django.db.models.deletion.PROTECT, related_name='templates', to='note.TemplateCategory', verbose_name='type')),
-                ('destination', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='note.NoteClub', verbose_name='destination')),
-            ],
-            options={
-                'verbose_name': 'transaction template',
-                'verbose_name_plural': 'transaction templates',
-            },
-        ),
-        migrations.AddIndex(
-            model_name='transaction',
-            index=models.Index(fields=['created_at'], name='note_transa_created_bea8b1_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='transaction',
-            index=models.Index(fields=['source'], name='note_transa_source__4a1a1e_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='transaction',
-            index=models.Index(fields=['destination'], name='note_transa_destina_6e1bb4_idx'),
-        ),
-        migrations.AddField(
-            model_name='recurrenttransaction',
-            name='template',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='note.TransactionTemplate'),
-        ),
-        migrations.AddField(
-            model_name='noteuser',
-            name='user',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='note', to=settings.AUTH_USER_MODEL, verbose_name='user'),
-        ),
-        migrations.AddField(
-            model_name='noteclub',
-            name='club',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='note', to='member.Club', verbose_name='club'),
-        ),
-        migrations.AddField(
-            model_name='membershiptransaction',
-            name='membership',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='transaction', to='member.Membership'),
-        ),
-        migrations.AddIndex(
-            model_name='alias',
-            index=models.Index(fields=['name'], name='note_alias_name_a89405_idx'),
-        ),
-        migrations.AddIndex(
-            model_name='alias',
-            index=models.Index(fields=['normalized_name'], name='note_alias_normali_bd52b4_idx'),
-        ),
-    ]

apps/note/migrations/0002_create_special_notes.py

@@ -1,25 +0,0 @@
-from django.db import migrations
-
-
-def create_special_notes(apps, schema_editor):
-    """
-    We create the four special note to make transfers.
-    """
-    NoteSpecial = apps.get_model("note", "notespecial")
-    ContentType = apps.get_model('contenttypes', 'ContentType')
-    polymorphic_ctype_id = ContentType.objects.get_for_model(NoteSpecial).id
-
-    NoteSpecial.objects.get_or_create(id=1, special_type="Espèces", polymorphic_ctype_id=polymorphic_ctype_id)
-    NoteSpecial.objects.get_or_create(id=2, special_type="Carte bancaire", polymorphic_ctype_id=polymorphic_ctype_id)
-    NoteSpecial.objects.get_or_create(id=3, special_type="Chèque", polymorphic_ctype_id=polymorphic_ctype_id)
-    NoteSpecial.objects.get_or_create(id=4, special_type="Virement bancaire", polymorphic_ctype_id=polymorphic_ctype_id)
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ('note', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RunPython(create_special_notes),
-    ]

apps/note/migrations/0003_replace_null_by_blank.py

@@ -1,17 +0,0 @@
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('note', '0002_create_special_notes'),
-    ]
-
-    operations = [
-        migrations.RunSQL(
-            "UPDATE note_note SET inactivity_reason = '' WHERE inactivity_reason IS NULL;"
-        ),
-        migrations.RunSQL(
-            "UPDATE note_transaction SET invalidity_reason = '' WHERE invalidity_reason IS NULL;"
-        ),
-    ]

apps/note/migrations/0004_remove_null_tag_on_charfields.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.2.16 on 2020-09-06 19:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('note', '0003_replace_null_by_blank'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='note',
-            name='inactivity_reason',
-            field=models.CharField(blank=True, choices=[('manual', 'The user blocked his/her note manually, eg. when he/she left the school for holidays. It can be reactivated at any time.'), ('forced', "The note is blocked by the the BDE and can't be manually reactivated.")], default='', max_length=255),
-        ),
-        migrations.AlterField(
-            model_name='transaction',
-            name='invalidity_reason',
-            field=models.CharField(blank=True, default='', max_length=255, verbose_name='invalidity reason'),
-        ),
-    ]

apps/note/models/notes.py

@@ -4,11 +4,9 @@
 import unicodedata
 
 from django.conf import settings
-from django.conf.global_settings import DEFAULT_FROM_EMAIL
 from django.core.exceptions import ValidationError
-from django.core.mail import send_mail
 from django.core.validators import RegexValidator
-from django.db import models, transaction
+from django.db import models
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -27,20 +25,24 @@ class Note(PolymorphicModel):
     A Note can be searched find throught an :model:`note.Alias`
 
     """
-
+    balance = models.IntegerField(
-    balance = models.BigIntegerField(
         verbose_name=_('account balance'),
         help_text=_('in centimes, money credited for this instance'),
         default=0,
     )
-
     last_negative = models.DateTimeField(
         verbose_name=_('last negative date'),
         help_text=_('last time the balance was negative'),
         null=True,
         blank=True,
     )
-
+    is_active = models.BooleanField(
+        _('active'),
+        default=True,
+        help_text=_(
+            'Designates whether this note should be treated as active. '
+            'Unselect this instead of deleting notes.'),
+    )
     display_image = models.ImageField(
         verbose_name=_('display image'),
         max_length=255,
@@ -49,31 +51,11 @@ class Note(PolymorphicModel):
         upload_to='pic/',
         default='pic/default.png'
     )
-
     created_at = models.DateTimeField(
         verbose_name=_('created at'),
         default=timezone.now,
     )
 
-    is_active = models.BooleanField(
-        _('active'),
-        default=True,
-        help_text=_(
-            'Designates whether this note should be treated as active. '
-            'Unselect this instead of deleting notes.'),
-    )
-
-    inactivity_reason = models.CharField(
-        max_length=255,
-        choices=[
-            ('manual', _("The user blocked his/her note manually, eg. when he/she left the school for holidays. "
-                         "It can be reactivated at any time.")),
-            ('forced', _("The note is blocked by the the BDE and can't be manually reactivated.")),
-        ],
-        blank=True,
-        default="",
-    )
-
     class Meta:
         verbose_name = _("note")
         verbose_name_plural = _("notes")
@@ -93,33 +75,28 @@ class Note(PolymorphicModel):
         delta = timezone.now() - self.last_negative
         return "{:d} jours".format(delta.days)
 
-    @transaction.atomic
     def save(self, *args, **kwargs):
         """
         Save note with it's alias (called in polymorphic children)
         """
-        # Check that we can save the alias
+        aliases = Alias.objects.filter(name=str(self))
-        self.clean()
+        if aliases.exists():
+            # Alias exists, so check if it is linked to this note
+            if aliases.first().note != self:
+                raise ValidationError(_('This alias is already taken.'),
+                                      code="same_alias")
 
+            # Save note
             super().save(*args, **kwargs)
-
+        else:
-        if not Alias.objects.filter(normalized_name=Alias.normalize(str(self))).exists():
+            # Alias does not exist yet, so check if it can exist
             a = Alias(name=str(self))
             a.clean()
 
-            # Save alias
+            # Save note and alias
+            super().save(*args, **kwargs)
             a.note = self
-            # Consider that if the name of the note could be changed, then the alias can be created.
-            # It does not mean that any alias can be created.
-            a._force_save = True
             a.save(force_insert=True)
-        else:
-            # Check if the name of the note changed without changing the normalized form of the alias
-            alias = Alias.objects.get(normalized_name=Alias.normalize(str(self)))
-            if alias.name != str(self):
-                alias.name = str(self)
-                alias._force_save = True
-                alias.save()
 
     def clean(self, *args, **kwargs):
         """
@@ -159,6 +136,15 @@ class NoteUser(Note):
     def pretty(self):
         return _("%(user)s's note") % {'user': str(self.user)}
 
+    def save(self, *args, **kwargs):
+        if self.pk and self.balance < 0:
+            old_note = NoteUser.objects.get(pk=self.pk)
+            if old_note.balance >= 0:
+                # Passage en négatif
+                self.last_negative = timezone.now()
+                self.send_mail_negative_balance()
+        super().save(*args, **kwargs)
+
     def send_mail_negative_balance(self):
         plain_text = render_to_string("note/mails/negative_balance.txt", dict(note=self))
         html = render_to_string("note/mails/negative_balance.html", dict(note=self))
@@ -187,12 +173,6 @@ class NoteClub(Note):
     def pretty(self):
         return _("Note of %(club)s club") % {'club': str(self.club)}
 
-    def send_mail_negative_balance(self):
-        plain_text = render_to_string("note/mails/negative_balance.txt", dict(note=self))
-        html = render_to_string("note/mails/negative_balance.html", dict(note=self))
-        send_mail("[Note Kfet] Passage en négatif (club {})".format(self.club.name), plain_text, DEFAULT_FROM_EMAIL,
-                  [self.club.email], html_message=html)
-
 
 class NoteSpecial(Note):
     """
@@ -242,7 +222,7 @@ class Alias(models.Model):
     normalized_name = models.CharField(
         max_length=255,
         unique=True,
-        blank=False,
+        default='',
         editable=False,
     )
     note = models.ForeignKey(
@@ -269,16 +249,13 @@ class Alias(models.Model):
         return ''.join(
             char for char in unicodedata.normalize('NFKD', string.casefold().replace('æ', 'ae').replace('œ', 'oe'))
             if all(not unicodedata.category(char).startswith(cat)
-                   for cat in {'M', 'Pc', 'Pe', 'Pf', 'Pi', 'Po', 'Ps', 'Z', 'C'}))\
+                   for cat in {'M', 'P', 'Z', 'C'})).casefold().encode('ascii', 'ignore').decode('ascii')
-            .casefold().encode('ascii', 'ignore').decode('ascii')
 
     def clean(self):
         normalized_name = self.normalize(self.name)
         if len(normalized_name) >= 255:
             raise ValidationError(_('Alias is too long.'),
                                   code='alias_too_long')
-        if not normalized_name:
-            raise ValidationError(_('This alias contains only complex character. Please use a more simple alias.'))
         try:
             sim_alias = Alias.objects.get(normalized_name=normalized_name)
             if self != sim_alias:
@@ -289,9 +266,8 @@ class Alias(models.Model):
             pass
         self.normalized_name = normalized_name
 
-    @transaction.atomic
     def save(self, *args, **kwargs):
-        self.clean()
+        self.normalized_name = self.normalize(self.name)
         super().save(*args, **kwargs)
 
     def delete(self, using=None, keep_parents=False):

apps/note/models/transactions.py

@@ -1,6 +1,5 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 from django.core.exceptions import ValidationError
 from django.db import models, transaction
 from django.urls import reverse
@@ -90,9 +89,6 @@ class TransactionTemplate(models.Model):
     def get_absolute_url(self):
         return reverse('note:template_update', args=(self.pk,))
 
-    def __str__(self):
-        return self.name
-
 
 class Transaction(PolymorphicModel):
     """
@@ -153,7 +149,8 @@ class Transaction(PolymorphicModel):
     invalidity_reason = models.CharField(
         verbose_name=_('invalidity reason'),
         max_length=255,
-        default='',
+        default=None,
+        null=True,
         blank=True,
     )
 
@@ -170,41 +167,29 @@ class Transaction(PolymorphicModel):
         previous_source_balance = self.source.balance
         previous_dest_balance = self.destination.balance
 
-        source_balance = previous_source_balance
-        dest_balance = previous_dest_balance
-
         created = self.pk is None
-        to_transfer = self.total
+        to_transfer = self.amount * self.quantity
         if not created:
             # Revert old transaction
-            # We make a select for update to avoid concurrency issues
+            old_transaction = Transaction.objects.get(pk=self.pk)
-            old_transaction = Transaction.objects.select_for_update().get(pk=self.pk)
-            # Check that nothing important changed
-            if not hasattr(self, "_force_save"):
-                for field_name in ["source_id", "destination_id", "quantity", "amount"]:
-                    if getattr(self, field_name) != getattr(old_transaction, field_name):
-                        raise ValidationError(_("You can't update the {field} on a Transaction. "
-                                                "Please invalidate it and create one other.").format(field=field_name))
-
-            if old_transaction.valid == self.valid:
-                # Don't change anything
-                return 0, 0
             if old_transaction.valid:
-                source_balance += to_transfer
+                self.source.balance += to_transfer
-                dest_balance -= to_transfer
+                self.destination.balance -= to_transfer
 
         if self.valid:
-            source_balance -= to_transfer
+            self.source.balance -= to_transfer
-            dest_balance += to_transfer
+            self.destination.balance += to_transfer
 
             # When a transaction is declared valid, we ensure that the invalidity reason is null, if it was
             # previously invalid
-            self.invalidity_reason = ""
+            self.invalidity_reason = None
 
-        if source_balance > 9223372036854775807 or source_balance < -9223372036854775808\
+        source_balance = self.source.balance
-                or dest_balance > 9223372036854775807 or dest_balance < -9223372036854775808:
+        dest_balance = self.destination.balance
-            raise ValidationError(_("The note balances must be between - 92 233 720 368 547 758.08 € "
+
-                                    "and 92 233 720 368 547 758.07 €."))
+        if source_balance > 2147483647 or source_balance < -2147483648\
+                or dest_balance > 2147483647 or dest_balance < -2147483648:
+            raise ValidationError(_("The note balances must be between - 21 474 836.47 € and 21 474 836.47 €."))
 
         return source_balance - previous_source_balance, dest_balance - previous_dest_balance
 
@@ -213,17 +198,12 @@ class Transaction(PolymorphicModel):
         """
         When saving, also transfer money between two notes
         """
-        if self.source.pk == self.destination.pk:
+        with transaction.atomic():
-            # When source == destination, no money is transferred and no transaction is created
-            return
-
-        self.source = Note.objects.select_for_update().get(pk=self.source_id)
-        self.destination = Note.objects.select_for_update().get(pk=self.destination_id)
-
-        # 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 'force_insert' not in kwargs or not kwargs['force_insert']:
+                    if 'force_update' not in kwargs or not kwargs['force_update']:
                         raise ValidationError(_("The transaction can't be saved since the source note "
                                                 "or the destination note is not active."))
 
@@ -234,6 +214,10 @@ class Transaction(PolymorphicModel):
             if not self.destination_alias:
                 self.destination_alias = str(self.destination)
 
+            if self.source.pk == self.destination.pk:
+                # When source == destination, no money is transferred and no transaction is created
+                return
+
             # We save first the transaction, in case of the user has no right to transfer money
             super().save(*args, **kwargs)
 
@@ -247,6 +231,14 @@ class Transaction(PolymorphicModel):
             self.destination._force_save = True
             self.destination.save()
 
+    def delete(self, **kwargs):
+        """
+        Whenever we want to delete a transaction (caution with this), we ensure the transaction is invalid first.
+        """
+        self.valid = False
+        self.save(**kwargs)
+        super().delete(**kwargs)
+
     @property
     def total(self):
         return self.amount * self.quantity
@@ -270,16 +262,10 @@ class RecurrentTransaction(Transaction):
         on_delete=models.PROTECT,
     )
 
-    def clean(self):
+    category = models.ForeignKey(
-        if self.template.destination != self.destination:
+        TemplateCategory,
-            raise ValidationError(
+        on_delete=models.PROTECT,
-                _("The destination of this transaction must equal to the destination of the template."))
+    )
-        return super().clean()
-
-    @transaction.atomic
-    def save(self, *args, **kwargs):
-        self.clean()
-        return super().save(*args, **kwargs)
 
     @property
     def type(self):
@@ -327,11 +313,6 @@ class SpecialTransaction(Transaction):
             raise(ValidationError(_("A special transaction is only possible between a"
                                     " Note associated to a payment method and a User or a Club")))
 
-    @transaction.atomic
-    def save(self, *args, **kwargs):
-        self.clean()
-        super().save(*args, **kwargs)
-
     class Meta:
         verbose_name = _("Special transaction")
         verbose_name_plural = _("Special transactions")
@@ -355,4 +336,4 @@ class MembershipTransaction(Transaction):
 
     @property
     def type(self):
-        return _('membership').capitalize()
+        return _('membership transaction')