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

Merge branch 'master' into development

Browse Source
This commit is contained in:
Rushil Umaretiya 2020-06-16 10:58:31 -04:00 committed by GitHub
commit 6e959654ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CLI/student.py
View File

@ -186,6 +186,7 @@ class Student:
print("ADDING CLASS: " + str(c['name'])) print("ADDING CLASS: " + str(c['name']))
self.addClass(str(c['name'])) self.addClass(str(c['name']))
command("git checkout master") command("git checkout master")
print(os.getcwd())
#updates 1 class, does not switch to master #updates 1 class, does not switch to master
def updateClass(self, course): def updateClass(self, course):
@ -222,14 +223,14 @@ class Student:
os.system(url) os.system(url)
cdir = os.getcwd() cdir = os.getcwd()
# path1 = self.username + "/" + self.username path1 = self.username + "/" + self.username
# path2 = self.username path2 = self.username
# if(os.path.isdir(path1)): if(os.path.isdir(path1)):
# os.chdir(path1) os.chdir(path1)
# else: else:
# os.chdir(self.username) os.chdir(self.username)
# command("git clone " + self.repo) command("git clone " + self.repo)
# os.chdir(self.username) os.chdir(self.username)
#push to git, start at master #push to git, start at master
os.chdir(self.username) os.chdir(self.username)
@ -277,6 +278,7 @@ class Student:
data={ data={
'user':self.user, 'user':self.user,
'added_to':self.snew, 'added_to':self.snew,
'classes':self.sclass
} }
print(self.url) print(self.url)
print(patchDB(data, self.url)) print(patchDB(data, self.url))
@ -366,15 +368,14 @@ class Student:
command('git checkout master') command('git checkout master')
os.chdir(cdir) os.chdir(cdir)
# data = getStudent("2022rkhondak") data = getStudent("2022rkhondak")
# s = Student(data) s = Student(data)
# #s.viewClass("APLit_eharris1") #s.viewClass("APLit_eharris1")
# #s.updateClass("APLit_eharris1") s.addClass("APLit_eharris1")
# #s.update() # #s.update()
# s.exitCLI() # s.exitCLI()
def main(): def main():
print("noooo")
pass pass
if __name__ == "__main__": if __name__ == "__main__":

22
CLI/teacher.py
View File

@ -332,24 +332,23 @@ class Teacher:
command('git push -u origin ' + cname) command('git push -u origin ' + cname)
os.chdir(cdir) os.chdir(cdir)
if(course['confirmed']==""): if(course['confirmed']==[]):
course['confirmed']=student['ion_user'] course['confirmed']=student['ion_user']
else: else:
course['confirmed']=course['confirmed']+ "," + student['ion_user'] course['confirmed'].append(student['ion_user'])
#only 1 pereson on confirmeed #only 1 pereson on confirmeed
if(("," in course['unconfirmed']) == False): if(len(course['unconfirmed']) == 1):
course['unconfirmed']="" course['unconfirmed']=[]
#mutiple #mutiple
else: else:
course['unconfirmed']= course['unconfirmed'].replace("," + student['ion_user'], "") course['unconfirmed'].remove(student['ion_user'])
course['unconfirmed']= course['unconfirmed'].replace(student['ion_user']+",", "")
cinfo = { cinfo = {
"confirmed": course["confirmed"], "confirmed": course["confirmed"],
"unconfirmed": course['unconfirmed'] "unconfirmed": course['unconfirmed']
} }
print(patchDB(cinfo, "http://localhost:8000/api/classes/" + course['name'] + "/")) print(putDB(course, "http://localhost:8000/api/classes/" + course['name'] + "/"))
return True return True
#goes through list of studennts, tries to add, then request, return unconfirmed students #goes through list of studennts, tries to add, then request, return unconfirmed students
@ -436,15 +435,12 @@ class Teacher:
'due_date':due 'due_date':due
} }
postDB(ass, 'http://127.0.0.1:8000/api/assignments/') postDB(ass, 'http://127.0.0.1:8000/api/assignments/')
if(course['assignments'] == ""): course['assignments'].append(aname)
course['assignments'] = ass
else:
course['assignments'] = course['assignments'].append(ass)
cinfo = { cinfo = {
"assignments": course['assignments'], "assignments": course['assignments'],
} }
patchDB(cinfo, "http://127.0.0.1:8000/api/classes/" + course['name'] + "/") print(patchDB(cinfo, "http://127.0.0.1:8000/api/classes/" + course['name'] + "/"))
return True return True
else: else:
print("Assignment already addedd") print("Assignment already addedd")
@ -606,7 +602,7 @@ t = Teacher(data)
#ar = ['2022rkhondak','2022inafi','2023rumareti'] #ar = ['2022rkhondak','2022inafi','2023rumareti']
#extra = t.reqAddStudentList(ar, "APLit_eharris1") #extra = t.reqAddStudentList(ar, "APLit_eharris1")
#print(extra) #print(extra)
t.reqStudent('2022rkhondak', 'APLit_eharris1') #t.addStudent('2022rkhondak', 'APLit_eharris1')
# t.getChanges('2022rkhondak','APLit_eharris1', 10) # t.getChanges('2022rkhondak','APLit_eharris1', 10)
''' '''

0
eharris1/APLit_eharris1/Essay1_APLit_eharris1/instruct.txt Normal file
View File