diff --git a/README.md b/README.md index 39011cb..398b95d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [Iridium Tutoring](https://www.iridiumtutoring.org) is a nationwide 501(c)(3) nonprofit tutoring organization serving K-12 students with free, personalized educational support in all subjects. Our mission is to provide high-quality, accessible, and equitable tutoring to students in need, regardless of their background or financial status. We are committed to helping students reach their full potential and achieve academic success. -This dashboard streamlines the tutoring session registration process and tutor sign-up process to a non-Google-Sheets/Forms hosted platform. Developed by the 2024 Iridium Tutoring director team (Charles Tang). Utilizes Model-View-Template (MVT) architecture for Tutors, Students, and TutoringSessions. +This dashboard streamlines the tutoring session registration process and tutor sign-up process to a non-Google-Sheets/Forms-hosted platform. Developed by the 2024 Iridium Tutoring director team (Charles Tang). Utilizes Model-View-Template (MVT) architecture for `Tutors`, `Students`, and `Tutoring-Sessions`. ## Tech Stack @@ -13,8 +13,9 @@ This dashboard streamlines the tutoring session registration process and tutor s ## Features [x] Admin dashboard (manage tutor, student, session registrations) [x] Student session registration (sign up for tutoring sessions, email confirmation, automatic account generation) -[] Student dashboard (login/logout, see past/upcoming sessions, register session, see tutor details) -[] Tutor dashboard (login/logout, see available sessions, see historical sessions, volunteering hours, sign up for sessions, past taken sessions, add sessions) +[x] Student dashboard (login/logout, see past/upcoming sessions, register session, see session details, see tutor details) +[x] Tutor session dashboard (login/logout, see available sessions, see historical sessions, sign up for sessions, past taken sessions, add session) +[] Tutor profile dashboard (volunteering hours) [] Admin dashboard (sort by model, create new tutor form, create new session form) [] Deployed onto DigitalOcean (thanks to nonprofit credits), subdomain of iridiumtutoring.org diff --git a/db.sqlite3 b/db.sqlite3 index e294218..688cb8c 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/iridisite/__pycache__/urls.cpython-312.pyc b/iridisite/__pycache__/urls.cpython-312.pyc index 4b9ee1a..fb0df38 100644 Binary files a/iridisite/__pycache__/urls.cpython-312.pyc and b/iridisite/__pycache__/urls.cpython-312.pyc differ diff --git a/iridisite/urls.py b/iridisite/urls.py index 80e9ecd..a6b2d7d 100644 --- a/iridisite/urls.py +++ b/iridisite/urls.py @@ -18,7 +18,7 @@ from django.urls import include, path urlpatterns = [ - path("tutoring_student/", include("tutoring_student.urls")), + path("", include("tutoring_student.urls")), path('admin/', admin.site.urls), path("__debug__/", include("debug_toolbar.urls")), ] diff --git a/tutoring_student/__pycache__/urls.cpython-312.pyc b/tutoring_student/__pycache__/urls.cpython-312.pyc index 7e7afcb..047227b 100644 Binary files a/tutoring_student/__pycache__/urls.cpython-312.pyc and b/tutoring_student/__pycache__/urls.cpython-312.pyc differ diff --git a/tutoring_student/__pycache__/views.cpython-312.pyc b/tutoring_student/__pycache__/views.cpython-312.pyc index 979768b..efd58ca 100644 Binary files a/tutoring_student/__pycache__/views.cpython-312.pyc and b/tutoring_student/__pycache__/views.cpython-312.pyc differ diff --git a/tutoring_student/templates/tutoring_student/index.html b/tutoring_student/templates/tutoring_student/index.html index 15cf795..50e7cfe 100644 --- a/tutoring_student/templates/tutoring_student/index.html +++ b/tutoring_student/templates/tutoring_student/index.html @@ -1,5 +1,6 @@ + Iridium Tutoring + + {% load static %} +
-

Register for a Tutoring Session

+

Register for a Tutoring Session

@@ -122,14 +126,26 @@

Register for a Tutoring Session

- + /> {% endcomment %} +
Most commonly, sessions are 0.5, 1, or 1.5 hours.
@@ -205,10 +221,22 @@

Register for a Tutoring Session

+ + + + + + diff --git a/tutoring_student/templates/tutoring_student/session-student.html b/tutoring_student/templates/tutoring_student/session-student.html new file mode 100644 index 0000000..1e99d6c --- /dev/null +++ b/tutoring_student/templates/tutoring_student/session-student.html @@ -0,0 +1,78 @@ + + + + + + Iridium Tutoring + + + + + {% load static %} + + +
+ {% if error_message %} +
+

{{ error_message }}

+
+ {% if button %} + Back to Home + {% endif %} + {% else %} + {% if tutoringSession %} +
+

Thank you for registering, {{ tutoringSession.student.studentName }}!

+

Here are the details of your tutoring session:

+
    +
  • Student: {{ tutoringSession.student.studentName }}
    • +
  • Subject: {{ tutoringSession.subject }} - {{ tutoringSession.description }}
    • +
  • Date: {{ tutoringSession.date }} - {{ tutoringSession.time }} ({{ tutoringSession.duration }} hours)
    • + {% if tutoringSession.tutor %} +
  • Tutor: {{ tutoringSession.tutor.tutorName }} - {{tutoringSession.tutor.email}}
    • + {% endif %} +
+ {% if not tutoringSession.tutor %} +

A tutor will reach out soon about the details of your session. If you have any questions, please contact us at iridiumtutoring@gmail.com.

+ {% else %} +

{{tutoringSession.tutor.tutorName}} has signed up for your session and will reach out soon about the details of your session. If you have any questions, feel free to contact us at iridiumtutoring@gmail.com.

+ {% endif %} + Go Back +
+ {% endif %} + {% endif %} +
+ + + + diff --git a/tutoring_student/templates/tutoring_student/session-tutor.html b/tutoring_student/templates/tutoring_student/session-tutor.html new file mode 100644 index 0000000..77fd6e6 --- /dev/null +++ b/tutoring_student/templates/tutoring_student/session-tutor.html @@ -0,0 +1,93 @@ + + + + + + Iridium Tutoring + + + + + {% load static %} + + +
+ {% if error_message %} +
+

{{ error_message }}

+
+ {% if button %} + Back to Home + {% endif %} + {% else %} + {% if tutoringSession %} +
+

{{ tutoringSession.student.studentName }}'s registration

+

Here are the details of your {{ tutoringSession.student.studentName }}'s session:

+
    +
  • Student: {{ tutoringSession.student.studentName }}
    • +
  • Email: {{tutoringSession.student.email}}
    • + {% if tutoringSession.student.phone %} +
  • Phone: {{ tutoringSession.student.phone }}
    • + {% endif %} +
  • Subject: {{ tutoringSession.subject }} - {{ tutoringSession.description }}
    • +
  • Date: {{ tutoringSession.date }} - {{ tutoringSession.time }} ({{ tutoringSession.duration }} hours)
    • + {% if tutoringSession.tutor %} +
  • Tutor: {{ tutoringSession.tutor.tutorName }} - {{tutoringSession.tutor.email}}
    • + {% endif %} +
+ {% if not tutoringSession.tutor %} +

You may contact the student via their email of phone number to ask any additional questions about their request. If the student asks to change the time/topic, please contact an administrator to update the session accordingly. To claim this session, press the claim session button below and follow up with an email to the student.

+
+ {% csrf_token %} + + +
+ {% elif tutoringSession.tutor.tutorName == tutor.tutorName and tutoringSession.tutor.email == tutor.email %} +
+ {% csrf_token %} + + +
+ {% else %} +

{{tutoringSession.tutor.tutorName}} has signed up for this session.

+ {% endif %} + Go Back +
+ {% endif %} + {% endif %} +
+ + + + diff --git a/tutoring_student/templates/tutoring_student/studentView.html b/tutoring_student/templates/tutoring_student/studentView.html index b975695..bd4ea93 100644 --- a/tutoring_student/templates/tutoring_student/studentView.html +++ b/tutoring_student/templates/tutoring_student/studentView.html @@ -9,6 +9,7 @@ crossorigin="anonymous" /> + Iridium Tutoring {% load static %} @@ -23,17 +24,20 @@
Home Student Portal - Back To Main Site
- {% if user %} +
+ {% if not user %} + Back To Main Site + {% endif %} + {% if user %} -
{% endif %} + @@ -41,25 +45,59 @@

Your Tutoring Sessions

+ +

Upcoming Tutoring Sessions

{% if tutoringSessionList %} -
+
{% for session in tutoringSessionList %} - -
{{session.student.studentName}} - {{session.subject}} (Grade {{session.gradeLevel}})
{% if session.was_in_the_past %} Past + {% elif session.tutor %} + Upcoming (Tutor Confirmed) {% else %} - Upcoming + Upcoming (Tutor Pending) {% endif %} -
+
{{session.date}} - {{session.time}} ({{session.duration}} hours) + + {% endif %} + {% endfor %} +
+ {% endif %} {% if not tutoringSessionList %} +

No upcoming of tutoring sessions.

+ {% endif %} +
+
+
+
+

Past Tutoring Sessions

+
+
+ {% if tutoringSessionList %} +
+ {% for session in tutoringSessionList %} + {% if session.was_in_the_past%} +
+
{{session.student.studentName}} - {{session.subject}} (Grade {{session.gradeLevel}})
+ {% if session.tutor %} + Past (Tutor Confirmed) + {% else %} + Past (Tutor Not Found) + {% endif %} + +
+ {{session.date}} - {{session.time}} ({{session.duration}} hours) + {% endif %} {% endfor %}
{% endif %} {% if not tutoringSessionList %} @@ -94,7 +132,7 @@

Student Portal

- {% endif %} + {% endif %}