diff --git a/web/forms.py b/web/forms.py index 5e1e85c1e..8fd6c596a 100644 --- a/web/forms.py +++ b/web/forms.py @@ -40,6 +40,7 @@ SuccessStory, TeamGoal, TeamInvite, + WaitingRoom, ) from .referrals import handle_referral from .widgets import ( @@ -350,6 +351,22 @@ def clean_max_students(self): raise forms.ValidationError(msg) return max_students + def clean_title(self): + title = self.cleaned_data.get("title") + if not title: + raise forms.ValidationError("Title is required") + + # Check if title contains valid characters for slugification + if not re.match(r"^[\w\s-]+$", title): + raise forms.ValidationError("Title can only contain letters, numbers, spaces, and hyphens") + + # Check if a course with this slug already exists + slug = slugify(title) + if Course.objects.filter(slug=slug).exists(): + raise forms.ValidationError("A course with a similar title already exists.") + + return title + class CourseForm(forms.ModelForm): description = MarkdownxFormField( @@ -770,39 +787,39 @@ class Meta: } -class LearnForm(forms.Form): - subject = forms.CharField( - max_length=100, - widget=TailwindInput( - attrs={ - "placeholder": "What would you like to learn?", - "class": "block w-full border rounded p-2 focus:outline-none focus:ring-2 focus:ring-orange-500", - } - ), - ) - email = forms.EmailField( - widget=TailwindEmailInput( - attrs={ - "placeholder": "Your email address", - "class": "block w-full border rounded p-2 focus:outline-none focus:ring-2 focus:ring-orange-500", - } - ) - ) - message = forms.CharField( - widget=TailwindTextarea( - attrs={ - "placeholder": "Tell us more about what you want to learn...", - "rows": 4, - "class": "block w-full border rounded p-2 focus:outline-none focus:ring-2 focus:ring-orange-500", - } - ), - required=False, - ) - captcha = CaptchaField( - widget=TailwindCaptchaTextInput( - attrs={"class": "block w-full border rounded p-2 focus:outline-none focus:ring-2 focus:ring-orange-500"} - ) - ) +class LearnForm(forms.ModelForm): + """Form for creating and editing waiting rooms.""" + + class Meta: + model = WaitingRoom + fields = ["title", "description", "subject", "topics"] + + widgets = { + "title": TailwindInput(attrs={"placeholder": "What would you like to learn?"}), + "description": TailwindTextarea(attrs={"rows": 4, "placeholder": "Describe what you want to learn"}), + "subject": TailwindInput(attrs={"placeholder": "Main subject (e.g., Mathematics, Programming)"}), + "topics": TailwindInput( + attrs={"placeholder": "e.g., Python, Machine Learning, Data Science", "class": "tag-input"} + ), + } + help_texts = { + "title": "Give your waiting room a descriptive title", + "subject": "The main subject area for this waiting room", + "topics": "Enter topics separated by commas", + } + + def clean_topics(self): + """Validate and clean the topics field.""" + topics = self.cleaned_data.get("topics") + if not topics: + raise forms.ValidationError("Please enter at least one topic.") + + # Ensure we have at least one non-empty topic after splitting + topic_list = [t.strip() for t in topics.split(",") if t.strip()] + if not topic_list: + raise forms.ValidationError("Please enter at least one valid topic.") + + return topics class TeachForm(forms.Form): diff --git a/web/migrations/0044_waitingroom_fulfilled_course.py b/web/migrations/0044_waitingroom_fulfilled_course.py new file mode 100644 index 000000000..a7616444b --- /dev/null +++ b/web/migrations/0044_waitingroom_fulfilled_course.py @@ -0,0 +1,63 @@ +# Generated by Django 5.1.6 on 2025-03-24 07:12 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("web", "0043_alter_studygroup_members_studygroupinvite"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name="WaitingRoom", + fields=[ + ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("title", models.CharField(max_length=200)), + ("description", models.TextField(blank=True)), + ("subject", models.CharField(max_length=100)), + ("topics", models.TextField(help_text="Comma-separated list of topics")), + ( + "status", + models.CharField( + choices=[("open", "Open"), ("closed", "Closed"), ("fulfilled", "Fulfilled")], + default="open", + max_length=10, + ), + ), + ("created_at", models.DateTimeField(auto_now_add=True)), + ("updated_at", models.DateTimeField(auto_now=True)), + ( + "creator", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="created_waiting_rooms", + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "participants", + models.ManyToManyField( + blank=True, + related_name="joined_waiting_rooms", + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "fulfilled_course", + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name="fulfilled_waiting_rooms", + to="web.course", + ), + ), + ], + options={}, + ), + ] diff --git a/web/models.py b/web/models.py index 03fabd0d3..5e925d4b5 100644 --- a/web/models.py +++ b/web/models.py @@ -2150,6 +2150,28 @@ def created_at(self): return self.start_time +class WaitingRoom(models.Model): + """Model for storing waiting room requests for courses on specific subjects.""" + + STATUS_CHOICES = [("open", "Open"), ("closed", "Closed"), ("fulfilled", "Fulfilled")] + + title = models.CharField(max_length=200) + description = models.TextField(blank=True) + subject = models.CharField(max_length=100) + topics = models.TextField(help_text="Comma-separated list of topics") + creator = models.ForeignKey(User, on_delete=models.CASCADE, related_name="created_waiting_rooms") + participants = models.ManyToManyField(User, related_name="joined_waiting_rooms", blank=True) + status = models.CharField(max_length=10, choices=STATUS_CHOICES, default="open") + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + fulfilled_course = models.ForeignKey( + "Course", on_delete=models.SET_NULL, null=True, blank=True, related_name="fulfilled_waiting_rooms" + ) + + def __str__(self): + return self.title + + class GradeableLink(models.Model): """Model for storing links that users want to get grades on.""" @@ -2175,6 +2197,24 @@ class Meta: def __str__(self): return self.title + def participant_count(self): + """Return the number of participants in the waiting room.""" + return self.participants.count() + + def topic_list(self): + """Return the list of topics as a list.""" + return [topic.strip() for topic in self.topics.split(",") if topic.strip()] + + def mark_as_fulfilled(self, course=None): + """Mark the waiting room as fulfilled and notify participants.""" + self.status = "fulfilled" + self.save() + + if course: + from .notifications import notify_waiting_room_fulfilled + + notify_waiting_room_fulfilled(self, course) + def get_absolute_url(self): return reverse("gradeable_link_detail", kwargs={"pk": self.pk}) diff --git a/web/notifications.py b/web/notifications.py index f0258106d..37637a7ae 100644 --- a/web/notifications.py +++ b/web/notifications.py @@ -148,6 +148,58 @@ def send_weekly_progress_updates(): ) +def notify_waiting_room_fulfilled(waiting_room, course): + """ + Notify all participants in a waiting room that a course has been created. + + Args: + waiting_room (WaitingRoom): The waiting room that was fulfilled + course (Course): The course that was created from the waiting room + """ + subject = f"New Course Created: {course.title}" + + # Notify all participants + for participant in waiting_room.participants.all(): + notification_data = { + "title": subject, + "message": f"A new course has been created based on a waiting room you joined: '{waiting_room.title}'. " + f"The course '{course.title}' is now available for enrollment.", + "notification_type": "success", + } + + # Send notification + send_notification(participant, notification_data) + + # Send email with more details + html_message = render_to_string( + "emails/waiting_room_fulfilled.html", + { + "user": participant, + "waiting_room": waiting_room, + "course": course, + "site_url": settings.SITE_URL, + }, + ) + + send_mail( + subject, + "", # Plain text version - we're only sending HTML + settings.DEFAULT_FROM_EMAIL, + [participant.email], + html_message=html_message, + ) + + # Also notify the creator if they're not already a participant + if waiting_room.creator not in waiting_room.participants.all(): + notification_data = { + "title": subject, + "message": f"A new course has been created based on your waiting room: '{waiting_room.title}'. " + f"The course '{course.title}' is now available.", + "notification_type": "success", + } + send_notification(waiting_room.creator, notification_data) + + def send_email(subject, message, recipient_list): """ Send an email to the specified recipients and notify Slack. diff --git a/web/templates/base.html b/web/templates/base.html index 9ea8ad184..e7a4f13a2 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -220,6 +220,10 @@ diff --git a/web/templates/courses/create.html b/web/templates/courses/create.html index 3007ed493..faed93502 100644 --- a/web/templates/courses/create.html +++ b/web/templates/courses/create.html @@ -19,6 +19,26 @@

Create New Course

Fill out the form below to create your new course.

+ + {% if request.session.waiting_room_data %} +
+
+
+ + + +
+
+

+ Creating course for waiting room. Ensure the subject and topics match the waiting room's request. +

+
+
+
+ {% endif %}
-

New Learning Interest

+

New Learning Request

-

Subject Interest: {{ subject }}

+

{{ title }}

+

+ Waiting Room ID: {{ waiting_room_id }} +

+

+ Subject: {{ subject }} +

+

+ Topics: {{ topics }} +

From: {{ email }}

+

Description:

+

{{ description }}

{% if message %} -

Additional Information:

+

Additional Requirements:

{{ message }}

{% endif %} +

+ Create Course from this Request +

This is an automated message from Alpha One Labs Learning Platform

diff --git a/web/templates/emails/waiting_room_fulfilled.html b/web/templates/emails/waiting_room_fulfilled.html new file mode 100644 index 000000000..4a2192605 --- /dev/null +++ b/web/templates/emails/waiting_room_fulfilled.html @@ -0,0 +1,59 @@ +{% extends "emails/base_email.html" %} + +{% block content %} + + +

New Course Created!

+

Hello {{ user.first_name|default:user.username }},

+

Great news! A new course has been created based on a waiting room you joined:

+
+

+ Waiting Room: {{ waiting_room.title }} +

+

+ Subject: {{ waiting_room.subject }} +

+

+ Topics: {{ waiting_room.topics }} +

+
+

The following course is now available for enrollment:

+
+

{{ course.title }}

+

{{ course.description|truncatewords:50 }}

+

+ Teacher: {{ course.teacher.get_full_name|default:course.teacher.username }} +

+ {% if course.price == 0 %} +

+ Price: Free +

+ {% else %} +

+ Price: ${{ course.price }} +

+ {% endif %} +
+

Don't miss this opportunity to learn exactly what you've been looking for!

+
+ View Course Details +
+

Happy learning!

+

The Alpha One Labs Team

+ + +{% endblock %} diff --git a/web/templates/waiting_room/create.html b/web/templates/waiting_room/create.html new file mode 100644 index 000000000..ebf79ec12 --- /dev/null +++ b/web/templates/waiting_room/create.html @@ -0,0 +1,104 @@ +{% extends "base.html" %} + +{% block title %}Create Waiting Room{% endblock %} +{% block content %} +
+
+ + + + + Back to Waiting Rooms + +
+
+
+

Create a Waiting Room

+
+
+
+ + + +
+
+

+ Create a waiting room to express interest in subjects and topics you want to learn. + Other students can join your waiting room, and teachers can create courses based on popular demand. +

+
+
+
+ + {% csrf_token %} +
+
+ +
{{ form.title }}
+ {% if form.title.errors %}

{{ form.title.errors.0 }}

{% endif %} +
+
+ +
{{ form.description }}
+ {% if form.description.errors %}

{{ form.description.errors.0 }}

{% endif %} +

Describe what you want to learn in more detail.

+
+
+ +
{{ form.subject }}
+ {% if form.subject.errors %}

{{ form.subject.errors.0 }}

{% endif %} +

Main subject area (e.g., Mathematics, Programming, Art)

+
+
+ +
{{ form.topics }}
+ {% if form.topics.errors %}

{{ form.topics.errors.0 }}

{% endif %} +

Enter comma-separated topics (e.g., Python, Machine Learning, Data Science)

+
+
+
+ +
+ +
+
+
+ {% block extra_js %} + + {% endblock %} +{% endblock %} diff --git a/web/templates/waiting_room/create_course.html b/web/templates/waiting_room/create_course.html new file mode 100644 index 000000000..916d782ed --- /dev/null +++ b/web/templates/waiting_room/create_course.html @@ -0,0 +1,124 @@ +{% extends "base.html" %} + +{% block title %}Create Course from Waiting Room{% endblock %} +{% block content %} +
+
+ + + + + Back to Waiting Room + +
+
+
+
+

Create Course from Waiting Room

+
+
+
+ + + +
+
+

+ You are creating a course based on the waiting room "{{ waiting_room.title }}". + The form has been pre-filled with information from the waiting room. + You can modify any details as needed before creating the course. +

+
+
+
+
+

Waiting Room Details

+
+
+ Title: {{ waiting_room.title }} +
+
+ Description: {{ waiting_room.description }} +
+
+ Subject: {{ waiting_room.subject }} +
+
+ Topics: +
+ {% for topic in topics_list %} + {{ topic }} + {% endfor %} +
+
+
+ Participants: {{ waiting_room.participants.count }} +
+
+
+
+ {% csrf_token %} +
+
+ +
{{ form.title }}
+ {% if form.title.errors %}

{{ form.title.errors.0 }}

{% endif %} +
+
+ +
{{ form.description }}
+ {% if form.description.errors %}

{{ form.description.errors.0 }}

{% endif %} +
+
+ +
{{ form.subject }}
+ {% if form.subject.errors %}

{{ form.subject.errors.0 }}

{% endif %} +
+ {% if form.image %} +
+ +
{{ form.image }}
+ {% if form.image.errors %}

{{ form.image.errors.0 }}

{% endif %} +
+ {% endif %} + {% if form.price %} +
+ +
{{ form.price }}
+ {% if form.price.errors %}

{{ form.price.errors.0 }}

{% endif %} +

Leave as 0 for a free course

+
+ {% endif %} + {% if form.max_students %} +
+ +
{{ form.max_students }}
+ {% if form.max_students.errors %}

{{ form.max_students.errors.0 }}

{% endif %} +
+ {% endif %} +
+
+ +
+
+
+
+
+
+{% endblock %} diff --git a/web/templates/waiting_room/detail.html b/web/templates/waiting_room/detail.html new file mode 100644 index 000000000..5b28748b8 --- /dev/null +++ b/web/templates/waiting_room/detail.html @@ -0,0 +1,200 @@ +{% extends "base.html" %} + +{% block title %}{{ waiting_room.title }} - Waiting Room{% endblock %} +{% block content %} +
+
+ + + + + Back to Waiting Rooms + +
+
+
+
+
+

{{ waiting_room.title }}

+

{{ waiting_room.description }}

+
+
+ {% if waiting_room.status == 'open' %} +
+
+ Open +
+ {% elif waiting_room.status == 'fulfilled' %} +
+
+ Fulfilled +
+ {% elif waiting_room.status == 'closed' %} +
+
+ Closed +
+ {% endif %} +
Created {{ waiting_room.created_at|timesince }} ago
+
+
+ {% if waiting_room.status == 'fulfilled' and waiting_room.fulfilled_course %} +
+
+
+ + + +
+
+

Course Available!

+

+ The course "{{ waiting_room.fulfilled_course.title }}" has been created based on this request. +

+
+ + View Course Details + + + Enroll Now + +
+
+
+
+ {% endif %} +
+ +
+

Request Details

+
+
+
Subject
+
+ {{ waiting_room.subject }} +
+
+
+
Topics
+
+ {% for topic in topic_list %} + {{ topic }} + {% endfor %} +
+
+
+
Created By
+
+ + {{ waiting_room.creator.get_full_name|default:waiting_room.creator.username }} + +
+
+
+
+ +
+
+

Participants

+ {{ participant_count }} +
+ {% if waiting_room.participants.all %} +
    + {% for participant in waiting_room.participants.all %} +
  • +
    +
    + {{ participant.get_full_name|default:participant.username|first }} +
    +
    + {{ participant.get_full_name|default:participant.username }} +
    • + {% endfor %} +
+ {% else %} +
+

Be the first to join!

+
+ {% endif %} +
+
+ {% if matching_courses %} +
+

Related Courses

+
+ {% for course in matching_courses %} +
+
+

{{ course.title }}

+ {{ course.enrolled_students.count }} enrolled +
+

{{ course.description }}

+
+
+
+ {{ course.teacher.get_full_name|first }} +
+ {{ course.teacher.get_full_name }} +
+ + View Course + + + + +
+
+ {% endfor %} +
+
+ {% endif %} +
+ {% if waiting_room.status == 'open' %} +
+ {% if is_participant %} +
+ {% csrf_token %} + +
+ {% else %} +
+ {% csrf_token %} + +
+ {% endif %} + {% if is_teacher %} + + Create Matching Course + + {% endif %} +
+ {% elif waiting_room.status == 'closed' %} +
+

This request is no longer accepting participants

+
+ {% endif %} +
+
+
+
+{% endblock %} diff --git a/web/templates/waiting_room/list.html b/web/templates/waiting_room/list.html new file mode 100644 index 000000000..d2644ac48 --- /dev/null +++ b/web/templates/waiting_room/list.html @@ -0,0 +1,145 @@ +{% extends "base.html" %} + +{% load dict_filters %} + +{% block title %}Waiting Rooms{% endblock %} +{% block content %} +
+
+

Waiting Rooms

+ Create Waiting Room +
+
+

What are Waiting Rooms?

+

+ Waiting rooms allow you to express interest in subjects and topics you want to learn. + Join existing waiting rooms or create your own to find others interested in the same topics. + Teachers can see these waiting rooms and create courses based on popular demand. +

+
+ + {% if open_rooms %} +
+
+

Open Waiting Rooms

+ {{ open_rooms.count }} +
+
+ {% for room in open_rooms %} +
+ {% include 'waiting_room/room_card.html' with room=room room_topics=room_topics %} +
+ {% endfor %} +
+
+ {% endif %} + + {% if fulfilled_rooms %} +
+
+

Fulfilled Waiting Rooms

+ {{ fulfilled_rooms.count }} +
+
+ {% for room in fulfilled_rooms %} +
+ {% include 'waiting_room/room_card.html' with room=room room_topics=room_topics %} + {% if room.fulfilled_course %} +
+
+ + + + + + View Course + + + + + + Enroll Now + +
+
+ {% endif %} +
+ {% endfor %} +
+
+ {% endif %} + + {% if user_created_rooms or user_joined_rooms %} +
+

Your Waiting Rooms

+
+ {% for room in user_created_rooms %} +
+
+
+

{{ room.title }}

+ Created by you +
+

{{ room.description|truncatechars:100 }}

+
+ Subject: {{ room.subject }} +
+
+ Topics: +
+ {% for topic in room_topics|get_item:room.id %} + {{ topic }} + {% endfor %} +
+
+
+ {{ room.participants.count }} participant{{ room.participants.count|pluralize }} + View Details +
+
+
+ {% endfor %} + {% for room in user_joined_rooms %} + {% if room.creator != user %} +
+
+
+

{{ room.title }}

+ Joined +
+

{{ room.description|truncatechars:100 }}

+
+ Subject: {{ room.subject }} +
+
+ Topics: +
+ {% for topic in room_topics|get_item:room.id %} + {{ topic }} + {% endfor %} +
+
+
+ {{ room.participants.count }} participant{{ room.participants.count|pluralize }} + View Details +
+
+
+ {% endif %} + {% endfor %} +
+
+ {% endif %} +
+{% endblock %} diff --git a/web/templates/waiting_room/room_card.html b/web/templates/waiting_room/room_card.html new file mode 100644 index 000000000..68e916d70 --- /dev/null +++ b/web/templates/waiting_room/room_card.html @@ -0,0 +1,27 @@ +{% load dict_filters %} + +
+
+

{{ room.title }}

+ {% if room.creator == user %} + Created by you + {% endif %} +
+

{{ room.description|truncatechars:100 }}

+
+ Subject: {{ room.subject }} +
+
+ Topics: +
+ {% for topic in room_topics|get_item:room.id %} + {{ topic }} + {% endfor %} +
+
+
+ {{ room.participants.count }} participant{{ room.participants.count|pluralize }} + View Details +
+
diff --git a/web/templates/waiting_rooms.html b/web/templates/waiting_rooms.html new file mode 100644 index 000000000..8e3ceef14 --- /dev/null +++ b/web/templates/waiting_rooms.html @@ -0,0 +1,145 @@ +{% extends "base.html" %} + +{% load dict_filters %} + +{% block title %}Waiting Rooms{% endblock %} +{% block content %} +
+
+

Waiting Rooms

+ Create Learning Request +
+
+

What are Waiting Rooms?

+

+ Waiting rooms allow you to express interest in subjects and topics you want to learn. + Join existing waiting rooms or create your own to find others interested in the same topics. + Teachers can see these waiting rooms and create courses based on popular demand. +

+
+ + {% if open_rooms %} +
+
+

Open Waiting Rooms

+ {{ open_rooms.count }} +
+
+ {% for room in open_rooms %} +
+ {% include 'waiting_room/room_card.html' with room=room room_topics=room_topics %} +
+ {% endfor %} +
+
+ {% endif %} + + {% if fulfilled_rooms %} +
+
+

Fulfilled Waiting Rooms

+ {{ fulfilled_rooms.count }} +
+
+ {% for room in fulfilled_rooms %} +
+ {% include 'waiting_room/room_card.html' with room=room room_topics=room_topics %} + {% if room.fulfilled_course %} +
+
+ + + + + + View Course + + + + + + Enroll Now + +
+
+ {% endif %} +
+ {% endfor %} +
+
+ {% endif %} + + {% if user_created_rooms or user_joined_rooms %} +
+

Your Waiting Rooms

+
+ {% for room in user_created_rooms %} +
+
+
+

{{ room.title }}

+ Created by you +
+

{{ room.description|truncatechars:100 }}

+
+ Subject: {{ room.subject }} +
+
+ Topics: +
+ {% for topic in room_topics|get_item:room.id %} + {{ topic }} + {% endfor %} +
+
+
+ {{ room.participants.count }} participant{{ room.participants.count|pluralize }} + View Details +
+
+
+ {% endfor %} + {% for room in user_joined_rooms %} + {% if room.creator != user %} +
+
+
+

{{ room.title }}

+ Joined +
+

{{ room.description|truncatechars:100 }}

+
+ Subject: {{ room.subject }} +
+
+ Topics: +
+ {% for topic in room_topics|get_item:room.id %} + {{ topic }} + {% endfor %} +
+
+
+ {{ room.participants.count }} participant{{ room.participants.count|pluralize }} + View Details +
+
+
+ {% endif %} + {% endfor %} +
+
+ {% endif %} +
+{% endblock %} diff --git a/web/urls.py b/web/urls.py index aeb1cbe07..5c337d032 100644 --- a/web/urls.py +++ b/web/urls.py @@ -35,6 +35,7 @@ path("", views.index, name="index"), path("create-test-data/", views.run_create_test_data, name="create_test_data"), path("learn/", views.learn, name="learn"), + path("waiting-rooms/", views.waiting_rooms, name="waiting_rooms"), path("teach/", views.teach, name="teach"), path("about/", views.about, name="about"), path("profile//", views.public_profile, name="public_profile"), @@ -160,6 +161,16 @@ name="calendar_links", ), path("streak/", streak_detail, name="streak_detail"), + # Waiting Room URLs + path("waiting-rooms/", views.waiting_room_list, name="waiting_room_list"), + path("waiting-rooms//", views.waiting_room_detail, name="waiting_room_detail"), + path("waiting-rooms//join/", views.join_waiting_room, name="join_waiting_room"), + path("waiting-rooms//leave/", views.leave_waiting_room, name="leave_waiting_room"), + path( + "waiting-rooms//create-course/", + views.create_course_from_waiting_room, + name="create_course_from_waiting_room", + ), # Forum URLs path("forum/", views.forum_categories, name="forum_categories"), path("forum/category/create/", views.create_forum_category, name="create_forum_category"), diff --git a/web/views.py b/web/views.py index 6d7e79936..7e27187e1 100644 --- a/web/views.py +++ b/web/views.py @@ -142,6 +142,7 @@ TeamInvite, TimeSlot, UserBadge, + WaitingRoom, WebRequest, ) from .notifications import ( @@ -432,8 +433,33 @@ def create_course(request): if form.is_valid(): course = form.save(commit=False) course.teacher = request.user + course.status = "published" # Set status to published course.save() form.save_m2m() # Save many-to-many relationships + + # Handle waiting room if course was created from one + if "waiting_room_data" in request.session: + waiting_room = get_object_or_404(WaitingRoom, id=request.session["waiting_room_data"]["id"]) + + # Update waiting room status and link to course + waiting_room.status = "fulfilled" + waiting_room.fulfilled_course = course + waiting_room.save(update_fields=["status", "fulfilled_course"]) + + # Send notifications to all participants + for participant in waiting_room.participants.all(): + messages.success( + request, + f"A new course matching your request has been created: {course.title}", + extra_tags=f"course_{course.slug}", + ) + + # Clear waiting room data from session + del request.session["waiting_room_data"] + + # Redirect back to waiting room to show the update + return redirect("waiting_room_detail", waiting_room_id=waiting_room.id) + return redirect("course_detail", slug=course.slug) else: form = CourseForm() @@ -441,6 +467,27 @@ def create_course(request): return render(request, "courses/create.html", {"form": form}) +@login_required +@teacher_required +def create_course_from_waiting_room(request, waiting_room_id): + waiting_room = get_object_or_404(WaitingRoom, id=waiting_room_id) + + # Ensure waiting room is open + if waiting_room.status != "open": + messages.error(request, "This waiting room is no longer open.") + return redirect("waiting_room_detail", waiting_room_id=waiting_room_id) + + # Store waiting room data in session for validation + request.session["waiting_room_data"] = { + "id": waiting_room.id, + "subject": waiting_room.subject.strip().lower(), + "topics": [t.strip().lower() for t in waiting_room.topics.split(",") if t.strip()], + } + + # Redirect to regular course creation form + return redirect(reverse("create_course")) + + def course_detail(request, slug): course = get_object_or_404(Course, slug=slug) sessions = course.sessions.all().order_by("start_time") @@ -692,22 +739,82 @@ def about(request): return render(request, "about.html") +def waiting_rooms(request): + # Get open waiting rooms + open_rooms = WaitingRoom.objects.filter(status="open").order_by("-created_at") + + # Get fulfilled waiting rooms (ones that have associated courses) + fulfilled_rooms = WaitingRoom.objects.filter(status="fulfilled").order_by("-created_at") + + # Get rooms created by the user + user_created_rooms = ( + WaitingRoom.objects.filter(creator=request.user).order_by("-created_at") + if request.user.is_authenticated + else [] + ) + + # Get rooms the user has joined + user_joined_rooms = ( + WaitingRoom.objects.filter(participants=request.user).order_by("-created_at") + if request.user.is_authenticated + else [] + ) + + # Get topics for each room + room_topics = {} + all_rooms = list(open_rooms) + list(fulfilled_rooms) + list(user_created_rooms) + list(user_joined_rooms) + for room in all_rooms: + # Split topics string into a list + room_topics[room.id] = [t.strip() for t in room.topics.split(",")] if room.topics else [] + + context = { + "open_rooms": open_rooms, + "fulfilled_rooms": fulfilled_rooms, + "user_created_rooms": user_created_rooms, + "user_joined_rooms": user_joined_rooms, + "room_topics": room_topics, + } + + return render(request, "waiting_rooms.html", context) + + def learn(request): if request.method == "POST": form = LearnForm(request.POST) if form.is_valid(): + # Create waiting room + waiting_room = form.save(commit=False) + waiting_room.status = "open" # Set initial status + waiting_room.creator = request.user # Set the creator + + # Get topics from form and save as comma-separated string + topics = form.cleaned_data.get("topics", "") + if isinstance(topics, list): + topics = ", ".join(topics) + waiting_room.topics = topics + + waiting_room.save() + + # Redirect to waiting rooms page + return redirect("waiting_rooms") + + # Get form data + title = form.cleaned_data["title"] + description = form.cleaned_data["description"] subject = form.cleaned_data["subject"] - email = form.cleaned_data["email"] - message = form.cleaned_data["message"] + topics = form.cleaned_data["topics"] # Prepare email content - email_subject = f"Learning Interest: {subject}" + email_subject = f"New Learning Request: {title}" email_body = render_to_string( "emails/learn_interest.html", { + "title": title, + "description": description, "subject": subject, - "email": email, - "message": message, + "topics": topics, + "user": request.user.username, + "waiting_room_id": waiting_room.id, }, ) @@ -721,8 +828,11 @@ def learn(request): html_message=email_body, fail_silently=False, ) - messages.success(request, "Thank you for your interest! We'll be in touch soon.") - return redirect("index") + messages.success( + request, + "Thank you for your learning request!", + ) + return redirect("waiting_rooms") except Exception: logger = logging.getLogger(__name__) logger.exception("Error sending email") @@ -730,7 +840,11 @@ def learn(request): else: initial_data = {} if request.GET.get("subject"): - initial_data["subject"] = request.GET.get("subject") + try: + subject = Subject.objects.get(name=request.GET.get("subject")) + initial_data["subject"] = subject.id + except Subject.DoesNotExist: + pass form = LearnForm(initial=initial_data) return render(request, "learn.html", {"form": form}) @@ -4515,6 +4629,120 @@ def streak_detail(request): return render(request, "streak_detail.html", {"streak": streak}) +@login_required +def waiting_room_list(request): + """View for displaying waiting rooms categorized by status.""" + # Get waiting rooms by status + open_rooms = WaitingRoom.objects.filter(status="open") + fulfilled_rooms = WaitingRoom.objects.filter(status="fulfilled") + closed_rooms = WaitingRoom.objects.filter(status="closed") + + # Get waiting rooms created by the user + user_created_rooms = WaitingRoom.objects.filter(creator=request.user) + + # Get waiting rooms joined by the user + user_joined_rooms = request.user.joined_waiting_rooms.all() + + # Process topics for all waiting rooms + all_rooms = ( + list(open_rooms) + + list(fulfilled_rooms) + + list(closed_rooms) + + list(user_created_rooms) + + list(user_joined_rooms) + ) + room_topics = {} + for room in all_rooms: + room_topics[room.id] = [topic.strip() for topic in room.topics.split(",") if topic.strip()] + + context = { + "open_rooms": open_rooms, + "fulfilled_rooms": fulfilled_rooms, + "closed_rooms": closed_rooms, + "user_created_rooms": user_created_rooms, + "user_joined_rooms": user_joined_rooms, + "room_topics": room_topics, + } + return render(request, "waiting_room/list.html", context) + + +def find_matching_courses(waiting_room): + """Find courses that match the waiting room's subject and topics.""" + # Get courses with matching subject name (case-insensitive) + matching_courses = Course.objects.filter(subject__iexact=waiting_room.subject, status="published") + + # Filter courses that have all required topics + required_topics = {t.strip().lower() for t in waiting_room.topics.split(",") if t.strip()} + + # Further filter courses by checking if their topics contain all required topics + final_matches = [] + for course in matching_courses: + course_topics = {t.strip().lower() for t in course.topics.split(",") if t.strip()} + if course_topics.issuperset(required_topics): + final_matches.append(course) + + return final_matches + + +def waiting_room_detail(request, waiting_room_id): + """View for displaying details of a waiting room.""" + waiting_room = get_object_or_404(WaitingRoom, id=waiting_room_id) + + # Check if the user is a participant + is_participant = request.user.is_authenticated and request.user in waiting_room.participants.all() + + # Check if the user is the creator + is_creator = request.user.is_authenticated and request.user == waiting_room.creator + + # Check if the user is a teacher + is_teacher = request.user.is_authenticated and hasattr(request.user, "profile") and request.user.profile.is_teacher + + context = { + "waiting_room": waiting_room, + "is_participant": is_participant, + "is_creator": is_creator, + "is_teacher": is_teacher, + "participant_count": waiting_room.participants.count(), + "topic_list": [topic.strip() for topic in waiting_room.topics.split(",") if topic.strip()], + } + return render(request, "waiting_room/detail.html", context) + + +@login_required +def join_waiting_room(request, waiting_room_id): + """View for joining a waiting room.""" + waiting_room = get_object_or_404(WaitingRoom, id=waiting_room_id) + + # Check if the waiting room is open + if waiting_room.status != "open": + messages.error(request, "This waiting room is no longer open for joining.") + return redirect("waiting_room_list") + + # Add the user as a participant if not already + if request.user not in waiting_room.participants.all(): + waiting_room.participants.add(request.user) + messages.success(request, f"You have joined the waiting room: {waiting_room.title}") + else: + messages.info(request, "You are already a participant in this waiting room.") + + return redirect("waiting_room_detail", waiting_room_id=waiting_room.id) + + +@login_required +def leave_waiting_room(request, waiting_room_id): + """View for leaving a waiting room.""" + waiting_room = get_object_or_404(WaitingRoom, id=waiting_room_id) + + # Remove the user from participants + if request.user in waiting_room.participants.all(): + waiting_room.participants.remove(request.user) + messages.success(request, f"You have left the waiting room: {waiting_room.title}") + else: + messages.info(request, "You are not a participant in this waiting room.") + + return redirect("waiting_room_list") + + def is_superuser(user): return user.is_superuser