done
This commit is contained in:
@@ -2,6 +2,8 @@ from django.contrib.auth.models import User
|
||||
from django.db import models
|
||||
from django.utils import timezone
|
||||
|
||||
from Main.models.task import Task
|
||||
|
||||
|
||||
class Set(models.Model):
|
||||
name = models.TextField()
|
||||
@@ -18,3 +20,7 @@ class Set(models.Model):
|
||||
and (self.start_time is None or timezone.now() >= self.start_time)
|
||||
and (self.end_time is None or timezone.now() <= self.end_time)
|
||||
)
|
||||
|
||||
@property
|
||||
def tasks(self):
|
||||
return Task.objects.filter(settasks__set=self).order_by('settasks__name')
|
||||
|
@@ -5,6 +5,6 @@ from Main.models.set import Set
|
||||
|
||||
|
||||
class SetTask(models.Model):
|
||||
set = models.ForeignKey(Set, on_delete=models.CASCADE)
|
||||
set = models.ForeignKey(Set, on_delete=models.CASCADE, related_name="settasks")
|
||||
task = models.ForeignKey(Task, on_delete=models.CASCADE, related_name="settasks")
|
||||
name = models.CharField(max_length=2)
|
||||
|
@@ -1,8 +1,8 @@
|
||||
from django.contrib.auth.models import User
|
||||
from django.db import models
|
||||
from django.db.models import Q
|
||||
from django.utils import timezone
|
||||
|
||||
from Main.models.set import Set
|
||||
from Main.models.group import Group
|
||||
from Main.models.settask import SetTask
|
||||
from Main.models.subscription import Subscription
|
||||
@@ -55,6 +55,10 @@ class UserInfo(models.Model):
|
||||
self._append_task(task, tasks)
|
||||
return sorted(tasks, key=lambda x: x.time_estimation)
|
||||
|
||||
@property
|
||||
def available_sets(self):
|
||||
return Set.objects.all()
|
||||
|
||||
@property
|
||||
def place(self):
|
||||
return len(UserInfo.objects.filter(rating__gt=self.rating)) + 1
|
||||
|
Reference in New Issue
Block a user