ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-04-21 14:22:30 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:a90f45bd8b9295b18967a5649b74b6ecec902c25
Branches Tags
ynerant:main
ynerant:update_invoice_template
ynerant:time-display
ynerant:guests_schools
ynerant:export_members_ml
ynerant:notekfet_wrapped
ynerant:Add_some_permissions
ynerant:permissions_fo_parent_clubs
ynerant:respo_comm_permissionsV2
ynerant:fix_activity_view
ynerant:Automation_mailing_lists
ynerant:potvieux
ynerant:New_permission
ynerant:finito_sda
ynerant:beta
ynerant:non-BDE-members-permission-fix
ynerant:survey_wei_2024
ynerant:migration-django-4-2
ynerant:food_traceability
ynerant:summary_notes
ynerant:traduction_inclusive_fr
ynerant:migration-django-5-0
ynerant:qrcode
ynerant:VSS
ynerant:update_permission
ynerant:fix_pipeline
ynerant:permission_var
ynerant:inclusive
ynerant:nix-shell
ynerant:sheets
ynerant:svg_icons
ynerant:faster_ci
ynerant:v1.0.3
ynerant:v1.0.2
ynerant:v1.0.1
ynerant:v1.0.0
...
compare: ynerant:235b071ee6f5e34458bf5ecee63a927b4d45762c
Branches Tags
ynerant:main
ynerant:update_invoice_template
ynerant:time-display
ynerant:guests_schools
ynerant:export_members_ml
ynerant:notekfet_wrapped
ynerant:Add_some_permissions
ynerant:permissions_fo_parent_clubs
ynerant:respo_comm_permissionsV2
ynerant:fix_activity_view
ynerant:Automation_mailing_lists
ynerant:potvieux
ynerant:New_permission
ynerant:finito_sda
ynerant:beta
ynerant:non-BDE-members-permission-fix
ynerant:survey_wei_2024
ynerant:migration-django-4-2
ynerant:food_traceability
ynerant:summary_notes
ynerant:traduction_inclusive_fr
ynerant:migration-django-5-0
ynerant:qrcode
ynerant:VSS
ynerant:update_permission
ynerant:fix_pipeline
ynerant:permission_var
ynerant:inclusive
ynerant:nix-shell
ynerant:sheets
ynerant:svg_icons
ynerant:faster_ci
ynerant:v1.0.3
ynerant:v1.0.2
ynerant:v1.0.1
ynerant:v1.0.0

10 Commits
a90f45bd8b ... 235b071ee6

Author SHA1 Message Date
ehouarn
235b071ee6 Upload New File 2025-04-14 19:29:37 +02:00
ehouarn
9a67bb5e8f Upload New File 2025-04-14 19:20:32 +02:00
ehouarn
fbd301dc58 Update models.py 2025-04-14 19:17:44 +02:00
ehouarn
8e2b24b2da Merge branch 'options_order' into 'main' 
Options order

See merge request bde/nk20!306
 2025-04-13 23:12:05 +02:00
ehouarn
bd76c280ec Update forms.py 2025-04-13 22:59:04 +02:00
ehouarn
ca0a95ba9e Update transaction_form.html 2025-04-13 22:32:49 +02:00
alexismdr
614f76e699 Add BDA email as an option to fix NL updates 
Commit [1] removed default BDA email address from extract_ml_registrations script code. We should now add it to cron.

[1] 3dd5f6e3e0

See merge request bde/nk20!305
 2025-04-13 20:17:44 +02:00
alexismdr
a5815f0bc7 Add BDA email as an option to fix NL updates 
Commit [1] removed default BDA email address from extract_ml_registrations script code. We should now add it to cron.

[1] 3dd5f6e3e0
 2025-04-13 19:56:20 +02:00
alexismdr
b7a660ee40 bootstrap: fix minor issues with profile picture cropping 
* Add required [1] "display: block;" style property to img element
* Fix image overflow in modal. As cropper size inherits from img's parent element [2] (including padding according to my research), we need to wrap modal body into another div that has the padding we want.
* Remove ability [3] to click away to dismiss the modal as it often interfered with user interaction when cropping.

[1] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#example
[2] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#notes
[3] https://getbootstrap.com/docs/4.0/components/modal/#options

See merge request bde/nk20!301
 2025-04-04 01:14:46 +02:00
Alexis Mercier des Rochettes
93aed87265 bootstrap: fix minor issues with profile picture cropping 
* Add required [1] "display: block;" style property to img element
* Fix image overflow in modal. As cropper size inherits from img's parent element [2] (including padding according to my research), we need to wrap modal body into another div that has the padding we want.
* Remove ability [3] to click away to dismiss the modal as it often interfered with user interaction when cropping.

[1] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#example
[2] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#notes
[3] https://getbootstrap.com/docs/4.0/components/modal/#options

Signed-off-by: Alexis Mercier des Rochettes <apernouille@gmail.com>
 2025-03-24 17:36:30 +01:00
7 changed files with 11 additions and 8 deletions
Show Stats Expand all files Collapse all files

2
apps/member/forms.py
View File

@ -23,7 +23,7 @@ from .models import Profile, Club, Membership
class CustomAuthenticationForm(AuthenticationForm): class CustomAuthenticationForm(AuthenticationForm):
permission_mask = forms.ModelChoiceField( permission_mask = forms.ModelChoiceField(
label=_("Permission mask"), label=_("Permission mask"),
queryset=PermissionMask.objects.order_by("rank"), queryset=PermissionMask.objects.order_by("-rank"),
empty_label=None, empty_label=None,
) )

10
apps/member/templates/member/picture_update.html
View File

@ -20,12 +20,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
</form> </form>
</div> </div>
<!-- MODAL TO CROP THE IMAGE --> <!-- MODAL TO CROP THE IMAGE -->
<div class="modal fade" id="modalCrop"> <div class="modal fade" id="modalCrop" data-backdrop="static">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body-wrapper" style="width: 500px; height: 500px; padding: 16px;">
<img src="" id="modal-image" style="max-width: 100%;"> <div class="modal-body" style="width: 100%; height: 100%; padding: 0">
</div> <img src="" id="modal-image" style="display: block; max-width: 100%;">
</div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<div class="btn-group pull-left" role="group"> <div class="btn-group pull-left" role="group">
<button type="button" class="btn btn-default" id="js-zoom-in"> <button type="button" class="btn btn-default" id="js-zoom-in">

2
apps/note/templates/note/transaction_form.html
View File

@ -89,7 +89,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
</ul> </ul>
<div class="card-body"> <div class="card-body">
<select id="debit_type" class="form-control custom-select d-none"> <select id="debit_type" class="form-control custom-select d-none">
{% for special_type in special_types %} {% for special_type in special_types|slice:"::-1" %}
<option value="{{ special_type.id }}">{{ special_type.special_type }}</option> <option value="{{ special_type.id }}">{{ special_type.special_type }}</option>
{% endfor %} {% endfor %}
</select> </select>

3
apps/treasury/models.py
View File

@ -27,8 +27,9 @@ class Invoice(models.Model):
bde = models.CharField( bde = models.CharField(
max_length=32, max_length=32,
default='RavePartlist', default='Diolistos',
choices=( choices=(
('Diolistos', 'Dio[list]os')
('RavePartlist', 'RavePart[list]'), ('RavePartlist', 'RavePart[list]'),
('SecretStorlist', 'SecretStor[list]'), ('SecretStorlist', 'SecretStor[list]'),
('TotalistSpies', 'Tota[list]Spies'), ('TotalistSpies', 'Tota[list]Spies'),

BIN
apps/treasury/static/img/Diolistos.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 368 KiB

BIN
apps/treasury/static/img/Diolistos_bg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

2
note.cron
View File

@ -27,5 +27,5 @@ MAILTO=notekfet2020@lists.crans.org
# Vider les tokens Oauth2 # Vider les tokens Oauth2
00 6 * * * root cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0 00 6 * * * root cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0
# Envoyer la liste des abonnés à la NL BDA # Envoyer la liste des abonnés à la NL BDA
00 10 * * 0 root cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art 00 10 * * 0 root cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -e "bda.ensparissaclay@gmail.com"