forked from DGNum/gestioCOF
Compare commits
572 commits
kerl/dumpk
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
2126224e15 | ||
|
d6109a9312 | ||
|
a69bd0426f | ||
|
81a4dbef7c | ||
|
4fedf3453d | ||
|
8607d77c84 | ||
|
bc55a3067e | ||
|
dd68ad91cd | ||
|
2f71246509 | ||
|
a20a1c11d6 | ||
|
0e1ff1765a | ||
|
177d413f4c | ||
|
01dd16c795 | ||
|
84c87c1b4b | ||
|
1b143b322f | ||
|
f9456e3c29 | ||
|
dd1350f1c2 | ||
|
8f4cb68d31 | ||
|
3a3f96a8df | ||
|
7d8926e459 | ||
|
3fee014384 | ||
|
cd351786bb | ||
|
7362c2fa2a | ||
|
efbc947145 | ||
|
0c45262fbc | ||
|
cabd277b4a | ||
|
4108efe8c9 | ||
|
693e4252d5 | ||
|
3aa928e8f0 | ||
|
5e2e68960b | ||
|
91e9beee11 | ||
|
ac286209ed | ||
|
b03cda5962 | ||
|
4feb567af7 | ||
|
1ac47885d0 | ||
|
071c810605 | ||
|
7f00ce0ff1 | ||
|
95136cb4eb | ||
|
e299997aa8 | ||
|
40f34926bb | ||
|
69976a878a | ||
|
6621ae3950 | ||
|
9288daaf9e | ||
|
e92c500940 | ||
|
d75eaf583f | ||
|
55bd3ab51d | ||
|
f640a25f59 | ||
|
f881c7cd8b | ||
|
b548b87c25 | ||
|
a72302291f | ||
|
a0bde75f50 | ||
|
44b19c12e5 | ||
|
f97d339a1c | ||
|
094116e88d | ||
|
b32a07fc22 | ||
|
4fc9902cf6 | ||
|
7164cfa37a | ||
|
90f96fb5c9 | ||
|
e50249355d | ||
|
c304d734d9 | ||
|
c36dd30bce | ||
|
2571cc955e | ||
|
3eaac5c68f | ||
|
af4c8e0744 | ||
|
14e0a3ef0a | ||
|
83078d4726 | ||
|
cb262ad479 | ||
|
5c47118834 | ||
|
30e842ce80 | ||
|
892bf51163 | ||
|
e20d7ca6c2 | ||
|
1b09293206 | ||
|
e7da476697 | ||
|
761ab6df90 | ||
|
a8d4035d33 | ||
|
b80426c56f | ||
|
429e611daa | ||
|
5160da7862 | ||
|
aad3775222 | ||
|
4b92716092 | ||
|
dfa5b4bf69 | ||
|
1be5dcb6af | ||
|
a891ec56a6 | ||
|
7a52690a63 | ||
|
a2f396ce7a | ||
|
85e30056a6 | ||
|
69de48f285 | ||
|
eba36f2712 | ||
|
bfdb34aae7 | ||
|
fcf2002cd7 | ||
|
b236d6a950 | ||
|
4b29097f02 | ||
|
87f383bef1 | ||
|
1ad025e046 | ||
|
b3c047738a | ||
|
17a9ae3302 | ||
|
e41bcbb6d7 | ||
|
e384bfb0f3 | ||
|
373ff1f62c | ||
|
65eb95a3c9 | ||
|
1c880b265e | ||
|
75fbdc7efb | ||
|
1b8dd971b0 | ||
|
713d686047 | ||
|
77aa269c90 | ||
|
9a143521d5 | ||
|
a77cf59b18 | ||
|
d8cabda678 | ||
|
f086140dad | ||
|
4d1ae8f540 | ||
|
6d824a58be | ||
|
20880114aa | ||
|
df180d7446 | ||
|
ef1793a348 | ||
|
2d677b2093 | ||
|
f70eacfc37 | ||
|
264a0a852f | ||
|
7ca7f7298a | ||
|
a5c822e7f7 | ||
|
6b316c482b | ||
|
4060730ec5 | ||
|
c6cfc311e0 | ||
|
4326ba9016 | ||
|
4205e0ad0e | ||
|
964eec6ab1 | ||
|
29236e0b0e | ||
|
1939a54fef | ||
|
348881d207 | ||
|
ef8c1b8bf2 | ||
|
8743301105 | ||
|
6a11139588 | ||
|
a34b83c236 | ||
|
02584982f6 | ||
|
7bf0c5f09e | ||
|
b9aaf6a19c | ||
|
16dee0c143 | ||
|
a947b9d3f2 | ||
|
93d283fecb | ||
|
63738e8e02 | ||
|
1e44550e12 | ||
|
4136cb6868 | ||
|
99809209e0 | ||
|
0351f6728b | ||
|
7efc7e6b94 | ||
|
7d21a5a1fc | ||
|
dba785bf13 | ||
|
71878caf2c | ||
|
db42028228 | ||
|
7171a7567c | ||
|
339223bec0 | ||
|
d62a8d61de | ||
|
f6c83dc692 | ||
|
a984d1fd6f | ||
|
f901ea9396 | ||
|
17d96f1775 | ||
|
c10e5fe45c | ||
|
9bbe3f50cb | ||
|
1f4a4ec76f | ||
|
2befa584aa | ||
|
b48d32f4bc | ||
|
e36e88e77a | ||
|
8e9fc341ca | ||
|
c14c2d54a5 | ||
|
6adfaba8e9 | ||
|
06005014f9 | ||
|
4268a30d51 | ||
|
c71e6d22bf | ||
|
4df3ef4dd9 | ||
|
af95e64344 | ||
|
ac8ad15ad1 | ||
|
47dd078b6a | ||
|
472a44c30f | ||
|
b72ea9ebf9 | ||
|
f9958e4da0 | ||
|
47f406e09e | ||
|
1450b65dcd | ||
|
aac94afcd0 | ||
|
209360f535 | ||
|
b224fedf28 | ||
|
1ab071d16e | ||
|
1cf6f6f3e7 | ||
|
a421bec625 | ||
|
4e758fbba0 | ||
|
2350109a33 | ||
|
778637d60e | ||
|
23f7865140 | ||
|
cc7c4306f4 | ||
|
1183e50f60 | ||
|
a8de7e0ae0 | ||
|
30a39ef2f6 | ||
|
9a635148bb | ||
|
4b95b65be2 | ||
|
884ec2535b | ||
|
beba3052dd | ||
|
46242ad2c0 | ||
|
fa8c57269c | ||
|
b97bc8bfa8 | ||
|
89fc309c01 | ||
|
d7367476bc | ||
|
7297baaf7e | ||
|
8bf7914728 | ||
|
71fbbcff8a | ||
|
9303772f9a | ||
|
559b36b6f0 | ||
|
fbafdb7134 | ||
|
a53bd94737 | ||
|
46ef12309a | ||
|
4f60ba35eb | ||
|
f29b3f0187 | ||
|
aa3462aaee | ||
|
7c35357060 | ||
|
726b3f55a0 | ||
|
63eeb5b7a9 | ||
|
7081380058 | ||
|
288de95c49 | ||
|
9a01d1e877 | ||
|
10746c0469 | ||
|
5c8eca15b6 | ||
|
ef64f9ce5c | ||
|
9762838921 | ||
|
bf6d6d6430 | ||
|
ba9aa06b4f | ||
|
880dc31353 | ||
|
9a78fca507 | ||
|
4bc56d34e0 | ||
|
79f0757e9f | ||
|
a2eed13717 | ||
|
830aba984e | ||
|
33319cfe76 | ||
|
44b001bd3c | ||
|
ab9d95055e | ||
|
40391d8814 | ||
|
681507f211 | ||
|
7f133316a4 | ||
|
0bdbcf59fa | ||
|
0bad404b71 | ||
|
c100f2fc8d | ||
|
ba74779f95 | ||
|
035bbe68a5 | ||
|
319db68655 | ||
|
9d2c13e67c | ||
|
73c068055b | ||
|
30ce8d13af | ||
|
340f8f16a7 | ||
|
0ce1e62586 | ||
|
783fe1de32 | ||
|
49fde85187 | ||
|
479e751b7c | ||
|
f2c1ff2abd | ||
|
8b73460165 | ||
|
411d7e7dce | ||
|
f952d50b12 | ||
|
7324a72e6e | ||
|
ad73cc987d | ||
|
e9e0c79b40 | ||
|
badee498a3 | ||
|
72cd55716b | ||
|
a7cbd2d451 | ||
|
b9699637aa | ||
|
521be6db85 | ||
|
f3701d91fc | ||
|
59dacda37d | ||
|
7f58b5fa00 | ||
|
df222f18a3 | ||
|
5d22a4cac4 | ||
|
cc3a436750 | ||
|
404d3f4f4c | ||
|
43fcdc8526 | ||
|
35f896b40f | ||
|
fb1a38cff3 | ||
|
f88795a60e | ||
|
0ffebdf82f | ||
|
147b8514ef | ||
|
d535cf24a3 | ||
|
84dab59c72 | ||
|
22cf0d403e | ||
|
a525cffaff | ||
|
1af602c9f7 | ||
|
8a17aa2caa | ||
|
7a9d96d83a | ||
|
3869c02dfa | ||
|
848eb2274a | ||
|
ebd8b7ccdb | ||
|
3c6ab35390 | ||
|
57901c0013 | ||
|
d172dad0ab | ||
|
d0b7000747 | ||
|
84ff0d7182 | ||
|
600927b21c | ||
|
d965050563 | ||
|
a14c9d9574 | ||
|
8f9c94fe10 | ||
|
46f447ec5d | ||
|
4dbf11f91e | ||
|
569ce0ba25 | ||
|
aa955a06ef | ||
|
a9eb32217f | ||
|
c7998f56f0 | ||
|
a6e58dcd68 | ||
|
49591fa67e | ||
|
9f9724b1d1 | ||
|
205dc93f4b | ||
|
7f6d4527ed | ||
|
43a2f8db53 | ||
|
ba4cc01ed4 | ||
|
11d94ecba8 | ||
|
82d58d23c9 | ||
|
6377dd5c95 | ||
|
f364928004 | ||
|
dc070278f7 | ||
|
561a121e04 | ||
|
b03cf05ef7 | ||
|
edf6a03bc4 | ||
|
eb3cba31a7 | ||
|
1ffda1a5c4 | ||
|
2bc97a115c | ||
|
b8072f4346 | ||
|
cedd3cf816 | ||
|
2c833daa7f | ||
|
2a05c2247c | ||
|
c957ab2b72 | ||
|
98cce25f4c | ||
|
ba6ddfc516 | ||
|
c5d7eb9d30 | ||
|
d3185f25c3 | ||
|
007b5006d4 | ||
|
2d36c85085 | ||
|
d6fa738a25 | ||
|
c145191e55 | ||
|
91852bd4a0 | ||
|
6f5fa19fc3 | ||
|
e92d50593c | ||
|
0590bc3aab | ||
|
3286ad09df | ||
|
3da0a613f7 | ||
|
34be9e2393 | ||
|
97bdeed97a | ||
|
8016b16904 | ||
|
6e8926595d | ||
|
a9b6bc65a2 | ||
|
b1fd6e6021 | ||
|
576d43f44d | ||
|
c55a2c8c8e | ||
|
65c979ea59 | ||
|
dcd592ed11 | ||
|
e401303a08 | ||
|
2b72f3b40b | ||
|
2aae281120 | ||
|
1387da3b54 | ||
|
e868e6eb18 | ||
|
fc988e3fad | ||
|
205b5c206b | ||
|
ab9b4d14ef | ||
|
5f8b8661bf | ||
|
858a0c61e2 | ||
|
12d3ef0c02 | ||
|
da40ed1d8c | ||
|
f10bd1eea2 | ||
|
8576023b42 | ||
|
24eaaa277f | ||
|
8f4e3bb048 | ||
|
7775e45b60 | ||
|
b3ada0eb89 | ||
|
74b9721fbd | ||
|
7db75c0060 | ||
|
d96b3d26b6 | ||
|
72210e1980 | ||
|
359f85a42d | ||
|
95cac47f4e | ||
|
7dc32add35 | ||
|
0011cfe8f7 | ||
|
5a7c4f64d5 | ||
|
46893a8df5 | ||
|
81b45f74e3 | ||
|
c6dfcea5e2 | ||
|
198e456c22 | ||
|
1518f4c703 | ||
|
2d59565f61 | ||
|
d3384dc5fc | ||
|
e7cc705350 | ||
|
8fa635773c | ||
|
1ac3e0f976 | ||
|
f811230c25 | ||
|
74c3afe9ca | ||
|
0875ef1278 | ||
|
1d707aad41 | ||
|
fef19024d8 | ||
|
566e968849 | ||
|
55c69ae42b | ||
|
40839458a5 | ||
|
a259dd524f | ||
|
85c750d380 | ||
|
826e45f619 | ||
|
5989f65154 | ||
|
2cf0ccbb6b | ||
|
1677768177 | ||
|
7a7e02adab | ||
|
62d26560d9 | ||
|
df9639715b | ||
|
72237fef60 | ||
|
8fa07bb845 | ||
|
7931f50611 | ||
|
910536c6d3 | ||
|
3d830884b1 | ||
|
9110e5b185 | ||
|
22f60163fe | ||
|
8661716df9 | ||
|
ae64f09869 | ||
|
422e2f7b42 | ||
|
f990934425 | ||
|
effed1b5c5 | ||
|
efbb9c2be3 | ||
|
a6c9cf11bd | ||
|
26fa9dc898 | ||
|
ee1d158f2d | ||
|
5e5b224f89 | ||
|
f33416b712 | ||
|
b6626093e5 | ||
|
15936751c0 | ||
|
9efc200f74 | ||
|
54e8f95667 | ||
|
a5ccd40ec1 | ||
|
b4fbc3edf8 | ||
|
eb10c904e0 | ||
|
c8c8c6abc8 | ||
|
e64f405299 | ||
|
aa2f691f1e | ||
|
8cd9434664 | ||
|
e323f2f755 | ||
|
deae1c4639 | ||
|
62281cb3b7 | ||
|
6454931e70 | ||
|
6e88f1a887 | ||
|
2e28986503 | ||
|
b24935b938 | ||
|
ac06211841 | ||
|
5c1e2e9cda | ||
|
c1e48579f1 | ||
|
c6a6e7fafa | ||
|
be064262da | ||
|
9ac030fd16 | ||
|
7caee5665b | ||
|
e7517195cd | ||
|
30783d677b | ||
|
c863b2010e | ||
|
24d7d90c28 | ||
|
f2b1962e1c | ||
|
68ccd4722f | ||
|
9a90f19502 | ||
|
fbbc9937f6 | ||
|
e9f00b4f06 | ||
|
c7ca96bce5 | ||
|
637572ab58 | ||
|
28370c8e67 | ||
|
701ea96a90 | ||
|
de1bba3695 | ||
|
56f1edebe3 | ||
|
c52bac05b3 | ||
|
5d24786e20 | ||
|
bca75dbf98 | ||
|
0789da7bed | ||
|
f6458074b2 | ||
|
eadfd1d3cd | ||
|
3a34ab4462 | ||
|
25b603d667 | ||
|
f26d330973 | ||
|
7a52e841e6 | ||
|
9a3914ece6 | ||
|
6a32a72c15 | ||
|
d464b69b2e | ||
|
d16bf5e6b0 | ||
|
1ba6b5753f | ||
|
21fcb5daa9 | ||
|
c5adc6b7d8 | ||
|
b9ba0a3829 | ||
|
028b6f6cb7 | ||
|
3ca8b45014 | ||
|
90fc6aa3e7 | ||
|
707b7b76db | ||
|
6fff995ccd | ||
|
9b0440429c | ||
|
50266f2466 | ||
|
65171d1276 | ||
|
3b43ad84b5 | ||
|
bb72a16b64 | ||
|
b1c69eddb5 | ||
|
88c9187e2e | ||
|
bbe831a226 | ||
|
f642b218d0 | ||
|
cc72f47f00 | ||
|
24180e747e | ||
|
5a0cf58d8a | ||
|
d7d4d73af3 | ||
|
c2f6622a9f | ||
|
8778695e95 | ||
|
e0fd3db638 | ||
|
d5e9d09044 | ||
|
6e9dc03bc7 | ||
|
6384cfc701 | ||
|
67d7dafc14 | ||
|
1ada8645b8 | ||
|
d4a9e96e38 | ||
|
abb8cc5a2d | ||
|
5a9ea4234e | ||
|
c9136dbcfa | ||
|
61e4ad9741 | ||
|
c9dad9465a | ||
|
f10d6d1a71 | ||
|
97cb9d1f3b | ||
|
c66fb7eb6f | ||
|
48ad5cd1c7 | ||
|
ef35f45ad2 | ||
|
26bcd729bb | ||
|
78ad4402b0 | ||
|
6767ba8e8c | ||
|
4f15bb9624 | ||
|
3b2251a1d6 | ||
|
64ceb813c6 | ||
|
3b0d4ba58f | ||
|
5298a19667 | ||
|
b1d8bb04c4 | ||
|
b8cd5f1da5 | ||
|
a259b04d9c | ||
|
e45ee3fb40 | ||
|
d2c6c9da7a | ||
|
914888d18a | ||
|
c8b8c90580 | ||
|
922190d20f | ||
|
6362740a77 | ||
|
9eebc7fb22 | ||
|
2aa06d2954 | ||
|
931b2c4e1f | ||
|
b450cb09e6 | ||
|
8d11044610 | ||
|
786c8f132f | ||
|
677ba5b92e | ||
|
fb4455af39 | ||
|
7438445110 | ||
|
f7ce2edd87 | ||
|
0221221d53 | ||
|
49ef8b3c15 | ||
|
550a073d51 | ||
|
af0de33d4c | ||
|
c95e1818b2 | ||
|
41ad2a15ac | ||
|
36d6a4a1cd | ||
|
9b2c4c1f98 | ||
|
c3b5de336a | ||
|
bf117ec070 | ||
|
a3b0ea9b8d | ||
|
9dabab51db | ||
|
2ad400c5e7 | ||
|
8a27f70e89 | ||
|
fcf29fe6df | ||
|
31e4658766 | ||
|
7b554e4778 | ||
|
fe2f8aaa5a | ||
|
137dd655d1 | ||
|
494cd5ddc1 | ||
|
80188fa88d | ||
|
4580f8bf0f | ||
|
03e6fe3ef6 | ||
|
8c75189ce1 | ||
|
68b7219cf5 | ||
|
7a828760b3 | ||
|
5280ec2d18 | ||
|
b0d8b0b7f8 | ||
|
bc90de76b6 | ||
|
ed97ff466d | ||
|
6cce9779fa | ||
|
2c2872275a | ||
|
fb3f6b9073 |
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -5,6 +5,7 @@ cof/settings.py
|
||||||
settings.py
|
settings.py
|
||||||
*~
|
*~
|
||||||
venv/
|
venv/
|
||||||
|
.venv/
|
||||||
.vagrant
|
.vagrant
|
||||||
/src
|
/src
|
||||||
media/
|
media/
|
||||||
|
@ -19,3 +20,4 @@ media/
|
||||||
|
|
||||||
# VSCode
|
# VSCode
|
||||||
.vscode/
|
.vscode/
|
||||||
|
.direnv
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
image: "python:3.5"
|
image: "python:3.7"
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
# GestioCOF settings
|
# GestioCOF settings
|
||||||
DJANGO_SETTINGS_MODULE: "cof.settings.prod"
|
|
||||||
DBHOST: "postgres"
|
DBHOST: "postgres"
|
||||||
REDIS_HOST: "redis"
|
REDIS_HOST: "redis"
|
||||||
REDIS_PASSWD: "dummy"
|
REDIS_PASSWD: "dummy"
|
||||||
|
@ -18,22 +17,23 @@ variables:
|
||||||
# psql password authentication
|
# psql password authentication
|
||||||
PGPASSWORD: $POSTGRES_PASSWORD
|
PGPASSWORD: $POSTGRES_PASSWORD
|
||||||
|
|
||||||
|
# apps to check migrations for
|
||||||
|
MIGRATION_APPS: "bda bds cofcms clubs events gestioncof kfet kfetauth kfetcms open petitscours shared"
|
||||||
|
|
||||||
.test_template:
|
.test_template:
|
||||||
before_script:
|
before_script:
|
||||||
- mkdir -p vendor/{pip,apt}
|
- mkdir -p vendor/{pip,apt}
|
||||||
- apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client
|
- apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client libldap2-dev libsasl2-dev
|
||||||
- sed -E 's/^REDIS_HOST.*/REDIS_HOST = "redis"/' cof/settings/secret_example.py > cof/settings/secret.py
|
- sed -E 's/^REDIS_HOST.*/REDIS_HOST = "redis"/' gestioasso/settings/secret_example.py > gestioasso/settings/secret.py
|
||||||
- sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' cof/settings/secret.py
|
- sed -i.bak -E 's;^REDIS_PASSWD = .*$;REDIS_PASSWD = "";' gestioasso/settings/secret.py
|
||||||
# Remove the old test database if it has not been done yet
|
# Remove the old test database if it has not been done yet
|
||||||
- psql --username=$POSTGRES_USER --host=$DBHOST -c "DROP DATABASE IF EXISTS test_$POSTGRES_DB"
|
- psql --username=$POSTGRES_USER --host=$DBHOST -c "DROP DATABASE IF EXISTS test_$POSTGRES_DB"
|
||||||
- pip install --upgrade -r requirements-prod.txt coverage tblib
|
- pip install --upgrade -r requirements-prod.txt coverage tblib
|
||||||
- python --version
|
- python --version
|
||||||
script:
|
|
||||||
- coverage run manage.py test --parallel
|
|
||||||
after_script:
|
after_script:
|
||||||
- coverage report
|
- coverage report
|
||||||
services:
|
services:
|
||||||
- postgres:9.6
|
- postgres:11.7
|
||||||
- redis:latest
|
- redis:latest
|
||||||
cache:
|
cache:
|
||||||
key: test
|
key: test
|
||||||
|
@ -43,27 +43,40 @@ variables:
|
||||||
# Keep this disabled for now, as it may kill GitLab...
|
# Keep this disabled for now, as it may kill GitLab...
|
||||||
# coverage: '/TOTAL.*\s(\d+\.\d+)\%$/'
|
# coverage: '/TOTAL.*\s(\d+\.\d+)\%$/'
|
||||||
|
|
||||||
test35:
|
kfettest:
|
||||||
extends: ".test_template"
|
stage: test
|
||||||
image: "python:3.5"
|
extends: .test_template
|
||||||
stage: test
|
variables:
|
||||||
|
DJANGO_SETTINGS_MODULE: "gestioasso.settings.cof_prod"
|
||||||
|
script:
|
||||||
|
- coverage run manage.py test kfet
|
||||||
|
|
||||||
test37:
|
coftest:
|
||||||
extends: ".test_template"
|
stage: test
|
||||||
image: "python:3.7"
|
extends: .test_template
|
||||||
stage: test
|
variables:
|
||||||
|
DJANGO_SETTINGS_MODULE: "gestioasso.settings.cof_prod"
|
||||||
|
script:
|
||||||
|
- coverage run manage.py test gestioncof bda petitscours shared --parallel
|
||||||
|
|
||||||
|
bdstest:
|
||||||
|
stage: test
|
||||||
|
extends: .test_template
|
||||||
|
variables:
|
||||||
|
DJANGO_SETTINGS_MODULE: "gestioasso.settings.bds_prod"
|
||||||
|
script:
|
||||||
|
- coverage run manage.py test bds clubs events --parallel
|
||||||
|
|
||||||
linters:
|
linters:
|
||||||
image: python:3.6
|
|
||||||
stage: test
|
stage: test
|
||||||
before_script:
|
before_script:
|
||||||
- mkdir -p vendor/pip
|
- mkdir -p vendor/pip
|
||||||
- pip install --upgrade black isort flake8
|
- pip install --upgrade black isort flake8
|
||||||
script:
|
script:
|
||||||
- black --check .
|
- black --check .
|
||||||
- isort --recursive --check-only --diff bda bds clubs cof events gestioncof kfet petitscours provisioning shared utils
|
- isort --check --diff .
|
||||||
# Print errors only
|
# Print errors only
|
||||||
- flake8 --exit-zero bda bds clubs cof events gestioncof kfet petitscours provisioning shared utils
|
- flake8 --exit-zero bda bds clubs gestioasso events gestioncof kfet petitscours provisioning shared
|
||||||
cache:
|
cache:
|
||||||
key: linters
|
key: linters
|
||||||
paths:
|
paths:
|
||||||
|
@ -72,16 +85,18 @@ linters:
|
||||||
# Check whether there are some missing migrations.
|
# Check whether there are some missing migrations.
|
||||||
migration_checks:
|
migration_checks:
|
||||||
stage: test
|
stage: test
|
||||||
|
variables:
|
||||||
|
DJANGO_SETTINGS_MODULE: "gestioasso.settings.local"
|
||||||
before_script:
|
before_script:
|
||||||
- mkdir -p vendor/{pip,apt}
|
- mkdir -p vendor/{pip,apt}
|
||||||
- apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client
|
- apt-get update -q && apt-get -o dir::cache::archives="vendor/apt" install -yqq postgresql-client libldap2-dev libsasl2-dev
|
||||||
- cp cof/settings/secret_example.py cof/settings/secret.py
|
- cp gestioasso/settings/secret_example.py gestioasso/settings/secret.py
|
||||||
- pip install --upgrade -r requirements-prod.txt
|
- pip install --upgrade -r requirements-devel.txt
|
||||||
- python --version
|
- python --version
|
||||||
script: python manage.py makemigrations --dry-run --check
|
script: python manage.py makemigrations --dry-run --check $MIGRATION_APPS
|
||||||
services:
|
services:
|
||||||
# this should not be necessary…
|
# this should not be necessary…
|
||||||
- postgres:9.6
|
- postgres:11.7
|
||||||
cache:
|
cache:
|
||||||
key: migration_checks
|
key: migration_checks
|
||||||
paths:
|
paths:
|
||||||
|
|
|
@ -48,7 +48,7 @@ if type isort &>/dev/null; then
|
||||||
ISORT_OUTPUT="/tmp/gc-isort-output.log"
|
ISORT_OUTPUT="/tmp/gc-isort-output.log"
|
||||||
touch $ISORT_OUTPUT
|
touch $ISORT_OUTPUT
|
||||||
|
|
||||||
if ! echo "$STAGED_PYTHON_FILES" | xargs -d'\n' isort --check-only &>$ISORT_OUTPUT; then
|
if ! echo "$STAGED_PYTHON_FILES" | xargs -d'\n' isort --check &>$ISORT_OUTPUT; then
|
||||||
echo "$STAGED_PYTHON_FILES" | xargs -d'\n' isort &>$ISORT_OUTPUT
|
echo "$STAGED_PYTHON_FILES" | xargs -d'\n' isort &>$ISORT_OUTPUT
|
||||||
printf "Reformatted.\n"
|
printf "Reformatted.\n"
|
||||||
formatter_updated=1
|
formatter_updated=1
|
||||||
|
|
231
CHANGELOG.md
231
CHANGELOG.md
|
@ -5,11 +5,234 @@ Liste des changements notables dans GestioCOF depuis la version 0.1 (septembre
|
||||||
|
|
||||||
## Le FUTUR ! (pas prêt pour la prod)
|
## Le FUTUR ! (pas prêt pour la prod)
|
||||||
|
|
||||||
- Nouveau module de gestion des événements
|
### Nouveau module de gestion des événements
|
||||||
- Nouveau module BDS
|
|
||||||
- Nouveau module clubs
|
|
||||||
|
|
||||||
## Upcoming
|
- Désormais complet niveau modèles
|
||||||
|
- Export des participants implémenté
|
||||||
|
|
||||||
|
#### TODO
|
||||||
|
|
||||||
|
- Vue de création d'événements ergonomique
|
||||||
|
- Vue d'inscription à un événement **ou** intégration propre dans la vue
|
||||||
|
"inscription d'un nouveau membre"
|
||||||
|
|
||||||
|
### Nouveau module de gestion des clubs
|
||||||
|
|
||||||
|
Uniquement un modèle simple de clubs avec des respos. Aucune gestion des
|
||||||
|
adhérents ni des cotisations.
|
||||||
|
|
||||||
|
## TODO Prod
|
||||||
|
|
||||||
|
- Lancer `python manage.py update_translation_fields` après la migration
|
||||||
|
- Mettre à jour les units systemd `daphne.service` et `worker.service`
|
||||||
|
|
||||||
|
- Créer un compte hCaptcha (https://www.hcaptcha.com/), au COF, et remplacer les secrets associés
|
||||||
|
|
||||||
|
## Version ??? - ??/??/????
|
||||||
|
|
||||||
|
## Version 0.15.1 - 15/06/2023
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- Rattrape les erreurs d'envoi de mail de négatif
|
||||||
|
- Utilise l'adresse chefs pour les envois de négatifs
|
||||||
|
|
||||||
|
## Version 0.15 - 22/05/2023
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- Rajoute un formulaire de contact
|
||||||
|
- Rajoute un formulaire de demande de soirée
|
||||||
|
- Désactive les mails d'envoi de négatifs sur les comptes gelés
|
||||||
|
|
||||||
|
## Version 0.14 - 19/05/2023
|
||||||
|
|
||||||
|
- Répare les dépendances en spécifiant toutes les versions
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- Répare la gestion des changement d'heure via moment.js
|
||||||
|
|
||||||
|
## Version 0.13 - 19/02/2023
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- Rajoute la valeur des inventaires
|
||||||
|
- Résout les problèmes de négatif ne disparaissant pas
|
||||||
|
- Affiche son surnom s'il y en a un
|
||||||
|
- Bugfixes
|
||||||
|
|
||||||
|
## Version 0.12.1 - 03/10/2022
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- Fixe un problème de rendu causé par l'agrandissement du menu
|
||||||
|
|
||||||
|
- Mise à jour vers Channels 3.x et Django 3.2
|
||||||
|
|
||||||
|
## Version 0.12 - 17/06/2022
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- Ajoute une exception à la limite d'historique pour les comptes `LIQ` et `#13`
|
||||||
|
- Répare le problème des étiquettes LIQ/Comptes K-Fêt inversées dans les stats des articles K-Fêt
|
||||||
|
|
||||||
|
## Version 0.11 - 26/10/2021
|
||||||
|
|
||||||
|
### COF
|
||||||
|
|
||||||
|
- Répare un problème de rendu sur le wagtail du COF
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- Ajoute de mails de rappels pour les comptes en négatif
|
||||||
|
- La recherche de comptes sur K-Psul remarche normalement
|
||||||
|
- Le pointeur de la souris change de forme quand on survole un item d'autocomplétion
|
||||||
|
- Modification du gel de compte:
|
||||||
|
- on ne peut plus geler/dégeler son compte soi-même (il faut la permission "Gérer les permissions K-Fêt")
|
||||||
|
- on ne peut rien compter sur un compte gelé (aucune override possible), et les K-Fêteux·ses dont le compte est gelé perdent tout accès à K-Psul
|
||||||
|
- les comptes actuellement gelés (sur l'ancien système) sont dégelés automatiquement
|
||||||
|
- Modification du fonctionnement des négatifs
|
||||||
|
- impossible d'avoir des négatifs inférieurs à `kfet_config.overdraft_amount`
|
||||||
|
- il n'y a plus de limite de temps sur les négatifs
|
||||||
|
- supression des autorisations de négatif
|
||||||
|
- il n'est plus possible de réinitialiser la durée d'un négatif en faisant puis en annulant une charge
|
||||||
|
- La gestion des erreurs passe du client au serveur, ce qui permet d'avoir des messages plus explicites
|
||||||
|
- La supression d'opérations anciennes est réparée
|
||||||
|
|
||||||
|
## Version 0.10 - 18/04/2021
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- On fait sauter la limite qui empêchait de vendre plus de 24 unités d'un item à
|
||||||
|
la fois.
|
||||||
|
- L'interface indique plus clairement quand on fait une erreur en modifiant un
|
||||||
|
compte.
|
||||||
|
- On supprime la fonction "décalage de balance".
|
||||||
|
- L'accès à l'historique est maintenant limité à 7 jours pour raison de
|
||||||
|
confidentialité. Les chefs/trez peuvent disposer d'une permission
|
||||||
|
supplémentaire pour accéder à jusqu'à 30 jours en cas de problème de compta.
|
||||||
|
L'accès à son historique personnel n'est pas limité. Les durées sont
|
||||||
|
configurables dans `settings/cof_prod.py`.
|
||||||
|
|
||||||
|
### COF
|
||||||
|
|
||||||
|
- Le Captcha sur la page de demande de petits cours utilise maintenant hCaptcha
|
||||||
|
au lieu de ReCaptcha, pour mieux respecter la vie privée des utilisateur·ices
|
||||||
|
|
||||||
|
## Version 0.9 - 06/02/2020
|
||||||
|
|
||||||
|
### COF / BdA
|
||||||
|
|
||||||
|
- Le COF peut remettre à zéro la liste de ses adhérents en août (sans passer par
|
||||||
|
KDE).
|
||||||
|
- La page d'accueil affiche la date de fermeture des tirages BdA.
|
||||||
|
- On peut revendre une place dès qu'on l'a payée, plus besoin de payer toutes
|
||||||
|
ses places pour pouvoir revendre.
|
||||||
|
- On s'assure que l'email fourni lors d'une demande de petit cours est valide.
|
||||||
|
|
||||||
|
### BDS
|
||||||
|
|
||||||
|
- Le burô peut maintenant accorder ou révoquer le statut de membre du Burô
|
||||||
|
en modifiant le profil d'un membre du BDS.
|
||||||
|
- Le burô peut exporter la liste de ses membres avec email au format CSV depuis
|
||||||
|
la page d'accueil.
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- On affiche les articles actuellement en vente en premier lors des inventaires
|
||||||
|
et des commandes.
|
||||||
|
- On peut supprimer un inventaire. Seuls les articles dont c'est le dernier
|
||||||
|
inventaire sont affectés.
|
||||||
|
|
||||||
|
## Version 0.8 - 03/12/2020
|
||||||
|
|
||||||
|
### COF
|
||||||
|
|
||||||
|
- La page "Mes places" dans la section BdA indique quelles places sont sur
|
||||||
|
listing.
|
||||||
|
- ergonomie de l'interface admin du BdA : moins d'options inutiles lors de
|
||||||
|
la sélection de participants.
|
||||||
|
- les tirages sont maintenant archivables pour éviter d'avoir encore d'autres
|
||||||
|
options inutiles.
|
||||||
|
- l'autocomplétion dans l'admin BdA est réparée.
|
||||||
|
- Les icones de la page de gestion des petits cours sont (à nouveau) réparées.
|
||||||
|
- On a supprimé la possibilité de modifier les mails automatiques depuis
|
||||||
|
l'interface admin car trop problématique. Faute de mieux, envoyer un mail à
|
||||||
|
KDE pour modifier ces mails.
|
||||||
|
- corrige un crash sporadique sur la page d'inscription au système de petits
|
||||||
|
cours
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- (fix partiel) Empêche la K-Fêt de modifier des données COF (e.g. nom, prénom,
|
||||||
|
username) lors de la création d'un nouveau compte.
|
||||||
|
- Les statistiques de conso globales montrent deux courbes COF / non-COF au
|
||||||
|
lieu de LIQ / sur compte.
|
||||||
|
- Un bug empêchait de fermer manuellement la K-Fêt depuis un compte non
|
||||||
|
privilégié en tapant un mot de passe. C'est corrigé.
|
||||||
|
|
||||||
|
## Version 0.7.2 - 08/09/2020
|
||||||
|
|
||||||
|
- Nouvelle page 404
|
||||||
|
- Correction de bug en K-Fêt : le lien pour créer un nouveau compte exté apparaît
|
||||||
|
à nouveau dans l'autocomplétion
|
||||||
|
|
||||||
|
## Version 0.7.1 - 05/09/2020
|
||||||
|
|
||||||
|
Petits ajustements sur le site du COF :
|
||||||
|
|
||||||
|
- Possibilité d'ajouter des champs d'infos supplémentaires en plus de l'email et
|
||||||
|
de la page web dans les annuaires (clubs et partenaires).
|
||||||
|
- Corrige un bug d'affichage des adresses emails de clubs
|
||||||
|
|
||||||
|
## Version 0.7 - 29/08/2020
|
||||||
|
|
||||||
|
### GestioBDS
|
||||||
|
|
||||||
|
- Ajout d'un bouton pour supprimer un compte
|
||||||
|
- Le nombre d'adhérent⋅es est affiché sur la page d'accueil
|
||||||
|
- le groupe BDS a les bonnes permissions
|
||||||
|
|
||||||
|
### Site du COF
|
||||||
|
|
||||||
|
- Captcha fonctionnel pour les mailing-listes
|
||||||
|
|
||||||
|
### K-Fêt
|
||||||
|
|
||||||
|
- L'autocomplétion pour la création de compte K-Fêt se lance à 3 caractères seulement,
|
||||||
|
donc est plus rapide.
|
||||||
|
|
||||||
|
## Version 0.6 - 27/07/2020
|
||||||
|
|
||||||
|
Arrivée du BDS !
|
||||||
|
GestioCOF et GestioBDS ont du code en commun mais tournent de façon séparée, les
|
||||||
|
deux bases de données sont distinctes.
|
||||||
|
|
||||||
|
## Version 0.5 - 11/07/2020
|
||||||
|
|
||||||
|
### Problèmes corrigés
|
||||||
|
|
||||||
|
- La recherche d'utilisateurices (COF + K-Fêt) fonctionne de nouveau
|
||||||
|
- Bug d'affichage quand on a beaucoup de clubs dans le cadre "Accès rapide" sur
|
||||||
|
la page des clubs (nouveau site du COF)
|
||||||
|
- Version mobile plus ergonimique sur le nouveau site du COF
|
||||||
|
- Cliquer sur "visualiser" sur les pages de clubs dans wagtail ne provoque plus
|
||||||
|
d'erreurs 500 (nouveau site du COF)
|
||||||
|
- L'historique des ventes des articles K-Fêt fonctionne à nouveau
|
||||||
|
- Les montants en K-Fêt sont à nouveau affichés en UKF (et non en €).
|
||||||
|
- Les boutons "afficher/cacher" des mails et noms des participant⋅e⋅s à un
|
||||||
|
spectacle BdA fonctionnent à nouveau.
|
||||||
|
- on ne peut plus compter de consos sur ☠☠☠, ni éditer les comptes spéciaux
|
||||||
|
(LIQ, GNR, ☠☠☠, #13).
|
||||||
|
|
||||||
|
### Nouvelles fonctionnalités
|
||||||
|
|
||||||
|
- On n'affiche que 4 articles sur la pages "nouveautés" (nouveau site du COF)
|
||||||
|
- Plus de traductions sur le nouveau site du COF
|
||||||
|
- Les transferts apparaissent maintenant dans l'historique K-Fêt et l'historique
|
||||||
|
personnel.
|
||||||
|
- les statistiques K-Fêt remontent à plus d'un an (et le code est simplifié)
|
||||||
|
|
||||||
## Version 0.4.1 - 17/01/2020
|
## Version 0.4.1 - 17/01/2020
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# GestioCOF
|
# GestioCOF / GestioBDS
|
||||||
|
|
||||||
[![pipeline status](https://git.eleves.ens.fr/cof-geek/gestioCOF/badges/master/pipeline.svg)](https://git.eleves.ens.fr/cof-geek/gestioCOF/commits/master)
|
[![pipeline status](https://git.eleves.ens.fr/cof-geek/gestioCOF/badges/master/pipeline.svg)](https://git.eleves.ens.fr/cof-geek/gestioCOF/commits/master)
|
||||||
[![coverage report](https://git.eleves.ens.fr/cof-geek/gestioCOF/badges/master/coverage.svg)](https://git.eleves.ens.fr/cof-geek/gestioCOF/commits/master)
|
[![coverage report](https://git.eleves.ens.fr/cof-geek/gestioCOF/badges/master/coverage.svg)](https://git.eleves.ens.fr/cof-geek/gestioCOF/commits/master)
|
||||||
|
@ -38,11 +38,11 @@ Vous pouvez maintenant installer les dépendances Python depuis le fichier
|
||||||
pip install -U pip # parfois nécessaire la première fois
|
pip install -U pip # parfois nécessaire la première fois
|
||||||
pip install -r requirements-devel.txt
|
pip install -r requirements-devel.txt
|
||||||
|
|
||||||
Pour terminer, copier le fichier `cof/settings/secret_example.py` vers
|
Pour terminer, copier le fichier `gestioasso/settings/secret_example.py` vers
|
||||||
`cof/settings/secret.py`. Sous Linux ou Mac, préférez plutôt un lien symbolique
|
`gestioasso/settings/secret.py`. Sous Linux ou Mac, préférez plutôt un lien symbolique
|
||||||
pour profiter de façon transparente des mises à jour du fichier:
|
pour profiter de façon transparente des mises à jour du fichier:
|
||||||
|
|
||||||
ln -s secret_example.py cof/settings/secret.py
|
ln -s secret_example.py gestioasso/settings/secret.py
|
||||||
|
|
||||||
Nous avons un git hook de pre-commit pour formatter et vérifier que votre code
|
Nous avons un git hook de pre-commit pour formatter et vérifier que votre code
|
||||||
vérifie nos conventions. Pour bénéficier des mises à jour du hook, préférez
|
vérifie nos conventions. Pour bénéficier des mises à jour du hook, préférez
|
||||||
|
|
42
Vagrantfile
vendored
42
Vagrantfile
vendored
|
@ -1,47 +1,19 @@
|
||||||
# -*- mode: ruby -*-
|
# -*- mode: ruby -*-
|
||||||
# vi: set ft=ruby :
|
# vi: set ft=ruby :
|
||||||
|
|
||||||
# All Vagrant configuration is done below. The "2" in Vagrant.configure
|
# Configuration de base pour GestioCOF.
|
||||||
# configures the configuration version (we support older styles for
|
# Voir https://docs.vagrantup.com pour plus d'informations.
|
||||||
# backwards compatibility). Please don't change it unless you know what
|
|
||||||
# you're doing.
|
|
||||||
Vagrant.configure(2) do |config|
|
Vagrant.configure(2) do |config|
|
||||||
# The most common configuration options are documented and commented below.
|
# On se base sur Debian 10 (Buster) pour avoir le même environnement qu'en
|
||||||
# For a complete reference, please see the online documentation at
|
# production.
|
||||||
# https://docs.vagrantup.com.
|
config.vm.box = "debian/contrib-buster64"
|
||||||
|
|
||||||
config.vm.box = "ubuntu/xenial64"
|
|
||||||
|
|
||||||
# On associe le port 80 dans la machine virtuelle avec le port 8080 de notre
|
# On associe le port 80 dans la machine virtuelle avec le port 8080 de notre
|
||||||
# ordinateur, et le port 8000 avec le port 8000.
|
# ordinateur, et le port 8000 avec le port 8000.
|
||||||
config.vm.network :forwarded_port, guest: 80, host: 8080
|
config.vm.network :forwarded_port, guest: 80, host: 8080
|
||||||
config.vm.network :forwarded_port, guest: 8000, host: 8000
|
config.vm.network :forwarded_port, guest: 8000, host: 8000
|
||||||
|
|
||||||
# Create a private network, which allows host-only access to the machine
|
# Le restes de la configuration (installation de paquets, etc) est géré un
|
||||||
# using a specific IP.
|
# script shell.
|
||||||
# config.vm.network "private_network", ip: "192.168.33.10"
|
|
||||||
|
|
||||||
# Provider-specific configuration so you can fine-tune various
|
|
||||||
# backing providers for Vagrant. These expose provider-specific options.
|
|
||||||
# Example for VirtualBox:
|
|
||||||
#
|
|
||||||
# config.vm.provider "virtualbox" do |vb|
|
|
||||||
# # Display the VirtualBox GUI when booting the machine
|
|
||||||
# vb.gui = true
|
|
||||||
#
|
|
||||||
# # Customize the amount of memory on the VM:
|
|
||||||
# vb.memory = "1024"
|
|
||||||
# end
|
|
||||||
#
|
|
||||||
# View the documentation for the provider you are using for more
|
|
||||||
# information on available options.
|
|
||||||
|
|
||||||
# Enable provisioning with a shell script. Additional provisioners such as
|
|
||||||
# Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
|
|
||||||
# documentation for more information about their specific syntax and use.
|
|
||||||
# config.vm.provision "shell", inline: <<-SHELL
|
|
||||||
# sudo apt-get update
|
|
||||||
# sudo apt-get install -y apache2
|
|
||||||
# SHELL
|
|
||||||
config.vm.provision :shell, path: "provisioning/bootstrap.sh"
|
config.vm.provision :shell, path: "provisioning/bootstrap.sh"
|
||||||
end
|
end
|
||||||
|
|
83
bda/admin.py
83
bda/admin.py
|
@ -1,10 +1,11 @@
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
|
|
||||||
from custommail.shortcuts import send_mass_custom_mail
|
|
||||||
from dal.autocomplete import ModelSelect2
|
from dal.autocomplete import ModelSelect2
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
from django.core.mail import send_mass_mail
|
||||||
from django.db.models import Count, Q, Sum
|
from django.db.models import Count, Q, Sum
|
||||||
|
from django.template import loader
|
||||||
from django.template.defaultfilters import pluralize
|
from django.template.defaultfilters import pluralize
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
|
@ -32,20 +33,6 @@ class ReadOnlyMixin(object):
|
||||||
return readonly_fields + self.readonly_fields_update
|
return readonly_fields + self.readonly_fields_update
|
||||||
|
|
||||||
|
|
||||||
class ChoixSpectacleAdminForm(forms.ModelForm):
|
|
||||||
class Meta:
|
|
||||||
widgets = {
|
|
||||||
"participant": ModelSelect2(url="bda-participant-autocomplete"),
|
|
||||||
"spectacle": ModelSelect2(url="bda-spectacle-autocomplete"),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class ChoixSpectacleInline(admin.TabularInline):
|
|
||||||
model = ChoixSpectacle
|
|
||||||
form = ChoixSpectacleAdminForm
|
|
||||||
sortable_field_name = "priority"
|
|
||||||
|
|
||||||
|
|
||||||
class AttributionTabularAdminForm(forms.ModelForm):
|
class AttributionTabularAdminForm(forms.ModelForm):
|
||||||
listing = None
|
listing = None
|
||||||
|
|
||||||
|
@ -93,14 +80,17 @@ class WithoutListingAttributionInline(AttributionInline):
|
||||||
class ParticipantAdminForm(forms.ModelForm):
|
class ParticipantAdminForm(forms.ModelForm):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
self.fields["choicesrevente"].queryset = Spectacle.objects.select_related(
|
queryset = Spectacle.objects.select_related("location")
|
||||||
"location"
|
|
||||||
)
|
if self.instance.pk is not None:
|
||||||
|
queryset = queryset.filter(tirage=self.instance.tirage)
|
||||||
|
|
||||||
|
self.fields["choicesrevente"].queryset = queryset
|
||||||
|
|
||||||
|
|
||||||
class ParticipantPaidFilter(admin.SimpleListFilter):
|
class ParticipantPaidFilter(admin.SimpleListFilter):
|
||||||
"""
|
"""
|
||||||
Permet de filtrer les participants sur s'ils ont payé leurs places ou pas
|
Permet de filtrer les participants sur s'ils ont payé leurs places ou pas
|
||||||
"""
|
"""
|
||||||
|
|
||||||
title = "A payé"
|
title = "A payé"
|
||||||
|
@ -169,19 +159,23 @@ class ParticipantAdmin(ReadOnlyMixin, admin.ModelAdmin):
|
||||||
form = ParticipantAdminForm
|
form = ParticipantAdminForm
|
||||||
|
|
||||||
def send_attribs(self, request, queryset):
|
def send_attribs(self, request, queryset):
|
||||||
datatuple = []
|
emails = []
|
||||||
for member in queryset.all():
|
for member in queryset.all():
|
||||||
|
subject = "Résultats du tirage au sort"
|
||||||
attribs = member.attributions.all()
|
attribs = member.attributions.all()
|
||||||
context = {"member": member.user}
|
context = {"member": member.user}
|
||||||
shortname = ""
|
|
||||||
|
template_name = ""
|
||||||
if len(attribs) == 0:
|
if len(attribs) == 0:
|
||||||
shortname = "bda-attributions-decus"
|
template_name = "bda/mails/attributions-decus.txt"
|
||||||
else:
|
else:
|
||||||
shortname = "bda-attributions"
|
template_name = "bda/mails/attributions.txt"
|
||||||
context["places"] = attribs
|
context["places"] = attribs
|
||||||
print(context)
|
|
||||||
datatuple.append((shortname, context, "bda@ens.fr", [member.user.email]))
|
message = loader.render_to_string(template_name, context)
|
||||||
send_mass_custom_mail(datatuple)
|
emails.append((subject, message, "bda@ens.fr", [member.user.email]))
|
||||||
|
|
||||||
|
send_mass_mail(emails)
|
||||||
count = len(queryset.all())
|
count = len(queryset.all())
|
||||||
if count == 1:
|
if count == 1:
|
||||||
message_bit = "1 membre a"
|
message_bit = "1 membre a"
|
||||||
|
@ -197,17 +191,6 @@ class ParticipantAdmin(ReadOnlyMixin, admin.ModelAdmin):
|
||||||
|
|
||||||
|
|
||||||
class AttributionAdminForm(forms.ModelForm):
|
class AttributionAdminForm(forms.ModelForm):
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
super().__init__(*args, **kwargs)
|
|
||||||
if "spectacle" in self.fields:
|
|
||||||
self.fields["spectacle"].queryset = Spectacle.objects.select_related(
|
|
||||||
"location"
|
|
||||||
)
|
|
||||||
if "participant" in self.fields:
|
|
||||||
self.fields["participant"].queryset = Participant.objects.select_related(
|
|
||||||
"user", "tirage"
|
|
||||||
)
|
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
cleaned_data = super().clean()
|
cleaned_data = super().clean()
|
||||||
participant = cleaned_data.get("participant")
|
participant = cleaned_data.get("participant")
|
||||||
|
@ -220,9 +203,14 @@ class AttributionAdminForm(forms.ModelForm):
|
||||||
)
|
)
|
||||||
return cleaned_data
|
return cleaned_data
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
widgets = {
|
||||||
|
"participant": ModelSelect2(url="bda-participant-autocomplete"),
|
||||||
|
"spectacle": ModelSelect2(url="bda-spectacle-autocomplete"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
|
class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
|
||||||
|
|
||||||
list_display = ("id", "spectacle", "participant", "given", "paid")
|
list_display = ("id", "spectacle", "participant", "given", "paid")
|
||||||
search_fields = (
|
search_fields = (
|
||||||
"spectacle__title",
|
"spectacle__title",
|
||||||
|
@ -235,7 +223,7 @@ class AttributionAdmin(ReadOnlyMixin, admin.ModelAdmin):
|
||||||
|
|
||||||
|
|
||||||
class ChoixSpectacleAdmin(admin.ModelAdmin):
|
class ChoixSpectacleAdmin(admin.ModelAdmin):
|
||||||
form = ChoixSpectacleAdminForm
|
autocomplete_fields = ["participant", "spectacle"]
|
||||||
|
|
||||||
def tirage(self, obj):
|
def tirage(self, obj):
|
||||||
return obj.participant.tirage
|
return obj.participant.tirage
|
||||||
|
@ -279,15 +267,14 @@ class SalleAdmin(admin.ModelAdmin):
|
||||||
class SpectacleReventeAdminForm(forms.ModelForm):
|
class SpectacleReventeAdminForm(forms.ModelForm):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
self.fields["confirmed_entry"].queryset = Participant.objects.select_related(
|
qset = Participant.objects.select_related("user", "tirage")
|
||||||
"user", "tirage"
|
|
||||||
)
|
if self.instance.pk is not None:
|
||||||
self.fields["seller"].queryset = Participant.objects.select_related(
|
qset = qset.filter(tirage=self.instance.seller.tirage)
|
||||||
"user", "tirage"
|
|
||||||
)
|
self.fields["confirmed_entry"].queryset = qset
|
||||||
self.fields["soldTo"].queryset = Participant.objects.select_related(
|
self.fields["seller"].queryset = qset
|
||||||
"user", "tirage"
|
self.fields["soldTo"].queryset = qset
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class SpectacleReventeAdmin(admin.ModelAdmin):
|
class SpectacleReventeAdmin(admin.ModelAdmin):
|
||||||
|
|
|
@ -2,7 +2,6 @@ import random
|
||||||
|
|
||||||
|
|
||||||
class Algorithm(object):
|
class Algorithm(object):
|
||||||
|
|
||||||
shows = None
|
shows = None
|
||||||
ranks = None
|
ranks = None
|
||||||
origranks = None
|
origranks = None
|
||||||
|
@ -10,10 +9,10 @@ class Algorithm(object):
|
||||||
|
|
||||||
def __init__(self, shows, members, choices):
|
def __init__(self, shows, members, choices):
|
||||||
"""Initialisation :
|
"""Initialisation :
|
||||||
- on aggrège toutes les demandes pour chaque spectacle dans
|
- on aggrège toutes les demandes pour chaque spectacle dans
|
||||||
show.requests
|
show.requests
|
||||||
- on crée des tables de demandes pour chaque personne, afin de
|
- on crée des tables de demandes pour chaque personne, afin de
|
||||||
pouvoir modifier les rankings"""
|
pouvoir modifier les rankings"""
|
||||||
self.max_group = 2 * max(choice.priority for choice in choices)
|
self.max_group = 2 * max(choice.priority for choice in choices)
|
||||||
self.shows = []
|
self.shows = []
|
||||||
showdict = {}
|
showdict = {}
|
||||||
|
|
|
@ -3,7 +3,7 @@ from django.forms.models import BaseInlineFormSet
|
||||||
from django.template import loader
|
from django.template import loader
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
from bda.models import Attribution, Spectacle, SpectacleRevente
|
from bda.models import SpectacleRevente
|
||||||
|
|
||||||
|
|
||||||
class InscriptionInlineFormSet(BaseInlineFormSet):
|
class InscriptionInlineFormSet(BaseInlineFormSet):
|
||||||
|
@ -77,7 +77,7 @@ class ResellForm(forms.Form):
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
self.fields["attributions"] = TemplateLabelField(
|
self.fields["attributions"] = TemplateLabelField(
|
||||||
queryset=participant.attribution_set.filter(
|
queryset=participant.attribution_set.filter(
|
||||||
spectacle__date__gte=timezone.now()
|
spectacle__date__gte=timezone.now(), paid=True
|
||||||
)
|
)
|
||||||
.exclude(revente__seller=participant)
|
.exclude(revente__seller=participant)
|
||||||
.select_related("spectacle", "spectacle__location", "participant__user"),
|
.select_related("spectacle", "spectacle__location", "participant__user"),
|
||||||
|
|
|
@ -81,7 +81,7 @@ class Command(MyBaseCommand):
|
||||||
shows = random.sample(
|
shows = random.sample(
|
||||||
list(tirage.spectacle_set.all()), tirage.spectacle_set.count() // 2
|
list(tirage.spectacle_set.all()), tirage.spectacle_set.count() // 2
|
||||||
)
|
)
|
||||||
for (rank, show) in enumerate(shows):
|
for rank, show in enumerate(shows):
|
||||||
choices.append(
|
choices.append(
|
||||||
ChoixSpectacle(
|
ChoixSpectacle(
|
||||||
participant=part,
|
participant=part,
|
||||||
|
|
|
@ -6,7 +6,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
|
dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -35,7 +35,6 @@ def fill_tirage_fields(apps, schema_editor):
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0001_initial")]
|
dependencies = [("bda", "0001_initial")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -5,7 +5,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0002_add_tirage")]
|
dependencies = [("bda", "0002_add_tirage")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -5,7 +5,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0003_update_tirage_and_spectacle")]
|
dependencies = [("bda", "0003_update_tirage_and_spectacle")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -5,7 +5,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0004_mails-rappel")]
|
dependencies = [("bda", "0004_mails-rappel")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -18,7 +18,6 @@ def forwards_func(apps, schema_editor):
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0005_encoding")]
|
dependencies = [("bda", "0005_encoding")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -5,7 +5,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0006_add_tirage_switch")]
|
dependencies = [("bda", "0006_add_tirage_switch")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -5,7 +5,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0007_extends_spectacle")]
|
dependencies = [("bda", "0007_extends_spectacle")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -6,7 +6,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0008_py3")]
|
dependencies = [("bda", "0008_py3")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -12,15 +12,15 @@ def forwards_func(apps, schema_editor):
|
||||||
|
|
||||||
for revente in SpectacleRevente.objects.all():
|
for revente in SpectacleRevente.objects.all():
|
||||||
is_expired = timezone.now() > revente.date_tirage()
|
is_expired = timezone.now() > revente.date_tirage()
|
||||||
is_direct = revente.attribution.spectacle.date >= revente.date and timezone.now() > revente.date + timedelta(
|
is_direct = (
|
||||||
minutes=15
|
revente.attribution.spectacle.date >= revente.date
|
||||||
|
and timezone.now() > revente.date + timedelta(minutes=15)
|
||||||
)
|
)
|
||||||
revente.shotgun = is_expired or is_direct
|
revente.shotgun = is_expired or is_direct
|
||||||
revente.save()
|
revente.save()
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0009_revente")]
|
dependencies = [("bda", "0009_revente")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -5,7 +5,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0010_spectaclerevente_shotgun")]
|
dependencies = [("bda", "0010_spectaclerevente_shotgun")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -5,7 +5,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0011_tirage_appear_catalogue")]
|
dependencies = [("bda", "0011_tirage_appear_catalogue")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -13,7 +13,6 @@ def swap_double_choice(apps, schema_editor):
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0011_tirage_appear_catalogue")]
|
dependencies = [("bda", "0011_tirage_appear_catalogue")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -6,7 +6,6 @@ from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0012_notif_time"), ("bda", "0012_swap_double_choice")]
|
dependencies = [("bda", "0012_notif_time"), ("bda", "0012_swap_double_choice")]
|
||||||
|
|
||||||
operations = []
|
operations = []
|
||||||
|
|
|
@ -4,7 +4,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0013_merge_20180524_2123")]
|
dependencies = [("bda", "0013_merge_20180524_2123")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -29,7 +29,6 @@ def set_participant_payment(apps, schema_editor):
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0014_attribution_paid_field")]
|
dependencies = [("bda", "0014_attribution_paid_field")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -4,7 +4,6 @@ from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0015_move_bda_payment")]
|
dependencies = [("bda", "0015_move_bda_payment")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -4,7 +4,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bda", "0016_delete_participant_paid")]
|
dependencies = [("bda", "0016_delete_participant_paid")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
37
bda/migrations/0018_auto_20201021_1818.py
Normal file
37
bda/migrations/0018_auto_20201021_1818.py
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
# Generated by Django 2.2.12 on 2020-10-21 16:18
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("bda", "0017_participant_accepte_charte"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name="participant",
|
||||||
|
options={"ordering": ("-tirage", "user__last_name", "user__first_name")},
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="tirage",
|
||||||
|
name="archived",
|
||||||
|
field=models.BooleanField(default=False, verbose_name="Archivé"),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="participant",
|
||||||
|
name="tirage",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
limit_choices_to={"archived": False},
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
to="bda.Tirage",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AddConstraint(
|
||||||
|
model_name="participant",
|
||||||
|
constraint=models.UniqueConstraint(
|
||||||
|
fields=("tirage", "user"), name="unique_tirage"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
23
bda/migrations/0019_auto_20220630_1245.py
Normal file
23
bda/migrations/0019_auto_20220630_1245.py
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
# Generated by Django 3.2.13 on 2022-06-30 10:45
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("bda", "0018_auto_20201021_1818"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterUniqueTogether(
|
||||||
|
name="choixspectacle",
|
||||||
|
unique_together=set(),
|
||||||
|
),
|
||||||
|
migrations.AddConstraint(
|
||||||
|
model_name="choixspectacle",
|
||||||
|
constraint=models.UniqueConstraint(
|
||||||
|
fields=("participant", "spectacle"), name="unique_participation"
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
115
bda/models.py
115
bda/models.py
|
@ -2,14 +2,14 @@ import calendar
|
||||||
import random
|
import random
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
|
|
||||||
from custommail.models import CustomMail
|
|
||||||
from custommail.shortcuts import send_mass_custom_mail
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.contrib.sites.models import Site
|
from django.contrib.sites.models import Site
|
||||||
from django.core import mail
|
from django.core import mail
|
||||||
|
from django.core.mail import EmailMessage, send_mass_mail
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models import Count, Exists
|
from django.db.models import Count, Exists
|
||||||
|
from django.template import loader
|
||||||
from django.utils import formats, timezone
|
from django.utils import formats, timezone
|
||||||
|
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@ class Tirage(models.Model):
|
||||||
"Tirage à afficher dans le catalogue", default=False
|
"Tirage à afficher dans le catalogue", default=False
|
||||||
)
|
)
|
||||||
enable_do_tirage = models.BooleanField("Le tirage peut être lancé", default=False)
|
enable_do_tirage = models.BooleanField("Le tirage peut être lancé", default=False)
|
||||||
|
archived = models.BooleanField("Archivé", default=False)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "%s - %s" % (
|
return "%s - %s" % (
|
||||||
|
@ -116,16 +117,19 @@ class Spectacle(models.Model):
|
||||||
bda_generic.nb_attr = 1
|
bda_generic.nb_attr = 1
|
||||||
members.append(bda_generic)
|
members.append(bda_generic)
|
||||||
# On écrit un mail personnalisé à chaque participant
|
# On écrit un mail personnalisé à chaque participant
|
||||||
datatuple = [
|
mails = [
|
||||||
(
|
(
|
||||||
"bda-rappel",
|
str(self),
|
||||||
{"member": member, "nb_attr": member.nb_attr, "show": self},
|
loader.render_to_string(
|
||||||
|
"bda/mails/rappel.txt",
|
||||||
|
context={"member": member, "nb_attr": member.nb_attr, "show": self},
|
||||||
|
),
|
||||||
settings.MAIL_DATA["rappels"]["FROM"],
|
settings.MAIL_DATA["rappels"]["FROM"],
|
||||||
[member.email],
|
[member.email],
|
||||||
)
|
)
|
||||||
for member in members
|
for member in members
|
||||||
]
|
]
|
||||||
send_mass_custom_mail(datatuple)
|
send_mass_mail(mails)
|
||||||
# On enregistre le fait que l'envoi a bien eu lieu
|
# On enregistre le fait que l'envoi a bien eu lieu
|
||||||
self.rappel_sent = timezone.now()
|
self.rappel_sent = timezone.now()
|
||||||
self.save()
|
self.save()
|
||||||
|
@ -172,8 +176,8 @@ class Attribution(models.Model):
|
||||||
|
|
||||||
class ParticipantPaidQueryset(models.QuerySet):
|
class ParticipantPaidQueryset(models.QuerySet):
|
||||||
"""
|
"""
|
||||||
Un manager qui annote le queryset avec un champ `paid`,
|
Un manager qui annote le queryset avec un champ `paid`,
|
||||||
indiquant si un participant a payé toutes ses attributions.
|
indiquant si un participant a payé toutes ses attributions.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def annotate_paid(self):
|
def annotate_paid(self):
|
||||||
|
@ -194,7 +198,9 @@ class Participant(models.Model):
|
||||||
attributions = models.ManyToManyField(
|
attributions = models.ManyToManyField(
|
||||||
Spectacle, through="Attribution", related_name="attributed_to"
|
Spectacle, through="Attribution", related_name="attributed_to"
|
||||||
)
|
)
|
||||||
tirage = models.ForeignKey(Tirage, on_delete=models.CASCADE)
|
tirage = models.ForeignKey(
|
||||||
|
Tirage, on_delete=models.CASCADE, limit_choices_to={"archived": False}
|
||||||
|
)
|
||||||
accepte_charte = models.BooleanField("A accepté la charte BdA", default=False)
|
accepte_charte = models.BooleanField("A accepté la charte BdA", default=False)
|
||||||
choicesrevente = models.ManyToManyField(
|
choicesrevente = models.ManyToManyField(
|
||||||
Spectacle, related_name="subscribed", blank=True
|
Spectacle, related_name="subscribed", blank=True
|
||||||
|
@ -205,6 +211,12 @@ class Participant(models.Model):
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "%s - %s" % (self.user, self.tirage.title)
|
return "%s - %s" % (self.user, self.tirage.title)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
ordering = ("-tirage", "user__last_name", "user__first_name")
|
||||||
|
constraints = [
|
||||||
|
models.UniqueConstraint(fields=("tirage", "user"), name="unique_tirage"),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
DOUBLE_CHOICES = (
|
DOUBLE_CHOICES = (
|
||||||
("1", "1 place"),
|
("1", "1 place"),
|
||||||
|
@ -241,7 +253,11 @@ class ChoixSpectacle(models.Model):
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ("priority",)
|
ordering = ("priority",)
|
||||||
unique_together = (("participant", "spectacle"),)
|
constraints = [
|
||||||
|
models.UniqueConstraint(
|
||||||
|
fields=["participant", "spectacle"], name="unique_participation"
|
||||||
|
)
|
||||||
|
]
|
||||||
verbose_name = "voeu"
|
verbose_name = "voeu"
|
||||||
verbose_name_plural = "voeux"
|
verbose_name_plural = "voeux"
|
||||||
|
|
||||||
|
@ -348,21 +364,24 @@ class SpectacleRevente(models.Model):
|
||||||
BdA-Revente à tous les intéressés.
|
BdA-Revente à tous les intéressés.
|
||||||
"""
|
"""
|
||||||
inscrits = self.attribution.spectacle.subscribed.select_related("user")
|
inscrits = self.attribution.spectacle.subscribed.select_related("user")
|
||||||
datatuple = [
|
mails = [
|
||||||
(
|
(
|
||||||
"bda-revente",
|
"BdA-Revente : {}".format(self.attribution.spectacle.title),
|
||||||
{
|
loader.render_to_string(
|
||||||
"member": participant.user,
|
"bda/mails/revente-new.txt",
|
||||||
"show": self.attribution.spectacle,
|
context={
|
||||||
"revente": self,
|
"member": participant.user,
|
||||||
"site": Site.objects.get_current(),
|
"show": self.attribution.spectacle,
|
||||||
},
|
"revente": self,
|
||||||
|
"site": Site.objects.get_current(),
|
||||||
|
},
|
||||||
|
),
|
||||||
settings.MAIL_DATA["revente"]["FROM"],
|
settings.MAIL_DATA["revente"]["FROM"],
|
||||||
[participant.user.email],
|
[participant.user.email],
|
||||||
)
|
)
|
||||||
for participant in inscrits
|
for participant in inscrits
|
||||||
]
|
]
|
||||||
send_mass_custom_mail(datatuple)
|
send_mass_mail(mails)
|
||||||
self.notif_sent = True
|
self.notif_sent = True
|
||||||
self.notif_time = timezone.now()
|
self.notif_time = timezone.now()
|
||||||
self.save()
|
self.save()
|
||||||
|
@ -373,20 +392,23 @@ class SpectacleRevente(models.Model):
|
||||||
leur indiquer qu'il est désormais disponible au shotgun.
|
leur indiquer qu'il est désormais disponible au shotgun.
|
||||||
"""
|
"""
|
||||||
inscrits = self.attribution.spectacle.subscribed.select_related("user")
|
inscrits = self.attribution.spectacle.subscribed.select_related("user")
|
||||||
datatuple = [
|
mails = [
|
||||||
(
|
(
|
||||||
"bda-shotgun",
|
"BdA-Revente : {}".format(self.attribution.spectacle.title),
|
||||||
{
|
loader.render_to_string(
|
||||||
"member": participant.user,
|
"bda/mails/revente-shotgun.txt",
|
||||||
"show": self.attribution.spectacle,
|
context={
|
||||||
"site": Site.objects.get_current(),
|
"member": participant.user,
|
||||||
},
|
"show": self.attribution.spectacle,
|
||||||
|
"site": Site.objects.get_current(),
|
||||||
|
},
|
||||||
|
),
|
||||||
settings.MAIL_DATA["revente"]["FROM"],
|
settings.MAIL_DATA["revente"]["FROM"],
|
||||||
[participant.user.email],
|
[participant.user.email],
|
||||||
)
|
)
|
||||||
for participant in inscrits
|
for participant in inscrits
|
||||||
]
|
]
|
||||||
send_mass_custom_mail(datatuple)
|
send_mass_mail(mails)
|
||||||
self.notif_sent = True
|
self.notif_sent = True
|
||||||
self.notif_time = timezone.now()
|
self.notif_time = timezone.now()
|
||||||
# Flag inutile, sauf si l'horloge interne merde
|
# Flag inutile, sauf si l'horloge interne merde
|
||||||
|
@ -418,31 +440,30 @@ class SpectacleRevente(models.Model):
|
||||||
"show": spectacle,
|
"show": spectacle,
|
||||||
}
|
}
|
||||||
|
|
||||||
c_mails_qs = CustomMail.objects.filter(
|
subject = "BdA-Revente : {}".format(spectacle.title)
|
||||||
shortname__in=[
|
|
||||||
"bda-revente-winner",
|
|
||||||
"bda-revente-loser",
|
|
||||||
"bda-revente-seller",
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
c_mails = {cm.shortname: cm for cm in c_mails_qs}
|
|
||||||
|
|
||||||
mails.append(
|
mails.append(
|
||||||
c_mails["bda-revente-winner"].get_message(
|
EmailMessage(
|
||||||
context,
|
subject=subject,
|
||||||
|
body=loader.render_to_string(
|
||||||
|
"bda/mails/revente-tirage-winner.txt",
|
||||||
|
context=context,
|
||||||
|
),
|
||||||
from_email=settings.MAIL_DATA["revente"]["FROM"],
|
from_email=settings.MAIL_DATA["revente"]["FROM"],
|
||||||
to=[winner.user.email],
|
to=[winner.user.email],
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
mails.append(
|
mails.append(
|
||||||
c_mails["bda-revente-seller"].get_message(
|
EmailMessage(
|
||||||
context,
|
subject=subject,
|
||||||
|
body=loader.render_to_string(
|
||||||
|
"bda/mails/revente-tirage-seller.txt",
|
||||||
|
context=context,
|
||||||
|
),
|
||||||
from_email=settings.MAIL_DATA["revente"]["FROM"],
|
from_email=settings.MAIL_DATA["revente"]["FROM"],
|
||||||
to=[seller.user.email],
|
to=[seller.user.email],
|
||||||
reply_to=[winner.user.email],
|
reply_to=[winner.user.email],
|
||||||
)
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
# Envoie un mail aux perdants
|
# Envoie un mail aux perdants
|
||||||
|
@ -452,11 +473,15 @@ class SpectacleRevente(models.Model):
|
||||||
new_context["acheteur"] = inscrit.user
|
new_context["acheteur"] = inscrit.user
|
||||||
|
|
||||||
mails.append(
|
mails.append(
|
||||||
c_mails["bda-revente-loser"].get_message(
|
EmailMessage(
|
||||||
new_context,
|
subject=subject,
|
||||||
|
body=loader.render_to_string(
|
||||||
|
"bda/mails/revente-tirage-loser.txt",
|
||||||
|
context=new_context,
|
||||||
|
),
|
||||||
from_email=settings.MAIL_DATA["revente"]["FROM"],
|
from_email=settings.MAIL_DATA["revente"]["FROM"],
|
||||||
to=[inscrit.user.email],
|
to=[inscrit.user.email],
|
||||||
)
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
mail_conn = mail.get_connection()
|
mail_conn = mail.get_connection()
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
{% block extra_head %}
|
{% block extra_head %}
|
||||||
<link type="text/css" rel="stylesheet" href="{% static "bda/css/bda.css" %}" />
|
<link type="text/css" rel="stylesheet" href="{% static "bda/css/bda.css" %}" />
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
{% block realcontent %}
|
{% block realcontent %}
|
||||||
<h2>État des inscriptions BdA</h2>
|
<h2>État des inscriptions BdA</h2>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
{% block extra_head %}
|
{% block extra_head %}
|
||||||
<script type="text/javascript" src="{% static 'vendor/jquery/jquery-ui.min.js' %}" ></script>
|
<script type="text/javascript" src="{% static 'vendor/jquery/jquery-ui.min.js' %}" ></script>
|
||||||
|
|
|
@ -26,13 +26,6 @@
|
||||||
|
|
||||||
<hr \>
|
<hr \>
|
||||||
|
|
||||||
<p>
|
|
||||||
<em>Note :</em> le template de ce mail peut être modifié à
|
|
||||||
<a href="{% url 'admin:custommail_custommail_change' custommail.pk %}">cette adresse</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<hr \>
|
|
||||||
|
|
||||||
<h3>Forme des mails</h3>
|
<h3>Forme des mails</h3>
|
||||||
|
|
||||||
<h4>Une seule place</h4>
|
<h4>Une seule place</h4>
|
||||||
|
|
10
bda/templates/bda/mails/attributions-decus.txt
Normal file
10
bda/templates/bda/mails/attributions-decus.txt
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
Cher-e {{ member.first_name }},
|
||||||
|
|
||||||
|
Tu t'es inscrit-e pour le tirage au sort du BdA. Malheureusement, tu n'as
|
||||||
|
obtenu aucune place.
|
||||||
|
|
||||||
|
Nous proposons cependant de nombreuses offres hors-tirage tout au long de
|
||||||
|
l'année, et nous t'invitons à nous contacter si l'une d'entre elles
|
||||||
|
t'intéresse !
|
||||||
|
--
|
||||||
|
Le Bureau des Arts
|
31
bda/templates/bda/mails/attributions.txt
Normal file
31
bda/templates/bda/mails/attributions.txt
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
Cher-e {{ member.first_name }},
|
||||||
|
|
||||||
|
Tu t'es inscrit-e pour le tirage au sort du BdA. Tu as été sélectionné-e
|
||||||
|
pour les spectacles suivants :
|
||||||
|
{% for place in places %}
|
||||||
|
- 1 place pour {{ place }}{% endfor %}
|
||||||
|
|
||||||
|
*Paiement*
|
||||||
|
L'intégralité de ces places de spectacles est à régler dès maintenant et AVANT
|
||||||
|
vendredi prochain, au bureau du COF pendant les heures de permanences (du lundi au vendredi
|
||||||
|
entre 12h et 14h, et entre 18h et 20h). Des facilités de paiement sont bien
|
||||||
|
évidemment possibles : nous pouvons ne pas encaisser le chèque immédiatement,
|
||||||
|
ou bien découper votre paiement en deux fois. Pour ceux qui ne pourraient pas
|
||||||
|
venir payer au bureau, merci de nous contacter par mail.
|
||||||
|
|
||||||
|
*Mode de retrait des places*
|
||||||
|
Au moment du paiement, certaines places vous seront remises directement,
|
||||||
|
d'autres seront à récupérer au cours de l'année, d'autres encore seront
|
||||||
|
nominatives et à retirer le soir même dans les théâtres correspondants.
|
||||||
|
Pour chaque spectacle, vous recevrez un mail quelques jours avant la
|
||||||
|
représentation vous indiquant le mode de retrait.
|
||||||
|
|
||||||
|
Nous vous rappelons que l'obtention de places du BdA vous engage à
|
||||||
|
respecter les règles de fonctionnement :
|
||||||
|
https://bda.ens.fr/lequipe/charte-bda/
|
||||||
|
Un système de revente des places via les mails BdA-revente est disponible
|
||||||
|
directement sur votre compte GestioCOF.
|
||||||
|
|
||||||
|
En vous souhaitant de très beaux spectacles tout au long de l'année,
|
||||||
|
--
|
||||||
|
Le Bureau des Arts
|
23
bda/templates/bda/mails/rappel.txt
Normal file
23
bda/templates/bda/mails/rappel.txt
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
Bonjour {{ member.first_name }},
|
||||||
|
|
||||||
|
Nous te rappellons que tu as eu la chance d'obtenir {{ nb_attr|pluralize:"une place,deux places" }}
|
||||||
|
pour {{ show.title }}, le {{ show.date }} au {{ show.location }}. N'oublie pas de t'y rendre !
|
||||||
|
{% if nb_attr == 2 %}
|
||||||
|
Tu as obtenu deux places pour ce spectacle. Nous te rappelons que
|
||||||
|
ces places sont strictement réservées aux personnes de moins de 28 ans.
|
||||||
|
{% endif %}
|
||||||
|
{% if show.listing %}Pour ce spectacle, tu as reçu {{ nb_attr|pluralize:"une place,des places" }} sur
|
||||||
|
listing. Il te faudra donc te rendre 15 minutes en avance sur les lieux de la représentation
|
||||||
|
pour {{ nb_attr|pluralize:"la,les" }} retirer.
|
||||||
|
{% else %}Pour assister à ce spectacle, tu dois présenter les billets qui ont
|
||||||
|
été distribués au burô.
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
Si tu ne peux plus assister à cette représentation, tu peux
|
||||||
|
revendre ta place via BdA-revente, accessible directement sur
|
||||||
|
GestioCOF (lien "revendre une place du premier tirage" sur la page
|
||||||
|
d'accueil https://www.cof.ens.fr/gestion/).
|
||||||
|
|
||||||
|
En te souhaitant un excellent spectacle,
|
||||||
|
--
|
||||||
|
Le Bureau des Arts
|
12
bda/templates/bda/mails/revente-new.txt
Normal file
12
bda/templates/bda/mails/revente-new.txt
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
Bonjour {{ member.first_name }}
|
||||||
|
|
||||||
|
Une place pour le spectacle {{ show.title }} ({{ show.date }})
|
||||||
|
a été postée sur BdA-Revente.
|
||||||
|
|
||||||
|
Si ce spectacle t'intéresse toujours, merci de nous le signaler en cliquant
|
||||||
|
sur ce lien : https://{{ site }}{% url "bda-revente-confirm" revente.id %}.
|
||||||
|
Dans le cas où plusieurs personnes seraient intéressées, nous procèderons à
|
||||||
|
un tirage au sort le {{ revente.date_tirage|date:"DATE_FORMAT" }}.
|
||||||
|
|
||||||
|
Chaleureusement,
|
||||||
|
Le BdA
|
13
bda/templates/bda/mails/revente-seller.txt
Normal file
13
bda/templates/bda/mails/revente-seller.txt
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
Bonjour {{ vendeur.first_name }},
|
||||||
|
|
||||||
|
Tu t’es bien inscrit·e pour revendre une place pour {{ show.title }}.
|
||||||
|
|
||||||
|
{% with revente.date_tirage as time %}
|
||||||
|
Le tirage au sort entre tout·e·s les racheteuse·eur·s potentiel·le·s aura lieu
|
||||||
|
le {{ time|date:"DATE_FORMAT" }} à {{ time|time:"TIME_FORMAT" }} (dans {{time|timeuntil }}).
|
||||||
|
Si personne ne s’est inscrit pour racheter la place, celle-ci apparaîtra parmi
|
||||||
|
les « Places disponibles immédiatement à la revente » sur GestioCOF.
|
||||||
|
{% endwith %}
|
||||||
|
|
||||||
|
Bonne revente !
|
||||||
|
Le Bureau des Arts
|
6
bda/templates/bda/mails/revente-shotgun-seller.txt
Normal file
6
bda/templates/bda/mails/revente-shotgun-seller.txt
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
Bonjour {{ vendeur.first_name }} !
|
||||||
|
|
||||||
|
Je souhaiterais racheter ta place pour {{ show.title }} le {{ show.date }} ({{ show.location }}) à {{ show.price|floatformat:2 }}€.
|
||||||
|
Contacte-moi si tu es toujours intéressé·e !
|
||||||
|
|
||||||
|
{{ acheteur.get_full_name }} ({{ acheteur.email }})
|
11
bda/templates/bda/mails/revente-shotgun.txt
Normal file
11
bda/templates/bda/mails/revente-shotgun.txt
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
Bonjour {{ member.first_name }}
|
||||||
|
|
||||||
|
Une place pour le spectacle {{ show.title }} ({{ show.date }})
|
||||||
|
a été postée sur BdA-Revente.
|
||||||
|
|
||||||
|
Puisque ce spectacle a lieu dans moins de 24h, il n'y a pas de tirage au sort pour
|
||||||
|
cette place : elle est disponible immédiatement à l'adresse
|
||||||
|
https://{{ site }}{% url "bda-revente-buy" show.id %}, à la disposition de tous.
|
||||||
|
|
||||||
|
Chaleureusement,
|
||||||
|
Le BdA
|
9
bda/templates/bda/mails/revente-tirage-loser.txt
Normal file
9
bda/templates/bda/mails/revente-tirage-loser.txt
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
Bonjour {{ acheteur.first_name }},
|
||||||
|
|
||||||
|
Tu t'étais inscrit·e pour la revente de la place de {{ vendeur.get_full_name }}
|
||||||
|
pour {{ show.title }}.
|
||||||
|
Malheureusement, une autre personne a été tirée au sort pour racheter la place.
|
||||||
|
Tu pourras certainement retenter ta chance pour une autre revente !
|
||||||
|
|
||||||
|
À très bientôt,
|
||||||
|
Le Bureau des Arts
|
7
bda/templates/bda/mails/revente-tirage-seller.txt
Normal file
7
bda/templates/bda/mails/revente-tirage-seller.txt
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
Bonjour {{ vendeur.first_name }},
|
||||||
|
|
||||||
|
La personne tirée au sort pour racheter ta place pour {{ show.title }} est {{ acheteur.get_full_name }}.
|
||||||
|
Tu peux le/la contacter à l'adresse {{ acheteur.email }}, ou en répondant à ce mail.
|
||||||
|
|
||||||
|
Chaleureusement,
|
||||||
|
Le BdA
|
7
bda/templates/bda/mails/revente-tirage-winner.txt
Normal file
7
bda/templates/bda/mails/revente-tirage-winner.txt
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
Bonjour {{ acheteur.first_name }},
|
||||||
|
|
||||||
|
Tu as été tiré·e au sort pour racheter une place pour {{ show.title }} le {{ show.date }} ({{ show.location }}) à {{ show.price|floatformat:2 }}€.
|
||||||
|
Tu peux contacter le/la vendeur·se à l'adresse {{ vendeur.email }}.
|
||||||
|
|
||||||
|
Chaleureusement,
|
||||||
|
Le BdA
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
{% block realcontent %}
|
{% block realcontent %}
|
||||||
<h2>{{ spectacle }}</h2>
|
<h2>{{ spectacle }}</h2>
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for participant in participants %}
|
{% for participant in participants %}
|
||||||
<tr>
|
<tr>
|
||||||
<td data-sort-value="{{ participan.name}}">{{participant.name}}</td>
|
<td data-sort-value="{{ participant.name}}">{{participant.name}}</td>
|
||||||
<td data-sort-value="{{participant.nb_places}}">{{participant.nb_places}} place{{participant.nb_places|pluralize}}</td>
|
<td data-sort-value="{{participant.nb_places}}">{{participant.nb_places}} place{{participant.nb_places|pluralize}}</td>
|
||||||
<td data-sort-value="{{participant.email}}">{{participant.email}}</td>
|
<td data-sort-value="{{participant.email}}">{{participant.email}}</td>
|
||||||
<td data-sort-value="{{ participant.paid}}" class={%if participant.paid %}"greenratio"{%else%}"redratio"{%endif%}>
|
<td data-sort-value="{{ participant.paid}}" class={%if participant.paid %}"greenratio"{%else%}"redratio"{%endif%}>
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
<h3><a href="{% url "admin:bda_attribution_add" %}?spectacle={{spectacle.id}}"><span class="glyphicon glyphicon-plus-sign"></span> Ajouter une attribution</a></h3>
|
<h3><a href="{% url "admin:bda_attribution_add" %}?spectacle={{spectacle.id}}"><span class="glyphicon glyphicon-plus-sign"></span> Ajouter une attribution</a></h3>
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
<button class="btn btn-default" type="button" onclick="toggle('export-mails')">Afficher/Cacher mails participants</button>
|
<button class="btn btn-default" type="button" onclick="toggle('export-mails')">Afficher/Cacher mails participant⋅e⋅s</button>
|
||||||
<pre id="export-mails" style="display:none">{% spaceless %}
|
<pre id="export-mails" style="display:none">{% spaceless %}
|
||||||
{% for participant in participants %}{{ participant.email }}, {% endfor %}
|
{% for participant in participants %}{{ participant.email }}, {% endfor %}
|
||||||
{% endspaceless %}</pre>
|
{% endspaceless %}</pre>
|
||||||
|
@ -56,6 +56,7 @@
|
||||||
<a href="{% url 'bda-rappels' spectacle.id %}">Page d'envoi manuel des mails de rappel</a>
|
<a href="{% url 'bda-rappels' spectacle.id %}">Page d'envoi manuel des mails de rappel</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
function toggle(id) {
|
function toggle(id) {
|
||||||
var pre = document.getElementById(id) ;
|
var pre = document.getElementById(id) ;
|
||||||
pre.style.display = pre.style.display == "none" ? "block" : "none" ;
|
pre.style.display = pre.style.display == "none" ? "block" : "none" ;
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
<td>{{place.spectacle.location}}</td>
|
<td>{{place.spectacle.location}}</td>
|
||||||
<td>{{place.spectacle.date}}</td>
|
<td>{{place.spectacle.date}}</td>
|
||||||
<td>{% if place.double %}deux places{%else%}une place{% endif %}</td>
|
<td>{% if place.double %}deux places{%else%}une place{% endif %}</td>
|
||||||
|
<td>{% if place.spectacle.listing %}sur listing{% else %}place physique{% endif %}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
|
|
||||||
{%block realcontent %}
|
{%block realcontent %}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
{% block realcontent %}
|
{% block realcontent %}
|
||||||
<h2>Inscription à une revente</h2>
|
<h2>Inscription à une revente</h2>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
{% block realcontent %}
|
{% block realcontent %}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
{% block realcontent %}
|
{% block realcontent %}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
{% extends "base_title.html" %}
|
|
||||||
|
|
||||||
{% block realcontent %}
|
|
||||||
<h2><strong>Nope</strong></h2>
|
|
||||||
<p>Avant de revendre des places, il faut aller les payer !</p>
|
|
||||||
{% endblock %}
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles%}
|
{% load static %}
|
||||||
|
|
||||||
{% block realcontent %}
|
{% block realcontent %}
|
||||||
<h2>Inscriptions pour BdA-Revente</h2>
|
<h2>Inscriptions pour BdA-Revente</h2>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
{% block realcontent %}
|
{% block realcontent %}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{% extends "base_title.html" %}
|
{% extends "base_title.html" %}
|
||||||
{% load staticfiles %}
|
{% load static %}
|
||||||
|
|
||||||
{% block extra_head %}
|
{% block extra_head %}
|
||||||
<link type="text/css" rel="stylesheet" href="{% static "bda/css/bda.css" %}" />
|
<link type="text/css" rel="stylesheet" href="{% static "bda/css/bda.css" %}" />
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
import os
|
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.core.management import call_command
|
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
from shared.tests.testcases import ViewTestCaseMixin
|
from shared.tests.mixins import ViewTestCaseMixin
|
||||||
|
|
||||||
from ..models import CategorieSpectacle, Salle, Spectacle, Tirage
|
from ..models import CategorieSpectacle, Salle, Spectacle, Tirage
|
||||||
from .utils import create_user
|
from .utils import create_user
|
||||||
|
@ -28,12 +24,6 @@ class BdATestHelpers:
|
||||||
if self.bda_testdata:
|
if self.bda_testdata:
|
||||||
self.load_bda_testdata()
|
self.load_bda_testdata()
|
||||||
|
|
||||||
def require_custommails(self):
|
|
||||||
data_file = os.path.join(
|
|
||||||
settings.BASE_DIR, "gestioncof", "management", "data", "custommail.json"
|
|
||||||
)
|
|
||||||
call_command("syncmails", data_file, verbosity=0)
|
|
||||||
|
|
||||||
def load_bda_testdata(self):
|
def load_bda_testdata(self):
|
||||||
self.tirage = Tirage.objects.create(
|
self.tirage = Tirage.objects.create(
|
||||||
title="Test tirage",
|
title="Test tirage",
|
|
@ -19,8 +19,6 @@ User = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
class SpectacleReventeTests(TestCase):
|
class SpectacleReventeTests(TestCase):
|
||||||
fixtures = ["gestioncof/management/data/custommail.json"]
|
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
now = timezone.now()
|
now = timezone.now()
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ from django.urls import reverse
|
||||||
from django.utils import formats, timezone
|
from django.utils import formats, timezone
|
||||||
|
|
||||||
from ..models import Participant, Tirage
|
from ..models import Participant, Tirage
|
||||||
from .testcases import BdATestHelpers, BdAViewTestCaseMixin
|
from .mixins import BdATestHelpers, BdAViewTestCaseMixin
|
||||||
|
|
||||||
User = get_user_model()
|
User = get_user_model()
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ class InscriptionViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url_expected(self):
|
def url_expected(self):
|
||||||
return "/bda/inscription/{}".format(self.tirage.id)
|
return "/gestion/bda/inscription/{}".format(self.tirage.id)
|
||||||
|
|
||||||
def test_get_opened(self):
|
def test_get_opened(self):
|
||||||
self.tirage.ouverture = timezone.now() - timedelta(days=1)
|
self.tirage.ouverture = timezone.now() - timedelta(days=1)
|
||||||
|
@ -149,7 +149,7 @@ class PlacesViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url_expected(self):
|
def url_expected(self):
|
||||||
return "/bda/places/{}".format(self.tirage.id)
|
return "/gestion/bda/places/{}".format(self.tirage.id)
|
||||||
|
|
||||||
|
|
||||||
class EtatPlacesViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
class EtatPlacesViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
@ -166,7 +166,7 @@ class EtatPlacesViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url_expected(self):
|
def url_expected(self):
|
||||||
return "/bda/etat-places/{}".format(self.tirage.id)
|
return "/gestion/bda/etat-places/{}".format(self.tirage.id)
|
||||||
|
|
||||||
|
|
||||||
class TirageViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
class TirageViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
@ -185,7 +185,7 @@ class TirageViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url_expected(self):
|
def url_expected(self):
|
||||||
return "/bda/tirage/{}".format(self.tirage.id)
|
return "/gestion/bda/tirage/{}".format(self.tirage.id)
|
||||||
|
|
||||||
def test_perform_tirage_disabled(self):
|
def test_perform_tirage_disabled(self):
|
||||||
# Cannot be performed if disabled
|
# Cannot be performed if disabled
|
||||||
|
@ -225,7 +225,7 @@ class SpectacleListViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url_expected(self):
|
def url_expected(self):
|
||||||
return "/bda/spectacles/{}".format(self.tirage.id)
|
return "/gestion/bda/spectacles/{}".format(self.tirage.id)
|
||||||
|
|
||||||
|
|
||||||
class SpectacleViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
class SpectacleViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
@ -242,7 +242,7 @@ class SpectacleViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url_expected(self):
|
def url_expected(self):
|
||||||
return "/bda/spectacles/{}/{}".format(self.tirage.id, self.show1.id)
|
return "/gestion/bda/spectacles/{}/{}".format(self.tirage.id, self.show1.id)
|
||||||
|
|
||||||
|
|
||||||
class UnpaidViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
class UnpaidViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
@ -259,7 +259,7 @@ class UnpaidViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url_expected(self):
|
def url_expected(self):
|
||||||
return "/bda/spectacles/unpaid/{}".format(self.tirage.id)
|
return "/gestion/bda/spectacles/unpaid/{}".format(self.tirage.id)
|
||||||
|
|
||||||
|
|
||||||
class SendRemindersViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
class SendRemindersViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
@ -276,10 +276,9 @@ class SendRemindersViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url_expected(self):
|
def url_expected(self):
|
||||||
return "/bda/mails-rappel/{}".format(self.show1.id)
|
return "/gestion/bda/mails-rappel/{}".format(self.show1.id)
|
||||||
|
|
||||||
def test_post(self):
|
def test_post(self):
|
||||||
self.require_custommails()
|
|
||||||
resp = self.client.post(self.url)
|
resp = self.client.post(self.url)
|
||||||
self.assertEqual(200, resp.status_code)
|
self.assertEqual(200, resp.status_code)
|
||||||
# TODO: check that emails are sent
|
# TODO: check that emails are sent
|
||||||
|
@ -292,7 +291,7 @@ class CatalogueViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
bda_testdata = True
|
bda_testdata = True
|
||||||
|
|
||||||
def test_api_list(self):
|
def test_api_list(self):
|
||||||
url_list = "/bda/catalogue/list"
|
url_list = "/gestion/bda/catalogue/list"
|
||||||
resp = self.client.get(url_list)
|
resp = self.client.get(url_list)
|
||||||
self.assertJSONEqual(
|
self.assertJSONEqual(
|
||||||
resp.content.decode("utf-8"),
|
resp.content.decode("utf-8"),
|
||||||
|
@ -300,7 +299,7 @@ class CatalogueViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_api_details(self):
|
def test_api_details(self):
|
||||||
url_details = "/bda/catalogue/details?id={}".format(self.tirage.id)
|
url_details = "/gestion/bda/catalogue/details?id={}".format(self.tirage.id)
|
||||||
resp = self.client.get(url_details)
|
resp = self.client.get(url_details)
|
||||||
self.assertJSONEqual(
|
self.assertJSONEqual(
|
||||||
resp.content.decode("utf-8"),
|
resp.content.decode("utf-8"),
|
||||||
|
@ -311,7 +310,9 @@ class CatalogueViewTestCase(BdATestHelpers, BdAViewTestCaseMixin, TestCase):
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_api_descriptions(self):
|
def test_api_descriptions(self):
|
||||||
url_descriptions = "/bda/catalogue/descriptions?id={}".format(self.tirage.id)
|
url_descriptions = "/gestion/bda/catalogue/descriptions?id={}".format(
|
||||||
|
self.tirage.id
|
||||||
|
)
|
||||||
resp = self.client.get(url_descriptions)
|
resp = self.client.get(url_descriptions)
|
||||||
raw = resp.content.decode("utf-8")
|
raw = resp.content.decode("utf-8")
|
||||||
try:
|
try:
|
||||||
|
@ -355,7 +356,9 @@ class TestReventeManageTest(TestCase):
|
||||||
|
|
||||||
def test_can_get(self):
|
def test_can_get(self):
|
||||||
client = Client()
|
client = Client()
|
||||||
client.force_login(self.user)
|
client.force_login(
|
||||||
|
self.user, backend="django.contrib.auth.backends.ModelBackend"
|
||||||
|
)
|
||||||
r = client.get(self.url)
|
r = client.get(self.url)
|
||||||
self.assertEqual(r.status_code, 200)
|
self.assertEqual(r.status_code, 200)
|
||||||
|
|
||||||
|
|
42
bda/urls.py
42
bda/urls.py
|
@ -1,74 +1,80 @@
|
||||||
from django.conf.urls import url
|
from django.urls import re_path
|
||||||
|
|
||||||
from bda import views
|
from bda import views
|
||||||
from bda.views import SpectacleListView
|
from bda.views import SpectacleListView
|
||||||
from gestioncof.decorators import buro_required
|
from gestioncof.decorators import buro_required
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(
|
re_path(
|
||||||
r"^inscription/(?P<tirage_id>\d+)$",
|
r"^inscription/(?P<tirage_id>\d+)$",
|
||||||
views.inscription,
|
views.inscription,
|
||||||
name="bda-tirage-inscription",
|
name="bda-tirage-inscription",
|
||||||
),
|
),
|
||||||
url(r"^places/(?P<tirage_id>\d+)$", views.places, name="bda-places-attribuees"),
|
re_path(r"^places/(?P<tirage_id>\d+)$", views.places, name="bda-places-attribuees"),
|
||||||
url(r"^etat-places/(?P<tirage_id>\d+)$", views.etat_places, name="bda-etat-places"),
|
re_path(
|
||||||
url(r"^tirage/(?P<tirage_id>\d+)$", views.tirage, name="bda-tirage"),
|
r"^etat-places/(?P<tirage_id>\d+)$", views.etat_places, name="bda-etat-places"
|
||||||
url(
|
),
|
||||||
|
re_path(r"^tirage/(?P<tirage_id>\d+)$", views.tirage, name="bda-tirage"),
|
||||||
|
re_path(
|
||||||
r"^spectacles/(?P<tirage_id>\d+)$",
|
r"^spectacles/(?P<tirage_id>\d+)$",
|
||||||
buro_required(SpectacleListView.as_view()),
|
buro_required(SpectacleListView.as_view()),
|
||||||
name="bda-liste-spectacles",
|
name="bda-liste-spectacles",
|
||||||
),
|
),
|
||||||
url(
|
re_path(
|
||||||
r"^spectacles/(?P<tirage_id>\d+)/(?P<spectacle_id>\d+)$",
|
r"^spectacles/(?P<tirage_id>\d+)/(?P<spectacle_id>\d+)$",
|
||||||
views.spectacle,
|
views.spectacle,
|
||||||
name="bda-spectacle",
|
name="bda-spectacle",
|
||||||
),
|
),
|
||||||
url(
|
re_path(
|
||||||
r"^spectacles/unpaid/(?P<tirage_id>\d+)$",
|
r"^spectacles/unpaid/(?P<tirage_id>\d+)$",
|
||||||
views.UnpaidParticipants.as_view(),
|
views.UnpaidParticipants.as_view(),
|
||||||
name="bda-unpaid",
|
name="bda-unpaid",
|
||||||
),
|
),
|
||||||
url(
|
re_path(
|
||||||
r"^spectacles/autocomplete$",
|
r"^spectacles/autocomplete$",
|
||||||
views.spectacle_autocomplete,
|
views.spectacle_autocomplete,
|
||||||
name="bda-spectacle-autocomplete",
|
name="bda-spectacle-autocomplete",
|
||||||
),
|
),
|
||||||
url(
|
re_path(
|
||||||
r"^participants/autocomplete$",
|
r"^participants/autocomplete$",
|
||||||
views.participant_autocomplete,
|
views.participant_autocomplete,
|
||||||
name="bda-participant-autocomplete",
|
name="bda-participant-autocomplete",
|
||||||
),
|
),
|
||||||
# Urls BdA-Revente
|
# Urls BdA-Revente
|
||||||
url(
|
re_path(
|
||||||
r"^revente/(?P<tirage_id>\d+)/manage$",
|
r"^revente/(?P<tirage_id>\d+)/manage$",
|
||||||
views.revente_manage,
|
views.revente_manage,
|
||||||
name="bda-revente-manage",
|
name="bda-revente-manage",
|
||||||
),
|
),
|
||||||
url(
|
re_path(
|
||||||
r"^revente/(?P<tirage_id>\d+)/subscribe$",
|
r"^revente/(?P<tirage_id>\d+)/subscribe$",
|
||||||
views.revente_subscribe,
|
views.revente_subscribe,
|
||||||
name="bda-revente-subscribe",
|
name="bda-revente-subscribe",
|
||||||
),
|
),
|
||||||
url(
|
re_path(
|
||||||
r"^revente/(?P<tirage_id>\d+)/tirages$",
|
r"^revente/(?P<tirage_id>\d+)/tirages$",
|
||||||
views.revente_tirages,
|
views.revente_tirages,
|
||||||
name="bda-revente-tirages",
|
name="bda-revente-tirages",
|
||||||
),
|
),
|
||||||
url(
|
re_path(
|
||||||
r"^revente/(?P<spectacle_id>\d+)/buy$",
|
r"^revente/(?P<spectacle_id>\d+)/buy$",
|
||||||
views.revente_buy,
|
views.revente_buy,
|
||||||
name="bda-revente-buy",
|
name="bda-revente-buy",
|
||||||
),
|
),
|
||||||
url(
|
re_path(
|
||||||
r"^revente/(?P<revente_id>\d+)/confirm$",
|
r"^revente/(?P<revente_id>\d+)/confirm$",
|
||||||
views.revente_confirm,
|
views.revente_confirm,
|
||||||
name="bda-revente-confirm",
|
name="bda-revente-confirm",
|
||||||
),
|
),
|
||||||
url(
|
re_path(
|
||||||
r"^revente/(?P<tirage_id>\d+)/shotgun$",
|
r"^revente/(?P<tirage_id>\d+)/shotgun$",
|
||||||
views.revente_shotgun,
|
views.revente_shotgun,
|
||||||
name="bda-revente-shotgun",
|
name="bda-revente-shotgun",
|
||||||
),
|
),
|
||||||
url(r"^mails-rappel/(?P<spectacle_id>\d+)$", views.send_rappel, name="bda-rappels"),
|
re_path(
|
||||||
url(r"^catalogue/(?P<request_type>[a-z]+)$", views.catalogue, name="bda-catalogue"),
|
r"^mails-rappel/(?P<spectacle_id>\d+)$", views.send_rappel, name="bda-rappels"
|
||||||
|
),
|
||||||
|
re_path(
|
||||||
|
r"^catalogue/(?P<request_type>[a-z]+)$", views.catalogue, name="bda-catalogue"
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|
65
bda/views.py
65
bda/views.py
|
@ -4,17 +4,17 @@ import random
|
||||||
import time
|
import time
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
|
|
||||||
from custommail.models import CustomMail
|
|
||||||
from custommail.shortcuts import send_custom_mail, send_mass_custom_mail
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.core import serializers
|
from django.core import serializers
|
||||||
from django.core.exceptions import NON_FIELD_ERRORS
|
from django.core.exceptions import NON_FIELD_ERRORS
|
||||||
|
from django.core.mail import send_mail, send_mass_mail
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.db.models import Count, Prefetch
|
from django.db.models import Count, Prefetch
|
||||||
from django.forms.models import inlineformset_factory
|
from django.forms.models import inlineformset_factory
|
||||||
from django.http import HttpResponseBadRequest, HttpResponseRedirect, JsonResponse
|
from django.http import HttpResponseBadRequest, HttpResponseRedirect, JsonResponse
|
||||||
from django.shortcuts import get_object_or_404, render
|
from django.shortcuts import get_object_or_404, render
|
||||||
|
from django.template import loader
|
||||||
from django.template.defaultfilters import pluralize
|
from django.template.defaultfilters import pluralize
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.utils import formats, timezone
|
from django.utils import formats, timezone
|
||||||
|
@ -42,7 +42,7 @@ from bda.models import (
|
||||||
Tirage,
|
Tirage,
|
||||||
)
|
)
|
||||||
from gestioncof.decorators import BuroRequiredMixin, buro_required, cof_required
|
from gestioncof.decorators import BuroRequiredMixin, buro_required, cof_required
|
||||||
from utils.views.autocomplete import Select2QuerySetView
|
from shared.views import Select2QuerySetView
|
||||||
|
|
||||||
|
|
||||||
@cof_required
|
@cof_required
|
||||||
|
@ -274,13 +274,13 @@ def do_tirage(tirage_elt, token):
|
||||||
results = Algorithm(data["shows"], data["members"], choices)(token)
|
results = Algorithm(data["shows"], data["members"], choices)(token)
|
||||||
|
|
||||||
# On compte les places attribuées et les déçus
|
# On compte les places attribuées et les déçus
|
||||||
for (_, members, losers) in results:
|
for _, members, losers in results:
|
||||||
data["total_slots"] += len(members)
|
data["total_slots"] += len(members)
|
||||||
data["total_losers"] += len(losers)
|
data["total_losers"] += len(losers)
|
||||||
|
|
||||||
# On calcule le déficit et les bénéfices pour le BdA
|
# On calcule le déficit et les bénéfices pour le BdA
|
||||||
# FIXME: le traitement de l'opéra est sale
|
# FIXME: le traitement de l'opéra est sale
|
||||||
for (show, members, _) in results:
|
for show, members, _ in results:
|
||||||
deficit = (show.slots - len(members)) * show.price
|
deficit = (show.slots - len(members)) * show.price
|
||||||
data["total_sold"] += show.slots * show.price
|
data["total_sold"] += show.slots * show.price
|
||||||
if deficit >= 0:
|
if deficit >= 0:
|
||||||
|
@ -293,8 +293,8 @@ def do_tirage(tirage_elt, token):
|
||||||
# so assign a single object for each Participant id
|
# so assign a single object for each Participant id
|
||||||
members_uniq = {}
|
members_uniq = {}
|
||||||
members2 = {}
|
members2 = {}
|
||||||
for (show, members, _) in results:
|
for show, members, _ in results:
|
||||||
for (member, _, _, _) in members:
|
for member, _, _, _ in members:
|
||||||
if member.id not in members_uniq:
|
if member.id not in members_uniq:
|
||||||
members_uniq[member.id] = member
|
members_uniq[member.id] = member
|
||||||
members2[member] = []
|
members2[member] = []
|
||||||
|
@ -385,12 +385,6 @@ def revente_manage(request, tirage_id):
|
||||||
user=request.user, tirage=tirage
|
user=request.user, tirage=tirage
|
||||||
)
|
)
|
||||||
|
|
||||||
# If the participant has just been created, the `paid` field is not
|
|
||||||
# automatically added by our custom ObjectManager. Skip the check in this
|
|
||||||
# scenario.
|
|
||||||
if not created and not participant.paid:
|
|
||||||
return render(request, "bda/revente/notpaid.html", {})
|
|
||||||
|
|
||||||
resellform = ResellForm(participant, prefix="resell")
|
resellform = ResellForm(participant, prefix="resell")
|
||||||
annulform = AnnulForm(participant, prefix="annul")
|
annulform = AnnulForm(participant, prefix="annul")
|
||||||
soldform = SoldForm(participant, prefix="sold")
|
soldform = SoldForm(participant, prefix="sold")
|
||||||
|
@ -400,7 +394,7 @@ def revente_manage(request, tirage_id):
|
||||||
if "resell" in request.POST:
|
if "resell" in request.POST:
|
||||||
resellform = ResellForm(participant, request.POST, prefix="resell")
|
resellform = ResellForm(participant, request.POST, prefix="resell")
|
||||||
if resellform.is_valid():
|
if resellform.is_valid():
|
||||||
datatuple = []
|
mails = []
|
||||||
attributions = resellform.cleaned_data["attributions"]
|
attributions = resellform.cleaned_data["attributions"]
|
||||||
with transaction.atomic():
|
with transaction.atomic():
|
||||||
for attribution in attributions:
|
for attribution in attributions:
|
||||||
|
@ -415,16 +409,17 @@ def revente_manage(request, tirage_id):
|
||||||
"show": attribution.spectacle,
|
"show": attribution.spectacle,
|
||||||
"revente": revente,
|
"revente": revente,
|
||||||
}
|
}
|
||||||
datatuple.append(
|
mails.append(
|
||||||
(
|
(
|
||||||
"bda-revente-new",
|
"BdA-Revente : {}".format(attribution.spectacle),
|
||||||
context,
|
loader.render_to_string(
|
||||||
|
"bda/mails/revente-seller.txt", context=context
|
||||||
|
),
|
||||||
settings.MAIL_DATA["revente"]["FROM"],
|
settings.MAIL_DATA["revente"]["FROM"],
|
||||||
[participant.user.email],
|
[participant.user.email],
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
revente.save()
|
send_mass_mail(mails)
|
||||||
send_mass_custom_mail(datatuple)
|
|
||||||
# On annule une revente
|
# On annule une revente
|
||||||
elif "annul" in request.POST:
|
elif "annul" in request.POST:
|
||||||
annulform = AnnulForm(participant, request.POST, prefix="annul")
|
annulform = AnnulForm(participant, request.POST, prefix="annul")
|
||||||
|
@ -643,12 +638,16 @@ def revente_buy(request, spectacle_id):
|
||||||
"acheteur": request.user,
|
"acheteur": request.user,
|
||||||
"vendeur": revente.seller.user,
|
"vendeur": revente.seller.user,
|
||||||
}
|
}
|
||||||
send_custom_mail(
|
|
||||||
"bda-buy-shotgun",
|
send_mail(
|
||||||
"bda@ens.fr",
|
"BdA-Revente : {}".format(spectacle.title),
|
||||||
|
loader.render_to_string(
|
||||||
|
"bda/mails/revente-shotgun-seller.txt", context=context
|
||||||
|
),
|
||||||
|
request.user.email,
|
||||||
[revente.seller.user.email],
|
[revente.seller.user.email],
|
||||||
context=context,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
return render(
|
return render(
|
||||||
request,
|
request,
|
||||||
"bda/revente/mail-success.html",
|
"bda/revente/mail-success.html",
|
||||||
|
@ -701,7 +700,7 @@ def spectacle(request, tirage_id, spectacle_id):
|
||||||
"username": participant.user.username,
|
"username": participant.user.username,
|
||||||
"email": participant.user.email,
|
"email": participant.user.email,
|
||||||
"given": int(attrib.given),
|
"given": int(attrib.given),
|
||||||
"paid": True,
|
"paid": attrib.paid,
|
||||||
"nb_places": 1,
|
"nb_places": 1,
|
||||||
}
|
}
|
||||||
if participant.id in participants:
|
if participant.id in participants:
|
||||||
|
@ -751,19 +750,21 @@ class UnpaidParticipants(BuroRequiredMixin, ListView):
|
||||||
def send_rappel(request, spectacle_id):
|
def send_rappel(request, spectacle_id):
|
||||||
show = get_object_or_404(Spectacle, id=spectacle_id)
|
show = get_object_or_404(Spectacle, id=spectacle_id)
|
||||||
# Mails d'exemples
|
# Mails d'exemples
|
||||||
custommail = CustomMail.objects.get(shortname="bda-rappel")
|
subject = show.title
|
||||||
exemple_mail_1place = custommail.render(
|
body_mail_1place = loader.render_to_string(
|
||||||
{"member": request.user, "show": show, "nb_attr": 1}
|
"bda/mails/rappel.txt",
|
||||||
|
context={"member": request.user, "show": show, "nb_attr": 1},
|
||||||
)
|
)
|
||||||
exemple_mail_2places = custommail.render(
|
body_mail_2places = loader.render_to_string(
|
||||||
{"member": request.user, "show": show, "nb_attr": 2}
|
"bda/mails/rappel.txt",
|
||||||
|
context={"member": request.user, "show": show, "nb_attr": 2},
|
||||||
)
|
)
|
||||||
|
|
||||||
# Contexte
|
# Contexte
|
||||||
ctxt = {
|
ctxt = {
|
||||||
"show": show,
|
"show": show,
|
||||||
"exemple_mail_1place": exemple_mail_1place,
|
"exemple_mail_1place": (subject, body_mail_1place),
|
||||||
"exemple_mail_2places": exemple_mail_2places,
|
"exemple_mail_2places": (subject, body_mail_2places),
|
||||||
"custommail": custommail,
|
|
||||||
}
|
}
|
||||||
# Envoi confirmé
|
# Envoi confirmé
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
|
|
25
bds/apps.py
25
bds/apps.py
|
@ -1,5 +1,28 @@
|
||||||
from django.apps import AppConfig
|
from django.apps import AppConfig, apps as global_apps
|
||||||
|
from django.db.models import Q
|
||||||
|
from django.db.models.signals import post_migrate
|
||||||
|
|
||||||
|
|
||||||
|
def bds_group_perms(app_config, apps=global_apps, **kwargs):
|
||||||
|
try:
|
||||||
|
Permission = apps.get_model("auth", "Permission")
|
||||||
|
Group = apps.get_model("auth", "Group")
|
||||||
|
|
||||||
|
group = Group.objects.get(name="Burô du BDS")
|
||||||
|
perms = Permission.objects.filter(
|
||||||
|
Q(content_type__app_label="bds")
|
||||||
|
| Q(content_type__app_label="auth") & Q(content_type__model="user")
|
||||||
|
)
|
||||||
|
group.permissions.set(perms)
|
||||||
|
group.save()
|
||||||
|
|
||||||
|
except (LookupError, Group.DoesNotExist):
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
class BdsConfig(AppConfig):
|
class BdsConfig(AppConfig):
|
||||||
name = "bds"
|
name = "bds"
|
||||||
|
verbose_name = "Gestion des adhérent·e·s du BDS"
|
||||||
|
|
||||||
|
def ready(self):
|
||||||
|
post_migrate.connect(bds_group_perms, sender=self)
|
||||||
|
|
63
bds/autocomplete.py
Normal file
63
bds/autocomplete.py
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
from urllib.parse import urlencode
|
||||||
|
|
||||||
|
from django.contrib.auth import get_user_model
|
||||||
|
from django.db.models import Q
|
||||||
|
from django.urls import reverse
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
|
from shared import autocomplete
|
||||||
|
|
||||||
|
User = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
|
class BDSMemberSearch(autocomplete.ModelSearch):
|
||||||
|
model = User
|
||||||
|
search_fields = ["username", "first_name", "last_name"]
|
||||||
|
verbose_name = _("Membres du BDS")
|
||||||
|
|
||||||
|
def get_queryset_filter(self, *args, **kwargs):
|
||||||
|
qset_filter = super().get_queryset_filter(*args, **kwargs)
|
||||||
|
qset_filter &= Q(bds__is_member=True)
|
||||||
|
return qset_filter
|
||||||
|
|
||||||
|
def result_uuid(self, user):
|
||||||
|
return user.username
|
||||||
|
|
||||||
|
def result_link(self, user):
|
||||||
|
return reverse("bds:user.update", args=(user.pk,))
|
||||||
|
|
||||||
|
|
||||||
|
class BDSOthersSearch(autocomplete.ModelSearch):
|
||||||
|
model = User
|
||||||
|
search_fields = ["username", "first_name", "last_name"]
|
||||||
|
verbose_name = _("Non-membres du BDS")
|
||||||
|
|
||||||
|
def get_queryset_filter(self, *args, **kwargs):
|
||||||
|
qset_filter = super().get_queryset_filter(*args, **kwargs)
|
||||||
|
qset_filter &= Q(bds__isnull=True) | Q(bds__is_member=False)
|
||||||
|
return qset_filter
|
||||||
|
|
||||||
|
def result_uuid(self, user):
|
||||||
|
return user.username
|
||||||
|
|
||||||
|
def result_link(self, user):
|
||||||
|
return reverse("bds:user.update", args=(user.pk,))
|
||||||
|
|
||||||
|
|
||||||
|
class BDSLDAPSearch(autocomplete.LDAPSearch):
|
||||||
|
def result_link(self, clipper):
|
||||||
|
url = reverse("bds:user.create.fromclipper", args=(clipper.clipper,))
|
||||||
|
get = {"fullname": clipper.fullname, "mail": clipper.mail}
|
||||||
|
|
||||||
|
return "{}?{}".format(url, urlencode(get))
|
||||||
|
|
||||||
|
|
||||||
|
class BDSSearch(autocomplete.Compose):
|
||||||
|
search_units = [
|
||||||
|
("members", BDSMemberSearch()),
|
||||||
|
("others", BDSOthersSearch()),
|
||||||
|
("clippers", BDSLDAPSearch()),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
bds_search = BDSSearch()
|
41
bds/forms.py
Normal file
41
bds/forms.py
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
from django import forms
|
||||||
|
from django.contrib.auth import get_user_model
|
||||||
|
from django.contrib.auth.forms import UserCreationForm
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
|
from bds.models import BDSProfile
|
||||||
|
|
||||||
|
User = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
|
class UserForm(forms.ModelForm):
|
||||||
|
is_buro = forms.BooleanField(label=_("Membre du Burô"), required=False)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = User
|
||||||
|
fields = ["email", "first_name", "last_name"]
|
||||||
|
|
||||||
|
|
||||||
|
class UserFromClipperForm(forms.ModelForm):
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
self.fields["username"].disabled = True
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = User
|
||||||
|
fields = ["username", "email", "first_name", "last_name"]
|
||||||
|
|
||||||
|
|
||||||
|
class UserFromScratchForm(UserCreationForm):
|
||||||
|
class Meta:
|
||||||
|
model = User
|
||||||
|
fields = ["username", "email", "first_name", "last_name"]
|
||||||
|
|
||||||
|
|
||||||
|
class ProfileForm(forms.ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = BDSProfile
|
||||||
|
exclude = ["user"]
|
||||||
|
widgets = {
|
||||||
|
"birthdate": forms.DateInput(attrs={"type": "date"}, format="%Y-%m-%d")
|
||||||
|
}
|
|
@ -8,7 +8,6 @@ import bds.models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
initial = True
|
initial = True
|
||||||
|
|
||||||
dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
|
dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
|
||||||
|
|
|
@ -1,28 +1,14 @@
|
||||||
# Generated by Django 2.2 on 2019-07-17 14:56
|
# Generated by Django 2.2 on 2019-07-17 14:56
|
||||||
|
|
||||||
from django.contrib.auth.management import create_permissions
|
|
||||||
from django.db import migrations
|
from django.db import migrations
|
||||||
from django.db.models import Q
|
|
||||||
|
|
||||||
|
|
||||||
def create_bds_buro_group(apps, schema_editor):
|
def create_bds_buro_group(apps, schema_editor):
|
||||||
for app_config in apps.get_app_configs():
|
|
||||||
create_permissions(app_config, apps=apps, verbosity=0)
|
|
||||||
|
|
||||||
Group = apps.get_model("auth", "Group")
|
Group = apps.get_model("auth", "Group")
|
||||||
Permission = apps.get_model("auth", "Permission")
|
Group.objects.get_or_create(name="Burô du BDS")
|
||||||
group, created = Group.objects.get_or_create(name="Burô du BDS")
|
|
||||||
if created:
|
|
||||||
perms = Permission.objects.filter(
|
|
||||||
Q(content_type__app_label="bds")
|
|
||||||
| Q(content_type__app_label="auth") & Q(content_type__model="user")
|
|
||||||
)
|
|
||||||
group.permissions.set(perms)
|
|
||||||
group.save()
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [("bds", "0001_initial")]
|
dependencies = [("bds", "0001_initial")]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
|
@ -4,7 +4,6 @@ from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("bds", "0002_bds_group"),
|
("bds", "0002_bds_group"),
|
||||||
]
|
]
|
||||||
|
@ -18,5 +17,8 @@ class Migration(migrations.Migration):
|
||||||
"verbose_name_plural": "Profils BDS",
|
"verbose_name_plural": "Profils BDS",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
migrations.RemoveField(model_name="bdsprofile", name="is_buro",),
|
migrations.RemoveField(
|
||||||
|
model_name="bdsprofile",
|
||||||
|
name="is_buro",
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -4,7 +4,6 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
("bds", "0003_staff_permission"),
|
("bds", "0003_staff_permission"),
|
||||||
]
|
]
|
||||||
|
|
16
bds/migrations/0005_remove_bdsprofile_certificate_file.py
Normal file
16
bds/migrations/0005_remove_bdsprofile_certificate_file.py
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
# Generated by Django 2.2.14 on 2020-07-27 20:14
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("bds", "0004_is_member_cotiz_type"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name="bdsprofile",
|
||||||
|
name="certificate_file",
|
||||||
|
),
|
||||||
|
]
|
22
bds/migrations/0006_bdsprofile_comments.py
Normal file
22
bds/migrations/0006_bdsprofile_comments.py
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
# Generated by Django 2.2.12 on 2020-08-28 12:14
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
dependencies = [
|
||||||
|
("bds", "0005_remove_bdsprofile_certificate_file"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="bdsprofile",
|
||||||
|
name="comments",
|
||||||
|
field=models.TextField(
|
||||||
|
blank=True,
|
||||||
|
help_text="Attention : l'utilisateur·ice dispose d'un droit d'accès"
|
||||||
|
" aux données le/la concernant, dont le contenu de ce champ !",
|
||||||
|
verbose_name="commentaires",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
122
bds/mixins.py
Normal file
122
bds/mixins.py
Normal file
|
@ -0,0 +1,122 @@
|
||||||
|
from django.contrib.auth.mixins import PermissionRequiredMixin
|
||||||
|
from django.core.exceptions import ImproperlyConfigured
|
||||||
|
from django.http import HttpResponseRedirect
|
||||||
|
from django.views.generic.base import ContextMixin, TemplateResponseMixin, View
|
||||||
|
|
||||||
|
|
||||||
|
class StaffRequiredMixin(PermissionRequiredMixin):
|
||||||
|
permission_required = "bds.is_team"
|
||||||
|
|
||||||
|
|
||||||
|
class MultipleFormMixin(ContextMixin):
|
||||||
|
"""Mixin pour gérer plusieurs formulaires dans la même vue.
|
||||||
|
Le fonctionnement est relativement identique à celui de
|
||||||
|
FormMixin, dont la documentation est disponible ici :
|
||||||
|
https://docs.djangoproject.com/en/3.0/ref/class-based-views/mixins-editing/
|
||||||
|
|
||||||
|
Les principales différences sont :
|
||||||
|
- au lieu de form_class, il faut donner comme attribut un dict de la forme
|
||||||
|
{<form_name>: <form_class>}, avec tous les formulaires à instancier. On
|
||||||
|
peut aussi redéfinir `get_form_classes`
|
||||||
|
|
||||||
|
- les données initiales se récupèrent pour chaque form via l'attribut
|
||||||
|
`<form_name>_initial` ou la fonction `get_<form_name>_initial`. De même,
|
||||||
|
si certaines forms sont des `ModelForm`s, on peut définir la fonction
|
||||||
|
`get_<form_name>_instance`.
|
||||||
|
|
||||||
|
- chaque form a un préfixe rajouté, par défaut <form_name>, mais qui peut
|
||||||
|
être customisé via `prefixes` ou `get_prefixes`.
|
||||||
|
"""
|
||||||
|
|
||||||
|
form_classes = {}
|
||||||
|
prefixes = {}
|
||||||
|
initial = {}
|
||||||
|
|
||||||
|
success_url = None
|
||||||
|
|
||||||
|
def get_form_classes(self):
|
||||||
|
return self.form_classes
|
||||||
|
|
||||||
|
def get_initial(self, form_name):
|
||||||
|
initial_attr = "%s_initial" % form_name
|
||||||
|
|
||||||
|
initial_method = "get_%s_initial" % form_name
|
||||||
|
initial_method = getattr(self, initial_method, None)
|
||||||
|
|
||||||
|
if hasattr(self, initial_attr):
|
||||||
|
return getattr(self, initial_attr)
|
||||||
|
elif callable(initial_method):
|
||||||
|
return initial_method()
|
||||||
|
else:
|
||||||
|
return self.initial.copy()
|
||||||
|
|
||||||
|
def get_prefix(self, form_name):
|
||||||
|
return self.prefixes.get(form_name, form_name)
|
||||||
|
|
||||||
|
def get_instance(self, form_name):
|
||||||
|
# Au cas où certaines des forms soient des ModelForms
|
||||||
|
instance_method = "get_%s_instance" % form_name
|
||||||
|
instance_method = getattr(self, instance_method, None)
|
||||||
|
|
||||||
|
if callable(instance_method):
|
||||||
|
return instance_method()
|
||||||
|
else:
|
||||||
|
return None
|
||||||
|
|
||||||
|
def get_form_kwargs(self, form_name):
|
||||||
|
kwargs = {
|
||||||
|
"initial": self.get_initial(form_name),
|
||||||
|
"prefix": self.get_prefix(form_name),
|
||||||
|
"instance": self.get_instance(form_name),
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.request.method in ("POST", "PUT"):
|
||||||
|
kwargs.update({"data": self.request.POST, "files": self.request.FILES})
|
||||||
|
|
||||||
|
return kwargs
|
||||||
|
|
||||||
|
def get_forms(self):
|
||||||
|
form_classes = self.get_form_classes()
|
||||||
|
return {
|
||||||
|
form_name: form_class(**self.get_form_kwargs(form_name))
|
||||||
|
for form_name, form_class in form_classes.items()
|
||||||
|
}
|
||||||
|
|
||||||
|
def get_success_url(self):
|
||||||
|
if not self.success_url:
|
||||||
|
raise ImproperlyConfigured("No URL to redirect to. Provide a success_url.")
|
||||||
|
return str(self.success_url)
|
||||||
|
|
||||||
|
def form_valid(self, forms):
|
||||||
|
# on garde le nom form_valid pour l'interface avec SuccessMessageMixin
|
||||||
|
return HttpResponseRedirect(self.get_success_url())
|
||||||
|
|
||||||
|
def form_invalid(self, forms):
|
||||||
|
"""If the form is invalid, render the invalid form."""
|
||||||
|
return self.render_to_response(self.get_context_data(forms=forms))
|
||||||
|
|
||||||
|
|
||||||
|
class ProcessMultipleFormView(View):
|
||||||
|
"""Équivalent de `ProcessFormView` pour plusieurs forms.
|
||||||
|
Note : il faut que *tous* les formulaires soient valides pour
|
||||||
|
qu'ils soient sauvegardés !
|
||||||
|
"""
|
||||||
|
|
||||||
|
def get(self, request, *args, **kwargs):
|
||||||
|
forms = self.get_forms()
|
||||||
|
return self.render_to_response(self.get_context_data(forms=forms))
|
||||||
|
|
||||||
|
def post(self, request, *args, **kwargs):
|
||||||
|
forms = self.get_forms()
|
||||||
|
if all(form.is_valid() for form in forms.values()):
|
||||||
|
return self.form_valid(forms)
|
||||||
|
else:
|
||||||
|
return self.form_invalid(forms)
|
||||||
|
|
||||||
|
|
||||||
|
class BaseMultipleFormView(MultipleFormMixin, ProcessMultipleFormView):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class MultipleFormView(TemplateResponseMixin, BaseMultipleFormView):
|
||||||
|
pass
|
|
@ -3,6 +3,7 @@ from os.path import splitext
|
||||||
|
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from django.db import models
|
from django.db import models
|
||||||
|
from django.utils import timezone
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from shared.utils import choices_length
|
from shared.utils import choices_length
|
||||||
|
@ -62,14 +63,11 @@ class BDSProfile(models.Model):
|
||||||
null=True,
|
null=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
is_member = models.BooleanField(_("adhérent⋅e du BDS"), default=False)
|
||||||
|
|
||||||
mails_bds = models.BooleanField(_("recevoir les mails du BDS"), default=False)
|
mails_bds = models.BooleanField(_("recevoir les mails du BDS"), default=False)
|
||||||
|
|
||||||
has_certificate = models.BooleanField(_("certificat médical"), default=False)
|
has_certificate = models.BooleanField(_("certificat médical"), default=False)
|
||||||
certificate_file = models.FileField(
|
|
||||||
_("fichier de certificat médical"),
|
|
||||||
upload_to=get_certificate_filename,
|
|
||||||
blank=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
ASPSL_number = models.CharField(
|
ASPSL_number = models.CharField(
|
||||||
_("numéro AS PSL"), max_length=50, blank=True, null=True
|
_("numéro AS PSL"), max_length=50, blank=True, null=True
|
||||||
|
@ -77,8 +75,6 @@ class BDSProfile(models.Model):
|
||||||
FFSU_number = models.CharField(
|
FFSU_number = models.CharField(
|
||||||
_("numéro FFSU"), max_length=50, blank=True, null=True
|
_("numéro FFSU"), max_length=50, blank=True, null=True
|
||||||
)
|
)
|
||||||
|
|
||||||
is_member = models.BooleanField(_("adhérent⋅e du BDS"), default=False)
|
|
||||||
cotisation_period = models.CharField(
|
cotisation_period = models.CharField(
|
||||||
_("inscription"), default="NO", choices=COTIZ_DURATION_CHOICES, max_length=3
|
_("inscription"), default="NO", choices=COTIZ_DURATION_CHOICES, max_length=3
|
||||||
)
|
)
|
||||||
|
@ -89,6 +85,25 @@ class BDSProfile(models.Model):
|
||||||
_("type de cotisation"), choices=TYPE_COTIZ_CHOICES, max_length=9
|
_("type de cotisation"), choices=TYPE_COTIZ_CHOICES, max_length=9
|
||||||
)
|
)
|
||||||
|
|
||||||
|
comments = models.TextField(
|
||||||
|
_("commentaires"),
|
||||||
|
blank=True,
|
||||||
|
help_text=_(
|
||||||
|
"Attention : l'utilisateur·ice dispose d'un droit d'accès aux données "
|
||||||
|
"le/la concernant, dont le contenu de ce champ !"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def expired_members(cls):
|
||||||
|
now = timezone.now()
|
||||||
|
qs = cls.objects.filter(is_member=True)
|
||||||
|
if now.month > 1 and now.month < 7:
|
||||||
|
return qs.filter(cotisation_period="SE1")
|
||||||
|
elif now.month < 2 or now.month > 8:
|
||||||
|
return qs.none()
|
||||||
|
return qs
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _("Profil BDS")
|
verbose_name = _("Profil BDS")
|
||||||
verbose_name_plural = _("Profils BDS")
|
verbose_name_plural = _("Profils BDS")
|
||||||
|
|
1
bds/static/bds/css/bds.css
Normal file
1
bds/static/bds/css/bds.css
Normal file
File diff suppressed because one or more lines are too long
1
bds/static/bds/css/bds.css.map
Normal file
1
bds/static/bds/css/bds.css.map
Normal file
File diff suppressed because one or more lines are too long
15
bds/static/bds/images/logo.svg
Normal file
15
bds/static/bds/images/logo.svg
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
|
||||||
|
<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="300px" height="246px" viewBox="0 0 3000 2460" preserveAspectRatio="xMidYMid meet">
|
||||||
|
<g id="layer101" fill="#ffffff" stroke="none">
|
||||||
|
<path d="M0 1230 l0 -1230 1500 0 1500 0 0 1230 0 1230 -1500 0 -1500 0 0 -1230z"/>
|
||||||
|
</g>
|
||||||
|
<g id="layer102" fill="#3e2263" stroke="none">
|
||||||
|
<path d="M0 1230 l0 -1230 1500 0 1500 0 0 1230 0 1230 -1500 0 -1500 0 0 -1230z m1716 765 c103 -17 204 -46 284 -83 l55 -25 -40 -8 c-80 -16 -169 -10 -245 16 -123 42 -232 59 -385 59 -126 0 -278 -18 -341 -40 -13 -5 -16 -4 -9 4 14 15 166 60 254 76 102 19 315 19 427 1z m-703 -217 c15 -6 27 -13 27 -17 0 -4 -37 -25 -82 -47 -86 -43 -182 -120 -193 -155 -8 -26 32 -113 78 -167 44 -52 46 -62 10 -62 -39 1 -106 33 -165 80 -40 31 -54 38 -64 29 -21 -18 -17 -50 16 -116 57 -113 151 -199 259 -235 49 -16 51 -18 16 -13 -123 19 -260 151 -322 310 -15 39 -14 -81 1 -147 25 -107 55 -176 112 -251 49 -65 52 -73 38 -88 -21 -23 -104 -62 -216 -100 -51 -18 -97 -35 -102 -40 -4 -4 32 -10 80 -14 106 -9 256 13 317 48 l39 22 56 -33 c32 -18 114 -61 184 -95 80 -39 126 -67 123 -74 -6 -19 12 -16 19 3 9 24 28 5 22 -22 -7 -26 8 -34 18 -9 11 29 28 16 21 -18 -6 -30 -5 -31 10 -13 8 11 15 24 15 29 0 4 5 5 10 2 6 -3 8 -18 4 -33 -5 -26 -5 -26 10 -8 15 19 18 19 118 -12 113 -35 284 -72 329 -72 24 0 29 4 29 25 0 34 -36 125 -63 158 l-22 28 -59 -30 c-74 -39 -165 -43 -233 -10 -24 11 -43 25 -43 30 0 4 28 6 63 2 49 -4 71 -2 98 12 46 23 79 55 79 75 0 16 -48 66 -135 139 l-40 33 43 -23 c55 -30 166 -121 188 -154 9 -13 13 -29 9 -36 -15 -23 -100 -69 -129 -69 -17 0 -38 -5 -46 -10 -12 -8 -10 -10 10 -10 49 1 104 19 149 51 l45 31 24 -28 c33 -40 72 -128 79 -180 10 -79 -25 -96 -233 -114 -84 -7 -148 -7 -218 0 -106 12 -269 51 -317 76 -28 14 -31 13 -62 -10 -56 -43 -167 -89 -225 -94 l-55 -5 6 29 c2 16 14 55 26 86 21 57 27 112 15 142 -3 9 -34 38 -68 64 l-62 49 -104 7 c-166 12 -192 34 -83 70 34 12 65 24 68 28 4 4 -7 27 -24 52 -118 171 -124 402 -16 571 18 29 50 88 70 131 42 93 99 154 168 184 82 35 212 44 280 18z m540 -39 c60 -16 70 -41 75 -196 l5 -134 -39 3 -39 3 -5 114 c-4 93 -8 116 -22 125 -31 19 -41 -7 -47 -126 l-6 -113 -32 -3 c-41 -4 -44 6 -34 151 9 143 25 172 101 186 3 0 22 -4 43 -10z m322 -34 c0 -30 0 -30 -64 -33 l-64 -3 7 -130 7 -129 -35 0 -36 0 0 165 0 166 93 -3 92 -3 0 -30z m115 -55 l5 -84 18 27 c21 33 39 34 60 5 15 -22 16 -18 16 60 l1 82 35 0 35 0 -2 -162 -3 -163 -40 0 c-38 0 -41 2 -53 43 -16 49 -24 48 -42 -7 -12 -38 -16 -41 -50 -41 -34 0 -38 3 -44 31 -8 43 -8 284 1 293 4 4 19 6 33 4 24 -3 25 -6 30 -88z m370 -42 c193 -243 228 -505 100 -759 -61 -120 -195 -260 -328 -343 -66 -41 -60 -26 13 33 36 29 92 85 125 126 182 230 209 500 75 753 -42 79 -45 89 -45 163 0 44 4 79 9 79 5 0 28 -24 51 -52z m-1111 -294 c76 -30 94 -102 41 -156 -27 -27 -29 -32 -17 -47 34 -40 25 -100 -19 -120 -30 -13 -143 -15 -164 -1 -11 7 -15 42 -18 164 l-4 156 23 9 c37 15 115 13 158 -5z m571 -9 c84 -43 61 -135 -43 -173 -46 -18 -52 -23 -52 -48 0 -39 30 -42 79 -9 l37 25 -3 -41 c-4 -49 -32 -76 -90 -85 -32 -6 -41 -2 -68 24 -24 25 -30 39 -30 74 0 57 21 85 87 114 40 18 54 29 51 42 -5 29 -71 28 -111 -2 -19 -14 -36 -26 -39 -26 -11 0 -16 55 -7 72 24 45 131 63 189 33z m-303 -12 c56 -26 75 -65 71 -150 -3 -67 -6 -75 -38 -108 -43 -44 -94 -61 -146 -48 l-39 9 -3 144 c-1 79 0 150 2 157 8 19 110 17 153 -4z"/>
|
||||||
|
<path d="M1503 633 c4 -3 10 -3 14 0 3 4 0 7 -7 7 -7 0 -10 -3 -7 -7z"/>
|
||||||
|
<path d="M1532 448 c3 -7 15 -14 29 -16 23 -2 23 -2 5 13 -24 18 -39 20 -34 3z"/>
|
||||||
|
<path d="M1140 1231 c0 -45 10 -61 36 -61 26 0 64 32 64 53 0 23 -23 37 -62 37 -35 0 -38 -2 -38 -29z"/>
|
||||||
|
<path d="M1140 1070 c0 -35 17 -45 56 -36 20 5 25 12 22 34 -3 23 -8 27 -40 30 -36 3 -38 2 -38 -28z"/>
|
||||||
|
<path d="M1430 1151 c0 -72 3 -91 14 -91 28 0 47 13 61 41 31 60 10 121 -47 135 l-28 6 0 -91z"/>
|
||||||
|
</g>
|
||||||
|
|
||||||
|
</svg>
|
After Width: | Height: | Size: 3.8 KiB |
42
bds/static/bds/images/logo_square.svg
Normal file
42
bds/static/bds/images/logo_square.svg
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
preserveAspectRatio="xMidYMid meet"
|
||||||
|
viewBox="0 0 2560 2560"
|
||||||
|
height="256"
|
||||||
|
width="256"
|
||||||
|
version="1.0">
|
||||||
|
<g
|
||||||
|
transform="translate(-220,50)"
|
||||||
|
stroke="none"
|
||||||
|
fill="#ffffff"
|
||||||
|
id="layer101">
|
||||||
|
<path
|
||||||
|
id="path2"
|
||||||
|
d="M 0,1230 V 0 H 1500 3000 V 1230 2460 H 1500 0 Z" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
transform="translate(-220,50)"
|
||||||
|
stroke="none"
|
||||||
|
fill="#3e2263"
|
||||||
|
id="layer102">
|
||||||
|
<path
|
||||||
|
id="path5"
|
||||||
|
d="M 220,1230 V -50 H 1500 2780 V 1230 2510 H 1500 220 Z m 1496,765 c 103,-17 204,-46 284,-83 l 55,-25 -40,-8 c -80,-16 -169,-10 -245,16 -123,42 -232,59 -385,59 -126,0 -278,-18 -341,-40 -13,-5 -16,-4 -9,4 14,15 166,60 254,76 102,19 315,19 427,1 z m -703,-217 c 15,-6 27,-13 27,-17 0,-4 -37,-25 -82,-47 -86,-43 -182,-120 -193,-155 -8,-26 32,-113 78,-167 44,-52 46,-62 10,-62 -39,1 -106,33 -165,80 -40,31 -54,38 -64,29 -21,-18 -17,-50 16,-116 57,-113 151,-199 259,-235 49,-16 51,-18 16,-13 -123,19 -260,151 -322,310 -15,39 -14,-81 1,-147 25,-107 55,-176 112,-251 49,-65 52,-73 38,-88 -21,-23 -104,-62 -216,-100 -51,-18 -97,-35 -102,-40 -4,-4 32,-10 80,-14 106,-9 256,13 317,48 l 39,22 56,-33 c 32,-18 114,-61 184,-95 80,-39 126,-67 123,-74 -6,-19 12,-16 19,3 9,24 28,5 22,-22 -7,-26 8,-34 18,-9 11,29 28,16 21,-18 -6,-30 -5,-31 10,-13 8,11 15,24 15,29 0,4 5,5 10,2 6,-3 8,-18 4,-33 -5,-26 -5,-26 10,-8 15,19 18,19 118,-12 113,-35 284,-72 329,-72 24,0 29,4 29,25 0,34 -36,125 -63,158 l -22,28 -59,-30 c -74,-39 -165,-43 -233,-10 -24,11 -43,25 -43,30 0,4 28,6 63,2 49,-4 71,-2 98,12 46,23 79,55 79,75 0,16 -48,66 -135,139 l -40,33 43,-23 c 55,-30 166,-121 188,-154 9,-13 13,-29 9,-36 -15,-23 -100,-69 -129,-69 -17,0 -38,-5 -46,-10 -12,-8 -10,-10 10,-10 49,1 104,19 149,51 l 45,31 24,-28 c 33,-40 72,-128 79,-180 10,-79 -25,-96 -233,-114 -84,-7 -148,-7 -218,0 -106,12 -269,51 -317,76 -28,14 -31,13 -62,-10 -56,-43 -167,-89 -225,-94 l -55,-5 6,29 c 2,16 14,55 26,86 21,57 27,112 15,142 -3,9 -34,38 -68,64 l -62,49 -104,7 c -166,12 -192,34 -83,70 34,12 65,24 68,28 4,4 -7,27 -24,52 -118,171 -124,402 -16,571 18,29 50,88 70,131 42,93 99,154 168,184 82,35 212,44 280,18 z m 540,-39 c 60,-16 70,-41 75,-196 l 5,-134 -39,3 -39,3 -5,114 c -4,93 -8,116 -22,125 -31,19 -41,-7 -47,-126 l -6,-113 -32,-3 c -41,-4 -44,6 -34,151 9,143 25,172 101,186 3,0 22,-4 43,-10 z m 322,-34 c 0,-30 0,-30 -64,-33 l -64,-3 7,-130 7,-129 h -35 -36 v 165 166 l 93,-3 92,-3 z m 115,-55 5,-84 18,27 c 21,33 39,34 60,5 15,-22 16,-18 16,60 l 1,82 h 35 35 l -2,-162 -3,-163 h -40 c -38,0 -41,2 -53,43 -16,49 -24,48 -42,-7 -12,-38 -16,-41 -50,-41 -34,0 -38,3 -44,31 -8,43 -8,284 1,293 4,4 19,6 33,4 24,-3 25,-6 30,-88 z m 370,-42 c 193,-243 228,-505 100,-759 -61,-120 -195,-260 -328,-343 -66,-41 -60,-26 13,33 36,29 92,85 125,126 182,230 209,500 75,753 -42,79 -45,89 -45,163 0,44 4,79 9,79 5,0 28,-24 51,-52 z M 1249,1314 c 76,-30 94,-102 41,-156 -27,-27 -29,-32 -17,-47 34,-40 25,-100 -19,-120 -30,-13 -143,-15 -164,-1 -11,7 -15,42 -18,164 l -4,156 23,9 c 37,15 115,13 158,-5 z m 571,-9 c 84,-43 61,-135 -43,-173 -46,-18 -52,-23 -52,-48 0,-39 30,-42 79,-9 l 37,25 -3,-41 c -4,-49 -32,-76 -90,-85 -32,-6 -41,-2 -68,24 -24,25 -30,39 -30,74 0,57 21,85 87,114 40,18 54,29 51,42 -5,29 -71,28 -111,-2 -19,-14 -36,-26 -39,-26 -11,0 -16,55 -7,72 24,45 131,63 189,33 z m -303,-12 c 56,-26 75,-65 71,-150 -3,-67 -6,-75 -38,-108 -43,-44 -94,-61 -146,-48 l -39,9 -3,144 c -1,79 0,150 2,157 8,19 110,17 153,-4 z" />
|
||||||
|
<path
|
||||||
|
id="path7"
|
||||||
|
d="m 1503,633 c 4,-3 10,-3 14,0 3,4 0,7 -7,7 -7,0 -10,-3 -7,-7 z" />
|
||||||
|
<path
|
||||||
|
id="path9"
|
||||||
|
d="m 1532,448 c 3,-7 15,-14 29,-16 23,-2 23,-2 5,13 -24,18 -39,20 -34,3 z" />
|
||||||
|
<path
|
||||||
|
id="path11"
|
||||||
|
d="m 1140,1231 c 0,-45 10,-61 36,-61 26,0 64,32 64,53 0,23 -23,37 -62,37 -35,0 -38,-2 -38,-29 z" />
|
||||||
|
<path
|
||||||
|
id="path13"
|
||||||
|
d="m 1140,1070 c 0,-35 17,-45 56,-36 20,5 25,12 22,34 -3,23 -8,27 -40,30 -36,3 -38,2 -38,-28 z" />
|
||||||
|
<path
|
||||||
|
id="path15"
|
||||||
|
d="m 1430,1151 c 0,-72 3,-91 14,-91 28,0 47,13 61,41 31,60 10,121 -47,135 l -28,6 z" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 4 KiB |
80
bds/static/bds/images/logout.svg
Normal file
80
bds/static/bds/images/logout.svg
Normal file
|
@ -0,0 +1,80 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||||
|
<svg
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:ns1="http://sozi.baierouge.fr"
|
||||||
|
xmlns:cc="http://web.resource.org/cc/"
|
||||||
|
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
id="Layer_1"
|
||||||
|
enable-background="new 0 0 40 40"
|
||||||
|
xml:space="preserve"
|
||||||
|
viewBox="0 0 40 40"
|
||||||
|
version="1.1"
|
||||||
|
y="0px"
|
||||||
|
x="0px"
|
||||||
|
>
|
||||||
|
<polygon
|
||||||
|
points="36.351 32.435 25.5 36.271 25.5 3.94 36.351 6.242"
|
||||||
|
fill="#ffffff"
|
||||||
|
/>
|
||||||
|
<g
|
||||||
|
fill="#ffffff"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="m13.627 29.253l8.123-8.941c0.241-0.241 0.379-0.58 0.379-0.934s-0.138-0.693-0.379-0.934l-8.123-8.943c-0.346-0.348-0.853-0.44-1.286-0.238-0.436 0.203-0.717 0.662-0.717 1.171v3.193h-7.745c-0.658 0-1.191 0.572-1.191 1.277v8.943c0 0.705 0.533 1.276 1.191 1.276h7.745v3.194c0 0.509 0.281 0.969 0.716 1.172 0.434 0.204 0.94 0.112 1.287-0.236z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="m13.627 29.253l8.123-8.941c0.241-0.241 0.379-0.58 0.379-0.934s-0.138-0.693-0.379-0.934l-8.123-8.943c-0.346-0.348-0.853-0.44-1.286-0.238-0.436 0.203-0.717 0.662-0.717 1.171v3.193h-7.745c-0.658 0-1.191 0.572-1.191 1.277v8.943c0 0.705 0.533 1.276 1.191 1.276h7.745v3.194c0 0.509 0.281 0.969 0.716 1.172 0.434 0.204 0.94 0.112 1.287-0.236z"
|
||||||
|
/>
|
||||||
|
</g
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="m24.166 6.224h-1.288c-1.78 0-3.223 1.442-3.223 3.223v3.981"
|
||||||
|
stroke="#ffffff"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-miterlimit="10"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
stroke-linejoin="round"
|
||||||
|
d="m19.655 25.495v3.733c0 1.78 1.442 3.223 3.223 3.223h1.288"
|
||||||
|
stroke="#ffffff"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-miterlimit="10"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
|
<metadata
|
||||||
|
><rdf:RDF
|
||||||
|
><cc:Work
|
||||||
|
><dc:format
|
||||||
|
>image/svg+xml</dc:format
|
||||||
|
><dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage"
|
||||||
|
/><cc:license
|
||||||
|
rdf:resource="http://creativecommons.org/licenses/publicdomain/"
|
||||||
|
/><dc:publisher
|
||||||
|
><cc:Agent
|
||||||
|
rdf:about="http://openclipart.org/"
|
||||||
|
><dc:title
|
||||||
|
>Openclipart</dc:title
|
||||||
|
></cc:Agent
|
||||||
|
></dc:publisher
|
||||||
|
></cc:Work
|
||||||
|
><cc:License
|
||||||
|
rdf:about="http://creativecommons.org/licenses/publicdomain/"
|
||||||
|
><cc:permits
|
||||||
|
rdf:resource="http://creativecommons.org/ns#Reproduction"
|
||||||
|
/><cc:permits
|
||||||
|
rdf:resource="http://creativecommons.org/ns#Distribution"
|
||||||
|
/><cc:permits
|
||||||
|
rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
|
||||||
|
/></cc:License
|
||||||
|
></rdf:RDF
|
||||||
|
></metadata
|
||||||
|
></svg
|
||||||
|
>
|
After Width: | Height: | Size: 2.9 KiB |
7
bds/static/bds/js/bds.js
Normal file
7
bds/static/bds/js/bds.js
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
$(function () {
|
||||||
|
// Close notifications when delete button is pressed
|
||||||
|
$(".notification .delete").on("click", function () {
|
||||||
|
$(this).parent().remove();
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
152
bds/static/src/sass/bds.scss
Normal file
152
bds/static/src/sass/bds.scss
Normal file
|
@ -0,0 +1,152 @@
|
||||||
|
// Compilation command :
|
||||||
|
// sass -I shared/static/src/ --watch bds/static/src/sass/bds.scss bds/static/bds/css/bds.css --style compressed
|
||||||
|
|
||||||
|
$text: black;
|
||||||
|
|
||||||
|
@import "bulma/bulma.sass";
|
||||||
|
|
||||||
|
$primary_color: #3e2263;
|
||||||
|
$background_color: #ddcecc;
|
||||||
|
|
||||||
|
html, body {
|
||||||
|
background: $background_color;
|
||||||
|
font-size: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
text-decoration: none;
|
||||||
|
color: #a82305;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* header */
|
||||||
|
|
||||||
|
#search-bar {
|
||||||
|
background-color: $primary_color;
|
||||||
|
padding: 0 1em;
|
||||||
|
margin-bottom: 0;
|
||||||
|
|
||||||
|
#logout-mobile {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@include mobile {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
|
||||||
|
#logout-mobile {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row-reverse;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
|
||||||
|
#logout {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#search-input {
|
||||||
|
flex: 0 1 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Workaround : `justify-content : <left/right>` pas encore supporté
|
||||||
|
// Voir https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content
|
||||||
|
& :first-child, & :last-child {
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
|
||||||
|
& :last-child {
|
||||||
|
flex-direction: row-reverse;
|
||||||
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
border-radius: 0;
|
||||||
|
margin: 10px 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Autocomplétion du BDS */
|
||||||
|
|
||||||
|
.highlight {
|
||||||
|
text-decoration: underline;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.yourlabs-autocomplete {
|
||||||
|
ul {
|
||||||
|
list-style: none;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
|
||||||
|
li {
|
||||||
|
height: 2em;
|
||||||
|
line-height: 2em;
|
||||||
|
padding: 0;
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
li.hilight {
|
||||||
|
background: #e8554e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.autocomplete-item {
|
||||||
|
display: block;
|
||||||
|
width: 480px;
|
||||||
|
height: 100%;
|
||||||
|
padding: 2px 10px;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.autocomplete-header {
|
||||||
|
background: #b497e1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.autocomplete-value, .autocomplete-new, .autocomplete-more {
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Forms --- */
|
||||||
|
|
||||||
|
$button_color: lighten($primary_color, 10);
|
||||||
|
|
||||||
|
input[type="submit"] {
|
||||||
|
background-color: $button_color;
|
||||||
|
color: findColorInvert($button_color);
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: $primary_color;
|
||||||
|
color: findColorInvert($primary_color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.button.is-primary {
|
||||||
|
background-color: $button_color;
|
||||||
|
color: findColorInvert($button_color);
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: $primary_color;
|
||||||
|
color: findColorInvert($primary_color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Message styling --- */
|
||||||
|
|
||||||
|
.notification {
|
||||||
|
padding: 0.5em 0;
|
||||||
|
font-size: 1.2em;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Modals --- */
|
||||||
|
|
||||||
|
.modal-card-head {
|
||||||
|
background-color: $primary_color;
|
||||||
|
|
||||||
|
.modal-card-title {
|
||||||
|
color: findColorInvert($primary_color);
|
||||||
|
}
|
||||||
|
}
|
50
bds/templates/bds/base.html
Normal file
50
bds/templates/bds/base.html
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
{% load static %}
|
||||||
|
{% load bulma_utils %}
|
||||||
|
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>{{ site.name }}</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
|
{# CSS #}
|
||||||
|
<link rel="stylesheet" href="{% static "bds/css/bds.css" %}">
|
||||||
|
<link type="text/css" rel="stylesheet" href="{% static 'vendor/font-awesome/css/font-awesome.min.css' %}">
|
||||||
|
|
||||||
|
{# Javascript #}
|
||||||
|
<script src="{% static 'vendor/jquery/jquery-3.3.1.min.js' %}"></script>
|
||||||
|
<script src="{% static "vendor/jquery/jquery.autocomplete-light.min.js" %}"></script>
|
||||||
|
<script src="{% static 'bds/js/bds.js' %}"></script>
|
||||||
|
|
||||||
|
{% block extra_head %}{% endblock extra_head %}
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
{% include "bds/nav.html" %}
|
||||||
|
{% block layout %}
|
||||||
|
<div class="columns">
|
||||||
|
<div class="column is-two-thirds is-offset-2">
|
||||||
|
<section class="section">
|
||||||
|
|
||||||
|
{% if messages %}
|
||||||
|
{% for message in messages %}
|
||||||
|
<div class="notification is-{{ message.level_tag|bulma_message_tag }}">
|
||||||
|
{% if 'safe' in message.tags %}
|
||||||
|
{{ message|safe }}
|
||||||
|
{% else %}
|
||||||
|
{{ message }}
|
||||||
|
{% endif %}
|
||||||
|
<button class="delete"></button>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
{% endblock content %}
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock layout %}
|
||||||
|
</body>
|
||||||
|
</html>
|
22
bds/templates/bds/expired_members.html
Normal file
22
bds/templates/bds/expired_members.html
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
{% extends "bds/base.html" %}
|
||||||
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
<h1 class="title">Liste des adhésions expirées</h1>
|
||||||
|
|
||||||
|
{% if object_list %}
|
||||||
|
<div class="content">
|
||||||
|
<ul>
|
||||||
|
{% for p in object_list %}
|
||||||
|
<li>{{ p.user.first_name }} {{ p.user.last_name }} ({{ p.user.username }}), {{ p.get_cotisation_period_display }}</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="buttons is-centered">
|
||||||
|
<a class="button is-danger" href="{% url 'bds:members.reset' %}">Réinitialiser les adhésions expirées</a>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% endblock %}
|
16
bds/templates/bds/forms/checkbox.html
Normal file
16
bds/templates/bds/forms/checkbox.html
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
<div class="control">
|
||||||
|
{% if field.auto_id %}
|
||||||
|
<label class="checkbox {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
|
||||||
|
{{ field }} {{ field.label }}
|
||||||
|
</label>
|
||||||
|
{% endif %}
|
||||||
|
{% for error in field.errors %}
|
||||||
|
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if field.help_text %}
|
||||||
|
<p class="help">
|
||||||
|
{{ field.help_text|safe }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
33
bds/templates/bds/forms/field.html
Normal file
33
bds/templates/bds/forms/field.html
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
{% load bulma_utils %}
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
{% if field|is_checkbox %}
|
||||||
|
|
||||||
|
{% include "bds/forms/checkbox.html" with field=field %}
|
||||||
|
|
||||||
|
{% elif field|is_radio %}
|
||||||
|
|
||||||
|
{% include "bds/forms/radio.html" with field=field %}
|
||||||
|
|
||||||
|
{% elif field|is_input %}
|
||||||
|
|
||||||
|
{% include "bds/forms/input.html" with field=field %}
|
||||||
|
|
||||||
|
{% elif field|is_textarea %}
|
||||||
|
|
||||||
|
{% include "bds/forms/textarea.html" with field=field %}
|
||||||
|
|
||||||
|
{% elif field|is_select %}
|
||||||
|
|
||||||
|
{% include "bds/forms/select.html" with field=field %}
|
||||||
|
|
||||||
|
{% elif field|is_file %}
|
||||||
|
|
||||||
|
{% include "bds/forms/file.html" with field=field %}
|
||||||
|
|
||||||
|
{% else %}
|
||||||
|
|
||||||
|
{% include "bds/forms/other.html" with field=field %}
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
31
bds/templates/bds/forms/file.html
Normal file
31
bds/templates/bds/forms/file.html
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
{% load bulma_utils %}
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
|
||||||
|
{{ field.label }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="control">
|
||||||
|
|
||||||
|
<label class="file-label">
|
||||||
|
{{ field|bulmafy:'file-input' }}
|
||||||
|
<span class="file-cta">
|
||||||
|
<span class="file-icon">
|
||||||
|
<i class="fa fa-upload"></i>
|
||||||
|
</span>
|
||||||
|
<span class="file-label">
|
||||||
|
{% trans "Choisissez un fichier..." %}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
{% for error in field.errors %}
|
||||||
|
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if field.help_text %}
|
||||||
|
<p class="help">
|
||||||
|
{{ field.help_text|safe }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
22
bds/templates/bds/forms/form.html
Normal file
22
bds/templates/bds/forms/form.html
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
{% if errors %}
|
||||||
|
{% if form.non_field_errors %}
|
||||||
|
<div class="message is-danger">
|
||||||
|
<div class="message-header">
|
||||||
|
<button class="delete" aria-label="delete"></button>
|
||||||
|
</div>
|
||||||
|
<div class="message-body">
|
||||||
|
{% for non_field_error in form.non_field_errors %}
|
||||||
|
{{ non_field_error }}
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% for field in form.hidden_fields %}
|
||||||
|
{{ field }}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% for field in form.visible_fields %}
|
||||||
|
{% include 'bds/forms/field.html' %}
|
||||||
|
{% endfor %}
|
19
bds/templates/bds/forms/input.html
Normal file
19
bds/templates/bds/forms/input.html
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{% load bulma_utils %}
|
||||||
|
|
||||||
|
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
|
||||||
|
{{ field.label }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="control">
|
||||||
|
{{ field|bulmafy:'input' }}
|
||||||
|
|
||||||
|
{% for error in field.errors %}
|
||||||
|
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if field.help_text %}
|
||||||
|
<p class="help">
|
||||||
|
{{ field.help_text|safe }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
19
bds/templates/bds/forms/other.html
Normal file
19
bds/templates/bds/forms/other.html
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{% if field.auto_id %}
|
||||||
|
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">
|
||||||
|
{{ field.label }}
|
||||||
|
</label>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="control {% if field|is_multiple_checkbox %}multiple-checkbox{% endif %}">
|
||||||
|
{{ field }}
|
||||||
|
|
||||||
|
{% for error in field.errors %}
|
||||||
|
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if field.help_text %}
|
||||||
|
<p class="help">
|
||||||
|
{{ field.help_text|safe }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
24
bds/templates/bds/forms/radio.html
Normal file
24
bds/templates/bds/forms/radio.html
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
{% if field.auto_id %}
|
||||||
|
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
|
||||||
|
{{ field.label }}
|
||||||
|
</label>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="control">
|
||||||
|
{% for choice in field %}
|
||||||
|
<label class="radio">
|
||||||
|
{{ choice.tag }}
|
||||||
|
{{ choice.choice_label }}
|
||||||
|
</label>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% for error in field.errors %}
|
||||||
|
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if field.help_text %}
|
||||||
|
<p class="help">
|
||||||
|
{{ field.help_text|safe }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
21
bds/templates/bds/forms/select.html
Normal file
21
bds/templates/bds/forms/select.html
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
{% load bulma_utils %}
|
||||||
|
|
||||||
|
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
|
||||||
|
{{ field.label }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="control">
|
||||||
|
<span class="select{% if field|is_multiple_select %} is-multiple{% endif %}{% if field.errors|length > 0 %} is-danger{% endif %}">
|
||||||
|
{{ field }}
|
||||||
|
</span>
|
||||||
|
|
||||||
|
{% for error in field.errors %}
|
||||||
|
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if field.help_text %}
|
||||||
|
<p class="help">
|
||||||
|
{{ field.help_text|safe }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
19
bds/templates/bds/forms/textarea.html
Normal file
19
bds/templates/bds/forms/textarea.html
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{% load bulma_utils %}
|
||||||
|
|
||||||
|
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
|
||||||
|
{{ field.label }}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="control">
|
||||||
|
{{ field|bulmafy:'textarea' }}
|
||||||
|
|
||||||
|
{% for error in field.errors %}
|
||||||
|
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if field.help_text %}
|
||||||
|
<p class="help">
|
||||||
|
{{ field.help_text|safe }}
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
62
bds/templates/bds/home.html
Normal file
62
bds/templates/bds/home.html
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
{% extends "bds/base.html" %}
|
||||||
|
{% load bulma_utils %}
|
||||||
|
|
||||||
|
{% block layout %}
|
||||||
|
<div class="columns">
|
||||||
|
<div class="column is-2">
|
||||||
|
<section class="section">
|
||||||
|
<div class="box">
|
||||||
|
<div class="content has-text-centered">
|
||||||
|
<h1>{{ member_count }}</h1>
|
||||||
|
adhérent·e·s
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
<div class="column is-two-thirds">
|
||||||
|
<section class="section">
|
||||||
|
|
||||||
|
{% if messages %}
|
||||||
|
{% for message in messages %}
|
||||||
|
<div class="notification is-{{ message.level_tag|bulma_message_tag }}">
|
||||||
|
{% if 'safe' in message.tags %}
|
||||||
|
{{ message|safe }}
|
||||||
|
{% else %}
|
||||||
|
{{ message }}
|
||||||
|
{% endif %}
|
||||||
|
<button class="delete"></button>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
<div class="container">
|
||||||
|
Bienvenue sur GestioBDS !
|
||||||
|
|
||||||
|
<br>
|
||||||
|
<br>
|
||||||
|
|
||||||
|
<a class=button href="{% url 'bds:export.members' %}">Télécharger la liste des membres (CSV)</a>
|
||||||
|
|
||||||
|
<a class=button href="{% url 'bds:members.expired' %}">Liste des adhésions expirées ({{ nb_expired }})</a>
|
||||||
|
|
||||||
|
<br>
|
||||||
|
<br>
|
||||||
|
|
||||||
|
Le site est encore en développement.
|
||||||
|
<br>
|
||||||
|
Suivez notre avancement sur
|
||||||
|
<a href="https://git.eleves.ens.fr/klub-dev-ens/gestioCOF/merge_requests?milestone_title=Int%C3%A9gration+du+BDS">
|
||||||
|
cette milestone</a> sur le gitlab de l'ENS.
|
||||||
|
<br>
|
||||||
|
Faites vos remarques par mail à
|
||||||
|
<a href="mailto:klub-dev@ens.fr"><tt>klub-dev@ens.fr</tt></a>
|
||||||
|
ou en ouvrant une
|
||||||
|
<a href="#https://git.eleves.ens.fr/klub-dev-ens/gestioCOF/issues?milestone_title=Int%C3%A9gration+du+BDS">
|
||||||
|
issue</a>.
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock layout %}
|
||||||
|
|
||||||
|
|
||||||
|
|
57
bds/templates/bds/nav.html
Normal file
57
bds/templates/bds/nav.html
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
{% load i18n %}
|
||||||
|
{% load static %}
|
||||||
|
|
||||||
|
<nav id="search-bar" class="level">
|
||||||
|
<div class="level-item" id="logo">
|
||||||
|
<figure class="image is-64x64">
|
||||||
|
<a href="{% url "bds:home" %}">
|
||||||
|
<img src="{% static "bds/images/logo_square.svg" %}" alt="bds-logo">
|
||||||
|
</a>
|
||||||
|
</figure>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="level-item" id="logout-mobile">
|
||||||
|
<figure class="image is-64x64">
|
||||||
|
<a href="{% url 'authens:logout' %}">
|
||||||
|
<img src="{% static "bds/images/logout.svg" %}" alt="logout">
|
||||||
|
</a>
|
||||||
|
</figure>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="level-item" id="search-input">
|
||||||
|
<input
|
||||||
|
class="input"
|
||||||
|
type="text"
|
||||||
|
name="q"
|
||||||
|
id="search_autocomplete"
|
||||||
|
spellcheck="false"
|
||||||
|
placeholder="{% trans "Chercher une personne" %}" />
|
||||||
|
<div class="yourlabs-autocomplete"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="level-item" id="logout">
|
||||||
|
<figure class="image is-64x64">
|
||||||
|
<a href="{% url 'authens:logout' %}">
|
||||||
|
<img src="{% static "bds/images/logout.svg" %}" alt="logout">
|
||||||
|
</a>
|
||||||
|
</figure>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(document).ready(function() {
|
||||||
|
$('input#search_autocomplete').yourlabsAutocomplete({
|
||||||
|
url: '{% url 'bds:autocomplete' %}',
|
||||||
|
minimumCharacters: 3,
|
||||||
|
id: 'search_autocomplete',
|
||||||
|
choiceSelector: 'li:has(a)',
|
||||||
|
box: $(".yourlabs-autocomplete"),
|
||||||
|
});
|
||||||
|
$('input#search_autocomplete').bind(
|
||||||
|
'selectChoice',
|
||||||
|
function(e, choice, autocomplete) {
|
||||||
|
window.location = choice.find('a:first').attr('href');
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
</script>
|
21
bds/templates/bds/search_results.html
Normal file
21
bds/templates/bds/search_results.html
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
{% extends "shared/search_results.html" %}
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
{% block extra_section %}
|
||||||
|
<li class="autocomplete-header">
|
||||||
|
{% if not results %}
|
||||||
|
<span class="autocomplete-item">
|
||||||
|
{% trans "Aucune correspondance trouvée" %}
|
||||||
|
</span>
|
||||||
|
{% else %}
|
||||||
|
<span class="autocomplete-item">
|
||||||
|
{% trans "Pas dans la liste ?" %}
|
||||||
|
</span>
|
||||||
|
{% endif %}
|
||||||
|
</li>
|
||||||
|
<li class="autocomplete-new">
|
||||||
|
<a class="autocomplete-item" href="{% url "bds:user.create" %}">
|
||||||
|
{% trans "Créer un compte" %}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endblock %}
|
33
bds/templates/bds/user_create.html
Normal file
33
bds/templates/bds/user_create.html
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
{% extends "bds/base.html" %}
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
{% for form in forms.values %}
|
||||||
|
{% for error in form.non_field_errors %}
|
||||||
|
<div class="notification is-danger">
|
||||||
|
{{ error }}
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
<h1 class="title">{% trans "Création d'un profil" %}</h1>
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
<form action="" method="post">
|
||||||
|
{% csrf_token %}
|
||||||
|
|
||||||
|
{% for form in forms.values %}
|
||||||
|
{% include "bds/forms/form.html" with form=form errors=False %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
<div class="field">
|
||||||
|
<p class="control">
|
||||||
|
<input class="button is-fullwidth" type="submit" value="Enregistrer">
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% endblock %}
|
104
bds/templates/bds/user_update.html
Normal file
104
bds/templates/bds/user_update.html
Normal file
|
@ -0,0 +1,104 @@
|
||||||
|
{% extends "bds/base.html" %}
|
||||||
|
{% load i18n %}
|
||||||
|
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
{% for form in forms.values %}
|
||||||
|
{% for error in form.non_field_errors %}
|
||||||
|
<div class="notification is-danger">
|
||||||
|
{{ error }}
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
<h1 class="title">{% trans "Modification du profil " %}{{ view.user.username }}</h1>
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
<form method="post" action="" id="user-update-form">
|
||||||
|
{% csrf_token %}
|
||||||
|
|
||||||
|
{% for form in forms.values %}
|
||||||
|
{% include "bds/forms/form.html" with form=form errors=False %}
|
||||||
|
{% endfor %}
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<form method="post" action="{% url 'bds:user.delete' view.user.pk %}" id="user-delete-form">
|
||||||
|
{% csrf_token %}
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<div class="columns is-gapless mt-5">
|
||||||
|
<div class="column is-5">
|
||||||
|
<button id="user-update-button" class="button is-fullwidth is-primary">Enregistrer</button>
|
||||||
|
</div>
|
||||||
|
<div class="column is-2">
|
||||||
|
</div>
|
||||||
|
<div class="column is-5">
|
||||||
|
<button id="user-delete-button" class="button is-fullwidth is-danger">Supprimer</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Hidden by default -->
|
||||||
|
<div id="confirm-delete-modal" class="modal">
|
||||||
|
<div class="modal-background"></div>
|
||||||
|
<div class="modal-card">
|
||||||
|
<header class="modal-card-head">
|
||||||
|
<p class="modal-card-title">Confirmer la suppression</p>
|
||||||
|
<button id="modal-close" class="delete" aria-label="close"></button>
|
||||||
|
</header>
|
||||||
|
<section class="modal-card-body">
|
||||||
|
Voulez-vous réellement supprimer ce compte ? Attention, cette opération est irréversible !
|
||||||
|
</section>
|
||||||
|
<footer class="modal-card-foot">
|
||||||
|
<button id="confirm-delete-button" class="button is-primary">Supprimer</button>
|
||||||
|
<button id="cancel-delete-button" class="button">Annuler</button>
|
||||||
|
</footer>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(document).ready(function() {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
// Adapted from https://bulma.io/lib/main.js
|
||||||
|
function openModal(target) {
|
||||||
|
$(document).addClass('is-clipped');
|
||||||
|
$(`#${target}`).addClass('is-active');
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeModals() {
|
||||||
|
$(document).removeClass('is-clipped');
|
||||||
|
$(".modal").removeClass('is-active');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Si on clique sur enregistrer, ça marche
|
||||||
|
$("#user-update-button").on("click", function() {
|
||||||
|
$("#user-update-form").submit();
|
||||||
|
})
|
||||||
|
|
||||||
|
// Si on clique sur supprimer, confirmation demandée
|
||||||
|
$("#user-delete-button").on("click", function() {
|
||||||
|
openModal("confirm-delete-modal");
|
||||||
|
});
|
||||||
|
|
||||||
|
$(".modal-background, #modal-close, #cancel-delete-button").on("click", closeModals);
|
||||||
|
|
||||||
|
$("#confirm-delete-button").on("click", function() {
|
||||||
|
$("#user-delete-form").submit();
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).on("keydown", function(e) {
|
||||||
|
if (e.key == "Escape") {
|
||||||
|
closeModals();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (e.key == "Enter") {
|
||||||
|
$("#user-update-form").submit();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{% endblock %}
|
74
bds/templatetags/bulma_utils.py
Normal file
74
bds/templatetags/bulma_utils.py
Normal file
|
@ -0,0 +1,74 @@
|
||||||
|
from django import forms, template
|
||||||
|
|
||||||
|
register = template.Library()
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def widget_type(field):
|
||||||
|
return field.field.widget
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def is_select(field):
|
||||||
|
return isinstance(field.field.widget, forms.Select)
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def is_multiple_select(field):
|
||||||
|
return isinstance(field.field.widget, forms.SelectMultiple)
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def is_textarea(field):
|
||||||
|
return isinstance(field.field.widget, forms.Textarea)
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def is_input(field):
|
||||||
|
return isinstance(
|
||||||
|
field.field.widget,
|
||||||
|
(
|
||||||
|
forms.TextInput,
|
||||||
|
forms.NumberInput,
|
||||||
|
forms.EmailInput,
|
||||||
|
forms.PasswordInput,
|
||||||
|
forms.URLInput,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def is_checkbox(field):
|
||||||
|
return isinstance(field.field.widget, forms.CheckboxInput)
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def is_multiple_checkbox(field):
|
||||||
|
return isinstance(field.field.widget, forms.CheckboxSelectMultiple)
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def is_radio(field):
|
||||||
|
return isinstance(field.field.widget, forms.RadioSelect)
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def is_file(field):
|
||||||
|
return isinstance(field.field.widget, forms.FileInput)
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def bulmafy(field, css_class):
|
||||||
|
if len(field.errors) > 0:
|
||||||
|
css_class += " is-danger"
|
||||||
|
field_classes = field.field.widget.attrs.get("class", "")
|
||||||
|
field_classes += f" {css_class}"
|
||||||
|
return field.as_widget(attrs={"class": field_classes})
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def bulma_message_tag(tag):
|
||||||
|
if tag == "error":
|
||||||
|
return "danger"
|
||||||
|
|
||||||
|
return tag
|
76
bds/tests/test_views.py
Normal file
76
bds/tests/test_views.py
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.contrib.auth import get_user_model
|
||||||
|
from django.contrib.auth.models import Permission
|
||||||
|
from django.test import Client, TestCase
|
||||||
|
from django.urls import reverse, reverse_lazy
|
||||||
|
|
||||||
|
User = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
|
def give_bds_buro_permissions(user: User) -> None:
|
||||||
|
perm = Permission.objects.get(content_type__app_label="bds", codename="is_team")
|
||||||
|
user.user_permissions.add(perm)
|
||||||
|
|
||||||
|
|
||||||
|
def login_url(next=None):
|
||||||
|
login_url = reverse_lazy(settings.LOGIN_URL)
|
||||||
|
if next is None:
|
||||||
|
return login_url
|
||||||
|
else:
|
||||||
|
return "{}?next={}".format(login_url, next)
|
||||||
|
|
||||||
|
|
||||||
|
class TestHomeView(TestCase):
|
||||||
|
@mock.patch("gestioncof.signals.messages")
|
||||||
|
def test_get(self, mock_messages):
|
||||||
|
user = User.objects.create_user(username="random_user")
|
||||||
|
give_bds_buro_permissions(user)
|
||||||
|
self.client.force_login(
|
||||||
|
user, backend="django.contrib.auth.backends.ModelBackend"
|
||||||
|
)
|
||||||
|
resp = self.client.get(reverse("bds:home"))
|
||||||
|
self.assertEqual(resp.status_code, 200)
|
||||||
|
|
||||||
|
|
||||||
|
class TestRegistrationView(TestCase):
|
||||||
|
@mock.patch("gestioncof.signals.messages")
|
||||||
|
def test_get_autocomplete(self, mock_messages):
|
||||||
|
user = User.objects.create_user(username="toto")
|
||||||
|
url = reverse("bds:autocomplete") + "?q=foo"
|
||||||
|
client = Client()
|
||||||
|
|
||||||
|
# Anonymous GET
|
||||||
|
resp = client.get(url)
|
||||||
|
self.assertRedirects(resp, login_url(next=url))
|
||||||
|
|
||||||
|
# Logged-in but unprivileged GET
|
||||||
|
client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
|
||||||
|
resp = client.get(url)
|
||||||
|
self.assertEqual(resp.status_code, 403)
|
||||||
|
|
||||||
|
# Burô user GET
|
||||||
|
give_bds_buro_permissions(user)
|
||||||
|
resp = client.get(url)
|
||||||
|
self.assertEqual(resp.status_code, 200)
|
||||||
|
|
||||||
|
@mock.patch("gestioncof.signals.messages")
|
||||||
|
def test_get(self, mock_messages):
|
||||||
|
user = User.objects.create_user(username="toto")
|
||||||
|
url = reverse("bds:user.update", args=(user.id,))
|
||||||
|
client = Client()
|
||||||
|
|
||||||
|
# Anonymous GET
|
||||||
|
resp = client.get(url)
|
||||||
|
self.assertRedirects(resp, login_url(next=url))
|
||||||
|
|
||||||
|
# Logged-in but unprivileged GET
|
||||||
|
client.force_login(user, backend="django.contrib.auth.backends.ModelBackend")
|
||||||
|
resp = client.get(url)
|
||||||
|
self.assertEqual(resp.status_code, 403)
|
||||||
|
|
||||||
|
# Burô user GET
|
||||||
|
give_bds_buro_permissions(user)
|
||||||
|
resp = client.get(url)
|
||||||
|
self.assertEqual(resp.status_code, 200)
|
24
bds/urls.py
Normal file
24
bds/urls.py
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
from django.urls import path
|
||||||
|
|
||||||
|
from bds import views
|
||||||
|
|
||||||
|
app_name = "bds"
|
||||||
|
urlpatterns = [
|
||||||
|
path("", views.Home.as_view(), name="home"),
|
||||||
|
path("autocomplete", views.BDSAutocompleteView.as_view(), name="autocomplete"),
|
||||||
|
path("user/update/<int:pk>", views.UserUpdateView.as_view(), name="user.update"),
|
||||||
|
path("user/create/", views.UserCreateView.as_view(), name="user.create"),
|
||||||
|
path(
|
||||||
|
"user/create/<slug:clipper>",
|
||||||
|
views.UserCreateView.as_view(),
|
||||||
|
name="user.create.fromclipper",
|
||||||
|
),
|
||||||
|
path("user/delete/<int:pk>", views.UserDeleteView.as_view(), name="user.delete"),
|
||||||
|
path("members", views.export_members, name="export.members"),
|
||||||
|
path(
|
||||||
|
"members/expired",
|
||||||
|
views.ResetMembershipListView.as_view(),
|
||||||
|
name="members.expired",
|
||||||
|
),
|
||||||
|
path("members/reset", views.ResetMembershipView.as_view(), name="members.reset"),
|
||||||
|
]
|
185
bds/views.py
185
bds/views.py
|
@ -1 +1,184 @@
|
||||||
# Create your views here.
|
import csv
|
||||||
|
|
||||||
|
from django.contrib import messages
|
||||||
|
from django.contrib.auth import get_user_model
|
||||||
|
from django.contrib.auth.decorators import permission_required
|
||||||
|
from django.contrib.auth.models import Permission
|
||||||
|
from django.http import HttpResponse
|
||||||
|
from django.shortcuts import get_object_or_404
|
||||||
|
from django.urls import reverse, reverse_lazy
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
from django.views.generic import DeleteView, ListView, RedirectView, TemplateView
|
||||||
|
|
||||||
|
from bds.autocomplete import bds_search
|
||||||
|
from bds.forms import ProfileForm, UserForm, UserFromClipperForm, UserFromScratchForm
|
||||||
|
from bds.mixins import MultipleFormView, StaffRequiredMixin
|
||||||
|
from bds.models import BDSProfile
|
||||||
|
from shared.views import AutocompleteView
|
||||||
|
|
||||||
|
User = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
|
class BDSAutocompleteView(StaffRequiredMixin, AutocompleteView):
|
||||||
|
template_name = "bds/search_results.html"
|
||||||
|
search_composer = bds_search
|
||||||
|
|
||||||
|
|
||||||
|
class Home(StaffRequiredMixin, TemplateView):
|
||||||
|
template_name = "bds/home.html"
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
context["member_count"] = BDSProfile.objects.filter(is_member=True).count()
|
||||||
|
context["nb_expired"] = BDSProfile.expired_members().count()
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class UserUpdateView(StaffRequiredMixin, MultipleFormView):
|
||||||
|
template_name = "bds/user_update.html"
|
||||||
|
|
||||||
|
form_classes = {
|
||||||
|
"user": UserForm,
|
||||||
|
"profile": ProfileForm,
|
||||||
|
}
|
||||||
|
|
||||||
|
def get_user_initial(self):
|
||||||
|
return {"is_buro": self.get_user_instance().has_perm("bds.is_team")}
|
||||||
|
|
||||||
|
def dispatch(self, request, *args, **kwargs):
|
||||||
|
self.user = get_object_or_404(User, pk=self.kwargs["pk"])
|
||||||
|
return super().dispatch(request, *args, **kwargs)
|
||||||
|
|
||||||
|
def get_user_instance(self):
|
||||||
|
return self.user
|
||||||
|
|
||||||
|
def get_profile_instance(self):
|
||||||
|
return getattr(self.user, "bds", None)
|
||||||
|
|
||||||
|
def get_success_url(self):
|
||||||
|
return reverse("bds:user.update", args=(self.user.pk,))
|
||||||
|
|
||||||
|
def form_valid(self, forms):
|
||||||
|
user = forms["user"].save()
|
||||||
|
profile = forms["profile"].save(commit=False)
|
||||||
|
perm = Permission.objects.get(content_type__app_label="bds", codename="is_team")
|
||||||
|
if forms["user"].cleaned_data["is_buro"]:
|
||||||
|
user.user_permissions.add(perm)
|
||||||
|
else:
|
||||||
|
user.user_permissions.remove(perm)
|
||||||
|
profile.user = user
|
||||||
|
profile.save()
|
||||||
|
messages.success(self.request, _("Profil mis à jour avec succès !"))
|
||||||
|
|
||||||
|
return super().form_valid(forms)
|
||||||
|
|
||||||
|
def form_invalid(self, forms):
|
||||||
|
messages.error(self.request, _("Veuillez corriger les erreurs ci-dessous"))
|
||||||
|
return super().form_invalid(forms)
|
||||||
|
|
||||||
|
|
||||||
|
class UserCreateView(StaffRequiredMixin, MultipleFormView):
|
||||||
|
template_name = "bds/user_create.html"
|
||||||
|
|
||||||
|
def get_form_classes(self):
|
||||||
|
profile_class = ProfileForm
|
||||||
|
|
||||||
|
if "clipper" in self.kwargs:
|
||||||
|
user_class = UserFromClipperForm
|
||||||
|
else:
|
||||||
|
user_class = UserFromScratchForm
|
||||||
|
|
||||||
|
return {"user": user_class, "profile": profile_class}
|
||||||
|
|
||||||
|
def get_user_initial(self):
|
||||||
|
if "clipper" in self.kwargs:
|
||||||
|
clipper = self.kwargs["clipper"]
|
||||||
|
email = self.request.GET.get("mail", "{}@clipper.ens.fr".format(clipper))
|
||||||
|
fullname = self.request.GET.get("fullname", None)
|
||||||
|
|
||||||
|
if fullname:
|
||||||
|
# Heuristique : le premier mot est le prénom
|
||||||
|
first_name = fullname.split()[0]
|
||||||
|
last_name = " ".join(fullname.split()[1:])
|
||||||
|
else:
|
||||||
|
first_name = ""
|
||||||
|
last_name = ""
|
||||||
|
|
||||||
|
return {
|
||||||
|
"username": clipper,
|
||||||
|
"email": email,
|
||||||
|
"first_name": first_name,
|
||||||
|
"last_name": last_name,
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
def get_success_url(self):
|
||||||
|
return reverse("bds:user.update", args=(self.user.pk,))
|
||||||
|
|
||||||
|
def form_valid(self, forms):
|
||||||
|
# On redéfinit self.user pour get_success_url
|
||||||
|
self.user = forms["user"].save()
|
||||||
|
profile = forms["profile"].save(commit=False)
|
||||||
|
profile.user = self.user
|
||||||
|
profile.save()
|
||||||
|
messages.success(self.request, _("Profil créé avec succès !"))
|
||||||
|
|
||||||
|
return super().form_valid(forms)
|
||||||
|
|
||||||
|
def form_invalid(self, forms):
|
||||||
|
messages.error(self.request, _("Veuillez corriger les erreurs ci-dessous"))
|
||||||
|
return super().form_invalid(forms)
|
||||||
|
|
||||||
|
|
||||||
|
class UserDeleteView(StaffRequiredMixin, DeleteView):
|
||||||
|
model = User
|
||||||
|
success_url = reverse_lazy("bds:home")
|
||||||
|
success_message = "Profil supprimé avec succès !"
|
||||||
|
|
||||||
|
def delete(self, request, *args, **kwargs):
|
||||||
|
# SuccessMessageMixin does not work with DeleteView, see :
|
||||||
|
# https://code.djangoproject.com/ticket/21926
|
||||||
|
messages.success(request, self.success_message)
|
||||||
|
|
||||||
|
return super().delete(request, *args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
class ResetMembershipListView(StaffRequiredMixin, ListView):
|
||||||
|
model = BDSProfile
|
||||||
|
template_name = "bds/expired_members.html"
|
||||||
|
|
||||||
|
def get_queryset(self):
|
||||||
|
return BDSProfile.expired_members()
|
||||||
|
|
||||||
|
|
||||||
|
class ResetMembershipView(StaffRequiredMixin, RedirectView):
|
||||||
|
url = reverse_lazy("bds:members.expired")
|
||||||
|
|
||||||
|
def get(self, request, *args, **kwargs):
|
||||||
|
qs = BDSProfile.expired_members()
|
||||||
|
nb = qs.count()
|
||||||
|
|
||||||
|
qs.update(cotisation_period="NO", is_member=False, mails_bds=False)
|
||||||
|
|
||||||
|
messages.success(request, f"{nb} adhésions réinitialisées")
|
||||||
|
|
||||||
|
return super().get(request, *args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
@permission_required("bds.is_team")
|
||||||
|
def export_members(request):
|
||||||
|
response = HttpResponse(content_type="text/csv")
|
||||||
|
response["Content-Disposition"] = "attachment; filename=membres_bds.csv"
|
||||||
|
|
||||||
|
writer = csv.writer(response)
|
||||||
|
for profile in BDSProfile.objects.filter(is_member=True).all():
|
||||||
|
user = profile.user
|
||||||
|
bits = [
|
||||||
|
user.username,
|
||||||
|
user.get_full_name(),
|
||||||
|
user.email,
|
||||||
|
]
|
||||||
|
writer.writerow([str(bit) for bit in bits])
|
||||||
|
|
||||||
|
return response
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue