manually fixed skoolos.py

This commit is contained in:
Nathaniel Kenschaft 2020-06-16 19:12:12 -04:00
parent 38532e7bfa
commit 1910502161

View File

@ -163,12 +163,37 @@ def classOptionsStudent(student, course):
################################################ TEACHER METHODS ################################################ TEACHER METHODS
def teacherCLI(user, password):
from CLI import teacher
data = getUser(user, password, 'teacher')
print(data)
teacher = teacher.Teacher(data, password)
EXIT = False
# 1. make a class
# 2. add studeents to an existing class
# 3. Get progress logs on a student
# 2. make an assignment for a class
# 3. view student submissions for an assignment
while(not EXIT):
#Options: '1) Request Student', "2) Add assignment", "3) View student information", "4) Exit"
course = chooseGeneralTeacher(teacher)
if course == "Exit SkoolOS":
EXIT = True
elif course == "Make New Class":
EXIT = makeClassTeacher(teacher)
#selected a class
else:
option = classOptionsTeacher(teacher, course)
if(option == '1'):
EXIT = addStudentsTeacher(teacher, course)
elif(option == '2'):
EXIT = addAssignmentTeacher(teacher, course)
elif(option == '3'):
EXIT = viewStudentsTeacher(teacher, course)
else:
EXIT = True
def chooseGeneralTeacher(teacher): def chooseGeneralTeacher(teacher):
"""
Presents teachers with their options
:param teacher: a teacher
:return: a course prompt
"""
carray = [] carray = []
for c in teacher.classes: for c in teacher.classes:
carray.append(c) carray.append(c)
@ -178,46 +203,14 @@ def chooseGeneralTeacher(teacher):
{ {
'type': 'list', 'type': 'list',
'name': 'course', 'name': 'course',
'choices': carray, 'choices':carray,
'message': 'Select class: ', 'message': 'Select class: ',
}, },
] ]
course = prompt(courses)['course'] course = prompt(courses)['course']
return course return course
def makeClassTeacher(teacher):
def teacherCLI(user, password):
"""
The teachers' view of the CLI
:param user: username
:param password: password
"""
from CLI import teacher
data = getUser(user, password, 'teacher')
print(data)
teacher = teacher.Teacher(data)
# 1. make a class
# 2. add studeents to an existing class
# 3. Get progress logs on a student
# 2. make an assignment for a class
# 3. view student submissions for an assignment
carray = []
for c in teacher.classes:
carray.append(c)
carray.append("Make New Class")
carray.append("Exit SkoolOS")
courses = [
{
'type': 'list',
'name': 'course',
'choices': carray,
'message': 'Select class: ',
},
]
course = chooseGeneralTeacher(teacher)
if course == "Exit SkoolOS":
teacher.exitCLI()
if course == "Make New Class":
questions = [ questions = [
{ {
'type': 'input', 'type': 'input',
@ -227,59 +220,73 @@ def teacherCLI(user, password):
] ]
cname = prompt(questions)['cname'] cname = prompt(questions)['cname']
print(cname) print(cname)
while(not ("_" + teacher.username) in cname):
print("Incorrect naming format")
questions = [
{
'type': 'input',
'name': 'cname',
'message': 'Class Name (Must be: <subject>_<ion_user>): ',
},
]
cname = prompt(questions)['cname']
teacher.makeClass(cname) teacher.makeClass(cname)
soption = ["1) Add individual student", "2) Add list of students through path", "3) Exit"] soption = ["1) Add individual student", "2) Add list of students through path", "3) Exit"]
questions = [ questions = [
{ {
'type': 'list', 'type': 'list',
'choices': soption, 'choices':soption,
'name': 'students', 'name': 'students',
'message': 'Add Students): ', 'message': 'Add Students): ',
}, },
] ]
choice = prompt(questions)['students'].split(")")[0] choice = prompt(questions)['students'].split(")")[0]
if "1" == choice: if("1" == choice):
s = input("Student name: ") s = input("Student name: ")
teacher.addStudent(s, cname) teacher.addStudent(s, cname)
if "2" == choice: if("2" == choice):
print("File must be .txt and have 1 student username per line") print("File must be .txt and have 1 student username per line")
path = input("Relative Path: ") path = input("Relative Path: ")
while not os.path.exists(path): while(not os.path.exists(path)):
if path == 'N': if(path == 'N'):
sys.exit(0) return True
print(path + " is not a valid path") print(path + " is not a valid path")
path = input("Enter file path ('N' to exit): ") path = input("Enter file path ('N' to exit): ")
f = open(path, 'r') f = open(path, 'r')
students = f.read().splitlines() students = f.read().splitlines()
teacher.reqAddStudentList(students, cname) teacher.reqAddStudentList(students, cname)
return False
else: def classOptionsTeacher(teacher, course):
print("Class: " + course) print("Class: " + course)
unconf = getDB("http://localhost:8000/api/classes/" + course)['unconfirmed'] unconf = getDB(teacher.username, teacher.password, "http://localhost:8000/api/classes/" + course)['unconfirmed']
for s in unconf: for s in unconf:
teacher.addStudent(s, course) teacher.addStudent(s, course)
options = ['1) Request Student', "2) Add assignment", "3) View student information", "Exit"] options = ['1) Request Student', "2) Add assignment", "3) View student information", "4) Exit"]
questions = [ questions = [
{ {
'type': 'list', 'type': 'list',
'name': 'course', 'name': 'course',
'choices': options, 'choices':options,
'message': 'Select option: ', 'message': 'Select option: ',
}, },
] ]
option = prompt(questions)['course'].split(")")[0] option = prompt(questions)['course'].split(")")[0]
if option == '1': return option
def addStudentsTeacher(teacher, course):
soption = ["1) Add individual student", "2) Add list of students through path", "3) Exit"] soption = ["1) Add individual student", "2) Add list of students through path", "3) Exit"]
questions = [ questions = [
{ {
'type': 'list', 'type': 'list',
'choices': soption, 'choices':soption,
'name': 'students', 'name': 'students',
'message': 'Add list of students (input path): ', 'message': 'Add list of students (input path): ',
}, },
] ]
schoice = prompt(questions)['students'].split(")")[0] schoice = prompt(questions)['students'].split(")")[0]
if schoice == '1': if(schoice == '1'):
questions = [ questions = [
{ {
'type': 'input', 'type': 'input',
@ -289,7 +296,8 @@ def teacherCLI(user, password):
] ]
s = prompt(questions)['student'] s = prompt(questions)['student']
teacher.reqStudent(s, course) teacher.reqStudent(s, course)
if schoice == '2': return False
if(schoice == '2'):
questions = [ questions = [
{ {
'type': 'input', 'type': 'input',
@ -298,19 +306,21 @@ def teacherCLI(user, password):
}, },
] ]
path = prompt(questions)['path'] path = prompt(questions)['path']
while not os.path.exists(path): while(not os.path.exists(path)):
if path == 'N': if(path == 'N'):
sys.exit(0) sys.exit(0)
print(path + " is not a valid path") print(path + " is not a valid path")
path = input("Enter file path ('N' to exit): ") path = input("Enter file path ('N' to exit): ")
f = open(path, 'r') f = open(path, 'r')
students = f.read().splitlines() students = f.read().splitlines()
teacher.reqAddStudentList(students, course) teacher.reqAddStudentList(students, course)
return False
else: else:
sys.exit(0) return True
if option == '2':
def addAssignmentTeacher(teacher, course):
nlist = os.listdir(teacher.username + "/" + course) nlist = os.listdir(teacher.username + "/" + course)
alist = getDB("http://localhost:8000/api/classes/" + course)['assignments'] alist = getDB(teacher.username, teacher.password, "http://localhost:8000/api/classes/" + course)['assignments']
print(nlist) print(nlist)
tlist = [] tlist = []
b = True b = True
@ -318,22 +328,24 @@ def teacherCLI(user, password):
b = True b = True
print(teacher.username + "/" + course + "/" + n) print(teacher.username + "/" + course + "/" + n)
for a in alist: for a in alist:
if n in a or n == a: if(n in a or n == a):
# 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)):
b = False b = False
if b: if(b):
tlist.append(n) tlist.append(n)
nlist = tlist nlist = tlist
if len(nlist) == 0: if(len(nlist) == 0):
print("No new assignments found") print("No new assignments found")
sys.exit(0) print("To make an assignment: make a subdirectory in the " + course + " folder. Add a file within the new folder")
return False
questions = [ questions = [
{ {
'type': 'list', 'type': 'list',
'choices': nlist, 'choices':nlist,
'name': 'assignment', 'name': 'assignment',
'message': 'Select new assignment: ', 'message': 'Select new assignment: ',
}, },
@ -344,7 +356,7 @@ def teacherCLI(user, password):
due = due + ":33.383124" due = due + ":33.383124"
due = due.strip() due = due.strip()
f = False f = False
while not f: while(not f):
try: try:
datetime.datetime.strptime(due, '%Y-%m-%d %H:%M:%S.%f') datetime.datetime.strptime(due, '%Y-%m-%d %H:%M:%S.%f')
f = True f = True
@ -354,6 +366,25 @@ def teacherCLI(user, password):
due = input("Enter due date (Example: 2020-08-11 16:58): ") due = input("Enter due date (Example: 2020-08-11 16:58): ")
due = due + ":33.383124" due = due + ":33.383124"
teacher.addAssignment(apath, course, due) teacher.addAssignment(apath, course, due)
return False
def viewStudentsTeacher(teacher, course):
data = getDB(teacher.username, teacher.password, "http://127.0.0.1:8000/api/classes/" + course)
students = data["confirmed"]
unconf = data['unconfirmed']
print("Studented in class: ")
for s in students:
print(s)
print("Requsted Students: ")
for s in unconf:
print(s)
student = input("View student (Enter student's ion username): ")
while((not student in str(data['confirmed'])) or (not student in str(data['unconfirmed']))):
print("Student not affiliated with class")
student = input("View student ('N' to exit): ")
if student == 'N':
return True
print(getDB(teacher.username, teacher.password, "http://127.0.0.1:8000/api/students/" + student + "/"))
###################################################################### ######################################################################