mirror of
https://github.com/Rushilwiz/SkoolOS.git
synced 2025-04-16 02:10:19 -04:00
Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development
Conflicts: CLI/teacher.py
This commit is contained in:
commit
9bd600a8f0
|
@ -101,7 +101,7 @@ def putDB(user, pwd, data, url):
|
||||||
:param url: URL for request
|
:param url: URL for request
|
||||||
:param data: data to request
|
:param data: data to request
|
||||||
:return: json request response
|
:return: json request response
|
||||||
"""
|
"""
|
||||||
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()
|
||||||
|
@ -158,6 +158,13 @@ class Teacher:
|
||||||
self.classes = data['classes']
|
self.classes = data['classes']
|
||||||
if os.path.isdir(self.username + "/Students"):
|
if os.path.isdir(self.username + "/Students"):
|
||||||
print("Synced to " + self.username)
|
print("Synced to " + self.username)
|
||||||
|
existing_classes = os.listdir(self.username)
|
||||||
|
for c in self.classes:
|
||||||
|
if not c in str(existing_classes):
|
||||||
|
os.mkdir(self.username + "/" + c)
|
||||||
|
print("Updated: " + c)
|
||||||
|
command("touch " + self.username + "/" + c + "/README.md")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
os.makedirs(self.username + "/Students")
|
os.makedirs(self.username + "/Students")
|
||||||
|
|
||||||
|
@ -733,7 +740,7 @@ class Teacher:
|
||||||
|
|
||||||
# data = getTeacher("eharris1","PWD")
|
# data = getTeacher("eharris1","PWD")
|
||||||
# print(data)
|
# print(data)
|
||||||
# t = Teacher(data, "PWD")
|
#t = Teacher(data, "PWD")
|
||||||
# t.makeClass("APLit_eharris1")
|
# t.makeClass("APLit_eharris1")
|
||||||
# t.updateAssignment("eharris1/APLit_eharris1/BookReport", "APLit_eharris1", '2020-08-11 16:58:33.383124')
|
# t.updateAssignment("eharris1/APLit_eharris1/BookReport", "APLit_eharris1", '2020-08-11 16:58:33.383124')
|
||||||
# ar = ['2022rkhondak','2022inafi','2023rumareti']
|
# ar = ['2022rkhondak','2022inafi','2023rumareti']
|
||||||
|
|
0
eharris1/History12_eharris1/README.md
Normal file
0
eharris1/History12_eharris1/README.md
Normal file
Loading…
Reference in New Issue
Block a user