thomas girod
04e7f65e8e
Merge pull request #725 from ae-utbm/drop-jquery-calendar
...
Remove jquery datetimepicker
2024-07-25 01:20:41 +02:00
fee7ade1a5
Harmonize test names
2024-07-24 00:50:48 +02:00
thomas girod
d51dbf8a53
Merge pull request #724 from ae-utbm/ninja
...
Use django-ninja for the API
2024-07-24 00:48:08 +02:00
thomas girod
9295325d21
remove jquery datetime picker
2024-07-23 23:26:48 +02:00
thomas girod
3046438cb1
replace drf by django-ninja
2024-07-23 19:57:33 +02:00
thomas girod
82d3791859
refactor counter
2024-07-21 10:51:08 +02:00
thomas girod
8c69a94488
use google convention for docstrings
2024-07-21 00:57:04 +02:00
thomas girod
e5a2236d72
remove pytz
2024-07-18 17:33:14 +02:00
thomas girod
c6d2ac9100
ruff rule B
2024-07-08 15:37:10 +02:00
thomas girod
2ac578c3ad
ruff rule DJ
...
Co-authored-by: Bartuccio Antoine <klmp200@users.noreply.github.com>
2024-07-08 15:37:10 +02:00
thomas girod
171a1cb876
ruff rule FBT
2024-07-08 15:37:09 +02:00
thomas girod
cfc19434d0
ruff rules UP008 and UP009
2024-07-08 15:37:09 +02:00
thomas girod
aa07fa9207
faster tests
2024-07-04 14:03:19 +02:00
thomas girod
cd58d5a357
resolve warnings
2024-07-04 11:31:35 +02:00
thomas girod
ae1fcdb8c0
fix: CashRegisterSummaryItem.check overriding a django method
2024-07-04 11:20:24 +02:00
thomas girod
d97602e60b
Use pytest for tests ( #681 )
...
* use pytest for tests
Eh ouais, il y a que la config qui change. Pytest est implémentable par étapes. Et ça c'est beau.
* rework tests with pytest
* remove unittest custom TestRunner
* Edit doc and CI
2024-06-26 19:10:24 +02:00
thomas girod
3143d3d91a
reorganize imports with ruff
2024-06-26 12:35:38 +02:00
thomas girod
9bdf3fc4ac
use ruff for formating
...
Co-authored-by: Bartuccio Antoine <klmp200@users.noreply.github.com>
2024-06-26 12:35:14 +02:00
Julien Constant
d16bf12611
Links update & translations typos fixes ( #671 )
...
* Remove BDF link (as BDF is now part of AE)
* Remove unused pages
* Fix typos
* Fix typo again
2023-10-10 15:29:02 +02:00
Julien Constant
38295e591d
Fix immutable default variable in get_start_of_semester ( #656 )
...
Le serveur ne percevait pas le changement de semestre, parce
que la valeur par défaut passée à la fonction `get_start_of_semester()` était une fonction appelée une seule fois, lors du lancement du serveur. Bref, c'était ça : https://beta.ruff.rs/docs/rules/function-call-in-default-argument/
---------
Co-authored-by: imperosol <thgirod@hotmail.com>
2023-09-07 23:11:58 +02:00
Julien Constant
b30ee0a27a
[FIX] Correction de bugs ( #617 )
...
* Fix #600
* Fix #602
* Fixes & améliorations du nouveau CSS (#616 )
* Fix #604
* should fix #605
* Fix #608
* Update core/views/site.py
Co-Authored-By: thomas girod <56346771+imperosol@users.noreply.github.com>
* Added back the permission denied
* Should fix #609
* Fix failing test when 2 user are merged
* Should fix #610
* Should fix #627
* Should fix #109
Block les URLs suivantes lorsque le fichier se trouve dans le dir `profiles` ou `SAS` :
- `/file/<id>/`
- `/file/<id>/[delete|prop|edit]`
> Les urls du SAS restent accessiblent pour les roots & les admins SAS
> Les urls de profiles sont uniquement accessiblent aux roots
* Fix root dir of SAS being unnaccessible for sas admins
⚠️ need to edit the SAS directory & save it (no changes required in sas directory properties)
* Remove overwritten code
* Should fix duplicated albums in user profile (wtf)
* Fix typo
* Extended profiles picture access to board members
* Should fix #607
* Fix keyboard navigation not working properly
* Fix user tagged pictures section inside python rather than in the template
* Update utils.py
* Apply suggested changes
* Fix #604
* Fix #608
* Added back the permission denied
* Should fix duplicated albums in user profile (wtf)
* Fix user tagged pictures section inside python rather than in the template
* Apply suggested changes
---------
Co-authored-by: thomas girod <56346771+imperosol@users.noreply.github.com>
2023-05-02 13:07:36 +02:00
thomas girod
ef968f3673
Better usage of cache for groups and clubs related operations ( #634 )
...
* Better usage of cache for group retrieval
* Cache clearing on object deletion or update
* replace signals by save and delete override
* add is_anonymous check in is_owned_by
Add in many is_owned_by(self, user) methods that user is not anonymous. Since many of those functions do db queries, this should reduce a little bit the load of the db.
* Stricter usage of User.is_in_group
Constrain the parameters that can be passed to the function to make sure only a str or an int can be used. Also force to explicitly specify if the group id or the group name is used.
* write test and correct bugs
* remove forgotten populate commands
* Correct test
2023-05-02 12:36:59 +02:00
thomas girod
96dede5077
Speed up tests ( #638 )
2023-05-02 11:00:23 +02:00
thomas girod
b5a40cfda9
Mise à jour de Black vers la version 23.3 ( #629 )
2023-04-22 15:32:31 +02:00
Julien Constant
8e7c025e47
[FIX] Broken link in readme and license fix (& update) ( #591 )
2023-04-04 18:39:45 +02:00
Julien Constant
28f397574f
Amélioration des pages utilisateurs pour les petits écrans ( #578 , #520 )
...
- Refonte de l'organisation des pages utilisateurs (principalement du front)
- Page des parrains/fillots
- Page d'édition du profil
- Page du profil
- Page des outils
- Page des préférences
- Page des stats utilisateurs
- Refonte du CSS / organisation de la navbar principale (en haut de l'écran)
- Refonte du CSS de la navbar bleu clair (le menu)
- Refonte du CSS du SAS :
- Page de photo
- Page d'albums
2023-03-30 14:38:40 +02:00
thomas girod
6c1fa6de0b
remove-useless-queries-counter-stats ( #519 )
2023-03-24 15:32:05 +01:00
Théo DURR
f0a08afd31
Merge branch 'repair_NaN_bug_on_click' into taiste
2023-03-10 10:50:26 +01:00
Thomas Girod
25c5a3297c
Repair NaN bug for autocomplete on counter click
2023-03-09 14:21:12 +01:00
Théo DURR
dd3ad42eb5
Mise à jour de février ( #581 )
...
Co-authored-by: Thomas Girod <thgirod@hotmail.com>
Co-authored-by: Julien Constant <julienconstant190@gmail.com>
Co-authored-by: Skia <skia@hya.sk>
2023-03-09 13:39:33 +01:00
thomas girod
a73fe598ef
repair user merging tool ( #498 )
2023-03-04 15:01:08 +01:00
thomas girod
394e17d599
resolved importError ( #565 )
2023-01-13 02:22:53 +01:00
thomas girod
59136850b8
Merge pull request #530 from ae-utbm/redirection_for_barmen
...
redirect the user directly on counter when barman
2023-01-11 23:24:45 +01:00
thomas girod
d726f4b1e8
Merge pull request #499 from ae-utbm/unify-account-creation
...
Unify account id creation
2023-01-11 13:26:00 +01:00
thomas girod
705b9b1e6a
Passage de vue à Alpine pour les comptoirs ( #561 )
...
Vue, c'est cool, mais avec Django c'est un peu chiant à utiliser. Alpine a l'avantage d'être plus léger et d'avoir une syntaxe qui ne ressemble pas à celle de Jinja (ce qui évite d'avoir à mettre des {% raw %} partout).
2023-01-10 22:26:46 +01:00
Thomas Girod
31e8ad8a3e
redirect directly on counter if user is barman
2023-01-10 17:37:26 +01:00
thomas girod
99827e005b
upgrade re_path to path ( #533 )
2023-01-09 22:07:03 +01:00
Thomas Girod
751c8a8bc6
unify account_id creation
2023-01-09 21:40:38 +01:00
thomas girod
73305c0b28
Implémentation 3DSv2 + résolution bugs eboutic + amélioration pages admin ( #558 )
...
Eboutic :
- Implémentation de la norme 3DSecure v2 pour les paiement par carte bancaire
- Amélioration générale de l'interface utilisateur
- Résolution du problème avec les caractères spéciaux dans le panier sur Safari
- Réparation du cookie du panier de l'eboutic qui n'était pas fonctionnel
Autre :
- Mise à jour de la documentation
- Mise à jour des dépendances Javascript
- Suppression du code inutilisé dans `subscription/models.py`
- Amélioration des pages administrateur (back-office Django)
Co-authored-by: thomas girod <56346771+imperosol@users.noreply.github.com>
Co-authored-by: Théo DURR <git@theodurr.fr>
Co-authored-by: Julien Constant <julienconstant190@gmail.com>
2023-01-09 20:53:12 +01:00
Théo DURR
4fe46fbcef
[FIX] 3DSv2 - Echappement du XML et modif tables ( #543 )
...
* Fixed wrong HMAC signature generation
* Updated migration files
Co-authored-by: Julien Constant <julienconstant190@gmail.com>
2023-01-09 17:46:34 +01:00
Théo DURR
fe8b8f46aa
Fix 3DSv2 implementation ( #542 )
...
* Fixed wrong HMAC signature generation
* Fix xml du panier
Co-authored-by: Julien Constant <julienconstant190@gmail.com>
2023-01-06 20:02:45 +01:00
Thomas Girod
ceb2888f82
enhance admin pages
2022-12-19 20:55:33 +01:00
thomas girod
1d82e2a7d9
Change country id to ISO 3166 1 numeric for 3DSV2 ( #510 )
2022-12-12 22:54:31 +01:00
thomas girod
b8a72c57e1
escape html characters on xml ( #505 )
2022-12-10 20:41:35 +01:00
Thomas Girod
fe9e5ce861
integration of 3D secure v2 for eboutic bank payment
2022-11-30 22:52:56 +01:00
Thomas Girod
60eff1000f
second patch on eboutic
2022-11-16 20:41:24 +01:00
Thomas Girod
3c1724fa81
Add warning message when user has no birthdate
2022-11-15 21:07:50 +01:00
Thomas Girod
8b09ba2924
refonte de la boutique en ligne
2022-10-30 12:33:21 +01:00
4f00224f0d
Update dependencies, apply black and fix wrong default SITH_COUNTER_OFFICES values
2022-08-04 18:42:29 +02:00
98bfc308a7
Minimal working version
...
* Upgrade dependencies
* Fix ugettext
* Fix bad urls
2022-08-04 00:28:09 +02:00
Alexandre | L'Sacienne
454ae5f9e3
Add authorization to refill to the counters AE & BdF
2022-05-22 09:56:53 +00:00
lsacienne
ba6599fa56
Add of tests
2022-05-05 23:24:08 +02:00
lsacienne
f2666f6fb0
Replace the query by a function which already
...
existed
2022-05-02 00:04:00 +02:00
lsacienne
ee3e375dde
Post request management
2022-04-28 11:13:07 +02:00
lsacienne
bbf362691b
Change to use settings instead of hardcoding
2022-04-27 15:38:55 +02:00
lsacienne
15e2c8c7b3
Fix the balck pipeline
2022-04-27 15:38:14 +02:00
lsacienne
c6caf5dbce
Add of restriction for refilling
2022-04-20 14:01:33 +02:00
lsacienne
757ff7ead7
Add of date in the counter/refilling_list view
2022-04-19 12:02:22 +02:00
Skia
bfa3b45547
counter_click.jinja: fix error display with Vue
2021-10-11 22:09:45 +02:00
Skia
1b688a8aa5
Add a first version of a mobile friendly UI
...
Although not perfect and with many flaws, this should still allow far
easier navigation on mobile devices.
2021-10-01 18:44:14 +02:00
tleb
49a0ade315
core: create TzAwareDateTimeField to replace forms.DateTimeField
2021-09-29 15:24:06 +02:00
Skia
a3158253a7
Black update
2021-09-26 13:58:39 +02:00
Skia
406380e4f1
counter: make click page dynamic to avoid repetitive loading
...
This makes the whole click page load only once for a normal click
workflow. The current basket is now rendered client side with Vue.JS,
and the backend view is able to answer with JSON if asked to.
This should lighten the workflow a lot on the client side, especially
with poor connectivity, and the server should also feel lighter during
big events, due to far less complex Jinja pages to render.
2021-09-26 13:58:39 +02:00
Skia
efb70652af
counter: redirect to counter main when barman login is timed out
2021-09-26 13:58:39 +02:00
Skia
05256bb99a
counter: templates: click: JS clean up
2021-09-26 13:58:39 +02:00
Skia
64d0cc2fa8
counter: don't display info boxes and navigation menu
...
This will lighten the pages and make the functionality directly
accessible without ever scrolling the header garbage that is never
needed on those pages.
2021-09-26 13:58:39 +02:00
f34f5fe693
Upgrade black and format accordingly
2020-08-27 15:59:42 +02:00
5c30de5f22
core: redesign request middleware with django latest design and better use of threading
2019-11-14 16:32:29 +01:00
e634cda318
core/counter: add generic operation logs and implements it for Sellings and Refilling deletions
2019-11-14 01:14:44 +01:00
209867b3a8
black: makes new version happy
2019-11-04 13:46:09 +01:00
Robin Trioux
59511d255f
eticketListView: product id instead of eticket id
2019-11-03 20:58:20 +01:00
566dcc7aee
counter: fix Selling view permission
2019-10-17 11:24:52 +02:00
241650c171
counter: fix eticket server crash induced by old permission system and fix Selling permission
2019-10-16 21:21:51 +02:00
Cyl
aac4e3b99c
Minor fix for requestGala
2019-10-14 00:32:11 +02:00
Robin Trioux
5a55a6c642
E-ticket link is sent in the email
2019-10-13 19:02:25 +02:00
97c316b62e
django2.2: replace removed is_anonymous() and is_authenticated to their now used counterparts
2019-10-08 22:46:03 +02:00
f7548ab8d1
django2.2: add on_delete on migrations for OneToOneField
2019-10-08 22:46:03 +02:00
3cb306bc91
django2.2: add on_delete on migrations for ForeignKey
2019-10-08 22:46:03 +02:00
12b6f0d488
django2.2: adapt DateTimeField in forms with the new API
2019-10-08 22:46:02 +02:00
6cc234e8d3
django2.2: add default mandatory on_delete on OneToOneField
2019-10-08 22:46:02 +02:00
4dadb1dbc0
django2.2: add default mandatory on_delete on all ForeignKey
2019-10-08 22:46:01 +02:00
2616e8b24c
django2.2: relpace django.core.urlresolvers by django.urls
2019-10-08 22:46:01 +02:00
be855c6c90
django2.2: migrate url to re_path
2019-10-08 22:46:01 +02:00
b7db969f08
Merge branch 'counter' into 'master'
...
[Counter] - Buying group is now required
See merge request ae/Sith!239
2019-09-20 14:03:07 +02:00
Cyl
14303fd46c
[Counter] - Buying group is now required
2019-09-19 23:04:03 +02:00
Cyl
8232ff59a0
[Counter] - add the product ID for every Eticket
2019-09-16 23:41:06 +02:00
405b938e08
counter: speed counter click interface and auto scroll
2019-09-10 14:22:13 +02:00
f0524a9f00
counter: fix error for stats 500 on PermissionDenied
2019-05-28 16:39:16 +02:00
1f3220246a
counter: fix a bug where you can't register UID card with only number inside
2019-05-24 08:38:15 +02:00
3bddf176d8
Fix typo for NFC cards
2019-05-20 19:12:53 +02:00
19e353970d
Enforce uid with uppercase for Studentcard and test more edge cases
2019-05-20 17:56:14 +02:00
5ae7d10e84
Add unit tests for student cards and fix edge cases
2019-05-20 17:56:09 +02:00
0ba0df0f29
Better handling of user rights for studentcards
2019-05-20 17:52:44 +02:00
616b7ccfc8
Nice user interface and permission rework
2019-05-20 17:52:39 +02:00
4669e5a4e9
Gui for studentcards in counters
2019-05-20 17:52:36 +02:00
14d9fc04d1
Stronger bdd validation for studentcards
2019-05-20 17:52:33 +02:00
577ad07a2b
Can identify user on counter with student card UID
2019-05-20 17:52:29 +02:00
cb58b00b6e
All: Apply Black coding rules
2018-10-05 21:52:55 +02:00
Skia
f2106a37a3
counter: fix tests
2018-06-07 19:57:56 +02:00
4af3239f4c
fix can_buy in customer
2017-12-01 01:44:38 +01:00
6113de33ec
Add comment in product type
2017-10-25 23:02:46 +02:00
3994a58a2f
Add search form in admin
2017-10-11 00:01:24 +02:00
9489b52304
Oups, I did it again...
2017-09-02 15:31:20 +02:00
e71db5a997
Add translations
2017-09-02 15:22:50 +02:00
39ce14804a
Add refillings list
2017-09-02 15:16:29 +02:00
Skia
9f259b35bd
core, counter: add preferences for counter notifications
...
Signed-off-by: Skia <skia@libskia.so>
2017-09-02 12:42:07 +02:00
c83a990165
Wtf migration blocking me
2017-08-22 16:03:24 +02:00
9cb88a878d
Even better mailing
2017-08-22 15:36:39 +02:00
6cfdcb093f
Wtf forgot this little guy
2017-08-17 00:10:12 +02:00
3e950e1dd1
Migration fix
2017-08-15 17:37:25 +02:00
de4521c192
Ecocup limit comments
2017-08-15 14:03:56 +02:00
748e3ae326
Refactor and migration corrections
2017-08-15 13:57:49 +02:00
240b68f98d
Allow negative amount for customer
2017-08-15 13:57:49 +02:00
d60e14a303
Migration from old database
2017-08-15 13:57:49 +02:00
7588cc8f73
Hardcoding ecocup values
2017-08-15 13:57:49 +02:00
40927fa13d
Add limit for ecocup recording
2017-08-15 13:57:49 +02:00
d722efc40f
Format counter
2017-06-13 10:04:13 +02:00
Skia
10ee5e1708
Merge branch 'counter' into 'master'
...
Tests for counter
See merge request !77
2017-06-07 19:45:05 +02:00
eb510e102c
Test for click
2017-06-07 19:28:15 +02:00
0076c9cdb4
Macro for pagination
2017-06-07 18:39:42 +02:00
0af72500c6
Add some tests on counter
2017-06-07 18:36:26 +02:00
Skia
63acf588ca
Add basic unfinished counter test
2017-06-07 18:36:26 +02:00
Skia
ec307cd5df
Add db index in counter
2017-05-30 19:33:09 +02:00
Skia
23fe797a9e
Make less DB queries (particularly in the Forum)
2017-05-14 04:38:33 +02:00
5a7b743c83
Try fix right issues in counter admin
2017-05-06 20:48:48 +02:00
Skia
c7f48bd5f7
Fix counter view with no stock
2017-05-01 19:39:28 +02:00
Skia
423313f008
Update stock translations
2017-04-25 09:41:05 +02:00
Skia
20deda8a8e
Merge branch 'master' into stock
2017-04-24 18:07:25 +02:00
Skia
83deae5964
Apply GPLv3 to Sith, and add header to every concerned file
2017-04-24 17:51:12 +02:00
553b33c313
Proposal for summary sending confirmation
2017-04-19 11:01:56 +02:00
edc438bc0e
More readability for sum
2017-04-05 15:08:11 +02:00
6ca183ad55
Better sum writing
2017-04-05 14:23:51 +02:00
53a2a160be
Add CB refills sum
2017-04-05 13:48:43 +02:00
34f3fadd3d
Rename counter mixin
2017-04-04 15:45:02 +02:00
d4815df55f
Better right counter management
2017-04-03 15:21:07 +02:00
824411b13d
Rights fix for counters
2017-04-03 13:50:28 +02:00
1430479a1d
Some rights fix
2017-04-03 11:57:28 +02:00
5d89786c8f
Serious counter fix
2017-04-03 10:46:53 +02:00
dfd465c7f9
Fix bug where customer can't buy an item when they have the just amount
2017-03-28 00:55:25 +02:00
0d918d80d3
Avoid negative value in refilings
2017-03-28 00:34:58 +02:00
ccd67e50b8
Avoid unothorised customer to buy in counter by modifying url
2017-03-27 23:28:06 +02:00
493d48bcca
Pagination length in settings
2017-03-13 23:33:43 +01:00
e4deacbe56
Pagination for cash sumary
2017-03-13 16:32:59 +01:00
158a140aa4
No negative values for cash summary
2017-03-01 10:21:57 +01:00
Skia
dea234f98a
Change is_subscriber and was_subscriber to cached_properties
2017-02-24 02:59:59 +01:00
Skia
27e69fd3b8
Bad hack to fix Firefox broken autofocus
2017-01-18 19:09:58 +01:00
Skia
a826fd40a3
Small update on last operations view
2017-01-13 13:13:31 +01:00
4a5d789d9f
partners banner added
2017-01-07 17:39:21 +01:00
guillaume-renaud
8f88f7cb70
Take item from stock form addition
2017-01-05 11:16:25 +01:00
guillaume-renaud
21c05cc779
Addition of the ShoppingList view to know the item to buy
2017-01-05 11:14:41 +01:00
