Merge branch 'development' of https://github.com/Rushilwiz/SkoolOS into development

.2022rkhondakprofile

@@ -1 +0,0 @@
-{"username": "2022rkhondak", "grade": 10, "is_student": true, "password": "hackgroup1"}

.2023rumaretiprofile

@@ -0,0 +1 @@
+{"username": "2023rumareti", "grade": 9, "is_student": true, "password": "a"}

.eharris1profile

@@ -1 +0,0 @@
-{"username": "eharris1", "is_student": false, "password": "hackgroup1"}

.sstern1profile

@@ -0,0 +1 @@
+{"username": "sstern1", "is_student": false, "password": "Riya2011"}

2023rumareti

@@ -0,0 +1 @@
+Subproject commit ca356ef8532873bf52ec67a647fbb91a25ca1cb7

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)

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()

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!
 ===================================

sstern1/Students/wow4_sstern1/2023rumareti

@@ -0,0 +1 @@
+Subproject commit ca356ef8532873bf52ec67a647fbb91a25ca1cb7