diff --git a/CLI/teacher.py b/CLI/teacher.py index 8062406..a08debb 100644 --- a/CLI/teacher.py +++ b/CLI/teacher.py @@ -254,27 +254,27 @@ class Teacher: print(sname + " does not exist.") return False course = getDB("http://127.0.0.1:8000/api/classes/" + cname) - # if(sname in str(course['unconfirmed'])): - # print (sname + " already requested.") - # return True - # if(sname in str(course['confirmed'])): - # print (sname + " alredy enrolled.") - # return False + if(sname in str(course['unconfirmed'])): + print (sname + " already requested.") + return True + if(sname in str(course['confirmed'])): + print (sname + " alredy enrolled.") + return False - # student = getDB("http://127.0.0.1:8000/api/students/" + sname) - # try: - # if(student['added_to']==""): - # student['added_to']=course['name'] - # else: - # student['added_to']=student['added_to']+ "," + course['name'] - # except: - # print(sname + " does not exist.") - # return False - # print(student['added_to']) - # data={ - # 'added_to':student['added_to'], - # } - # student = patchDB(data, "http://localhost:8000/api/students/" + student['ion_user'] + "/") + student = getDB("http://127.0.0.1:8000/api/students/" + sname) + try: + if(student['added_to']==""): + student['added_to']=course['name'] + else: + student['added_to']=student['added_to']+ "," + course['name'] + except: + print(sname + " does not exist.") + return False + print(student['added_to']) + data={ + 'added_to':student['added_to'], + } + student = patchDB(data, "http://localhost:8000/api/students/" + student['ion_user'] + "/") student = getDB( "http://localhost:8000/api/students/" + (sname)+ "/") if(course['unconfirmed']==[]): course['unconfirmed']=student['ion_user'] @@ -601,7 +601,7 @@ class Teacher: data = getTeacher("eharris1") 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') #ar = ['2022rkhondak','2022inafi','2023rumareti'] #extra = t.reqAddStudentList(ar, "APLit_eharris1") diff --git a/Website/api/models.py b/Website/api/models.py index d5b5aee..823fb99 100644 --- a/Website/api/models.py +++ b/Website/api/models.py @@ -21,7 +21,7 @@ class Student(models.Model): return f"{self.user.username}'s Profile" 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) due_date=models.DateTimeField() @@ -34,7 +34,7 @@ class Assignment(models.Model): return '%s' % (self.name) 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) name = models.CharField(primary_key=True, max_length=100) id = models.CharField(max_length=8, blank=True, null=True) @@ -53,7 +53,7 @@ class Class(models.Model): if not id: id = secrets.token_urlsafe()[:8].lower() 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 return super(Class, self).save(*args, **kwargs) diff --git a/eharris1/APLit_eharris1/Essay1_eharris1/instruct.txt b/eharris1/APLit_eharris1/Essay1_eharris1/instruct.txt deleted file mode 100644 index e69de29..0000000