mirror of
https://github.com/Rushilwiz/SkoolOS.git
synced 2025-04-16 02:10:19 -04:00
Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development
This commit is contained in:
commit
2de86475e7
|
@ -5,7 +5,7 @@ import secrets
|
|||
|
||||
|
||||
class Student(models.Model):
|
||||
user = models.OneToOneField(User, on_delete=models.CASCADE)
|
||||
user = models.OneToOneField(User, blank=True, on_delete=models.CASCADE)
|
||||
ion_user = models.CharField(max_length=100, primary_key=True)
|
||||
grade = models.IntegerField(default=0, blank=True)
|
||||
git=models.CharField(default="", max_length=100, blank=True)
|
||||
|
@ -20,8 +20,9 @@ class Student(models.Model):
|
|||
def __str__(self):
|
||||
return f"{self.user.username}'s Profile"
|
||||
|
||||
|
||||
class Assignment(models.Model):
|
||||
owner = models.ForeignKey('auth.User', related_name='aowner', on_delete=models.CASCADE)
|
||||
owner = models.ForeignKey(User, null=True, blank=True, related_name='aowner', on_delete=models.CASCADE)
|
||||
|
||||
name=models.CharField(max_length=100, primary_key=True)
|
||||
due_date=models.DateTimeField()
|
||||
|
@ -33,8 +34,9 @@ class Assignment(models.Model):
|
|||
def __str__(self):
|
||||
return '%s' % (self.name)
|
||||
|
||||
|
||||
class Class(models.Model):
|
||||
owner = models.ForeignKey('auth.User', related_name='cowner', on_delete=models.CASCADE)
|
||||
owner = models.ForeignKey(User, null=True, blank=True, related_name='cowner', on_delete=models.CASCADE)
|
||||
teacher = models.CharField(max_length=100)
|
||||
name = models.CharField(primary_key=True, max_length=100)
|
||||
id = models.CharField(max_length=8, blank=True, null=True)
|
||||
|
|
Loading…
Reference in New Issue
Block a user