rushilwiz/SkoolOS
1
0
Fork 0
mirror of https://github.com/Rushilwiz/SkoolOS.git synced 2025-04-16 02:10:19 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/rushilwiz/SkoolOs into development

Browse Source 
going to bed?.
This commit is contained in:
Rushil Umaretiya 2020-06-16 01:15:06 -04:00
commit 626d793125
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
CLI/teacher.py
View File

@ -254,27 +254,27 @@ class Teacher:
print(sname + " does not exist.") print(sname + " does not exist.")
return False return False
course = getDB("http://127.0.0.1:8000/api/classes/" + cname) course = getDB("http://127.0.0.1:8000/api/classes/" + cname)
# if(sname in str(course['unconfirmed'])): if(sname in str(course['unconfirmed'])):
# print (sname + " already requested.") print (sname + " already requested.")
# return True return True
# if(sname in str(course['confirmed'])): if(sname in str(course['confirmed'])):
# print (sname + " alredy enrolled.") print (sname + " alredy enrolled.")
# return False return False
# student = getDB("http://127.0.0.1:8000/api/students/" + sname) student = getDB("http://127.0.0.1:8000/api/students/" + sname)
# try: try:
# if(student['added_to']==""): if(student['added_to']==""):
# student['added_to']=course['name'] student['added_to']=course['name']
# else: else:
# student['added_to']=student['added_to']+ "," + course['name'] student['added_to']=student['added_to']+ "," + course['name']
# except: except:
# print(sname + " does not exist.") print(sname + " does not exist.")
# return False return False
# print(student['added_to']) print(student['added_to'])
# data={ data={
# 'added_to':student['added_to'], 'added_to':student['added_to'],
# } }
# student = patchDB(data, "http://localhost:8000/api/students/" + student['ion_user'] + "/") student = patchDB(data, "http://localhost:8000/api/students/" + student['ion_user'] + "/")
student = getDB( "http://localhost:8000/api/students/" + (sname)+ "/") student = getDB( "http://localhost:8000/api/students/" + (sname)+ "/")
if(course['unconfirmed']==[]): if(course['unconfirmed']==[]):
course['unconfirmed']=student['ion_user'] course['unconfirmed']=student['ion_user']
@ -601,7 +601,7 @@ class Teacher:
data = getTeacher("eharris1") data = getTeacher("eharris1")
t = Teacher(data) t = Teacher(data)
#t.addClass("eharris1/APLit_eharris1") #t.makeClass("APLit_eharris1")
#t.addAssignment("eharris1/APLit_eharris1/Essay1_eharris1", "APLit_eharris1", '2020-08-11 16:58:33.383124') #t.addAssignment("eharris1/APLit_eharris1/Essay1_eharris1", "APLit_eharris1", '2020-08-11 16:58:33.383124')
#ar = ['2022rkhondak','2022inafi','2023rumareti'] #ar = ['2022rkhondak','2022inafi','2023rumareti']
#extra = t.reqAddStudentList(ar, "APLit_eharris1") #extra = t.reqAddStudentList(ar, "APLit_eharris1")

6
Website/api/models.py
View File

@ -21,7 +21,7 @@ class Student(models.Model):
return f"{self.user.username}'s Profile" return f"{self.user.username}'s Profile"
class Assignment(models.Model): class Assignment(models.Model):
owner = models.ForeignKey('auth.User', related_name='assignments', on_delete=models.CASCADE) owner = models.ForeignKey('auth.User', related_name='aowner', on_delete=models.CASCADE)
name=models.CharField(max_length=100, primary_key=True) name=models.CharField(max_length=100, primary_key=True)
due_date=models.DateTimeField() due_date=models.DateTimeField()
@ -34,7 +34,7 @@ class Assignment(models.Model):
return '%s' % (self.name) return '%s' % (self.name)
class Class(models.Model): class Class(models.Model):
owner = models.ForeignKey('auth.User', related_name='classes', on_delete=models.CASCADE) owner = models.ForeignKey('auth.User', related_name='cowner', on_delete=models.CASCADE)
teacher = models.CharField(max_length=100) teacher = models.CharField(max_length=100)
name = models.CharField(primary_key=True, max_length=100) name = models.CharField(primary_key=True, max_length=100)
id = models.CharField(max_length=8, blank=True, null=True) id = models.CharField(max_length=8, blank=True, null=True)
@ -53,7 +53,7 @@ class Class(models.Model):
if not id: if not id:
id = secrets.token_urlsafe()[:8].lower() id = secrets.token_urlsafe()[:8].lower()
while Class.objects.filter(id=id).exclude(pk=self.pk).exists(): while Class.objects.filter(id=id).exclude(pk=self.pk).exists():
id = sercrets.token_urlsafe()[:8].lower() id = secrets.token_urlsafe()[:8].lower()
self.id = id self.id = id
return super(Class, self).save(*args, **kwargs) return super(Class, self).save(*args, **kwargs)

0
eharris1/APLit_eharris1/Essay1_eharris1/instruct.txt
View File