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

cleaned up code in skoolos.py

Browse Source
This commit is contained in:
Nathaniel Kenschaft 2020-06-16 19:40:45 -04:00
parent 11c0c03bae
commit 1c2a344cce
1 changed files with 98 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
skoolos.py
View File

@ -77,7 +77,7 @@ def main():
}, },
] ]
u = int(prompt(user)['user'].split(")")[0]) - 1 u = int(prompt(user)['user'].split(")")[0]) - 1
if(u+1 == count): if u + 1 == count:
authenticate() authenticate()
return return
data = info[u] data = info[u]
@ -89,6 +89,7 @@ def main():
else: else:
teacherCLI(USER, PWD) teacherCLI(USER, PWD)
#################################################################################################### STUDENT METHODS #################################################################################################### STUDENT METHODS
def studentCLI(user, password): def studentCLI(user, password):
@ -104,7 +105,7 @@ def studentCLI(user, password):
EXIT = False EXIT = False
while not EXIT: while not EXIT:
course = chooseClassStudent(student) course = chooseClassStudent(student)
if(course == "Exit SkoolOS"): if course == "Exit SkoolOS":
return return
EXIT = classOptionsStudent(student, course) EXIT = classOptionsStudent(student, course)
@ -171,6 +172,11 @@ def classOptionsStudent(student, course):
#################################################################################################### TEACHER METHODS #################################################################################################### TEACHER METHODS
def teacherCLI(user, password): def teacherCLI(user, password):
"""
The CLI for teachers to access
:param user: teachers username
:param password: teachers password
"""
from CLI import teacher from CLI import teacher
data = getUser(user, password, 'teacher') data = getUser(user, password, 'teacher')
print(data) print(data)
@ -181,25 +187,26 @@ def teacherCLI(user, password):
# 3. Get progress logs on a student # 3. Get progress logs on a student
# 2. make an assignment for a class # 2. make an assignment for a class
# 3. view student submissions for an assignment # 3. view student submissions for an assignment
while(not EXIT): while not EXIT:
#Options: '1) Request Student', "2) Add assignment", "3) View student information", "4) Exit" # Options: '1) Request Student', "2) Add assignment", "3) View student information", "4) Exit"
course = chooseGeneralTeacher(teacher) course = chooseGeneralTeacher(teacher)
if course == "Exit SkoolOS": if course == "Exit SkoolOS":
EXIT = True EXIT = True
elif course == "Make New Class": elif course == "Make New Class":
EXIT = makeClassTeacher(teacher) EXIT = makeClassTeacher(teacher)
#selected a class # selected a class
else: else:
option = classOptionsTeacher(teacher, course) option = classOptionsTeacher(teacher, course)
if(option == '1'): if option == '1':
EXIT = addStudentsTeacher(teacher, course) EXIT = addStudentsTeacher(teacher, course)
elif(option == '2'): elif option == '2':
EXIT = addAssignmentTeacher(teacher, course) EXIT = addAssignmentTeacher(teacher, course)
elif(option == '3'): elif option == '3':
EXIT = viewStudentsTeacher(teacher, course) EXIT = viewStudentsTeacher(teacher, course)
else: else:
EXIT = True EXIT = True
def chooseGeneralTeacher(teacher): def chooseGeneralTeacher(teacher):
carray = [] carray = []
for c in teacher.classes: for c in teacher.classes:
@ -207,56 +214,57 @@ def chooseGeneralTeacher(teacher):
carray.append("Make New Class") carray.append("Make New Class")
carray.append("Exit SkoolOS") carray.append("Exit SkoolOS")
courses = [ courses = [
{ {
'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 makeClassTeacher(teacher):
questions = [ questions = [
{
'type': 'input',
'name': 'cname',
'message': 'Class Name (Must be: <subject>_<ion_user>): ',
},
]
cname = prompt(questions)['cname']
print(cname)
while(not ("_" + teacher.username) in cname):
print("Incorrect naming format")
questions = [
{ {
'type': 'input', 'type': 'input',
'name': 'cname', 'name': 'cname',
'message': 'Class Name (Must be: <subject>_<ion_user>): ', 'message': 'Class Name (Must be: <subject>_<ion_user>): ',
}, },
]
cname = prompt(questions)['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'] 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':
return True 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): ")
@ -265,6 +273,7 @@ def makeClassTeacher(teacher):
teacher.reqAddStudentList(students, cname) teacher.reqAddStudentList(students, cname)
return False return False
def classOptionsTeacher(teacher, course): def classOptionsTeacher(teacher, course):
print("Class: " + course) print("Class: " + course)
unconf = getDB(teacher.username, teacher.password, "http://localhost:8000/api/classes/" + course)['unconfirmed'] unconf = getDB(teacher.username, teacher.password, "http://localhost:8000/api/classes/" + course)['unconfirmed']
@ -272,49 +281,50 @@ def classOptionsTeacher(teacher, course):
teacher.addStudent(s, course) teacher.addStudent(s, course)
options = ['1) Request Student', "2) Add assignment", "3) View student information", "4) 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]
return option return option
def addStudentsTeacher(teacher, course): 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',
'name': 'student', 'name': 'student',
'message': 'Student Name: ', 'message': 'Student Name: ',
}, },
] ]
s = prompt(questions)['student'] s = prompt(questions)['student']
teacher.reqStudent(s, course) teacher.reqStudent(s, course)
return False return False
if(schoice == '2'): if schoice == '2':
questions = [ questions = [
{ {
'type': 'input', 'type': 'input',
'name': 'path', 'name': 'path',
'message': 'Path: ', 'message': 'Path: ',
}, },
] ]
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): ")
@ -325,6 +335,7 @@ def addStudentsTeacher(teacher, course):
else: else:
return True return True
def addAssignmentTeacher(teacher, course): def addAssignmentTeacher(teacher, course):
nlist = os.listdir(teacher.username + "/" + course) nlist = os.listdir(teacher.username + "/" + course)
alist = getDB(teacher.username, teacher.password, "http://localhost:8000/api/classes/" + course)['assignments'] alist = getDB(teacher.username, teacher.password, "http://localhost:8000/api/classes/" + course)['assignments']
@ -334,36 +345,36 @@ def addAssignmentTeacher(teacher, course):
for n in nlist: for n in nlist:
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")
print("To make an assignment: make a subdirectory in the " + course + " folder. Add a file within the new folder") print(
"To make an assignment: make a subdirectory in the " + course + " folder. Add a file within the new folder")
return False return False
questions = [ questions = [
{ {
'type': 'list', 'type': 'list',
'choices':nlist, 'choices': nlist,
'name': 'assignment', 'name': 'assignment',
'message': 'Select new assignment: ', 'message': 'Select new assignment: ',
}, },
] ]
ass = prompt(questions)['assignment'] ass = prompt(questions)['assignment']
apath = teacher.username + "/" + course + "/" + ass apath = teacher.username + "/" + course + "/" + ass
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"
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
@ -371,10 +382,11 @@ def addAssignmentTeacher(teacher, course):
print("Due-date format is incorrect.") print("Due-date format is incorrect.")
print(due) print(due)
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 return False
def viewStudentsTeacher(teacher, course): def viewStudentsTeacher(teacher, course):
data = getDB(teacher.username, teacher.password, "http://127.0.0.1:8000/api/classes/" + course) data = getDB(teacher.username, teacher.password, "http://127.0.0.1:8000/api/classes/" + course)
students = data["confirmed"] students = data["confirmed"]
@ -386,7 +398,7 @@ def viewStudentsTeacher(teacher, course):
for s in unconf: for s in unconf:
print(s) print(s)
student = input("View student (Enter student's ion username): ") student = input("View student (Enter student's ion username): ")
while((not student in str(data['confirmed'])) or (not student in str(data['unconfirmed']))): while (not student in str(data['confirmed'])) or (not student in str(data['unconfirmed'])):
print("Student not affiliated with class") print("Student not affiliated with class")
student = input("View student ('N' to exit): ") student = input("View student ('N' to exit): ")
if student == 'N': if student == 'N':
@ -394,7 +406,6 @@ def viewStudentsTeacher(teacher, course):
print(getDB(teacher.username, teacher.password, "http://127.0.0.1:8000/api/students/" + student + "/")) print(getDB(teacher.username, teacher.password, "http://127.0.0.1:8000/api/students/" + student + "/"))
############################################################################################################################################ ############################################################################################################################################
@ -427,32 +438,33 @@ def getUser(ion_user, password, utype):
print(r.status_code) print(r.status_code)
return None return None
def patchDB(USER, PWD, url, data): def patchDB(USER, PWD, url, data):
r = requests.patch(url = url, data=data, auth=(USER,PWD)) r = requests.patch(url=url, data=data, auth=(USER, PWD))
print("PATH:" + str(r.status_code)) print("PATH:" + str(r.status_code))
return r.json() return r.json()
def getDB(USER, PWD, url): def getDB(USER, PWD, url):
r = requests.get(url = url, auth=(USER,PWD)) r = requests.get(url=url, auth=(USER, PWD))
print("GET:" + str(r.status_code)) print("GET:" + str(r.status_code))
return r.json() return r.json()
def postDB(USER, PWD, url, data): def postDB(USER, PWD, url, data):
r = requests.post(url = url, data=data, auth=(USER,PWD)) r = requests.post(url=url, data=data, auth=(USER, PWD))
print("POST:" + str(r.status_code)) print("POST:" + str(r.status_code))
return r.json() return r.json()
def putDB(USER, PWD, url, data): def putDB(USER, PWD, url, data):
r = requests.put(url = url, data=data, auth=(USER,PWD)) r = requests.put(url=url, data=data, auth=(USER, PWD))
print("PUT:" + str(r.status_code)) print("PUT:" + str(r.status_code))
return r.json() return r.json()
def delDB(USER, PWD, url): def delDB(USER, PWD, url):
r = requests.delete(url = url, auth=(USER,PWD)) r = requests.delete(url=url, auth=(USER, PWD))
print("DELETE:" + str(r.status_code)) print("DELETE:" + str(r.status_code))
return None return None
@ -500,7 +512,7 @@ def authenticate():
# Linux: chromdriver-linux # Linux: chromdriver-linux
# Macos: chromdriver-mac # Macos: chromdriver-mac
# Windows: chromdriver.exe # Windows: chromdriver.exe
path = os.path.join(os.getcwd(),'chromedriver','chromedriver-mac') path = os.path.join(os.getcwd(), 'chromedriver', 'chromedriver-mac')
browser = webdriver.Chrome(path) browser = webdriver.Chrome(path)