mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-10-30 15:29:53 +01:00 
			
		
		
		
	Compare commits
	
		
			9 Commits
		
	
	
		
			non-BDE-me
			...
			a63c34fe37
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | a63c34fe37 | ||
|  | 2be6133458 | ||
|  | 7975fe47a6 | ||
|  | 476fbceeea | ||
|  | 8fbaa0bdc8 | ||
|  | a0de63effd | ||
|  | 09fb1d227e | ||
|  | 2e27d4f05c | ||
|  | 3c34033bf5 | 
| @@ -3800,6 +3800,22 @@ | ||||
|             "description": "Voir les utilisateurs adhérents au club parent" | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "model": "permission.permission", | ||||
|         "pk": 242, | ||||
|         "fields": { | ||||
|             "model": [ | ||||
|                 "note", | ||||
|                 "transaction" | ||||
|             ], | ||||
|             "query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]]", | ||||
|             "type": "add", | ||||
|             "mask": 2, | ||||
|             "field": "", | ||||
|             "permanent": false, | ||||
|             "description": "Créer une transaction vers la note d'un club" | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "model": "permission.role", | ||||
|         "pk": 1, | ||||
|   | ||||
| @@ -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 not hasattr(s.information, 'hardcoded') or not s.information.hardcoded] | ||||
|  | ||||
|  | ||||
|         # 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) | ||||
| @@ -288,15 +287,13 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm): | ||||
|         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} | ||||
|  | ||||
|  | ||||
|         # Reset previous algorithm run | ||||
|         for survey in surveys: | ||||
|             survey.free() | ||||
|             if survey.registration.user_id in hardcoded_first_year.keys(): | ||||
|                 survey.select_bus(hardcoded_first_year[s.registration.user_id]) | ||||
|                 survey.select_bus(hardcoded_first_year[survey.registration.user_id]) | ||||
|             survey.save() | ||||
|  | ||||
|  | ||||
|         non_men = [s for s in surveys if s.registration.gender != 'male'] | ||||
|         men = [s for s in surveys if s.registration.gender == 'male'] | ||||
|  | ||||
|   | ||||
| @@ -1032,6 +1032,7 @@ msgid "" | ||||
| "Register on the mailing list to stay informed of the sport events of the " | ||||
| "campus (1 mail/week)" | ||||
| msgstr "" | ||||
| "S'inscrire sur la liste de diffusion pour rester informé·e des actualités " | ||||
| "sportives sur le campus (1 mail par semaine)" | ||||
|  | ||||
| #: apps/member/models.py:113 | ||||
|   | ||||
| @@ -159,6 +159,11 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|     </nav> | ||||
|     <div class="{% block containertype %}container{% endblock %} my-3"> | ||||
| 	<div id="messages"> | ||||
| 	    {% if user.is_authenticated %} | ||||
| 		<div class="alert alert-info"> | ||||
| 		    Venez au festival des Sens de l'Art du 2 au 7 décembre 🐘 ! | ||||
| 		</div> | ||||
| 	    {% endif %} | ||||
|             {% if user.is_authenticated %} | ||||
|                 {% if not user|is_member:"BDE" %} | ||||
|                     <div class="alert alert-danger"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user