Compare commits

..

5 Commits

Author SHA1 Message Date
hugoooo 0cdca28238 Merge branch 'summary_notes' into 'main'
treasury summary

See merge request bde/nk20!223
2024-09-18 19:52:30 +02:00
thomasl a0de63effd Merge branch 'beta' into 'main'
Correction translation of sport events ml

See merge request bde/nk20!276
2024-09-18 13:52:33 +02:00
korenstin 09fb1d227e Correction translation of sport events ml 2024-09-18 08:54:04 +02:00
thomasl 2e27d4f05c Merge branch 'non-BDE-members-permission-fix' into 'main'
Added some necessary rights

See merge request bde/nk20!275
2024-09-17 17:24:30 +02:00
Nicolas Margulies 5d16dc4e7d Added some necessary rights 2024-09-17 17:13:47 +02:00
3 changed files with 4 additions and 4 deletions

View File

@ -3912,7 +3912,8 @@
12, 12,
13, 13,
14, 14,
22 22,
48
] ]
} }
}, },
@ -3961,6 +3962,7 @@
"for_club": null, "for_club": null,
"name": "Tr\u00e9sorièr\u22c5e de club", "name": "Tr\u00e9sorièr\u22c5e de club",
"permissions": [ "permissions": [
6,
19, 19,
20, 20,
21, 21,

View File

@ -279,7 +279,6 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
# surveys = [s for s in surveys if s.bus_id != None] # surveys = [s for s in surveys if s.bus_id != None]
# surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded] # surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
# surveys = [s for s in surveys if s.registration.user_id in free_users] # surveys = [s for s in surveys if s.registration.user_id in free_users]
# hardcoded_first_year_mb = WEIMembership.objects.filter(bus != None,registration__first_year=True) # hardcoded_first_year_mb = WEIMembership.objects.filter(bus != None,registration__first_year=True)
@ -288,7 +287,6 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
hardcoded_first_year_mb = WEIMembership.objects.filter(registration__first_year=True) hardcoded_first_year_mb = WEIMembership.objects.filter(registration__first_year=True)
hardcoded_first_year = {mb.user.id if mb.bus else None: mb.bus.id if mb.bus else None for mb in hardcoded_first_year_mb} hardcoded_first_year = {mb.user.id if mb.bus else None: mb.bus.id if mb.bus else None for mb in hardcoded_first_year_mb}
# Reset previous algorithm run # Reset previous algorithm run
for survey in surveys: for survey in surveys:
survey.free() survey.free()
@ -296,7 +294,6 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
survey.select_bus(hardcoded_first_year[s.registration.user_id]) survey.select_bus(hardcoded_first_year[s.registration.user_id])
survey.save() survey.save()
non_men = [s for s in surveys if s.registration.gender != 'male'] non_men = [s for s in surveys if s.registration.gender != 'male']
men = [s for s in surveys if s.registration.gender == 'male'] men = [s for s in surveys if s.registration.gender == 'male']

View File

@ -1032,6 +1032,7 @@ msgid ""
"Register on the mailing list to stay informed of the sport events of the " "Register on the mailing list to stay informed of the sport events of the "
"campus (1 mail/week)" "campus (1 mail/week)"
msgstr "" msgstr ""
"S'inscrire sur la liste de diffusion pour rester informé·e des actualités "
"sportives sur le campus (1 mail par semaine)" "sportives sur le campus (1 mail par semaine)"
#: apps/member/models.py:113 #: apps/member/models.py:113