ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity
1,902 Commits 20 Branches 4 Tags 27 MiB
Commit Graph

377 Commits

Author SHA1 Message Date
Yohann D'ANELLO 8434c0062c Merge branch 'beta' into JS_translations 
# Conflicts:
#	apps/note/static/note/js/consos.js
#	locale/de/LC_MESSAGES/django.po
#	locale/es/LC_MESSAGES/django.po
#	locale/fr/LC_MESSAGES/django.po
 2020-11-16 00:59:26 +01:00
Yohann D'ANELLO 23243e09bb Fix some errors on JS string interpolation 2020-11-15 23:37:36 +01:00
Yohann D'ANELLO 5635598bbc Extract strings from javascript files and translate them in french 2020-11-15 23:28:41 +01:00
Yohann D'ANELLO 18a8ff1b8a Set credit/debit reason non mandatory 2020-10-07 09:45:09 +02:00
Yohann D'ANELLO c61bb2e90d When we credit the note of a club directly, fill the last name and the first name information with the club name instead of empty 2020-10-07 09:39:40 +02:00
Yohann D'ANELLO 541ed59f40 When a membership is created, redirect to the user profile page rather than club detail 2020-10-04 21:08:35 +02:00
Yohann D'ANELLO f22e92132c Select for update transaction notes, and not only the transaction 2020-10-04 20:47:15 +02:00
Yohann D'ANELLO ca7ad05746 Use a signal to prevent a user that the note balance is negative 2020-10-04 20:26:43 +02:00
Yohann D'ANELLO e48ef92137 Revert commit that broke beta branch 2020-09-23 18:32:09 +02:00
Yohann D'ANELLO 3ba61385a3 Debit is not credit 2020-09-20 11:12:44 +02:00
elkmaennchen d566def706 Try to translate js, not working... 2020-09-19 22:03:45 +02:00
Yohann D'ANELLO 180cd3e1ec Fix registration permissions and procedure 2020-09-14 09:49:30 +02:00
Yohann D'ANELLO 5ed0560953 Fix linting 2020-09-14 09:09:20 +02:00
Yohann D'ANELLO dbc6fbbf71 Fix the validation clicker issue, now the note is safe 2020-09-14 09:05:35 +02:00
Yohann D'ANELLO 9b090a145c All transactions are now atomic 2020-09-11 22:52:16 +02:00
Yohann D'ANELLO 860c7b50e5 Filter a consumer by its note id 2020-09-10 14:42:52 +02:00
Yohann D'ANELLO afdc75c0bd Access to consumer object wa buggy 2020-09-10 14:41:09 +02:00
Yohann D'ANELLO c6603e8aa7 Add more filters in the API 2020-09-10 14:37:11 +02:00
Alexandre Iooss c720e5483e Move transfer.js where it belongs 2020-09-09 16:45:15 +02:00
Alexandre Iooss 0fd3e9db78 Move consos.js where it belongs 2020-09-09 16:42:45 +02:00
Alexandre Iooss ce4c22a4a1 Smaller text and larger padding on note label 2020-09-09 15:03:34 +02:00
Alexandre Iooss 8225445c3e Update translations 2020-09-09 14:10:07 +02:00
Alexandre Iooss f333e6a875 Fix profile picture width 2020-09-09 14:03:49 +02:00
Yohann D'ANELLO fa3c723140 The BDE offers 80 € to each new member that registers to the Société générale 2020-09-07 21:33:23 +02:00
Yohann D'ANELLO 78586b9343 Don't trigger signals when we add an object through a permission check 2020-09-07 14:52:37 +02:00
ynerant 9eff3d8850 Merge branch 'no_null_charfield' into 'beta' 
Add __str__ to models, remove null=True in CharField and TextField

See merge request bde/nk20!117
 2020-09-07 11:39:19 +02:00
Yohann D'ANELLO f3f746aba8 Plain text mode in reports 2020-09-07 11:03:58 +02:00
Yohann D'ANELLO 53c4e38771 Add __str__ to models, remove null=True in CharField and TextField 2020-09-07 01:06:22 +02:00
Alexandre Iooss 27aa2e9da8 JQuery is unable to cancel Turbolinks 2020-09-06 21:41:33 +02:00
Alexandre Iooss 89b2ff52e3 Fix I'm the emitter button 2020-09-06 21:38:55 +02:00
Yohann D'ANELLO 1023c6c502 Use pre_delete signal insted of Model.delete() to prevent note balance issues when deleting a transaction (don't do it) in Django Admin 2020-09-06 20:18:59 +02:00
Yohann D'ANELLO b63fa19644 With normal rights, notes were displayed as there were inactive 2020-09-06 09:10:57 +02:00
Yohann D'ANELLO 00bc9550f2 Add padding to the the note picture (cc shirenn) 2020-09-05 19:27:22 +02:00
Yohann D'ANELLO be8e74d056 If a note is saved and the main name changed without changing the normalized form, update the main alias 2020-09-05 15:41:47 +02:00
Yohann D'ANELLO 9f619a9df8 Center profile picture in transfer interface, closes #61 2020-09-05 14:36:49 +02:00
Yohann D'ANELLO 2a8a5cd736 Fix some linting, some complex functions are remaining 2020-09-05 14:29:40 +02:00
Yohann D'ANELLO 2e13356e39 Fix a bug in note saving 2020-09-05 13:52:03 +02:00
Yohann D'ANELLO bcb2398d68 Use migrations instead of fixtures to create BDE, Kfet and special notes 2020-09-05 10:33:24 +02:00
Yohann D'ANELLO 751a4291ab We are in production, then we commit migrations 2020-09-05 10:05:17 +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 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 8db9e92986 Sqlite does not support order by in subqueries 2020-09-02 18:01:41 +02:00
Yohann D'ANELLO d76aa3fec9 Some table accessors weren't updated 2020-09-01 19:04:35 +02:00
Yohann D'ANELLO 7c9287e387 Test and cover note app 2020-09-01 15:54:56 +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 ff7e954652 Add missing card on button edit 2020-09-01 10:47:51 +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 08c8792aed Fix alias deletion 2020-08-31 21:32:45 +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 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 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
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 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
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 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 51230e029d Better navbar buttons and less shadow 2020-08-21 14:21:26 +02:00
Pierre-antoine Comby 6ea92cdcde Merge branch 'documents' into beta 2020-08-19 13:18:12 +02:00
Pierre-antoine Comby b0ebc7c0a4 mv imageForm 2020-08-19 11:30:56 +02:00
Pierre-antoine Comby f324965f1a [note] comments view and templates 2020-08-18 14:27:04 +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 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 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 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 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 d98e46ffc2 Store note balances in a big integer 2020-08-13 18:04:28 +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 b7a88a387c More tests in WEI app, but we can still go further 2020-08-11 01:03:29 +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
Alexandre Iooss beff848796 Use a fixed-width container by default for lisibility 2020-08-10 12:08:47 +02:00
Alexandre Iooss 40b826a375 Fix hanging indent in apps/note/tables.py 2020-08-09 19:42:09 +02:00
Alexandre Iooss 7b40ee1ca4 Reorder templates 2020-08-09 19:06:57 +02:00
Yohann D'ANELLO 29f84ea007 Remove test code 2020-08-09 15:42:07 +02:00