fix create_events action

Author: MoeeinAali

Diff for: backend/skyroom/admin.py

@@ -1,33 +1,73 @@
 from django.contrib import admin
 from datetime import datetime, timedelta
 
+from django.db.models import Max
+
 from skyroom.models import *
-from core.models import Seminar, Event
+from core.models import Seminar, Event, RoundTable
+
 # Register your models here.
 admin.site.register(SkyroomRoom)
 
+
 class SkyroomEventAdmin(admin.ModelAdmin):
     list_display = ('title', 'room', 'starting_time', 'duration', 'tolerance')
-    actions = ['create_from_seminars']
+    actions = ['create_events']
+
+    def create_events(self, request, queryset):
+        from itertools import chain
+
+        rooms = list(SkyroomRoom.objects.all())
+        latest_order = Event.objects.aggregate(Max('order'))['order__max']
 
-    def create_from_seminars(self, request, queryset):
-        room = SkyroomRoom.objects.first()
-        plan = ParticipationPlan.objects.first()
-        if room is None:
-            self.message_user(request, "No Skyroom room found", level='ERROR')
+        plans = ParticipationPlan.objects.filter(
+            event__order=latest_order
+        ).order_by('-id')[:3]
+
+        if not rooms:
+            self.message_user(request, "No Skyroom rooms found", level='ERROR')
+            return
+
+        if not plans:
+            self.message_user(request, "No participation plans found", level='ERROR')
             return
-        event_seminars = Seminar.objects.filter(sub_event__event=Event.objects.last()).order_by('sub_event__date', 'sub_event__starting_time')
-        for seminar in event_seminars:
-            seminar_datetime = datetime.combine(seminar.sub_event.date, seminar.sub_event.starting_time)
-            ending_datetime = datetime.combine(seminar.sub_event.date, seminar.sub_event.ending_time)
+
+        event_seminars = Seminar.objects.filter(
+            sub_event__event=Event.objects.last()
+        ).order_by('sub_event__date', 'sub_event__starting_time')
+
+        event_roundTables = RoundTable.objects.filter(
+            sub_event__event=Event.objects.last()
+        ).order_by('sub_event', 'sub_event__starting_time')
+
+        room_count = len(rooms)
+
+        combined_events = list(chain(event_seminars, event_roundTables))
+        combined_events.sort(key=lambda e: (e.sub_event.date, e.sub_event.starting_time))
+
+        for index, event in enumerate(combined_events):
+            seminar_datetime = datetime.combine(event.sub_event.date, event.sub_event.starting_time)
+            ending_datetime = datetime.combine(event.sub_event.date, event.sub_event.ending_time)
             seminar_duration = ending_datetime - seminar_datetime
-            SkyroomEvent.objects.create(
-                title=seminar.sub_event.name,
-                description=seminar.sub_event.description,
+
+            room = rooms[index % room_count]
+
+            if hasattr(event, 'speaker') and event.speaker:
+                title = f"{event.speaker.name} | {event.sub_event.name}"
+            else:
+                title = f"RoundTable | {event.sub_event.name}"
+
+            skyroom_event = SkyroomEvent.objects.create(
+                title=title,
+                description=event.sub_event.description,
                 room=room,
                 starting_time=seminar_datetime,
-                duration=seminar_duration,
-                tolerance=timedelta(minutes=10),
-            ).plans.add(plan)
+                duration=seminar_duration + timedelta(minutes=30),
+                tolerance=timedelta(days=7),
+            )
+
+            for plan in plans:
+                skyroom_event.plans.add(plan)
+
 
-admin.site.register(SkyroomEvent, SkyroomEventAdmin)
+admin.site.register(SkyroomEvent, SkyroomEventAdmin)

Diff for: backend/skyroom/views.py

@@ -10,6 +10,7 @@
 from django.db.models import F
 from rest_framework.response import Response
 
+
 # Create your views here.
 class SkyroomEventsView(ListAPIView):
     queryset = SkyroomEvent.objects.all()
@@ -35,7 +36,7 @@ class SkyroomEventLinkView(GenericAPIView):
     serializer_class = SkyroomEventWithLinkSerializer
     permission_classes = [IsAuthenticated]
     skyroom = SkyroomAPI()
-    
+
     def get(self, request, *args, **kwargs):
         try:
             participant = Participant.objects.get(user=self.request.user)
@@ -46,4 +47,4 @@ def get(self, request, *args, **kwargs):
         return Response(self.get_serializer({
             'id': event.id,
             'link': link
-        }).data)
+        }).data)

Diff for: frontend/src/app/dashboard/stream/StreamEvent.tsx

@@ -9,6 +9,9 @@ import { attendStream } from '../../../lib/api/dashboard/stream';
 
 const formatTime = (time: Date) => {
   const options: Intl.DateTimeFormatOptions = {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
     hour: 'numeric',
     minute: 'numeric',
     hour12: true,
@@ -65,7 +68,9 @@ export default function StreamEvent({
                   </div>
                 )}
                 <div className="min-w-0 flex-shrink flex-grow overflow-hidden overflow-ellipsis whitespace-nowrap p-3">
-                  {streamEvent.title}
+                  {streamEvent.title.length > 70
+                    ? streamEvent.title.slice(0, 70) + '...'
+                    : streamEvent.title}
                 </div>
               </div>
               <div className="flex w-fit flex-shrink-0 flex-grow-0 justify-between">
@@ -74,7 +79,10 @@ export default function StreamEvent({
                 </Disclosure.Button>
                 <button
                   onClick={onAttendClick}
-                  className="ml-4 flex w-28 justify-around rounded-md bg-secondary p-3 text-center text-white transition-colors hover:bg-secondary-400"
+                  disabled={!hasStarted}
+                  className={`ml-4 flex w-28 justify-around rounded-md bg-secondary p-3 text-center text-white transition-colors hover:bg-secondary-400 ${
+                    !hasStarted ? 'opacity-50' : ''
+                  }`}
                 >
                   <Image src={play} height={22} width={22} alt="" />
                   Attend