diff --git a/.2022rkhondakprofile b/.2022rkhondakprofile deleted file mode 100644 index 544f6b1..0000000 --- a/.2022rkhondakprofile +++ /dev/null @@ -1 +0,0 @@ -{"username": "2022rkhondak", "grade": 10, "is_student": true, "password": "hackgroup1"} \ No newline at end of file diff --git a/.2023rumaretiprofile b/.2023rumaretiprofile new file mode 100644 index 0000000..b54ab03 --- /dev/null +++ b/.2023rumaretiprofile @@ -0,0 +1 @@ +{"username": "2023rumareti", "grade": 9, "is_student": true, "password": "a"} \ No newline at end of file diff --git a/.eharris1profile b/.eharris1profile deleted file mode 100644 index b141284..0000000 --- a/.eharris1profile +++ /dev/null @@ -1 +0,0 @@ -{"username": "eharris1", "is_student": false, "password": "hackgroup1"} \ No newline at end of file diff --git a/.sstern1profile b/.sstern1profile new file mode 100644 index 0000000..a51e01c --- /dev/null +++ b/.sstern1profile @@ -0,0 +1 @@ +{"username": "sstern1", "is_student": false, "password": "Riya2011"} \ No newline at end of file diff --git a/2023rumareti b/2023rumareti new file mode 160000 index 0000000..ca356ef --- /dev/null +++ b/2023rumareti @@ -0,0 +1 @@ +Subproject commit ca356ef8532873bf52ec67a647fbb91a25ca1cb7 diff --git a/Website/api/models.py b/Website/api/models.py index 37364a1..17b6a74 100644 --- a/Website/api/models.py +++ b/Website/api/models.py @@ -8,6 +8,7 @@ class Student(models.Model): user = models.OneToOneField(User, blank=True, on_delete=models.CASCADE) ion_user = models.CharField(max_length=100, primary_key=True) grade = models.IntegerField(default=0, blank=True) + log = models.TextField(default="", blank=True) git=models.CharField(default="", max_length=100, blank=True) repo=models.URLField(default="", blank=True) classes=models.CharField(max_length=100, default="", blank=True) diff --git a/Website/skoolos/views.py b/Website/skoolos/views.py index fb6f9b6..45f1ec2 100644 --- a/Website/skoolos/views.py +++ b/Website/skoolos/views.py @@ -152,6 +152,12 @@ def createClassHelper(request): messages.success(request, cleaned_data['subject'].capitalize() + " has been created!") print (newClass) teacher.classes.add(newClass) + for student in newClass.unconfirmed.all(): + if student.added_to == "": + student.added_to = newClass.name + else: + student.added_to = student.added_to + "," + newClass.name + student.save() return redirect('home') else: classForm = ClassCreationForm() diff --git a/docs/source/index.rst b/docs/source/index.rst index d781d3e..74d3036 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -1,7 +1,3 @@ -.. SkoolOS documentation master file, created by - sphinx-quickstart on Tue Jun 16 11:22:02 2020. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. Welcome to SkoolOS's documentation! =================================== diff --git a/eharris1/Art12_eharris1/README.md b/eharris1/Art12_eharris1/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/eharris1/English12_eharris1/README.md b/eharris1/English12_eharris1/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/skoolos.py b/skoolos.py index ad7491b..e4b4028 100644 --- a/skoolos.py +++ b/skoolos.py @@ -456,7 +456,7 @@ def authenticate(): #Linux: chromdriver-linux #Macos: chromdriver-mac #Windows: chromdriver.exe - path = os.path.join(os.getcwd(),'chromedriver','chromedriver-mac') + path = os.path.join(os.getcwd(),'chromedriver','chromedriver-linux') browser = webdriver.Chrome(path) diff --git a/sstern1/Students/wow4_sstern1/2023rumareti b/sstern1/Students/wow4_sstern1/2023rumareti new file mode 160000 index 0000000..ca356ef --- /dev/null +++ b/sstern1/Students/wow4_sstern1/2023rumareti @@ -0,0 +1 @@ +Subproject commit ca356ef8532873bf52ec67a647fbb91a25ca1cb7