diff --git a/CLI/student.py b/CLI/student.py index 5d6ad51..8559979 100644 --- a/CLI/student.py +++ b/CLI/student.py @@ -186,6 +186,7 @@ class Student: print("ADDING CLASS: " + str(c['name'])) self.addClass(str(c['name'])) command("git checkout master") + print(os.getcwd()) #updates 1 class, does not switch to master def updateClass(self, course): @@ -222,14 +223,14 @@ class Student: os.system(url) cdir = os.getcwd() - # path1 = self.username + "/" + self.username - # path2 = self.username - # if(os.path.isdir(path1)): - # os.chdir(path1) - # else: - # os.chdir(self.username) - # command("git clone " + self.repo) - # os.chdir(self.username) + path1 = self.username + "/" + self.username + path2 = self.username + if(os.path.isdir(path1)): + os.chdir(path1) + else: + os.chdir(self.username) + command("git clone " + self.repo) + os.chdir(self.username) #push to git, start at master os.chdir(self.username) @@ -277,6 +278,7 @@ class Student: data={ 'user':self.user, 'added_to':self.snew, + 'classes':self.sclass } print(self.url) print(patchDB(data, self.url)) @@ -366,15 +368,14 @@ class Student: command('git checkout master') os.chdir(cdir) -# data = getStudent("2022rkhondak") -# s = Student(data) -# #s.viewClass("APLit_eharris1") -# #s.updateClass("APLit_eharris1") +data = getStudent("2022rkhondak") +s = Student(data) +#s.viewClass("APLit_eharris1") +s.addClass("APLit_eharris1") # #s.update() # s.exitCLI() def main(): - print("noooo") pass if __name__ == "__main__": diff --git a/CLI/teacher.py b/CLI/teacher.py index a08debb..b062c15 100644 --- a/CLI/teacher.py +++ b/CLI/teacher.py @@ -332,24 +332,23 @@ class Teacher: command('git push -u origin ' + cname) os.chdir(cdir) - if(course['confirmed']==""): + if(course['confirmed']==[]): course['confirmed']=student['ion_user'] else: - course['confirmed']=course['confirmed']+ "," + student['ion_user'] + course['confirmed'].append(student['ion_user']) #only 1 pereson on confirmeed - if(("," in course['unconfirmed']) == False): - course['unconfirmed']="" + if(len(course['unconfirmed']) == 1): + course['unconfirmed']=[] #mutiple else: - course['unconfirmed']= course['unconfirmed'].replace("," + student['ion_user'], "") - course['unconfirmed']= course['unconfirmed'].replace(student['ion_user']+",", "") + course['unconfirmed'].remove(student['ion_user']) cinfo = { "confirmed": course["confirmed"], "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 #goes through list of studennts, tries to add, then request, return unconfirmed students @@ -436,15 +435,12 @@ class Teacher: 'due_date':due } postDB(ass, 'http://127.0.0.1:8000/api/assignments/') - if(course['assignments'] == ""): - course['assignments'] = ass - else: - course['assignments'] = course['assignments'].append(ass) + course['assignments'].append(aname) cinfo = { "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 else: print("Assignment already addedd") @@ -606,7 +602,7 @@ t = Teacher(data) #ar = ['2022rkhondak','2022inafi','2023rumareti'] #extra = t.reqAddStudentList(ar, "APLit_eharris1") #print(extra) -t.reqStudent('2022rkhondak', 'APLit_eharris1') +#t.addStudent('2022rkhondak', 'APLit_eharris1') # t.getChanges('2022rkhondak','APLit_eharris1', 10) ''' diff --git a/eharris1/APLit_eharris1/Essay1_APLit_eharris1/instruct.txt b/eharris1/APLit_eharris1/Essay1_APLit_eharris1/instruct.txt new file mode 100644 index 0000000..e69de29