fixed merge conflict

This commit is contained in:
Nathaniel Kenschaft 2020-06-16 23:45:11 -04:00
commit 96a089f71f

View File

@ -18,7 +18,7 @@ Enter the valid SkoolOS username and password. Congratialations, you have succes
============
Start the CLI and select your username. For instance, teacher 'eharris1'::
python skoolos.py
? Select User: (Use arrow keys)
1) 2022rkhondak
@ -38,7 +38,7 @@ You will then be given the choice to select an existing class, Make a new class,
Making a new class:
-------
Select 'Make a New Class'. You will then be prompted to enter a class name. The format for every class must be <subject>_<teacher_username> (Example: Art12_eharris1).
Select 'Make a New Class'. You will then be prompted to enter a class name. The format for every class must be <subject>_<teacher_username> (Example: Art12_eharris1).
Enter Period (must be a positive integer). You will then be prompted to add students. If you have a list of students, enter the relative path of a text file with the student usernames.
The file must be a .txt file and have one student username per line. If you add an individual student, simply enter their ion username.
one username per line.::
@ -49,12 +49,12 @@ one username per line.::
History12_eharris1
Make New Class
Exit SkoolOS
? Add Students): (Use arrow keys)
1) Add individual student
2) Add list of students through path
3) Exit
? Add Students): 2) Add list of students through path
File must be .txt and have 1 student username per line
Relative Path: students.txt
@ -79,7 +79,7 @@ added you the class.)::
Truck_eharris1
Make New Class
Exit SkoolOS
Class: English12_eharris1
? Select option: (Use arrow keys)
1) Request Student
@ -100,12 +100,12 @@ one username per line.::
2) Add assignment
3) View student information
4) Exit
? Add list of students (input path): (Use arrow keys)
1) Add individual student
2) Add list of students through path
3) Exit
? Select option: 1) Request Student
? Add list of students (input path): 1) Add individual student
? Student Name: 2022rkhondak
@ -145,9 +145,9 @@ work at ANY TIME. Simply go to the 'Students' directory and select the student's
3) View student information
4) Exit
Students in class:
Students in class:
2022rkhondak
Requsted Students:
Requsted Students:
2023rumareti
View student (Enter student's ion username):
@ -166,7 +166,7 @@ Select a class first:
Random_eharris1
Exit SkoolOS
You can then view the assignments associated with the class. Open you work directory and modify files within your assignments. At any time, you can 'Save' or go 'Back'.
You can then view the assignments associated with the class. Open you work directory and modify files within your assignments. At any time, you can 'Save' or go 'Back'.
When you are ready, you can submit an assignment:
::