Compare commits
4 commits
master
...
no-hardcod
Author | SHA1 | Date | |
---|---|---|---|
bd714538df | |||
a37e59ed02 | |||
c25356594a | |||
7e9b23d4a1 |
19 changed files with 99 additions and 1014 deletions
661
LICENSE
661
LICENSE
|
@ -1,661 +0,0 @@
|
||||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 19 November 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU Affero General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works, specifically designed to ensure
|
|
||||||
cooperation with the community in the case of network server software.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
our General Public Licenses are 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.
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
Developers that use our General Public Licenses protect your rights
|
|
||||||
with two steps: (1) assert copyright on the software, and (2) offer
|
|
||||||
you this License which gives you legal permission to copy, distribute
|
|
||||||
and/or modify the software.
|
|
||||||
|
|
||||||
A secondary benefit of defending all users' freedom is that
|
|
||||||
improvements made in alternate versions of the program, if they
|
|
||||||
receive widespread use, become available for other developers to
|
|
||||||
incorporate. Many developers of free software are heartened and
|
|
||||||
encouraged by the resulting cooperation. However, in the case of
|
|
||||||
software used on network servers, this result may fail to come about.
|
|
||||||
The GNU General Public License permits making a modified version and
|
|
||||||
letting the public access it on a server without ever releasing its
|
|
||||||
source code to the public.
|
|
||||||
|
|
||||||
The GNU Affero General Public License is designed specifically to
|
|
||||||
ensure that, in such cases, the modified source code becomes available
|
|
||||||
to the community. It requires the operator of a network server to
|
|
||||||
provide the source code of the modified version running there to the
|
|
||||||
users of that server. Therefore, public use of a modified version, on
|
|
||||||
a publicly accessible server, gives the public access to the source
|
|
||||||
code of the modified version.
|
|
||||||
|
|
||||||
An older license, called the Affero General Public License and
|
|
||||||
published by Affero, was designed to accomplish similar goals. This is
|
|
||||||
a different license, not a version of the Affero GPL, but Affero has
|
|
||||||
released a new version of the Affero GPL which permits relicensing under
|
|
||||||
this license.
|
|
||||||
|
|
||||||
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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, if you modify the
|
|
||||||
Program, your modified version must prominently offer all users
|
|
||||||
interacting with it remotely through a computer network (if your version
|
|
||||||
supports such interaction) an opportunity to receive the Corresponding
|
|
||||||
Source of your version by providing access to the Corresponding Source
|
|
||||||
from a network server at no charge, through some standard or customary
|
|
||||||
means of facilitating copying of software. This Corresponding Source
|
|
||||||
shall include the Corresponding Source for any work covered by version 3
|
|
||||||
of the GNU General Public License that is incorporated pursuant to the
|
|
||||||
following paragraph.
|
|
||||||
|
|
||||||
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 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 work with which it is combined will remain governed by version
|
|
||||||
3 of the GNU General Public License.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU Affero 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 Affero 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 Affero 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 Affero 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.
|
|
||||||
|
|
||||||
KeRS
|
|
||||||
Copyright (C) 2020 bestuur
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero 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 Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If your software can interact with users remotely through a computer
|
|
||||||
network, you should also make sure that it provides a way for users to
|
|
||||||
get its source. For example, if your program is a web application, its
|
|
||||||
interface could display a "Source" link that leads users to an archive
|
|
||||||
of the code. There are many ways you could offer source, and different
|
|
||||||
solutions will be better for different programs; see section 13 for the
|
|
||||||
specific requirements.
|
|
||||||
|
|
||||||
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 AGPL, see
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
6
Makefile
6
Makefile
|
@ -31,4 +31,8 @@ reset_db:
|
||||||
esac
|
esac
|
||||||
make migrate
|
make migrate
|
||||||
rewrite_migrations:
|
rewrite_migrations:
|
||||||
@echo "We have data in production. This is not allowed any more."; exit 1
|
@printf "Only for when there is no data in production yet. Continue? (y/N) "; read continue; [ "$$continue" = y ]
|
||||||
|
# Remove migrations but not users' migrations 0001 and 0002
|
||||||
|
rm -f events/migrations/0*_*.py users/migrations/000[3-9].py users/migrations/00[1-9]*.py
|
||||||
|
make migrations
|
||||||
|
make reset_db
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
from django import template
|
|
||||||
|
|
||||||
register = template.Library()
|
|
|
@ -1,15 +1,7 @@
|
||||||
from django import forms
|
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
from django import forms
|
||||||
|
|
||||||
from .models import Event, EventRegistration, TimeSlot
|
from .models import Event, EventRegistration
|
||||||
|
|
||||||
|
|
||||||
class TimeSlotFormSet(forms.BaseInlineFormSet):
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
kwargs["initial"] = [
|
|
||||||
{"time": TimeSlot.EVENING}
|
|
||||||
]
|
|
||||||
super().__init__(*args, **kwargs)
|
|
||||||
|
|
||||||
|
|
||||||
class RegistrationFormSet(forms.BaseInlineFormSet):
|
class RegistrationFormSet(forms.BaseInlineFormSet):
|
||||||
|
@ -20,25 +12,12 @@ class RegistrationFormSet(forms.BaseInlineFormSet):
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class TimeSlotInline(admin.StackedInline):
|
|
||||||
model = TimeSlot
|
|
||||||
extra = 1
|
|
||||||
formset = TimeSlotFormSet
|
|
||||||
|
|
||||||
|
|
||||||
class RegistrationInline(admin.TabularInline):
|
class RegistrationInline(admin.TabularInline):
|
||||||
model = EventRegistration
|
model = EventRegistration
|
||||||
extra = 1
|
extra = 1
|
||||||
formset = RegistrationFormSet
|
formset = RegistrationFormSet
|
||||||
#
|
|
||||||
|
|
||||||
class EventAdmin(admin.ModelAdmin):
|
class EventAdmin(admin.ModelAdmin):
|
||||||
inlines = [TimeSlotInline]
|
|
||||||
|
|
||||||
|
|
||||||
class TimeSlotAdmin(admin.ModelAdmin):
|
|
||||||
inlines = [RegistrationInline]
|
inlines = [RegistrationInline]
|
||||||
|
|
||||||
|
|
||||||
admin.site.register(Event, EventAdmin)
|
admin.site.register(Event, EventAdmin)
|
||||||
admin.site.register(TimeSlot, TimeSlotAdmin)
|
|
||||||
|
|
|
@ -1,104 +0,0 @@
|
||||||
# Generated by Django 3.0.8 on 2020-08-03 22:04
|
|
||||||
|
|
||||||
import django.db.models.deletion
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
def forwards_migrate_data(apps, schema_editor):
|
|
||||||
EventRegistration = apps.get_model('events', 'EventRegistration')
|
|
||||||
TimeSlot = apps.get_model('events', 'TimeSlot')
|
|
||||||
Event = apps.get_model('events', 'Event')
|
|
||||||
|
|
||||||
grouped = {}
|
|
||||||
for event in Event.objects.all():
|
|
||||||
if event.note in grouped:
|
|
||||||
grouped[event.note].append(event)
|
|
||||||
else:
|
|
||||||
grouped[event.note] = [event]
|
|
||||||
|
|
||||||
for note, events in grouped.items():
|
|
||||||
event = events[0]
|
|
||||||
new_event = Event(date=event.date, capacity=event.capacity, note=event.note,
|
|
||||||
responsible_person=event.responsible_person)
|
|
||||||
new_event.save()
|
|
||||||
|
|
||||||
# Create a corresponding timeslot for every event with the same description
|
|
||||||
for event in events:
|
|
||||||
new_timeslot = TimeSlot(time=event.time, event=new_event)
|
|
||||||
new_timeslot.save()
|
|
||||||
|
|
||||||
# Connect registrations to the timeslots instead of the events.
|
|
||||||
for registration in EventRegistration.objects.filter(event_id=event.id).all():
|
|
||||||
registration.time_slot = new_timeslot
|
|
||||||
registration.save()
|
|
||||||
|
|
||||||
def forwards_remove_old_data(apps, schema_editor):
|
|
||||||
# Remove old events here so the cascade doesnt remove the registrations.
|
|
||||||
EventRegistration = apps.get_model('events', 'EventRegistration')
|
|
||||||
TimeSlot = apps.get_model('events', 'TimeSlot')
|
|
||||||
Event = apps.get_model('events', 'Event')
|
|
||||||
|
|
||||||
# Remove all events without timeslot
|
|
||||||
for event in Event.objects.exclude(id__in=TimeSlot.objects.values('event_id').all()):
|
|
||||||
event.delete()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
dependencies = [
|
|
||||||
('events', '0001_initial'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.CreateModel(
|
|
||||||
name='TimeSlot',
|
|
||||||
fields=[
|
|
||||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
|
||||||
('time', models.IntegerField(choices=[(0, 'voormiddag'), (1, 'namiddag'), (2, 'avond')], default=0)),
|
|
||||||
('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.Event'))
|
|
||||||
],
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='eventregistration',
|
|
||||||
name='time_slot',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.TimeSlot', null=True),
|
|
||||||
),
|
|
||||||
migrations.AddConstraint(
|
|
||||||
model_name='timeslot',
|
|
||||||
constraint=models.UniqueConstraint(fields=('time', 'event'), name='no_duplicate_timeslots'),
|
|
||||||
),
|
|
||||||
migrations.AddConstraint(
|
|
||||||
model_name='eventregistration',
|
|
||||||
constraint=models.UniqueConstraint(fields=('time_slot', 'user'), name='register_only_once_per_timeslot'),
|
|
||||||
),
|
|
||||||
|
|
||||||
migrations.RunPython(forwards_migrate_data, hints={'target_db': 'default'}),
|
|
||||||
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='event',
|
|
||||||
name='time',
|
|
||||||
),
|
|
||||||
|
|
||||||
# Django bugs out when removing constraints that are made on fk's. We manualy fix it here 2 'AlterField' calls
|
|
||||||
# https://code.djangoproject.com/ticket/31335
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='eventregistration',
|
|
||||||
name='event',
|
|
||||||
field=models.ForeignKey(
|
|
||||||
db_constraint=False,
|
|
||||||
on_delete=django.db.models.deletion.CASCADE,
|
|
||||||
related_name='eventregistrations',
|
|
||||||
related_query_name='eventregistration',
|
|
||||||
to='events.Event',
|
|
||||||
),
|
|
||||||
),
|
|
||||||
migrations.RemoveConstraint(
|
|
||||||
model_name='eventregistration',
|
|
||||||
name='register_only_once',
|
|
||||||
),
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='eventregistration',
|
|
||||||
name='event',
|
|
||||||
),
|
|
||||||
|
|
||||||
migrations.RunPython(forwards_remove_old_data, hints={'target_db': 'default'}),
|
|
||||||
]
|
|
|
@ -1,19 +0,0 @@
|
||||||
# Generated by Django 3.0.8 on 2020-08-04 15:34
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
import django.db.models.deletion
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('events', '0002_auto_20200804_0004'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='eventregistration',
|
|
||||||
name='time_slot',
|
|
||||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.TimeSlot'),
|
|
||||||
),
|
|
||||||
]
|
|
|
@ -4,37 +4,23 @@ from users.models import CustomUser
|
||||||
|
|
||||||
|
|
||||||
class Event(models.Model):
|
class Event(models.Model):
|
||||||
date = models.DateField()
|
|
||||||
capacity = models.IntegerField(default=6)
|
|
||||||
note = models.TextField(max_length=1024, default="")
|
|
||||||
responsible_person = models.ForeignKey(CustomUser, null=True, on_delete=models.SET_NULL)
|
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
return f"{self.date}"
|
|
||||||
|
|
||||||
|
|
||||||
class TimeSlot(models.Model):
|
|
||||||
MORNING, AFTERNOON, EVENING = range(3)
|
MORNING, AFTERNOON, EVENING = range(3)
|
||||||
TIME_SLOTS = {
|
TIME_SLOTS = {
|
||||||
MORNING: "voormiddag",
|
MORNING: "voormiddag",
|
||||||
AFTERNOON: "namiddag",
|
AFTERNOON: "namiddag",
|
||||||
EVENING: "avond",
|
EVENING: "avond",
|
||||||
}
|
}
|
||||||
|
date = models.DateField()
|
||||||
time = models.IntegerField(choices=TIME_SLOTS.items(), default=MORNING)
|
time = models.IntegerField(choices=TIME_SLOTS.items(), default=MORNING)
|
||||||
event = models.ForeignKey(Event, on_delete=models.CASCADE)
|
capacity = models.IntegerField(default=6)
|
||||||
|
note = models.TextField(max_length=1024, default="")
|
||||||
class Meta:
|
responsible_person = models.ForeignKey(CustomUser, null=True, on_delete=models.SET_NULL)
|
||||||
constraints = [
|
|
||||||
models.UniqueConstraint(
|
|
||||||
fields=["time", "event"], name="no_duplicate_timeslots"
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.event.date} {self.TIME_SLOTS[self.time]}"
|
return f"{self.date} {self.TIME_SLOTS[self.time]}"
|
||||||
|
|
||||||
def time_str(self):
|
def time_str(self):
|
||||||
return TimeSlot.TIME_SLOTS[self.time]
|
return Event.TIME_SLOTS[self.time]
|
||||||
|
|
||||||
def count_with_status(self, status):
|
def count_with_status(self, status):
|
||||||
return self.eventregistration_set.filter(state=status).count()
|
return self.eventregistration_set.filter(state=status).count()
|
||||||
|
@ -45,32 +31,6 @@ class TimeSlot(models.Model):
|
||||||
def count_admitted(self):
|
def count_admitted(self):
|
||||||
return self.count_with_status(EventRegistration.ADMITTED)
|
return self.count_with_status(EventRegistration.ADMITTED)
|
||||||
|
|
||||||
|
|
||||||
def precision(self):
|
|
||||||
# TODO put this in a database field?
|
|
||||||
return 10
|
|
||||||
|
|
||||||
def lower_round(self, n):
|
|
||||||
return (n // self.precision()) * self.precision()
|
|
||||||
|
|
||||||
def upper_round(self, n):
|
|
||||||
return ((n + self.precision()) // self.precision()) * self.precision()
|
|
||||||
|
|
||||||
# Unfortunately, Django doesn't support arguments in templates
|
|
||||||
|
|
||||||
def lower_interested(self):
|
|
||||||
return self.lower_round(self.count_interested())
|
|
||||||
|
|
||||||
def upper_interested(self):
|
|
||||||
return self.upper_round(self.count_interested())
|
|
||||||
|
|
||||||
def lower_admitted(self):
|
|
||||||
return self.lower_round(self.count_admitted())
|
|
||||||
|
|
||||||
def upper_admitted(self):
|
|
||||||
return self.upper_round(self.count_admitted())
|
|
||||||
|
|
||||||
|
|
||||||
def registration_of(self, user):
|
def registration_of(self, user):
|
||||||
if not user.is_authenticated:
|
if not user.is_authenticated:
|
||||||
return None
|
return None
|
||||||
|
@ -78,7 +38,7 @@ class TimeSlot(models.Model):
|
||||||
registrations = self.eventregistration_set.filter(user=user).all()
|
registrations = self.eventregistration_set.filter(user=user).all()
|
||||||
if not registrations:
|
if not registrations:
|
||||||
return None
|
return None
|
||||||
assert len(registrations) == 1, "Registrations should be unique per user and timeslot"
|
assert len(registrations) == 1, "Registrations should be unique per user and event"
|
||||||
return registrations[0]
|
return registrations[0]
|
||||||
|
|
||||||
|
|
||||||
|
@ -89,19 +49,19 @@ class EventRegistration(models.Model):
|
||||||
INTERESTED: "op wachtlijst",
|
INTERESTED: "op wachtlijst",
|
||||||
ADMITTED: "bevestigd",
|
ADMITTED: "bevestigd",
|
||||||
}
|
}
|
||||||
time_slot = models.ForeignKey(TimeSlot, on_delete=models.CASCADE)
|
event = models.ForeignKey(Event, on_delete=models.CASCADE)
|
||||||
user = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
|
user = models.ForeignKey(CustomUser, on_delete=models.CASCADE)
|
||||||
state = models.CharField(max_length=1, choices=REGISTRATION_STATE.items())
|
state = models.CharField(max_length=1, choices=REGISTRATION_STATE.items())
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
constraints = [
|
constraints = [
|
||||||
models.UniqueConstraint(
|
models.UniqueConstraint(
|
||||||
fields=["time_slot", "user"], name="register_only_once_per_timeslot"
|
fields=["event", "user"], name="register_only_once"
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"Reservation[{self.user.username}:{self.time_slot.event.date}:{self.state}]"
|
return f"Reservation[{self.user.username}:{self.event.date}:{self.state}]"
|
||||||
|
|
||||||
def state_str(self):
|
def state_str(self):
|
||||||
return EventRegistration.REGISTRATION_STATE[self.state]
|
return EventRegistration.REGISTRATION_STATE[self.state]
|
||||||
|
|
|
@ -2,65 +2,76 @@ from datetime import date, timedelta
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
from KeRS.celery import app
|
from KeRS.celery import app
|
||||||
from events.models import Event, EventRegistration, TimeSlot
|
from events.models import Event, EventRegistration
|
||||||
from users.models import CustomUser
|
from users.models import CustomUser
|
||||||
|
|
||||||
|
|
||||||
def calc_score(user: CustomUser):
|
def calc_score(user: CustomUser):
|
||||||
registrations_last_month: List[EventRegistration] = EventRegistration.objects \
|
registrations_last_month = EventRegistration.objects.filter(
|
||||||
.filter(user_id=user.id,
|
user_id=user.id,
|
||||||
time_slot__event__date__gt=date.today() - timedelta(days=30),
|
event__date__gt=date.today() - timedelta(days=30),
|
||||||
time_slot__event__date__lte=date.today(),
|
event__date__lte=date.today(),
|
||||||
state=EventRegistration.ADMITTED)
|
state=EventRegistration.ADMITTED
|
||||||
|
)
|
||||||
|
|
||||||
score = 0
|
score = 0
|
||||||
for r in registrations_last_month:
|
for r in registrations_last_month:
|
||||||
days_ago = (date.today() - r.time_slot.event.date).days
|
days_ago = (date.today() - r.event.date.date()).days
|
||||||
score += 1 / (days_ago + 1)
|
score += 1 / (days_ago + 1)
|
||||||
|
|
||||||
return score
|
return score
|
||||||
|
|
||||||
|
|
||||||
@app.task(bind=True)
|
@app.task(bind=True)
|
||||||
def assign_reservations(self, dry_run=False):
|
def assign_reservations(self):
|
||||||
"""
|
"""
|
||||||
Check if there are any events the next day.
|
Check if there are any events tomorrow.
|
||||||
If so, calculate the current score for every interested user and assign the ones with the lowest scores.
|
If so, calculate the current score for every interested user and assign the ones with the lowest scores.
|
||||||
:param dry_run: If this is set to true, no persistent changes will be made.
|
:param self:
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
print("Assigning reservations")
|
|
||||||
print("======================")
|
|
||||||
# Get all events of tomorrow
|
# Get all events of tomorrow
|
||||||
events: List[Event] = Event.objects.filter(date=date.today() + timedelta(days=1))
|
events = Event.objects.filter(date=date.today() + timedelta(days=1))
|
||||||
# Get all timeslots of tomorrow
|
|
||||||
timeslots: List[TimeSlot] = TimeSlot.objects.filter(event_id__in=map(lambda e: e.id, events))
|
print(f"{len(events) if events else 'Geen'} event(s)")
|
||||||
|
|
||||||
# Reservations
|
# Reservations
|
||||||
registrations: List[EventRegistration] = EventRegistration.objects.filter(
|
registrations: List[EventRegistration] = EventRegistration.objects.filter(
|
||||||
time_slot_id__in=map(lambda timeslot: timeslot.id, timeslots),
|
event_id__in=map(lambda event: event.id, events))
|
||||||
state=EventRegistration.INTERESTED)
|
|
||||||
if len(registrations) == 0:
|
print(f"{len(registrations) if registrations else 'Geen'} registratie(s)")
|
||||||
print("NO REGISTRATIONS?")
|
print("")
|
||||||
|
|
||||||
# Relevant users
|
# Relevant users
|
||||||
users = set(map(lambda r: r.user, registrations))
|
users = [r.user for r in registrations if r.state == EventRegistration.INTERESTED]
|
||||||
scores = list(map(calc_score, users))
|
scores = list(map(calc_score, users))
|
||||||
queue = sorted(list(zip(users, scores)), key=lambda tup: tup[1])
|
queue = sorted(list(zip(users, scores)), key=lambda tup: tup[1])
|
||||||
print(f"Scores: {scores}")
|
print("Prioriteiten: " + ", ".join(f"{u.username} ({s})" for u, s in queue))
|
||||||
print(f"Queue: {queue}")
|
print("")
|
||||||
|
|
||||||
for timeslot in timeslots:
|
for event in events:
|
||||||
print(f"EVENT: {timeslot.event.date} - {timeslot.event.capacity}")
|
registrations = [r for r in registrations if r.event == event]
|
||||||
timeslot_registrations = list(filter(lambda r: r.time_slot == timeslot, registrations))
|
|
||||||
timeslot_users = set(map(lambda r: r.user, timeslot_registrations))
|
|
||||||
timeslot_queue = list(filter(lambda element: element[0] in timeslot_users, queue))
|
|
||||||
|
|
||||||
for user in timeslot_queue[0:timeslot.event.capacity]:
|
already_admitted_regs = [r for r in registrations if r.state == EventRegistration.ADMITTED]
|
||||||
print(f"Selected {user[0]}")
|
left = max(event.capacity - sum(1 for r in already_admitted_regs), 0)
|
||||||
|
|
||||||
|
moment_str = Event.TIME_SLOTS[event.time]
|
||||||
|
print(f"• Event: {event.date}, {moment_str}. Vrije plaatsen: {left}/{event.capacity}")
|
||||||
|
for reg in already_admitted_regs:
|
||||||
|
print(f" = {reg.user.username}")
|
||||||
|
|
||||||
|
interested_users = {r.user for r in registrations
|
||||||
|
if r.state == EventRegistration.INTERESTED}
|
||||||
|
user_queue = list(filter(lambda element: element[0] in interested_users, queue))
|
||||||
|
|
||||||
|
for user in user_queue[0:left]:
|
||||||
|
print(f" + {user[0].username}")
|
||||||
r = EventRegistration.objects.get(
|
r = EventRegistration.objects.get(
|
||||||
time_slot_id=timeslot.id,
|
event_id=event.id,
|
||||||
user_id=user[0].id
|
user_id=user[0].id
|
||||||
)
|
)
|
||||||
r.state = EventRegistration.ADMITTED
|
r.state = EventRegistration.ADMITTED
|
||||||
if not dry_run:
|
|
||||||
r.save()
|
r.save()
|
||||||
|
left -= 1
|
||||||
|
|
||||||
|
print(f" → Vrije plaatsen: {left}/{event.capacity}")
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% load events_extras %}
|
|
||||||
|
|
||||||
{% block title %}Events{% endblock %}
|
{% block title %}Events{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
@ -11,24 +9,14 @@
|
||||||
<ul>
|
<ul>
|
||||||
{% for x in events %}
|
{% for x in events %}
|
||||||
<li id="{{x.event.id}}">
|
<li id="{{x.event.id}}">
|
||||||
<h3>{{ x.event.date|date:"d F Y" }}
|
<h3>{{ x.event.date|date:"d F Y" }}, {{ x.event.time_str }}{% if x.event.note %}: <b>{{ x.event.note }}</b>{% endif %}
|
||||||
{% if user.is_staff %}
|
{% if user.is_staff %}
|
||||||
<a href="/admin/events/event/{{ x.event.id }}/change/">Modificeren</a>
|
<a href="/admin/events/event/{{ x.event.id }}/change/">Edit</a>
|
||||||
{% endif %}
|
{% endif %}</h3>
|
||||||
</h3>
|
|
||||||
|
|
||||||
<p>Verantwoordelijke: {{ x.event.responsible_person.username }}</p>
|
<p>Verantwoordelijke: {{ x.event.responsible_person.username }}</p>
|
||||||
|
|
||||||
{% if x.event.note %}
|
{% include "events/registrations.html" with event=x.event my_registration=x.my_registration %}
|
||||||
<p>Beschrijving: {{ x.event.note|markdown_to_html }}</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<ul>
|
|
||||||
{% for y in x.timeslots %}
|
|
||||||
{% include "events/registrations.html" with event=x.event timeslot=y.timeslot my_registration=y.my_registration %}
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -1,23 +1,21 @@
|
||||||
{% if not my_registration %}
|
{% if not my_registration %}
|
||||||
<form action="{% url 'events:register' timeslot.id %}" method="post">
|
<form action="{% url 'events:register' event.id %}" method="post">
|
||||||
{% else %}
|
{% else %}
|
||||||
<form action="{% url 'events:deregister' timeslot.id %}" method="post">
|
<form action="{% url 'events:deregister' event.id %}" method="post">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<p>{{ timeslot.time_str }}, tussen {{ timeslot.lower_admitted }} en {{ timeslot.upper_admitted }} van de mogelijke {{ event.capacity }} aanwezigheden bevestigd{% if timeslot.count_interested %},
|
<p>{{ event.count_admitted }}/{{ event.capacity }} bevestigd{% if event.count_interested %},
|
||||||
tussen {{ timeslot.lower_interested }} en {{ timeslot.upper_interested }} mensen op wachtlijst
|
{{ event.count_interested }} op wachtlijst
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
{% if not user.is_authenticated %}
|
{% if not user.is_authenticated %}
|
||||||
<p><i>Je moet inloggen voor je je kan inschrijven.</i></p>
|
<p>Je moet inloggen voor je je kan inschrijven.</p>
|
||||||
{% elif not user.has_ugent_info %}
|
{% elif not user.has_ugent_info %}
|
||||||
<p class="text--important">Je moet je studentennummer en echte naam invullen in je profiel voor je je kan inschrijven.</p>
|
<p>Je moet je studentennummer en echte naam invullen in je profiel voor je je kan inschrijven.</p>
|
||||||
{% elif not my_registration %}
|
{% elif not my_registration %}
|
||||||
<button type="submit">Ik wil komen</button>
|
<p><input type="submit" value="Ik wil komen"></p>
|
||||||
{% else %}
|
{% else %}
|
||||||
<p><strong>Mijn status: {{ my_registration.state_str }}</strong></p>
|
<p>Mijn status: {{ my_registration.state_str }} <input type="submit" value="Uitschrijven"></input></p>
|
||||||
|
|
||||||
<button class="cancel" type="submit">Uitschrijven</button>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</form>
|
</form>
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
from django.utils.safestring import mark_safe
|
|
||||||
from markdown import markdown
|
|
||||||
|
|
||||||
from events import register
|
|
||||||
|
|
||||||
|
|
||||||
@register.filter(name='markdown_to_html', needs_autoescape=False)
|
|
||||||
def markdown_to_html(value):
|
|
||||||
result = markdown(value, extensions=['codehilite'])
|
|
||||||
return mark_safe(result)
|
|
|
@ -5,6 +5,6 @@ from . import views
|
||||||
app_name = "events"
|
app_name = "events"
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("", views.index, name="index"),
|
path("", views.index, name="index"),
|
||||||
path("<int:timeslot_id>/register", views.register, name="register"),
|
path("<int:event_id>/register", views.register, name="register"),
|
||||||
path("<int:timeslot_id>/deregister", views.deregister, name="deregister"),
|
path("<int:event_id>/deregister", views.deregister, name="deregister"),
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,44 +1,46 @@
|
||||||
from django.http import HttpResponse, HttpResponseRedirect
|
from django.http import HttpResponse, HttpResponseRedirect
|
||||||
from django.shortcuts import render, get_object_or_404
|
from django.shortcuts import render, get_object_or_404
|
||||||
from django.urls import reverse
|
|
||||||
from django.utils import timezone
|
|
||||||
|
|
||||||
from .models import Event, EventRegistration, TimeSlot
|
from django.utils import timezone
|
||||||
|
from django.urls import reverse
|
||||||
|
import datetime
|
||||||
|
|
||||||
|
from .models import Event, EventRegistration, CustomUser
|
||||||
|
|
||||||
|
from events.tasks import assign_reservations
|
||||||
|
|
||||||
|
|
||||||
def index(request):
|
def index(request):
|
||||||
events = Event.objects.filter(date__gte=timezone.now().date()).order_by("date")[:20]
|
events = Event.objects.filter(date__gte=timezone.now().date()).order_by("date")[:20]
|
||||||
|
|
||||||
events_data = [
|
events_data = [
|
||||||
{"event": event, "timeslots": [{"timeslot": timeslot,
|
{ "event": event, "my_registration": event.registration_of(request.user) }
|
||||||
"my_registration": timeslot.registration_of(request.user)}
|
|
||||||
for timeslot in TimeSlot.objects.filter(event_id=event.id)]}
|
|
||||||
for event in events
|
for event in events
|
||||||
]
|
]
|
||||||
return render(request, "events/index.html", {"events": events_data})
|
return render(request, "events/index.html", {"events": events_data})
|
||||||
|
|
||||||
|
|
||||||
def register(request, timeslot_id):
|
def register(request, event_id):
|
||||||
if request.method != "POST":
|
if request.method != "POST":
|
||||||
return HttpResponse(status_code=405)
|
return HttpResponse(status_code=405)
|
||||||
|
|
||||||
if not request.user.has_ugent_info:
|
if not request.user.has_ugent_info:
|
||||||
raise ValueError("User has missing UGent info missing")
|
raise ValueError("User has missing UGent info missing")
|
||||||
|
|
||||||
timeslot = get_object_or_404(TimeSlot, id=timeslot_id)
|
event = get_object_or_404(Event, id=event_id)
|
||||||
|
|
||||||
timeslot.eventregistration_set.create(
|
event.eventregistration_set.create(
|
||||||
state=EventRegistration.INTERESTED,
|
state=EventRegistration.INTERESTED,
|
||||||
time_slot=timeslot,
|
event=event,
|
||||||
user=request.user,
|
user=request.user,
|
||||||
)
|
)
|
||||||
return HttpResponseRedirect(reverse("events:index") + f"#{timeslot.id}")
|
return HttpResponseRedirect(reverse("events:index") + f"#{event.id}")
|
||||||
|
|
||||||
|
|
||||||
def deregister(request, timeslot_id):
|
def deregister(request, event_id):
|
||||||
if request.method != "POST":
|
if request.method != "POST":
|
||||||
return HttpResponse(status_code=405)
|
return HttpResponse(status_code=405)
|
||||||
|
|
||||||
registration = get_object_or_404(EventRegistration, time_slot=timeslot_id, user=request.user)
|
registration = get_object_or_404(EventRegistration, event=event_id, user=request.user)
|
||||||
registration.delete()
|
registration.delete()
|
||||||
return HttpResponseRedirect(reverse("events:index") + f"#{timeslot_id}")
|
return HttpResponseRedirect(reverse("events:index") + f"#{event_id}")
|
||||||
|
|
|
@ -10,9 +10,7 @@ django-timezone-field==4.0
|
||||||
future==0.18.2
|
future==0.18.2
|
||||||
idna==2.10
|
idna==2.10
|
||||||
kombu==4.6.11
|
kombu==4.6.11
|
||||||
markdown==3.2.2
|
|
||||||
mysqlclient==2.0.1
|
mysqlclient==2.0.1
|
||||||
Pygments>=2.3.1
|
|
||||||
python-crontab==2.5.1
|
python-crontab==2.5.1
|
||||||
python-dateutil==2.8.1
|
python-dateutil==2.8.1
|
||||||
pytz==2020.1
|
pytz==2020.1
|
||||||
|
|
|
@ -5,7 +5,7 @@ body {
|
||||||
font-family: monospace;
|
font-family: monospace;
|
||||||
}
|
}
|
||||||
|
|
||||||
input, textarea, button {
|
input, textarea {
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
font-size: inherit;
|
font-size: inherit;
|
||||||
}
|
}
|
||||||
|
@ -78,19 +78,6 @@ h1 a:hover, h1 a:focus, h1 a:active {
|
||||||
background-color: rgba(255, 255, 255, 0.1);
|
background-color: rgba(255, 255, 255, 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.text--important {
|
|
||||||
color: #e74c3c;
|
|
||||||
}
|
|
||||||
|
|
||||||
button.cancel {
|
|
||||||
background-color: #e74c3c;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:focus.cancel {
|
|
||||||
background-color: #c0392b;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*change the layout of the navigation bar for all the screens
|
/*change the layout of the navigation bar for all the screens
|
||||||
that have a width less or equal than 500px*/
|
that have a width less or equal than 500px*/
|
||||||
|
|
||||||
|
@ -147,20 +134,6 @@ input[type=text] {
|
||||||
color: #66351d;
|
color: #66351d;
|
||||||
}
|
}
|
||||||
|
|
||||||
main ul {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
main li {
|
|
||||||
list-style-type: none;
|
|
||||||
margin: 3em 0;
|
|
||||||
}
|
|
||||||
main li:first-child {
|
|
||||||
margin-top: 2em;
|
|
||||||
}
|
|
||||||
main li:last-child {
|
|
||||||
margin-bottom: 2em;
|
|
||||||
}
|
|
||||||
|
|
||||||
select,
|
select,
|
||||||
input,
|
input,
|
||||||
textarea,
|
textarea,
|
||||||
|
@ -188,26 +161,12 @@ textarea {
|
||||||
select:focus,
|
select:focus,
|
||||||
input:focus,
|
input:focus,
|
||||||
textarea:focus,
|
textarea:focus,
|
||||||
button:active {
|
button:focus {
|
||||||
background: hsl(0, 0%, 20%);
|
background: hsl(0, 0%, 20%);
|
||||||
}
|
}
|
||||||
|
|
||||||
select:focus,
|
select:focus,
|
||||||
input:focus,
|
input:focus,
|
||||||
textarea:focus
|
textarea:focus {
|
||||||
button:active {
|
|
||||||
transform: scale(1.02);
|
transform: scale(1.02);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Hover styling */
|
|
||||||
button:hover:not([disabled]) {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
footer {
|
|
||||||
color: #777777;
|
|
||||||
padding: 10px;
|
|
||||||
}
|
|
||||||
footer a {
|
|
||||||
color: #888888;
|
|
||||||
}
|
|
|
@ -6,7 +6,6 @@
|
||||||
<meta name="viewport" content="width=device-width"/>
|
<meta name="viewport" content="width=device-width"/>
|
||||||
<title>{% block title %}{% endblock %} – KeRS</title>
|
<title>{% block title %}{% endblock %} – KeRS</title>
|
||||||
<link rel="stylesheet" type="text/css" href="{% static 'main.css' %}"/>
|
<link rel="stylesheet" type="text/css" href="{% static 'main.css' %}"/>
|
||||||
<link rel="stylesheet" type="text/css" href="{% static 'dracula.css' %}"/>
|
|
||||||
{% block styles %}{% endblock %}
|
{% block styles %}{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
@ -33,22 +32,15 @@
|
||||||
Hallo, {{ user.username }}
|
Hallo, {{ user.username }}
|
||||||
</span>
|
</span>
|
||||||
</li>
|
</li>
|
||||||
{% if user.is_staff or user.is_superuser %}
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'admin:index' %}">
|
|
||||||
Admininterface
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
<li>
|
<li>
|
||||||
<a href="{% url 'users:logout' %}">
|
<a href="{% url 'users:logout' %}">
|
||||||
Afmelden
|
Log out
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% else %}
|
{% else %}
|
||||||
<li>
|
<li>
|
||||||
<a href="{% url 'oauth:login' %}">
|
<a href="{% url 'oauth:login' %}">
|
||||||
Inloggen
|
Log in
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -61,11 +53,5 @@
|
||||||
<main class="align">
|
<main class="align">
|
||||||
{% block content %}{% endblock %}
|
{% block content %}{% endblock %}
|
||||||
</main>
|
</main>
|
||||||
<footer class="align">
|
|
||||||
<a href="https://git.zeus.gent/bestuur/drive/blob/master/activiteiten/2020-2021/kelderregels.md">Regels in de kelder</a> |
|
|
||||||
<a href="https://zeus.gent/about/privacy/#kers">Privacybeleid</a> |
|
|
||||||
<a href="https://git.zeus.gent/bestuur/kers">Broncode</a> |
|
|
||||||
Ontwikkeld door <a href="https://zeus.gent/">Zeus WPI</a>
|
|
||||||
</footer>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
@ -23,9 +23,6 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.username
|
return self.username
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return "<User: {}>".format(self.username)
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def has_ugent_info(self):
|
def has_ugent_info(self):
|
||||||
return self.real_name and self.student_number
|
return self.real_name and self.student_number
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<form action="/user/profile" method="post">
|
<form action="/user/profile" method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form }}
|
{{ form }}
|
||||||
<button type="submit">Bijwerken</button>
|
<input type="submit" value="Bijwerken">
|
||||||
</form>
|
</form>
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>Niet ingelogd</p>
|
<p>Niet ingelogd</p>
|
||||||
|
|
Loading…
Reference in a new issue