diff --git a/apps/member/views.py b/apps/member/views.py index 1054f3f2..57e4b1e0 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -746,6 +746,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView): # When we renew the BDE membership, we update the profile section # that should happens at least once a year. user.profile.section = user.profile.section_generated + user.profile._force_save = True user.profile.save() # Credit note before the membership is created. diff --git a/apps/scripts b/apps/scripts index 0c7070ae..1e9d7317 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 0c7070aea177e12fae099488e2ea6f8146b97e4d +Subproject commit 1e9d731715b9945a524aa8a4116936c9c2124ac7 diff --git a/note.cron b/note.cron index 90deac08..dd20c183 100644 --- a/note.cron +++ b/note.cron @@ -6,17 +6,17 @@ MAILTO=notekfet2020@lists.crans.org # m h dom mon dow user command # Envoyer les mails en attente - * * * * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail -v 0 - * * * * * root cd /var/www/note_kfet && env/bin/python manage.py retry_deferred -v 0 + * * * * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail -c 1 -v 0 + * * * * * root cd /var/www/note_kfet && env/bin/python manage.py retry_deferred -c 1 -v 0 00 0 * * * root cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 -v 0 # Faire une sauvegarde de la base de données 00 2 * * * root cd /var/www/note_kfet && apps/scripts/shell/backup_db # Vérifier la cohérence de la base et mailer en cas de problème - 00 4 * * * root cd /var/www/note_kfet && env/bin/python manage.py check_consistency --sum-all --check-all --mail -v 0 + 00 4 * * * root cd /var/www/note_kfet && env/bin/python manage.py check_consistency --sum-all --check-all -v 0 # Mettre à jour le wiki (modification sans (dé)validation, activités passées) 30 5 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_activities --raw --human --comment refresh --wiki -v 0 # Spammer les gens en négatif - 00 5 * * 2 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 0 -v 0 + 00 5 * * 2 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0 # Envoyer le rapport mensuel aux trésoriers et respos info 00 8 6 * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0 # Envoyer les rapports aux gens diff --git a/note_kfet/static/css/custom.css b/note_kfet/static/css/custom.css index 1f7cf763..cbd34b07 100644 --- a/note_kfet/static/css/custom.css +++ b/note_kfet/static/css/custom.css @@ -65,7 +65,7 @@ mark { /* Last BDE colors */ .bg-primary { - background-color: rgb(0, 119, 139) !important; + background-color: rgb(18, 67, 4) !important; } html { @@ -81,16 +81,30 @@ body { .btn-outline-primary:not(:disabled):not(.disabled).active, .btn-outline-primary:not(:disabled):not(.disabled):active { color: #fff; - background-color: rgb(0, 119, 139); - border-color: rgb(0, 119, 139); + background-color: rgb(18, 67, 46); + border-color: rgb(18, 67, 46); } .btn-outline-primary { - color: rgb(0, 119, 139); + color: rgb(18, 67, 46); background-color: rgba(248, 249, 250, 0.9); - border-color: rgb(0, 119, 139); + border-color: rgb(18, 67, 46); } .turbolinks-progress-bar { - background-color: #01D3FB; -} \ No newline at end of file + background-color: #12432E; +} + +.btn-primary:hover, +.btn-primary:not(:disabled):not(.disabled).active, +.btn-primary:not(:disabled):not(.disabled):active { + color: #fff; + background-color: rgb(18, 67, 46); + border-color: rgb(18, 67, 46); +} + +.btn-primary { + color: rgba(248, 249, 250, 0.9); + background-color: rgb(28, 114, 10); + border-color: rgb(18, 67, 46); +}