fix sample
This commit is contained in:
parent
d64df414eb
commit
20e0d1333b
@ -36,11 +36,11 @@ class MainView(BaseView):
|
|||||||
all_tasks = Task.objects.filter(solution__user=self.request.user).distinct()
|
all_tasks = Task.objects.filter(solution__user=self.request.user).distinct()
|
||||||
ok_tasks = all_tasks.filter(solution__result="OK").distinct()
|
ok_tasks = all_tasks.filter(solution__result="OK").distinct()
|
||||||
undone_tasks = set(all_tasks) - set(ok_tasks)
|
undone_tasks = set(all_tasks) - set(ok_tasks)
|
||||||
self.context['undone_tasks'] = sample(undone_tasks, k=min(5, len(undone_tasks)))
|
self.context['undone_tasks'] = sample(list(undone_tasks), k=min(5, len(undone_tasks)))
|
||||||
for task in self.context['undone_tasks']:
|
for task in self.context['undone_tasks']:
|
||||||
setattr(task, 'solution', Solution.objects.filter(user=self.request.user, task=task).last())
|
setattr(task, 'solution', Solution.objects.filter(user=self.request.user, task=task).last())
|
||||||
new_tasks = set(Task.objects.filter(public=True)) - set(all_tasks)
|
new_tasks = set(Task.objects.filter(public=True)) - set(all_tasks)
|
||||||
self.context['new_tasks'] = sample(new_tasks, k=min(5, len(new_tasks)))
|
self.context['new_tasks'] = sample(list(new_tasks), k=min(5, len(new_tasks)))
|
||||||
self.context['groups'] = Group.objects.filter(
|
self.context['groups'] = Group.objects.filter(
|
||||||
Q(editors__in=self.request.user.username) | Q(creator=self.request.user) | Q(
|
Q(editors__in=self.request.user.username) | Q(creator=self.request.user) | Q(
|
||||||
users=self.request.user)).distinct()
|
users=self.request.user)).distinct()
|
||||||
|
Loading…
Reference in New Issue
Block a user