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

merge gang
This commit is contained in:
Rushil Umaretiya 2020-06-16 14:12:59 -04:00
commit 668528d40a

View File

@ -62,7 +62,6 @@ def main():
teacherCLI(USER, PWD) teacherCLI(USER, PWD)
# while True: # while True:
# pass # pass
def studentCLI(user, password): def studentCLI(user, password):
@ -212,7 +211,6 @@ def teacherCLI(user, password):
#print("Assignments: " + n) #print("Assignments: " + n)
b = False b = False
if(not os.path.isdir(teacher.username + "/" + course + "/" + n)): if(not os.path.isdir(teacher.username + "/" + course + "/" + n)):
nlist.remove(n)
b = False b = False
if(b): if(b):
tlist.append(n) tlist.append(n)
@ -231,6 +229,9 @@ def teacherCLI(user, password):
}, },
] ]
ass = prompt(questions)['assignment'] ass = prompt(questions)['assignment']
apath = teacher.username + "/" + course + "/" + ass
teacher.addAssignment(apath, course, due)
def getUser(ion_user, password, utype): def getUser(ion_user, password, utype):