Merge branch 'survey_wei_2024' into 'main'

update hardcoded

See merge request bde/nk20!273

apps/wei/forms/surveys/wei2024.py

@@ -276,27 +276,13 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
         surveys = list(self.get_survey_class()(r) for r in self.get_registrations())  # All surveys
         surveys = [s for s in surveys if s.is_complete()]  # Don't consider invalid surveys
         # Don't manage hardcoded people
-        # surveys = [s for s in surveys if s.bus_id != None]
+        surveys = [s for s in surveys if s.registration.bus is not 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)
-        # hardcoded_first_year = hardcoded_first_year_mb.values_list('user__id', 'bus__id')
-
-        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.save()
 
-
         non_men = [s for s in surveys if s.registration.gender != 'male']
         men = [s for s in surveys if s.registration.gender == 'male']
 
@@ -304,8 +290,7 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
         registrations = self.get_registrations()
         non_men_total = registrations.filter(~Q(gender='male')).count()
         for bus in self.get_buses():
-            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
+            free_seats = bus.size - WEIMembership.objects.filter(bus=bus).count()
-            free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
             quotas[bus] = 4 + int(non_men_total / registrations.count() * free_seats)
 
         tqdm_obj = None
@@ -318,7 +303,7 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
 
         quotas = {}
         for bus in self.get_buses():
-            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
+            free_seats = bus.size - WEIMembership.objects.filter(bus=bus).count()
             free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
             quotas[bus] = free_seats