1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-12-26 01:12:23 +00:00
Commit Graph

1187 Commits

Author SHA1 Message Date
Yohann D'ANELLO
2fc13e5418 Edit the wiki after an activity update iff the wiki password is defined, and don't run the script asynchronous with a SQLite database 2020-09-05 00:47:30 +02:00
Yohann D'ANELLO
2e80233cbc Change debug option to "print stdout" / "edit wiki" in the Refresh activities script 2020-09-05 00:45:14 +02:00
Yohann D'ANELLO
0f47412c38 Fix Ansible script for production 2020-09-04 22:37:18 +02:00
Yohann D'ANELLO
4ddd763886 Test activity app 2020-09-04 21:46:40 +02:00
Yohann D'ANELLO
6d1b75b9b6 Fix linebreaks in ICS file 2020-09-04 19:24:48 +02:00
Yohann D'ANELLO
70e1a611dd Export activites as an ICS Calendar 2020-09-04 18:36:20 +02:00
Yohann D'ANELLO
5c7fe716ad Fix JSON 2020-09-04 16:43:57 +02:00
Yohann D'ANELLO
9b4923fc04 Fix some permissions, grant temporary all treasurers to make transactions from anyone to anyone while a better system is not implemented 2020-09-04 16:37:17 +02:00
Yohann D'ANELLO
c93c81861d Users can change their password, fix #59 2020-09-04 16:28:50 +02:00
Yohann D'ANELLO
f71fb1fa81 Use pre-defined queryset by default in API views 2020-09-04 16:02:42 +02:00
Yohann D'ANELLO
c03c18e93a Test and cover treasury app 2020-09-04 15:53:00 +02:00
Alexandre Iooss
b6847415b5 Remove unused imports in tests 2020-09-04 07:53:31 +02:00
Pierre-antoine Comby
43fffdf56f Merge branch 'traduction' into beta 2020-09-03 23:48:39 +02:00
Alexandre Iooss
d29e1d69d1 Format api viewsets 2020-09-03 21:47:08 +02:00
Alexandre Iooss
ff187581c9 Remove useless blank lines and spaces in api app 2020-09-03 21:21:19 +02:00
Yohann D'ANELLO
f02efd3b39 100% coverage on registration app 2020-09-03 20:03:40 +02:00
Pierre-antoine Comby
f7f6f053f7 Format date to ISO standard 2020-09-03 14:33:26 +02:00
Yohann D'ANELLO
fed9567522 Force line breaks on transactions reason in history, but don't wrap dates or amounts 2020-09-02 23:49:10 +02:00
Alexandre Iooss
7bdf5a4366 Update picture path in member test 2020-09-02 23:25:32 +02:00
Alexandre Iooss
be6cf93cdb Move default profile picture in member app 2020-09-02 23:08:40 +02:00
Yohann D'ANELLO
bf7f5b9cd6 Test and cover fully member app 2020-09-02 22:54:01 +02:00
Yohann D'ANELLO
1b8cb7abb0 Send user id and group id in Docker console 2020-09-02 22:53:43 +02:00
Pierre-antoine Comby
6a2b46be72 make API token button nicer 2020-09-02 19:16:08 +02:00
Pierre-antoine Comby
4da5c41f40 move viewsets and serializers out of urls.py 2020-09-02 19:00:04 +02:00
Yohann D'ANELLO
8db9e92986 Sqlite does not support order by in subqueries 2020-09-02 18:01:41 +02:00
Pierre-antoine Comby
3e42f4fffb superusers at creation gets automatically valid registration 2020-09-02 17:22:06 +02:00
Yohann D'ANELLO
cc5f04e2b3 Add script to launch a Docker bash easily 2020-09-02 15:26:57 +02:00
Yohann D'ANELLO
980032bfbf Remove ltablex and tabularx TeX depency 2020-09-02 12:23:45 +02:00
Yohann D'ANELLO
d76aa3fec9 Some table accessors weren't updated 2020-09-01 19:04:35 +02:00
Yohann D'ANELLO
361ea8cad3 Update Django Tables 2, change accessor from dot to __ 2020-09-01 17:58:58 +02:00
erdnaxe
08defd84e6 Merge branch 'debian_deps' into 'beta'
Debian deps

See merge request bde/nk20!103
2020-09-01 16:09:00 +02:00
Yohann D'ANELLO
7c9287e387 Test and cover note app 2020-09-01 15:54:56 +02:00
Yohann D'ANELLO
c6abad107a RecurrentTransaction has no longer a category 2020-09-01 15:54:35 +02:00
Yohann D'ANELLO
81e418e17e Use DateTimeField instead of Field in Transaction search form 2020-09-01 15:53:56 +02:00
Yohann D'ANELLO
1977e403e3 History tables are not orderable 2020-09-01 15:52:54 +02:00
Yohann D'ANELLO
eaf256b1b6 Fix mails when the user or the club has a negative balance 2020-09-01 15:52:27 +02:00
Yohann D'ANELLO
2b70a05a9e Remove useless category field in RecurrentTransaction (that is the category of the template) 2020-09-01 15:51:47 +02:00
Alexandre Iooss
5feb23ad51 Use Debian font awesome 2020-09-01 14:33:38 +02:00
Alexandre Iooss
ff7e954652 Add missing card on button edit 2020-09-01 10:47:51 +02:00
Alexandre Iooss
534831f380 Use buttons in profile page 2020-09-01 10:30:47 +02:00
Alexandre Iooss
dd9ca315fa Clean up templates header 2020-09-01 10:20:16 +02:00
Alexandre Iooss
d9e003a8f4 Remove contenttitle 2020-09-01 10:13:05 +02:00
erdnaxe
dbca5db7d7 Merge branch 'front_erdnaxe' into 'beta'
Front erdnaxe

See merge request bde/nk20!101
2020-09-01 10:07:25 +02:00
Alexandre Iooss
b787c8cfe2 Do not make long alias break layout 2020-09-01 09:56:19 +02:00
Yohann D'ANELLO
e0c1a5f590 Move highlighted buttons under the note selector 2020-09-01 09:46:56 +02:00
Alexandre Iooss
e8dcf295ad Make outline button have a background 2020-09-01 09:46:33 +02:00
Yohann D'ANELLO
5642c268e9 Move transfer type selector in credit/debit mode 2020-08-31 23:06:21 +02:00
Yohann D'ANELLO
ee26850e34 Add a line to describe superusers, remove useless roles in rights table 2020-08-31 21:49:02 +02:00
Yohann D'ANELLO
08c8792aed Fix alias deletion 2020-08-31 21:32:45 +02:00
Yohann D'ANELLO
a9da4a38e1 Order superusers by last name 2020-08-31 21:15:09 +02:00
Yohann D'ANELLO
b8c1cfba40 Display superusers in rights list 2020-08-31 21:11:00 +02:00
Yohann D'ANELLO
5e65e2d74a Add "Lock note" feature 2020-08-31 20:15:48 +02:00
Yohann D'ANELLO
0c753c3288 Prevent also club owners when the note balance is negative 2020-08-31 16:13:26 +02:00
Yohann D'ANELLO
1bbe7df797 API app must have no dependency 2020-08-31 00:49:41 +02:00
Yohann D'ANELLO
abbe74cc55 Add activity type "Other" 2020-08-31 00:20:09 +02:00
Yohann D'ANELLO
8744455cbe Add placeholders in activity form 2020-08-31 00:15:02 +02:00
Yohann D'ANELLO
56c41258b9 Highlight non-validated activities 2020-08-30 23:54:54 +02:00
Yohann D'ANELLO
48eb0749e0 Users can create a past activity 2020-08-30 23:14:57 +02:00
Yohann D'ANELLO
8ac551e1bc Hide activity creater if the user is not able to validate it 2020-08-30 23:10:41 +02:00
Yohann D'ANELLO
805ceda249 Don't display the alias create form if the user can't create anyone 2020-08-30 23:06:51 +02:00
Yohann D'ANELLO
a9258c332a Order note research results: match first aliases then normalized names 2020-08-30 22:33:59 +02:00
Yohann D'ANELLO
ca7f4791ed Preserve dashes in Alias normalisation 2020-08-30 17:28:36 +02:00
Yohann D'ANELLO
7d539d44e5 Display form error when a permission is missing rather than display a 403 page 2020-08-30 16:23:55 +02:00
Yohann D'ANELLO
227cb2a801 Add light background to "Gift/Transfer" buttons 2020-08-30 15:49:06 +02:00
Yohann D'ANELLO
374e6ed7f8 💚 Fix CI 2020-08-30 11:59:10 +02:00
Yohann D'ANELLO
c5f40e0952 🐛 Fix entry page view 2020-08-29 23:06:50 +02:00
Alexandre Iooss
4cb162de87 Card for wei templates 2020-08-25 18:36:49 +02:00
Alexandre Iooss
bca301700d Cards for all treasury 2020-08-25 18:10:21 +02:00
Alexandre Iooss
22a0af640e Cards for activity templates 2020-08-25 17:39:30 +02:00
erdnaxe
93e5e4c8cd Merge branch 'morefront' into 'beta'
Do not list alias on profile page

See merge request bde/nk20!99
2020-08-25 16:44:55 +02:00
Alexandre Iooss
1fd37bb1ce Smaller membership renew btn 2020-08-25 16:44:01 +02:00
Alexandre Iooss
e3785e11f1 Cards everywhere in member app 2020-08-25 16:30:02 +02:00
Alexandre Iooss
2e659c63cd Member templates inherit from member/base.html 2020-08-25 15:39:57 +02:00
Alexandre Iooss
63dc184ce4 Do not list alias on profile page 2020-08-25 15:05:50 +02:00
Yohann D'ANELLO
b25935e579 When data is imported from the NK15, prevent users whenever some aliases are deleted 2020-08-24 12:41:51 +02:00
Yohann D'ANELLO
550242226e 🎨 Normalize - to _ since these characters are used a lot 2020-08-24 11:54:00 +02:00
Alexandre Iooss
e14c8734c2 Template formating on member app 2020-08-23 14:21:31 +02:00
Alexandre Iooss
44b7fe8f52 List aliases on profile page 2020-08-23 12:07:04 +02:00
Alexandre Iooss
cbc3e39bd6 Create base template for member and wei 2020-08-23 10:06:16 +02:00
Alexandre Iooss
1c16d6ef18 Use block.parent to extend content 2020-08-23 09:56:42 +02:00
Alexandre Iooss
0ba77fb8f0 Make alias form a bit more HTML friendly 2020-08-23 00:33:36 +02:00
Alexandre Iooss
342d3910c7 Set fluid container on parent template 2020-08-23 00:03:10 +02:00
Alexandre Iooss
2c1cf148fa Remove alias_update.html 2020-08-22 23:55:22 +02:00
Alexandre Iooss
196f796570 Move alias.js to local static 2020-08-22 23:54:58 +02:00
Alexandre Iooss
8691421ce3 Change cursor on select 2020-08-22 23:23:44 +02:00
Alexandre Iooss
9cad8fcc65 Simplify future user search 2020-08-22 10:13:48 +02:00
Alexandre Iooss
891955cedf Cards for all rights template 2020-08-22 10:01:22 +02:00
Alexandre Iooss
8465b24d7d Use base search for club list 2020-08-21 23:20:45 +02:00
Alexandre Iooss
aa98c4848d Create base template for search page 2020-08-21 23:11:25 +02:00
Alexandre Iooss
83d2c18d1e Debounce user search 2020-08-21 19:12:28 +02:00
Alexandre Iooss
5ea1eed76d Password reset use cards 2020-08-21 18:34:20 +02:00
Alexandre Iooss
a3af2b0d9a Hide login select arrow on firefox 2020-08-21 17:52:10 +02:00
Alexandre Iooss
310f55a28e Light background on login box 2020-08-21 14:43:25 +02:00
Alexandre Iooss
51230e029d Better navbar buttons and less shadow 2020-08-21 14:21:26 +02:00
Rida Lali
2672721235 Add blocks with collapse animation instead of display all 2020-08-21 08:18:00 +02:00
Yohann D'ANELLO
ba636fc401 Transfer from the Société générale is antedated 2020-08-21 07:40:27 +02:00
Yohann D'ANELLO
c090b4af76 Superusers can see their note even if they have no membership for local dev 2020-08-20 23:13:27 +02:00
Pierre-antoine Comby
a1dc8fe530 fix trailing comma 2020-08-19 23:00:49 +02:00
Pierre-antoine Comby
6ea92cdcde Merge branch 'documents' into beta 2020-08-19 13:18:12 +02:00
Pierre-antoine Comby
9c9214b5df [registration] comments 2020-08-19 13:03:36 +02:00
Pierre-antoine Comby
00935a8c02 [activity] comments on view and forms 2020-08-19 11:31:15 +02:00
Pierre-antoine Comby
b0ebc7c0a4 mv imageForm 2020-08-19 11:30:56 +02:00
Pierre-antoine Comby
60b1cdbcf8 comments member views 2020-08-18 18:19:39 +02:00
Pierre-antoine Comby
f324965f1a [note] comments view and templates 2020-08-18 14:27:04 +02:00
Yohann D'ANELLO
7c291b115a Ensure that date_end ≥ date_start in activities 2020-08-18 12:10:52 +02:00
Yohann D'ANELLO
6217f35f67 Notes are force-updated when a transaction is saved 2020-08-18 11:46:35 +02:00
Pierre-antoine Comby
448d379315 no need to disable turbolinks if we don't use select2 2020-08-18 11:45:30 +02:00
Yohann D'ANELLO
e974eaa1fe Tuple (name, date_start, date_end) must be unique for activities 2020-08-17 19:28:26 +02:00
Yohann D'ANELLO
61ace4af74 Replace timezone.now().date() by date.today() 2020-08-16 00:36:34 +02:00
Yohann D'ANELLO
b8c3dda95b Replace timezone.now().date() by date.today() 2020-08-16 00:35:13 +02:00
Yohann D'ANELLO
da23df05cb Kfet members can edit their own WEI registration 2020-08-16 00:15:33 +02:00
Yohann D'ANELLO
9f258e39b6 Check that the user is a member of the parent club only at the creation of the membership 2020-08-15 23:52:57 +02:00
Yohann D'ANELLO
4997a37058 Ensure that the user is authenticated before that it has the permission to see page 2020-08-15 23:27:58 +02:00
Yohann D'ANELLO
b16871d925 Display a form error rather than a page error if a guest is already invited 2020-08-15 23:03:49 +02:00
Yohann D'ANELLO
1186b0f9a9 Don't serialize *_ptr fields in logs 2020-08-15 22:54:16 +02:00
Yohann D'ANELLO
5abbb84254 Permissions for activities must be more specific to prevent that anyone can validate its own activity 2020-08-15 22:24:48 +02:00
Yohann D'ANELLO
5f8c4a2857 Prevent time travelers to register in the note 2020-08-15 21:30:08 +02:00
Yohann D'ANELLO
14b969b2dd Fix link in negative balances mails 2020-08-15 21:12:16 +02:00
Yohann D'ANELLO
f95a0875db Fix link in negative balances mails 2020-08-15 21:11:02 +02:00
Yohann D'ANELLO
430036bfc2 Don't display "change password" button on other profile pages 2020-08-15 20:59:45 +02:00
Yohann D'ANELLO
d6fd925fdd Display email and phone number in profile page 2020-08-15 20:40:11 +02:00
Yohann D'ANELLO
89c15cbe3e Refresh filters to search a transaction when a source or a destination is selected 2020-08-15 20:19:34 +02:00
Yohann D'ANELLO
75cd34f5dd Enlarge buttons table and transactions table 2020-08-15 20:04:19 +02:00
Yohann D'ANELLO
6927f5fbb6 Search buttons by category or description, highlight matched words 2020-08-15 19:47:29 +02:00
Yohann D'ANELLO
0bf5067b60 Fix linters 2020-08-15 19:10:23 +02:00
Yohann D'ANELLO
fe2af5ac2b Pass resourcetype argument correctly when invalidating a transaction 2020-08-15 19:10:15 +02:00
Yohann D'ANELLO
d4090a4043 🎉 Use select_for_update tag to update note balances when we save a Transaction to avoid concurrency issues 2020-08-15 18:57:44 +02:00
Yohann D'ANELLO
242b85676d Floats are already formatted 2020-08-14 19:37:17 +02:00
Yohann D'ANELLO
eca4767155 Mark fields in TeX templates as safe 2020-08-14 19:35:21 +02:00
Yohann D'ANELLO
21ba46c1bc Don't escape numbers in TeX template 2020-08-14 19:16:51 +02:00
Yohann D'ANELLO
74097ecc44 "safe" template tag is not made for TeX templates, it replaces ' with ' but & is a special character 2020-08-14 19:13:24 +02:00
Yohann D'ANELLO
d962763987 datetime.today() => date.today() 2020-08-14 19:04:44 +02:00
Yohann D'ANELLO
a43abee00b Don't log database changes when we check a permission 2020-08-14 19:00:57 +02:00
Yohann D'ANELLO
912ce5da2e Fix the amount history in the button update page 2020-08-13 20:13:00 +02:00
Yohann D'ANELLO
29f8b9215d Fix the amount history in the button update page 2020-08-13 20:06:06 +02:00
Yohann D'ANELLO
f5f379e6ad BooleanField -> CharField (a locale name is not a boolean) 2020-08-13 19:48:15 +02:00
Yohann D'ANELLO
c50fdd6689 Move the mailing list registration to the Profile model, see #50 2020-08-13 19:43:37 +02:00
Yohann D'ANELLO
1e4cbf60c5 Display the full price of the WEI, including the BDE and the Kfet membership 2020-08-13 19:29:01 +02:00
Yohann D'ANELLO
a25e663a26 Use datetime.today for DateField 2020-08-13 18:54:53 +02:00
Yohann D'ANELLO
721da093e9 Don't update membership information every time 2020-08-13 18:16:26 +02:00
Yohann D'ANELLO
d98e46ffc2 Store note balances in a big integer 2020-08-13 18:04:28 +02:00
Yohann D'ANELLO
2d69e36adf Store only changed data in logs 2020-08-13 17:08:15 +02:00
Yohann D'ANELLO
bb2704323a Spam click on invalidity button is no longer possible 2020-08-13 17:04:10 +02:00
Yohann D'ANELLO
c466715e8a Raise permission denied on CreateView if you don't have the permission to create a sample instance, see #53 2020-08-13 15:20:15 +02:00
Yohann D'ANELLO
71f6436d06 More WEI tests, > 97 % coverage 2020-08-11 13:30:44 +02:00
Yohann D'ANELLO
106e97f5df Tests are better when they work (fix two tests) 2020-08-11 01:07:45 +02:00
Yohann D'ANELLO
b7a88a387c More tests in WEI app, but we can still go further 2020-08-11 01:03:29 +02:00
Yohann D'ANELLO
25e26fe8cf Don't test LaTeX pages if LaTeX is not installed 2020-08-10 23:29:11 +02:00
Yohann D'ANELLO
0fae5b3e62 Create tests for the WEI app 2020-08-10 23:18:40 +02:00
Yohann D'ANELLO
3784e97d60 Hide the credit interface when editing a WEI registration 2020-08-10 20:09:49 +02:00
Yohann D'ANELLO
6567d2f8cc When an user is registering to the WEI, it doesn't pay the membership + the credit amount. The credit amount is deducted instead 2020-08-10 19:59:01 +02:00
Yohann D'ANELLO
999cc0a6b2 Tesdt login page 2020-08-10 19:36:04 +02:00
Yohann D'ANELLO
9c816a288d Stronger alias normalisation, ensure that normalized strings are encoded in ASCII. Closes #52 2020-08-10 18:36:47 +02:00
Alexandre Iooss
747a878cca Do not hover table when not clickable 2020-08-10 18:01:39 +02:00
Yohann D'ANELLO
c612e159cf See user information does not imply see the note balance 2020-08-10 16:32:45 +02:00
Yohann D'ANELLO
1b84c8c603 🐛 The balance must be greater than the *total* amount of a transaction, not the unit price 2020-08-10 16:05:50 +02:00
Alexandre Iooss
ccfc1e74ac Reorder import statements of apps/activity 2020-08-10 15:30:39 +02:00
Alexandre Iooss
bba69f0a60 Give Pikachu as an example 2020-08-10 12:09:05 +02:00
Alexandre Iooss
beff848796 Use a fixed-width container by default for lisibility 2020-08-10 12:08:47 +02:00
Alexandre Iooss
e78ba49252 Override Django Registration templates 2020-08-10 12:08:21 +02:00
Alexandre Iooss
ce35e8f7e8 Make the container customizable 2020-08-10 11:40:51 +02:00
Alexandre Iooss
50f4a43343 Custom CSS and card for login page 2020-08-10 11:31:35 +02:00
Alexandre Iooss
f6dfbb0b6c Fix amount of \ in apps/activity/views.py 2020-08-09 19:49:11 +02:00
Alexandre Iooss
c6e3a57801 Reorder import in apps/treasury/admin.py 2020-08-09 19:43:21 +02:00
Alexandre Iooss
40b826a375 Fix hanging indent in apps/note/tables.py 2020-08-09 19:42:09 +02:00
Alexandre Iooss
f0089d0bc5 Remove unused django.template.loader.render_to_string import 2020-08-09 19:39:17 +02:00
Alexandre Iooss
5e75a56eda missing whitespace after ':' in apps/wei/forms/registration.py 2020-08-09 19:38:23 +02:00
Alexandre Iooss
7b40ee1ca4 Reorder templates 2020-08-09 19:06:57 +02:00
Yohann D'ANELLO
764eaafb95 Emails are unique. Translate mail foooters. Closes #55 #56 2020-08-09 16:38:37 +02:00
Yohann D'ANELLO
5846f03220 🐛 Last report date is a datetime, not a date 2020-08-09 15:53:50 +02:00
Yohann D'ANELLO
52e8b46aa2 🐛 Last report date is a datetime, not a date 2020-08-09 15:50:51 +02:00
Yohann D'ANELLO
29f84ea007 Remove test code 2020-08-09 15:42:07 +02:00
Yohann D'ANELLO
49bda926c6 Disable turbolinks for pages that require custom JS, like calendars or autocomplete fields 2020-08-09 15:31:38 +02:00
Yohann D'ANELLO
11fbbca2a8 Amount help text in transaction templates forms can be misleading: they type euros not cents 2020-08-09 14:52:57 +02:00
Yohann D'ANELLO
5f87e76be8 Fix Profile model in Django Admin 2020-08-09 13:42:37 +02:00
Yohann D'ANELLO
872456df20 🐛 Don't break the note 2020-08-09 12:31:06 +02:00
Pierre-antoine Comby
963ba05d01 🎨 set default birthday to 2001-01-01 2020-08-08 16:20:59 +02:00
Pierre-antoine Comby
18eaf4477e 🐛 timezone.now is a DateTime, not a Date 2020-08-08 15:30:33 +02:00
Yohann D'ANELLO
e4998cb6e3 [WEI] Implement WEI Survey front 2020-08-07 20:11:28 +02:00
Yohann D'ANELLO
ad59b5c81e Change help text in membership fields in club form 2020-08-07 14:20:34 +02:00
Yohann D'ANELLO
88917dde23 Some memberships were detected twice 2020-08-07 14:00:54 +02:00
Yohann D'ANELLO
aab194b987 Import Société générale credits 2020-08-07 13:19:00 +02:00
Yohann D'ANELLO
9751a5ad92 🐛 Fix pagination in transaction page 2020-08-07 12:55:07 +02:00
Yohann D'ANELLO
679ac3a652 Lock invoices, delete them 2020-08-07 11:04:54 +02:00
Yohann D'ANELLO
1fb14ea33d Store invoice source code instead of generate it everytime 2020-08-06 22:30:14 +02:00
Yohann D'ANELLO
e23eafd56c Add invoices in Django Admin 2020-08-06 21:51:53 +02:00
Yohann D'ANELLO
5c01c0bb6c Display 2 decimals in invoices 2020-08-06 21:02:25 +02:00
Yohann D'ANELLO
979628b02d 🐛 default last_report date is today, not the migration date 2020-08-06 20:30:17 +02:00
Yohann D'ANELLO
fd2f426f55 🐛 Fix signup 2020-08-06 19:56:37 +02:00
Yohann D'ANELLO
48a7128370 📦 On a déménagé 2020-08-06 19:42:22 +02:00
Yohann D'ANELLO
d95cd8c7c7 🎨 Better autocomplete field 2020-08-06 18:27:57 +02:00
Yohann D'ANELLO
5b3361f086 Product quantity must be positive 2020-08-06 18:05:58 +02:00
Yohann D'ANELLO
9c7cb07dec Improve activity interface 2020-08-06 17:41:30 +02:00
Yohann D'ANELLO
dd4b24d999 Don't match users only with the start of the name 2020-08-06 15:21:16 +02:00
Yohann D'ANELLO
eb3d426947 💩 Don't reset a transaction before saving it... 2020-08-06 15:18:14 +02:00
Yohann D'ANELLO
d8c7018b9a FP is bugggy 2020-08-06 15:08:35 +02:00
Yohann D'ANELLO
f47a0b8c9d Use neg for negative numbers in invoices 2020-08-06 14:41:14 +02:00
Yohann D'ANELLO
c859fc7821 Use neg for negative numbers in invoices 2020-08-06 14:39:01 +02:00
Yohann D'ANELLO
a4702fca86 Escape special TeX characters 2020-08-06 14:19:51 +02:00
Yohann D'ANELLO
de5e0c958e Fix some activity errors 2020-08-06 14:11:55 +02:00
Yohann D'ANELLO
434a393f3b During the beta, don't update the wiki automatically 2020-08-06 13:09:35 +02:00
Yohann D'ANELLO
cba6a35b6c Display matched alias in user table 2020-08-06 13:07:22 +02:00
Yohann D'ANELLO
0de69cbfaf 💚 Fix linters 2020-08-06 12:50:24 +02:00
Yohann D'ANELLO
d9cf812074 🐛 Prevent transactions to have the same source and destination 2020-08-06 12:46:44 +02:00
Yohann D'ANELLO
6dcb82855d 🐛 Default comment is an empty string, not None 2020-08-06 12:31:57 +02:00
Yohann D'ANELLO
a07b942738 Export activities in the Crans Wiki 2020-08-06 12:15:37 +02:00
Yohann D'ANELLO
b7ae411f96 Export activities in the Crans Wiki 2020-08-06 12:15:23 +02:00
Yohann D'ANELLO
315af75c45 Backup database daily 2020-08-06 09:27:33 +02:00
Yohann D'ANELLO
fd7e314ca3 Don't log mails in database 2020-08-06 08:53:47 +02:00
Yohann D'ANELLO
2aebeb8927 respoinfo.bde => respo-info.bde 2020-08-06 08:13:44 +02:00
Yohann D'ANELLO
93f7e1d45b Fix check consistency script 2020-08-05 23:53:50 +02:00
Yohann D'ANELLO
199219861c Fix check consistency script 2020-08-05 23:51:59 +02:00
Yohann D'ANELLO
33806967c8 Prepare weekly reports 2020-08-05 23:19:17 +02:00
Yohann D'ANELLO
24ac3ce45f Display users that have surnormal roles 2020-08-05 21:07:31 +02:00
Yohann D'ANELLO
018ca84e2d Prevent superusers when they make a transaction with a non-member user 2020-08-05 20:40:30 +02:00
Yohann D'ANELLO
c205219d47 🐛 Fix transaction update concurency 2020-08-05 19:42:44 +02:00
Yohann D'ANELLO
b0398e59b8 🐛 Fix treasury 2020-08-05 18:04:01 +02:00
Yohann D'ANELLO
9c3e978a41 🐛 Fix signup 2020-08-05 16:27:44 +02:00
Yohann D'ANELLO
21f1347a60 🐛 Fix signup 2020-08-05 16:26:44 +02:00
Yohann D'ANELLO
af857d6fae 🐛 Prevent transactions where note balances go out integer bounds 2020-08-05 16:23:32 +02:00
Yohann D'ANELLO
acf7ecc4ae Use phone number validator 2020-08-05 14:14:51 +02:00
Yohann D'ANELLO
6c9cf73848 Update permissions to see our own note 2020-08-05 12:22:35 +02:00
Yohann D'ANELLO
a096dc4427 Adhere to parent clubs automatically, adhere to Kfet automatically when registering to the WEI 2020-08-04 20:04:41 +02:00
Yohann D'ANELLO
20ce817b16 🐛 WEI members must be members of the Kfet club *this year* 2020-08-03 23:55:01 +02:00
Yohann D'ANELLO
2a744a8610 Display invalid transactions but don't count on them in the total 2020-08-03 19:37:47 +02:00
Yohann D'ANELLO
0e8058ab0d Add script to send weekly report to all members 2020-08-03 19:35:25 +02:00
Yohann D'ANELLO
655390b265 A longer transaction history is better 2020-08-03 18:50:51 +02:00
Yohann D'ANELLO
985a5ca876 Add "search transactions page" 2020-08-03 18:49:15 +02:00
Yohann D'ANELLO
5ea8d8f870 🎨 Update activity interface 2020-08-03 16:11:05 +02:00
Yohann D'ANELLO
0a2c9d9c87 🐛 Better entry page 2020-08-03 15:44:06 +02:00
Yohann D'ANELLO
fbf3a0bcf6 🐛 A new user can't take an existing alias as username 2020-08-03 12:35:51 +02:00
Yohann D'ANELLO
66defee3ea 🐛 Display the invalidity reason of an invalid transaction even if we can't validate it 2020-08-03 11:41:06 +02:00
Yohann D'ANELLO
f8a4087e56 🐛 Display full registration table when the search bar is empty 2020-08-03 11:32:37 +02:00
Yohann D'ANELLO
94086505e6 Fix note balances 2020-08-03 11:16:01 +02:00
Yohann D'ANELLO
0e8174aacd 🐛 Fix objects with pk 0 2020-08-03 10:50:55 +02:00
Yohann D'ANELLO
58fe8914cf 🐛 Fix infinite loop in permission check 2020-08-02 22:39:30 +02:00
Yohann D'ANELLO
f870af139e Typos 2020-08-02 09:51:39 +02:00
Yohann D'ANELLO
7742358b8f Secretaries can view and add memberships 2020-08-02 09:49:45 +02:00
Yohann D'ANELLO
8de7ba14bd Add permission for secretaries 2020-08-02 09:35:32 +02:00
Yohann D'ANELLO
8497dbb25c Club members can see the club 2020-08-02 09:30:18 +02:00
Yohann D'ANELLO
2f018f8c9d Always query distinct objects 2020-08-02 08:57:16 +02:00
Yohann D'ANELLO
0ae61f3643 BDE memberships can start on 1st august 2020-08-02 08:47:23 +02:00
Yohann D'ANELLO
b706efe463 2A+ can change their selected bus or team if the registration is not validated 2020-08-01 23:27:07 +02:00
Yohann D'ANELLO
37dc535d6d Display only one user 2020-08-01 23:05:14 +02:00
Yohann D'ANELLO
c0cdb13130 Can't concatenate string and proxy 2020-08-01 22:30:34 +02:00
Yohann D'ANELLO
8434841ec5 Fix one permission 2020-08-01 22:28:28 +02:00
Yohann D'ANELLO
efc2b6b0b0 Send mail to users when the note balance is negative 2020-08-01 21:44:16 +02:00
Yohann D'ANELLO
51fbde23b9 Add note consistency check script 2020-08-01 18:06:53 +02:00
Yohann D'ANELLO
36f1a3f0d4 Activity admin site was missing 2020-08-01 18:05:31 +02:00
Yohann D'ANELLO
cc04fa5555 default=timezone.default is better than auto_now_add=True 2020-08-01 17:49:23 +02:00
Yohann D'ANELLO
43a22cbed4 💩 Fix account import 2020-08-01 16:37:54 +02:00
ynerant
e50bff8e14 Merge branch 'beta-soon' into 'master'
Pre-beta fixes

Closes #51

See merge request bde/nk20!86
2020-08-01 16:12:09 +02:00
Yohann D'ANELLO
b5586c647b 💚 Fix linters 2020-08-01 16:07:47 +02:00
Yohann D'ANELLO
377397b319 🐛 Fix WEI tables 2020-08-01 15:59:39 +02:00
Yohann D'ANELLO
7c369bd264 Update the balance of the Kfet club and import creation dates 2020-08-01 15:16:50 +02:00
Yohann D'ANELLO
b6453ce03d 💄 Improve Django Admin 2020-08-01 15:13:29 +02:00
Yohann D'ANELLO
23b775447c 🐛 Fix email validation link 2020-08-01 10:48:17 +02:00
Yohann D'ANELLO
d7b834d908 Translate rights 2020-07-31 22:29:23 +02:00
Yohann D'ANELLO
dca655949e Improve transfer UI 2020-07-31 21:24:23 +02:00
Yohann D'ANELLO
8409ee4cc4 Display "Create WEI" button only for people that can create a WEI, see #53 2020-07-31 17:15:31 +02:00
Yohann D'ANELLO
9008baad3a Better alias research, closes #51 2020-07-31 17:07:14 +02:00
Yohann D'ANELLO
fd705adb05 Filter members 2020-07-31 17:01:52 +02:00
Yohann D'ANELLO
bd35e4e21e Separate club members in a dedicated page (WIP) 2020-07-31 13:17:16 +02:00
Yohann D'ANELLO
72dcc93136 Club managers can register new members to a club, even if they don't have the right to create a transaction 2020-07-31 09:49:43 +02:00
Yohann D'ANELLO
cb38ceb2c6 New club members have only the role "Club member" by default and no other one 2020-07-31 09:41:22 +02:00
Yohann D'ANELLO
2642ae3a1a 🐛 Scripts subproject has disappeared 2020-07-30 20:41:19 +02:00
Yohann D'ANELLO
ad2cc22964 Transactions are not invalidable if the user doesn't have the right to 2020-07-30 17:52:04 +02:00
Yohann D'ANELLO
ae629b55ad Add HTML titles 2020-07-30 17:30:21 +02:00
Yohann D'ANELLO
a5e50e5de6 Display true note name next to the alias, whenever the user has low permissions 2020-07-30 16:48:34 +02:00
Yohann D'ANELLO
aa66361ac7 Update permissions to create clubs.
For now, only superusers can edit the roles of a user.
2020-07-30 16:36:44 +02:00
Yohann D'ANELLO
e9cbc8e623 Fix linters 2020-07-30 15:53:23 +02:00
Yohann D'ANELLO
9d8c588b78 Buttons list didn't work as well 2020-07-30 15:49:59 +02:00
Yohann D'ANELLO
9361f3f2f0 Aliases should load really faster 2020-07-30 15:07:30 +02:00
Yohann D'ANELLO
e63219f7ad Force delete some objects 2020-07-30 14:58:18 +02:00
Yohann D'ANELLO
0c0aed0234 🐛 Force delete didn't work as well when trying to check add permissions 2020-07-30 13:10:03 +02:00
Yohann D'ANELLO
fb775de923 Add backdoor to login as other users (in debug mode only) 2020-07-30 12:50:48 +02:00
Yohann D'ANELLO
224ef5b2f0 Allow users to have complicated username 2020-07-29 19:37:40 +02:00
Yohann D'ANELLO
cbd36f110a Another uplicated permission 2020-07-29 19:13:29 +02:00
Yohann D'ANELLO
c9e68ca66b Duplicated permission 2020-07-29 19:12:16 +02:00
Yohann D'ANELLO
20011db37e Order aliases by name 2020-07-29 19:03:11 +02:00
Yohann D'ANELLO
5a91cac08d Add permissions to see clubs and users 2020-07-29 18:37:42 +02:00
Yohann D'ANELLO
fa9159bb28 Alias pk != Note pk 2020-07-29 17:50:14 +02:00
Yohann D'ANELLO
4549255198 Treasurers can update invalidity reason 2020-07-29 17:42:06 +02:00
Yohann D'ANELLO
750bdcb2c5 Treasurers can of course click on buttons. Fix PATCH requests on the API 2020-07-29 12:25:53 +02:00
Yohann D'ANELLO
b8a88eeda4 Only staff with good permission mask can visit Django Admin 2020-07-29 11:38:59 +02:00
Yohann D'ANELLO
f597b6dbd8 Prevent creating club when there exists an alias that is similar to the name of the club 2020-07-28 23:16:38 +02:00
Yohann D'ANELLO
3a4145e4d9 Woops, roles didn't have the permissions 2020-07-28 20:56:22 +02:00
Yohann D'ANELLO
54ce157019 Store clothing cut and size in WEI registration 2020-07-28 20:49:32 +02:00
Yohann D'ANELLO
7c6bab88f4 Update permissions to see buses 2020-07-28 20:22:10 +02:00
Yohann D'ANELLO
12ebf9d12a Before checking membership roles, we wait before the creation of the membership 2020-07-28 19:38:25 +02:00
Yohann D'ANELLO
0bfc3b9454 Not-yet-registered WEI members can see their registrations 2020-07-28 18:09:43 +02:00
Yohann D'ANELLO
84e8b02594 🐛 Calculating permissions faster 2020-07-28 15:25:08 +02:00
Yohann D'ANELLO
09027ea35e Store transactions by default 2020-07-27 00:16:28 +02:00
Yohann D'ANELLO
2f334e0707 Fix remittance import 2020-07-26 23:59:18 +02:00
Yohann D'ANELLO
e163f86f69 Section is not importable yet 2020-07-26 12:11:17 +02:00
Yohann D'ANELLO
0335a47667 Anonymize data, fix remittance import, better Ansible 2020-07-26 12:05:41 +02:00
Yohann D'ANELLO
b8d4fb9df1 🐛 Don't import only the last remittance... 2020-07-26 09:06:08 +02:00
Yohann D'ANELLO
8cde94c5f5 Import remittances 2020-07-26 01:01:21 +02:00
Yohann D'ANELLO
4c29d855d2 Fix RolePermissions merge 2020-07-25 20:07:45 +02:00
Yohann D'ANELLO
55bc288deb Some roles can only be given in some clubs 2020-07-25 19:59:04 +02:00
Yohann D'ANELLO
fb5e2578af Merge Role and RolePermissions 2020-07-25 19:40:30 +02:00
Yohann D'ANELLO
18bdc8044b 🐛 Minor fixes 2020-07-25 18:26:18 +02:00
Yohann D'ANELLO
f0bca69825 🐛 Minor fixes 2020-07-25 18:18:53 +02:00
Yohann D'ANELLO
afb35d7ae0 Fix linters 2020-07-25 17:42:44 +02:00
Yohann D'ANELLO
b212bf4093 Fix linters 2020-07-25 17:42:32 +02:00
Yohann D'ANELLO
2eb601bd66 💥 Improve performances 2020-07-25 17:25:57 +02:00
Yohann D'ANELLO
50024dc03d 🐛 Fix NK15 import 2020-07-23 07:21:49 +02:00
Yohann D'ANELLO
e3045522d1 Bind GuestTransaction to entry rather than guest (fix OneToOneField) 2020-07-22 21:05:25 +02:00
Yohann D'ANELLO
a098f70424 Better import 2020-07-22 01:46:31 +02:00
ynerant
1735ba25a8 Merge branch 'beta-soon' into 'master'
Beta soon

See merge request bde/nk20!85
2020-07-21 22:47:50 +02:00
Yohann D'ANELLO
71f6daf0e8 Add permission for treasurers to update the validation status of a transaction 2020-07-13 12:10:01 +02:00
Yohann D'ANELLO
2c7995a79e A transaction can only be created between active notes 2020-06-21 22:47:05 +02:00
Yohann D'ANELLO
ac5041f3ec Better club search bar 2020-06-21 22:27:32 +02:00
Yohann D'ANELLO
b46854e479 Rework on Docker image 2020-06-21 20:27:42 +02:00
Pierre-antoine Comby
a90eb2a6eb Merge branch 'order_table' into 'master'
order table of club for Pollion

See merge request bde/nk20!84
2020-06-02 09:43:12 +02:00
Pierre-antoine Comby
f2ac0cd8cf order table of club for Pollion 2020-06-02 09:37:25 +02:00
Yohann D'ANELLO
302f9e752c Create a test to check that permission queries are well formed 2020-05-30 15:46:09 +02:00
Yohann D'ANELLO
a9ccf46010 Linters 2020-05-29 21:43:24 +02:00
Yohann D'ANELLO
f567b1a343 Activity list is displayed in the right order 2020-05-29 21:37:44 +02:00
Yohann D'ANELLO
155b2df330 Fix some permissions, users can log in 2020-05-29 21:26:05 +02:00
Yohann D'ANELLO
716232e27f With distinct permissions, we don't need to check ~ 100 000 permissions to check if someone can log in 2020-05-29 21:11:51 +02:00
Yohann D'ANELLO
c62b5f935a Merge remote-tracking branch 'origin/master' into beta-soon
# Conflicts:
#	apps/scripts
2020-05-29 21:11:14 +02:00
Pierre-antoine Comby
f468c2f939 Merge branch 'import_nk15' into 'master'
Import nk15

See merge request bde/nk20!81
2020-05-25 22:09:52 +02:00
Pierre-antoine Comby
79fbe96fe1 updates scripts 2020-05-25 12:26:33 +02:00
Pierre-antoine Comby
110ef79951 move wei script to wei app 2020-05-14 15:16:10 +02:00
Yohann D'ANELLO
f7b68678d8 Prepare production, we will send mails 2020-05-08 15:59:31 +02:00
Yohann D'ANELLO
4108babdb4 Permissions can be permanent 2020-05-07 21:14:36 +02:00
Yohann D'ANELLO
fdf373d1d5 Merge remote-tracking branch 'origin/master' into import_nk15
# Conflicts:
#	apps/treasury/signals.py
2020-05-07 19:01:23 +02:00
ynerant
395c52220f Merge branch 'master' into 'tranfer_front'
# Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html
2020-05-07 18:48:35 +02:00
Yohann D'ANELLO
8c0ccdfdd0 Don't change the password of another member (+ minor fixes on WEI app) 2020-04-27 20:25:02 +02:00
Yohann D'ANELLO
eb39aff1ab Fix email validation, turbolinks link 2020-04-27 17:59:34 +02:00
Yohann D'ANELLO
5ea531fe68 Filter buttons list with visible buttons only 2020-04-27 03:56:22 +02:00
Yohann D'ANELLO
2bc2048076 RecurrentTransaction amount history 2020-04-27 03:21:13 +02:00
Yohann D'ANELLO
a83ab4bf85 Add a public rights page to view which permissions are granted to which role, update Font Awesome to 5.13 2020-04-26 01:20:46 +02:00
Yohann D'ANELLO
b0f6ec1061 Remove debug print line 2020-04-26 01:19:19 +02:00
Yohann D'ANELLO
957344922b Custom error pages 2020-04-25 19:29:18 +02:00
Yohann D'ANELLO
f35246c9e2 Send a mail to webmasters when an error occurs (in production mode) 2020-04-25 19:29:01 +02:00
Yohann D'ANELLO
705313edb6 Add Bus information in the WEI survey "api" 2020-04-24 19:34:20 +02:00
Yohann D'ANELLO
cdff0d3893 We can view and update our WEI registration while we are not fully registered to the WEI. 2020-04-24 14:30:18 +02:00
Yohann D'ANELLO
96a87483cc Order registration by promotion rather than by roles 2020-04-24 14:05:06 +02:00
Yohann D'ANELLO
16079e3cc5 Fix broken WEI permissions 2020-04-24 14:03:25 +02:00
Yohann D'ANELLO
edf2f793e2 Fields were missing in the generated CSV, better to be coherent with the header 2020-04-23 21:29:43 +02:00
Yohann D'ANELLO
60b579f7c6 Update the generation of the PDF files for WEI registrations (now borderless and smaller) 2020-04-23 21:16:14 +02:00
Yohann D'ANELLO
b81f186866 Add PDF member lists 2020-04-23 18:28:16 +02:00
Yohann D'ANELLO
38b32b0623 Update scripts README, fix make_su script 2020-04-23 15:40:38 +02:00
Yohann D'ANELLO
83bc017668 Move WEI scripts to the scripts app 2020-04-23 14:33:41 +02:00
Yohann D'ANELLO
05fa27ac57 Extract clubs mailing list 2020-04-22 20:02:30 +02:00
Yohann D'ANELLO
135cca18cc Extract active members mailing list 2020-04-22 20:00:41 +02:00
Yohann D'ANELLO
1152a43af5 Extract mailing list registrations 2020-04-22 17:53:42 +02:00
Yohann D'ANELLO
46464f535c Update translations 2020-04-22 17:30:17 +02:00
Yohann D'ANELLO
c31fb0c13d Add department and promotion in Profile model 2020-04-22 16:25:09 +02:00
Yohann D'ANELLO
a85a5bf8fe Add initial WEI permissions 2020-04-22 13:28:52 +02:00
Yohann D'ANELLO
640f0f9a31 Don't delete Sogé credits if the user don't have enough money on its note, stay positive :) 2020-04-22 03:57:19 +02:00
Yohann D'ANELLO
b23814aef0 Handle credits from the Société générale 2020-04-22 03:26:45 +02:00
Yohann D'ANELLO
f83f6da79a Better tables 2020-04-21 17:49:06 +02:00
Yohann D'ANELLO
73878d03ab Delete registrations 2020-04-21 01:06:54 +02:00
Yohann D'ANELLO
1c7d4fbbec 2A+ can select a bus (and fix random bugs) 2020-04-21 00:07:00 +02:00
Yohann D'ANELLO
47b9b53591 Protect all from update if the WEI is ended (or not started), remove useless fixture 2020-04-20 04:53:26 +02:00
Yohann D'ANELLO
16af9ac0ea Improve survey, comment code 2020-04-20 01:26:53 +02:00
Yohann D'ANELLO
473d3c3546 Integrate survey results into validation form 2020-04-19 22:16:57 +02:00
Yohann D'ANELLO
69ac5cd291 Revert changes on some comments 2020-04-19 20:45:59 +02:00
Yohann D'ANELLO
8113c5cd61 WEI Survey (work in progress) 2020-04-19 20:35:49 +02:00
Pierre-antoine Comby
6d27193ac4 update import script 2020-04-18 16:07:45 +02:00
Pierre-antoine Comby
038ddc2ab8 remittance need preciser check (bug during import) 2020-04-18 15:59:59 +02:00
Pierre-antoine Comby
cc97948c24 clean specialTransaction 2020-04-18 15:59:06 +02:00
Pierre-antoine Comby
53748cd534 frenglish -> english 2020-04-18 15:57:11 +02:00
Yohann D'ANELLO
b62fa4cc6d Register users themselves 2020-04-18 03:55:30 +02:00
Yohann D'ANELLO
0c9409fd4b Improve WEI UI 2020-04-18 03:27:12 +02:00
Yohann D'ANELLO
d7da876a23 Add a link to register 1A 2020-04-17 21:48:50 +02:00
Yohann D'ANELLO
96ad5385b0 Distinguish new and old members 2020-04-17 00:48:54 +02:00
Yohann D'ANELLO
080510bcf2 Add WEI form on signup form 2020-04-16 23:31:36 +02:00
Yohann D'ANELLO
db67598b25 Validate WEI memberships 2020-04-14 04:46:52 +02:00
Yohann D'ANELLO
36b26e0baa Validation form (only front) 2020-04-14 03:41:26 +02:00
Yohann D'ANELLO
0bf958dbd6 Edit and view teams 2020-04-13 21:16:52 +02:00
Yohann D'ANELLO
840376a4f5 Add teams 2020-04-13 06:01:27 +02:00
Yohann D'ANELLO
822853be66 Add a bus 2020-04-13 05:02:16 +02:00
Yohann D'ANELLO
6242e316ae Update pre-registrations 2020-04-12 04:39:57 +02:00
Yohann D'ANELLO
bdb0f677e5 List pre-registrations (TODO: filter) 2020-04-12 04:29:44 +02:00
Yohann D'ANELLO
6b8e9d45fd Pre-register 2A+ 2020-04-12 03:31:08 +02:00
Yohann D'ANELLO
ea8e25a7b3 Create WEI 2020-04-12 02:43:22 +02:00
Yohann D'ANELLO
69b7f31eed Add lorem ipsum, update WEI 2020-04-12 02:30:48 +02:00
Yohann D'ANELLO
7ad32c2afd View detail of a WEI 2020-04-12 00:06:20 +02:00
Yohann D'ANELLO
31d2224b8f List wei 2020-04-11 23:02:12 +02:00
Yohann D'ANELLO
a186ccbb26 Update WEI models 2020-04-11 17:42:08 +02:00
Yohann D'ANELLO
154ea64b9f Launching WEI app, add models 2020-04-11 03:37:06 +02:00
Yohann D'ANELLO
a609d7c995 Fix credit/debit tabs 2020-04-10 23:41:13 +02:00
Yohann D'ANELLO
658d402242 Notes of users that don't have validated their email addresses are displayed with a different background 2020-04-10 02:56:56 +02:00
Yohann D'ANELLO
6477590cd4 Fix devalidation 2020-04-10 00:09:10 +02:00
Yohann D'ANELLO
751147f254 Don't display a note that we can't see, fix CI, fix distinct fields on PostgresSQL DB 2020-04-10 00:02:22 +02:00
Yohann D'ANELLO
bac81cd13e Merge branch 'master' into tranfer_front
# Conflicts:
#	static/js/base.js
2020-04-09 22:49:52 +02:00
Pierre-antoine Comby
161d2ceed7 Merge branch 'explicit>implicit' into 'master'
Explicit>implicit

See merge request bde/nk20!75
2020-04-09 22:41:04 +02:00
Pierre-antoine Comby
99d3ba9c1a Merge branch 'master' into 'explicit>implicit'
# Conflicts:
#   apps/activity/views.py
2020-04-09 22:31:54 +02:00
Pierre-antoine Comby
68808ddece Merge branch 'master' into 'fix_distinct'
# Conflicts:
#   apps/activity/views.py
2020-04-09 22:30:19 +02:00
Yohann D'ANELLO
fc511689b0 Update mail translation 2020-04-09 22:03:26 +02:00
Yohann D'ANELLO
e067b19d41 Paginate memberships and transactions 2020-04-06 19:51:39 +02:00
Pierre-antoine Comby
7e0aac0125 add docstring for entry 2020-04-06 12:32:44 +02:00
Pierre-antoine Comby
61b32f9aec explicit context is better than implicit ctx 2020-04-06 12:13:12 +02:00
Pierre-antoine Comby
9fbfac7bdb distinct on field not supported by sqlite 2020-04-06 11:44:02 +02:00
Yohann D'ANELLO
6fedbe2a2a Some model translations were missing 2020-04-06 10:58:16 +02:00
Yohann D'ANELLO
bd41560f45 Update permission fixtures 2020-04-06 10:45:32 +02:00
Yohann D'ANELLO
f833f1c46c Comment code 2020-04-06 08:58:39 +02:00
Yohann D'ANELLO
9d584ae87a Add shortcuts for transfers and credits in the activity entry page 2020-04-06 07:06:52 +02:00
Yohann D'ANELLO
6498a20b87 A user is active iff the email and the account are validated 2020-04-06 03:58:48 +02:00
Yohann D'ANELLO
2c3127c746 Société générale can pay BDE membership renewal (only once) 2020-04-05 22:35:56 +02:00
Yohann D'ANELLO
c513759515 Credit note for membership renewals 2020-04-05 21:56:56 +02:00
Yohann D'ANELLO
515edc4459 Credit note for new memberships 2020-04-05 18:37:04 +02:00
Yohann D'ANELLO
5b61db8821 We adhere other users, not ourself... 2020-04-05 16:18:56 +02:00
Yohann D'ANELLO
e8133805f5 Users must be member of the BDE club 2020-04-05 16:07:31 +02:00
Yohann D'ANELLO
f2baeedc01 Add basic roles for BDE and Kfet 2020-04-05 16:05:49 +02:00
Yohann D'ANELLO
ff820ef086 Update translations 2020-04-05 15:42:09 +02:00
Yohann D'ANELLO
f286f99ced Handle payments from the Société Générale, closes #15 2020-04-05 15:31:39 +02:00
Yohann D'ANELLO
3516b1fa04 Add links to resend mail confirmations 2020-04-05 09:48:23 +02:00
Yohann D'ANELLO
fbc25240e6 Validate registrations, closes #14, #18, #19 2020-04-05 09:09:21 +02:00
Yohann D'ANELLO
b1cd46bf7d Invalidate registrations, fix profile creation 2020-04-05 08:01:51 +02:00
Yohann D'ANELLO
f10497bac3 List pending users 2020-04-05 06:40:03 +02:00
Yohann D'ANELLO
49807d33d9 Use a separate app for registration 2020-04-05 05:17:28 +02:00
Yohann D'ANELLO
0f77b9df9a Unvalidate e-mail when the user changes it, but the user still active 2020-04-05 04:37:29 +02:00
Yohann D'ANELLO
26281af673 Send an e-mail verification to a new registered user 2020-04-05 04:26:42 +02:00
Yohann D'ANELLO
0cdc8ae004 RolePermissions were missing in the API 2020-04-02 16:06:58 +02:00
Yohann D'ANELLO
17ea2246ca Remove useless field in activities 2020-04-02 15:43:41 +02:00
Yohann D'ANELLO
be42801709 The memoization doesn't work when objects don't have a primary key. 2020-04-02 14:50:28 +02:00
Yohann D'ANELLO
8ad464ae0c Fix CI 2020-04-02 00:42:00 +02:00
Yohann D'ANELLO
5c9c0bbc2a Optimize permissions, use memoization 2020-04-02 00:30:22 +02:00
Yohann D'ANELLO
3f5faa0b05 Add tab for user list 2020-04-01 20:56:24 +02:00
Yohann D'ANELLO
5eb08fd822 Dynamic user research 2020-04-01 20:14:16 +02:00
Yohann D'ANELLO
2853fe252b Renew memberships 2020-04-01 18:47:56 +02:00
Yohann D'ANELLO
356c8588e7 Users that are not member of the club Kfet can't have a negative balance 2020-04-01 17:00:06 +02:00
Yohann D'ANELLO
92ab5ee3af Fix memberships with clubs without memberships (we always need treasurers...) 2020-04-01 04:34:42 +02:00
Yohann D'ANELLO
535c493bc7 Fix some issues 2020-04-01 04:20:47 +02:00
Yohann D'ANELLO
0df0f3f66b Membership fees for paid and unpaid students, closes #43 2020-04-01 04:07:55 +02:00
Yohann D'ANELLO
d5b010980b Full membership support 2020-04-01 03:42:19 +02:00
Yohann D'ANELLO
bf9789bd9e Restructurate memberships, closes #16 2020-03-31 23:54:14 +02:00
Yohann D'ANELLO
e98693b214 Memberships are optional for clubs 2020-03-31 16:22:11 +02:00
Yohann D'ANELLO
dd3b7bd7e5 Remove note activities 2020-03-31 14:57:44 +02:00
Yohann D'ANELLO
12945945bc Update translations 2020-03-31 14:10:30 +02:00
Yohann D'ANELLO
1aae18e6a6 Improved permissions, 404 and 403 errors will be more frequent (when we type an invalid URL) 2020-03-31 04:16:30 +02:00
Yohann D'ANELLO
c384ee02eb Implement a new type of note (see #45) 2020-03-31 01:03:30 +02:00
Yohann D'ANELLO
b0b3aa35a9 Guests can't be invited if the activity is not validated 2020-03-30 17:35:47 +02:00
Yohann D'ANELLO
fcb4da2db3 Guests can't be invited since the activity is started 2020-03-30 17:27:02 +02:00
Yohann D'ANELLO
fb5796d35e Guests can't be invited more than 5 times a year and a member can't invite more than 3 people per activity. 2020-03-30 00:42:32 +02:00
Yohann D'ANELLO
691a03ecad Add some initial permissions for activities 2020-03-28 19:05:21 +01:00
Pierre-antoine Comby
6ea59a4603 Merge branch 'master' into tranfer_front 2020-03-28 17:47:20 +01:00
Pierre-antoine Comby
d8949a993a get alias and note infos together 2020-03-28 17:42:29 +01:00
Yohann D'ANELLO
c8b72cf1ff Guests can pay with CB or coins, lot of other improvements 2020-03-28 16:52:58 +01:00
Yohann D'ANELLO
81cfaf12fa People can join activities 2020-03-28 13:38:31 +01:00
Yohann D'ANELLO
a805e41367 Fix CI 2020-03-28 02:09:10 +01:00
Yohann D'ANELLO
08ed694438 Update translations 2020-03-28 02:08:29 +01:00
Yohann D'ANELLO
a8422411bc Entry page (we can search people) 2020-03-28 01:45:13 +01:00
Yohann D'ANELLO
8c1d902c30 Open and validate activities 2020-03-27 22:48:20 +01:00
Yohann D'ANELLO
d6e202a26f Display guests list 2020-03-27 21:18:27 +01:00