14 changed files with 120 additions and 457 deletions
--- a/locales/en.json
+++ b/locales/en.json
@ -210,33 +210,5 @@
    "journal.pl.overview.new": "new",
    "journal.pl.overview.pastLessonsStats": "Statistics of past lessons",
    "journal.pl.overview.dayOfWeekHelp": "Only statistics for completed lessons are shown",
-    "journal.pl.overview.attendanceHelp": "Attendance is calculated based on past lessons only",
-    "journal.pl.today": "Today",
-    "journal.pl.tomorrow": "Tomorrow",
-    "journal.pl.dayAfterTomorrow": "Day after tomorrow",
-    "journal.pl.days.morning": "Morning",
-    "journal.pl.days.day": "Day",
-    "journal.pl.days.evening": "Evening",
-    "journal.pl.lesson.form.selectTime": "Select time",
-    "journal.pl.lesson.existingLessonHint": "There is already a lesson on this day",
-    "journal.pl.lesson.form.selectDate": "Select date",
-    "journal.pl.days.shortMonday": "Mo",
-    "journal.pl.days.shortTuesday": "Tu",
-    "journal.pl.days.shortWednesday": "We",
-    "journal.pl.days.shortThursday": "Th",
-    "journal.pl.days.shortFriday": "Fr",
-    "journal.pl.days.shortSaturday": "Sa",
-    "journal.pl.days.shortSunday": "Su",
-    "journal.pl.months.january": "January",
-    "journal.pl.months.february": "February",
-    "journal.pl.months.march": "March",
-    "journal.pl.months.april": "April",
-    "journal.pl.months.may": "May",
-    "journal.pl.months.june": "June",
-    "journal.pl.months.july": "July",
-    "journal.pl.months.august": "August",
-    "journal.pl.months.september": "September",
-    "journal.pl.months.october": "October",
-    "journal.pl.months.november": "November",
-    "journal.pl.months.december": "December"
+    "journal.pl.overview.attendanceHelp": "Attendance is calculated based on past lessons only"
 }
--- a/locales/ru.json
+++ b/locales/ru.json
@ -207,33 +207,5 @@
  "journal.pl.overview.new": "новых",
  "journal.pl.overview.pastLessonsStats": "Статистика проведённых занятий",
  "journal.pl.overview.dayOfWeekHelp": "Показана статистика только состоявшихся занятий",
-  "journal.pl.overview.attendanceHelp": "Посещаемость рассчитана только по прошедшим занятиям",
-  "journal.pl.today": "Сегодня",
-  "journal.pl.tomorrow": "Завтра",
-  "journal.pl.dayAfterTomorrow": "Послезавтра",
-  "journal.pl.days.morning": "Утро",
-  "journal.pl.days.day": "День",
-  "journal.pl.days.evening": "Вечер",
-  "journal.pl.lesson.form.selectTime": "Выберите время",
-  "journal.pl.lesson.existingLessonHint": "В этот день уже есть лекция",
-  "journal.pl.lesson.form.selectDate": "Выберите дату",
-  "journal.pl.days.shortMonday": "Пн",
-  "journal.pl.days.shortTuesday": "Вт",
-  "journal.pl.days.shortWednesday": "Ср",
-  "journal.pl.days.shortThursday": "Чт",
-  "journal.pl.days.shortFriday": "Пт",
-  "journal.pl.days.shortSaturday": "Сб",
-  "journal.pl.days.shortSunday": "Вс",
-  "journal.pl.months.january": "Январь",
-  "journal.pl.months.february": "Февраль",
-  "journal.pl.months.march": "Март",
-  "journal.pl.months.april": "Апрель",
-  "journal.pl.months.may": "Май",
-  "journal.pl.months.june": "Июнь",
-  "journal.pl.months.july": "Июль",
-  "journal.pl.months.august": "Август",
-  "journal.pl.months.september": "Сентябрь",
-  "journal.pl.months.october": "Октябрь",
-  "journal.pl.months.november": "Ноябрь",
-  "journal.pl.months.december": "Декабрь"
+  "journal.pl.overview.attendanceHelp": "Посещаемость рассчитана только по прошедшим занятиям"
 }
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
    "name": "journal.pl",
-    "version": "3.16.4",
+    "version": "3.15.0",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "journal.pl",
-            "version": "3.16.4",
+            "version": "3.15.0",
            "license": "MIT",
            "dependencies": {
                "@brojs/cli": "^1.8.4",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "journal.pl",
-    "version": "3.16.4",
+    "version": "3.15.0",
    "description": "bro-js platform journal ui repo",
    "main": "./src/index.tsx",
    "scripts": {
--- a/src/data/model.ts
+++ b/src/data/model.ts
@ -59,7 +59,7 @@ export interface Lesson {
  id: string;
  _id: string;
  name: string;
-  studentReactions: Reaction[];
+  reactions: Reaction[];
  students: User[];
  teachers: Teacher[];
  date: string;
--- a/src/components/user-card/user-card.tsx
+++ b/src/components/user-card/user-card.tsx
@ -6,7 +6,7 @@ import { CheckCircleIcon, AddIcon } from '@chakra-ui/icons'
 import { motion, AnimatePresence } from 'framer-motion'
 import { useTranslation } from 'react-i18next'

-import { Reaction, User } from '../../__data__/model'
+import { User, Reaction } from '../../__data__/model'

 import { AddMissedButton, Avatar, Wrapper, NameOverlay } from './style'

@ -34,45 +34,58 @@ export const UserCard = ({
  wrapperAS = 'div',
  width,
  recentlyPresent = false,
-  reaction
+  reactions = []
 }: {
  student: User
  present: boolean
  width?: string | number
  onAddUser?: (user: User) => void
-  wrapperAS?: React.ElementType<any, keyof React.JSX.IntrinsicElements>
+  wrapperAS?: React.ElementType<any, keyof React.JSX.IntrinsicElements>;
  recentlyPresent?: boolean
-  reaction?: Reaction
+  reactions?: Reaction[]
 }) => {
  const { colorMode } = useColorMode();
  const { t } = useTranslation();
  const [imageError, setImageError] = useState(false);
-  const [showReaction, setShowReaction] = useState(false);
+  const [visibleReactions, setVisibleReactions] = useState<Reaction[]>([]);
  const timeoutRef = useRef<NodeJS.Timeout | null>(null);
  
-  // Обрабатываем изменение реакции
+  // Filter reactions to only show this student's reactions
  useEffect(() => {
-    if (reaction) {
-      setShowReaction(true);
+    const studentReactions = reactions.filter(r => r.sub === student.sub);
+    
+    if (studentReactions.length > 0) {
+      // Check for new reactions
+      const newReactions = studentReactions.filter(
+        newReaction => !visibleReactions.some(
+          existingReaction => existingReaction._id === newReaction._id
+        )
+      );
      
-      // Очищаем предыдущий таймер если он есть
-      if (timeoutRef.current) {
-        clearTimeout(timeoutRef.current);
+      if (newReactions.length > 0) {
+        // If there are new reactions, add them to visible reactions
+        setVisibleReactions(prevReactions => [...prevReactions, ...newReactions]);
+        
+        // Clear any existing timeout
+        if (timeoutRef.current) {
+          clearTimeout(timeoutRef.current);
+        }
+        
+        // Set a new timeout
+        timeoutRef.current = setTimeout(() => {
+          setVisibleReactions([]);
+          timeoutRef.current = null;
+        }, 3000);
      }
-      
-      // Устанавливаем новый таймер
-      timeoutRef.current = setTimeout(() => {
-        setShowReaction(false);
-        timeoutRef.current = null;
-      }, 3000);
    }
    
+    // Clean up on unmount
    return () => {
      if (timeoutRef.current) {
        clearTimeout(timeoutRef.current);
      }
    };
-  }, [reaction]);
+  }, [reactions, student.sub, visibleReactions]);
  
  return (
    <Wrapper 
@ -104,19 +117,22 @@ export const UserCard = ({
        </AddMissedButton>
      )}
      
-      {/* Анимация реакции */}
+      {/* Student reactions animation */}
      <AnimatePresence>
-        {showReaction && reaction && (
+        {visibleReactions.map((reaction, index) => (
          <motion.div
-            key={reaction._id}
-            initial={{ opacity: 0, scale: 0.5, y: 0 }}
-            animate={{ opacity: 1, scale: 1, y: 0 }}
+            key={reaction._id || index}
+            initial={{ opacity: 0, scale: 0.5, x: 0, y: 0 }}
+            animate={{ opacity: 1, scale: 1, x: 0, y: 0 }}
            exit={{ opacity: 0, scale: 0.5, y: -20 }}
-            transition={{ duration: 0.5 }}
+            transition={{ 
+              duration: 0.5,
+              delay: index * 0.1
+            }}
            style={{
              position: 'absolute',
-              top: '10px',
-              right: '10px',
+              top: '10px',  // Position at the top
+              right: '10px', // Position at the right
              zIndex: 10,
              pointerEvents: 'none',
              display: 'flex',
@ -130,17 +146,17 @@ export const UserCard = ({
            title={t(`journal.pl.reactions.${reaction.reaction}`)}
          >
            <Text 
-              fontSize="3xl"
+              fontSize="3xl" // Increased size
              sx={{
                filter: 'drop-shadow(0 1px 2px rgba(0,0,0,0.3))',
-                transform: 'scale(1.2)',
+                transform: 'scale(1.2)', // Additional scaling
                display: 'flex'
              }}
            >
              {REACTION_EMOJIS[reaction.reaction] || reaction.reaction}
            </Text>
          </motion.div>
-        )}
+        ))}
      </AnimatePresence>
    </Wrapper>
  )
--- a/src/pages/lesson-details.tsx
+++ b/src/pages/lesson-details.tsx
@ -127,8 +127,8 @@ const LessonDetail = () => {

  // Эффект для обработки новых реакций
  useEffect(() => {
-    if (accessCode?.body?.lesson?.studentReactions) {
-      const reactions = accessCode.body.lesson.studentReactions;
+    if (accessCode?.body?.lesson?.reactions) {
+      const reactions = accessCode.body.lesson.reactions;
      
      // Группируем реакции по sub (идентификатору студента)
      const groupedReactions: Record<string, Reaction[]> = {};
@ -137,20 +137,31 @@ const LessonDetail = () => {
        if (!groupedReactions[reaction.sub]) {
          groupedReactions[reaction.sub] = [];
        }
-        groupedReactions[reaction.sub].push(reaction);
+        
+        // Добавляем только новые реакции
+        const isNewReaction = !prevReactionsRef.current[reaction.sub]?.some(
+          r => r._id === reaction._id
+        );
+        
+        if (isNewReaction) {
+          groupedReactions[reaction.sub].push(reaction);
+        }
      });
      
      // Обновляем отображаемые реакции
      setStudentReactions(groupedReactions);
      
-      // Обновляем предыдущие реакции после небольшой задержки
-      const updatePrevReactionsTimeout = setTimeout(() => {
-        prevReactionsRef.current = groupedReactions;
-      }, 1000);
+      // Обновляем предыдущие реакции
+      prevReactionsRef.current = { ...groupedReactions };
      
-      return () => clearTimeout(updatePrevReactionsTimeout);
+      // Сбрасываем отображаемые реакции через некоторое время
+      const clearReactionsTimeout = setTimeout(() => {
+        setStudentReactions({});
+      }, 5000);
+      
+      return () => clearTimeout(clearReactionsTimeout);
    }
-  }, [accessCode?.body?.lesson?.studentReactions]);
+  }, [accessCode?.body?.lesson?.reactions]);

  useEffect(() => {
    if (manualAddRqst.isSuccess) {
@ -382,7 +393,7 @@ const LessonDetail = () => {
                            present={student.present}
                            recentlyPresent={student.recentlyPresent}
                            onAddUser={(user: User) => manualAdd({ lessonId, user })}
-                            reaction={accessCode?.body?.lesson?.studentReactions?.find(r => r.sub === student.sub)}
+                            reactions={studentReactions[student.sub] || []}
                          />
                        </Box>
                        
--- a/src/pages/lesson-list/components/lessons-form.tsx
+++ b/src/pages/lesson-list/components/lessons-form.tsx
@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect } from 'react'
 import { useForm, Controller } from 'react-hook-form'
 import {
  Box,
@ -24,14 +24,9 @@ import {
  SimpleGrid,
  Skeleton,
  SkeletonText,
-  useStyleConfig,
-  Select,
-  Wrap,
-  WrapItem,
-  IconButton,
-  Center
+  useStyleConfig
 } from '@chakra-ui/react'
-import { AddIcon, CheckIcon, WarningIcon, RepeatIcon, ChevronLeftIcon, ChevronRightIcon } from '@chakra-ui/icons'
+import { AddIcon, CheckIcon, WarningIcon, RepeatIcon } from '@chakra-ui/icons'
 import { useTranslation } from 'react-i18next'
 import { FaRobot } from 'react-icons/fa'
 import dayjs from 'dayjs'
@ -44,7 +39,6 @@ import { ErrorSpan } from '../style'
 interface NewLessonForm {
  name: string
  date: string
-  time: string
 }

 interface LessonFormProps {
@ -60,7 +54,6 @@ interface LessonFormProps {
  onSelectAiSuggestion?: (suggestion: any) => void // Обработчик выбора предложения
  selectedAiSuggestion?: any // Выбранное предложение
  onRetryAiGeneration?: () => void // Функция для повторного запуска генерации
-  existingLessons?: Array<{ date: string; name: string }> // Добавляем новый проп
 }

 export const LessonForm = ({
@ -75,8 +68,7 @@ export const LessonForm = ({
  isLoadingAiSuggestions = false,
  onSelectAiSuggestion = () => {},
  selectedAiSuggestion,
-  onRetryAiGeneration = () => {},
-  existingLessons
+  onRetryAiGeneration = () => {}
 }: LessonFormProps) => {
  const { t } = useTranslation()
  const isAiSuggested = lesson && !lesson._id && !lesson.id
@ -139,257 +131,6 @@ export const LessonForm = ({
    onSelectAiSuggestion(suggestion)
  }

-  // Добавляем новые вспомогательные функции
-  const generateTimeSlots = () => {
-    const slots = [];
-    for (let hour = 8; hour <= 21; hour++) {
-      slots.push(`${hour.toString().padStart(2, '0')}:00`);
-      slots.push(`${hour.toString().padStart(2, '0')}:30`);
-    }
-    return slots;
-  };
-
-  const getNextTimeSlots = (date: string, count: number = 3) => {
-    const currentDate = new Date();
-    const selectedDate = new Date(date);
-    const isToday = selectedDate.toDateString() === currentDate.toDateString();
-    
-    if (!isToday) return [];
-
-    const currentMinutes = currentDate.getHours() * 60 + currentDate.getMinutes();
-    const slots = generateTimeSlots();
-    
-    return slots
-      .map(slot => {
-        const [hours, minutes] = slot.split(':').map(Number);
-        const slotMinutes = hours * 60 + minutes;
-        return { slot, minutes: slotMinutes };
-      })
-      .filter(({ minutes }) => minutes > currentMinutes)
-      .slice(0, count)
-      .map(({ slot }) => slot);
-  };
-
-  const timeGroups = {
-    [`${t('journal.pl.days.morning')} (8-12)`]: generateTimeSlots().filter(slot => {
-      const hour = parseInt(slot.split(':')[0]);
-      return hour >= 8 && hour < 12;
-    }),
-    [`${t('journal.pl.days.day')} (12-17)`]: generateTimeSlots().filter(slot => {
-      const hour = parseInt(slot.split(':')[0]);
-      return hour >= 12 && hour < 17;
-    }),
-    [`${t('journal.pl.days.evening')} (17-21)`]: generateTimeSlots().filter(slot => {
-      const hour = parseInt(slot.split(':')[0]);
-      return hour >= 17 && hour <= 21;
-    })
-  };
-
-  // Добавляем функцию для получения дня недели
-  const getDayOfWeek = (date: Date) => {
-    const days = [
-      t('journal.pl.days.sunday'),
-      t('journal.pl.days.monday'),
-      t('journal.pl.days.tuesday'),
-      t('journal.pl.days.wednesday'),
-      t('journal.pl.days.thursday'),
-      t('journal.pl.days.friday'),
-      t('journal.pl.days.saturday')
-    ];
-    return days[date.getDay()];
-  };
-
-  // Добавляем вспомогательные функции для календаря
-  const getDaysInMonth = (year: number, month: number) => {
-    return new Date(year, month + 1, 0).getDate();
-  };
-
-  const getFirstDayOfMonth = (year: number, month: number) => {
-    return new Date(year, month, 1).getDay();
-  };
-
-  const isWeekend = (dayOfWeek: number) => {
-    return dayOfWeek === 0 || dayOfWeek === 6; // Воскресенье или суббота
-  };
-
-  const isSameDay = (date1: Date, date2: Date) => {
-    return date1.getFullYear() === date2.getFullYear() &&
-           date1.getMonth() === date2.getMonth() &&
-           date1.getDate() === date2.getDate();
-  };
-  // Компонент календаря
-  interface CalendarProps {
-    selectedDate: Date;
-    onSelectDate: (date: Date) => void;
-    existingLessons?: string[];
-  }
-
-  const Calendar: React.FC<CalendarProps> = ({ selectedDate, onSelectDate, existingLessons = [] }) => {
-    const { t } = useTranslation();
-    const [viewDate, setViewDate] = useState(new Date());
-    
-    // Используем короткие названия дней недели из локализации
-    const weekDays = [
-      t('journal.pl.days.shortMonday'),
-      t('journal.pl.days.shortTuesday'),
-      t('journal.pl.days.shortWednesday'),
-      t('journal.pl.days.shortThursday'),
-      t('journal.pl.days.shortFriday'),
-      t('journal.pl.days.shortSaturday'),
-      t('journal.pl.days.shortSunday'),
-    ];
-
-    // Используем локализованные названия месяцев
-    const monthNames = [
-      t('journal.pl.months.january'),
-      t('journal.pl.months.february'),
-      t('journal.pl.months.march'),
-      t('journal.pl.months.april'),
-      t('journal.pl.months.may'),
-      t('journal.pl.months.june'),
-      t('journal.pl.months.july'),
-      t('journal.pl.months.august'),
-      t('journal.pl.months.september'),
-      t('journal.pl.months.october'),
-      t('journal.pl.months.november'),
-      t('journal.pl.months.december'),
-    ];
-
-    const daysInMonth = getDaysInMonth(viewDate.getFullYear(), viewDate.getMonth());
-    let firstDay = getFirstDayOfMonth(viewDate.getFullYear(), viewDate.getMonth());
-    firstDay = firstDay === 0 ? 6 : firstDay - 1; // Корректируем для начала недели с понедельника
-
-    const days = Array.from({ length: 42 }, (_, i) => {
-      const dayNumber = i - firstDay + 1;
-      if (dayNumber > 0 && dayNumber <= daysInMonth) {
-        const date = new Date(viewDate.getFullYear(), viewDate.getMonth(), dayNumber);
-        return {
-          date,
-          dayOfMonth: dayNumber,
-          isCurrentMonth: true,
-          isWeekend: isWeekend(date.getDay()),
-          isToday: isSameDay(date, new Date()),
-          isSelected: isSameDay(date, selectedDate)
-        };
-      }
-      return null;
-    });
-
-    // Добавим функцию проверки наличия лекции в определенный день
-    const hasLessonOnDate = (date: Date) => {
-      return existingLessons.some(lessonDate => 
-        isSameDay(new Date(lessonDate), date)
-      );
-    };
-
-    return (
-      <Box>
-        <Text fontSize="sm" mb={2}>{t('journal.pl.lesson.form.selectDate')}</Text>
-        <HStack justify="space-between" mb={2}>
-          <IconButton
-            aria-label="Previous month"
-            icon={<ChevronLeftIcon />}
-            size="sm"
-            onClick={() => {
-              const newDate = new Date(viewDate);
-              newDate.setMonth(newDate.getMonth() - 1);
-              setViewDate(newDate);
-            }}
-          />
-          <HStack>
-            <Select
-              size="sm"
-              value={viewDate.getMonth()}
-              onChange={(e) => {
-                const newDate = new Date(viewDate);
-                newDate.setMonth(parseInt(e.target.value));
-                setViewDate(newDate);
-              }}
-            >
-              {monthNames.map((month, i) => (
-                <option key={i} value={i}>{month}</option>
-              ))}
-            </Select>
-            <Select
-              size="sm"
-              value={viewDate.getFullYear()}
-              onChange={(e) => {
-                const newDate = new Date(viewDate);
-                newDate.setFullYear(parseInt(e.target.value));
-                setViewDate(newDate);
-              }}
-            >
-              {Array.from({ length: 5 }, (_, i) => {
-                const year = new Date().getFullYear() + i;
-                return <option key={year} value={year}>{year}</option>;
-              })}
-            </Select>
-          </HStack>
-          <IconButton
-            aria-label="Next month"
-            icon={<ChevronRightIcon />}
-            size="sm"
-            onClick={() => {
-              const newDate = new Date(viewDate);
-              newDate.setMonth(newDate.getMonth() + 1);
-              setViewDate(newDate);
-            }}
-          />
-        </HStack>
-
-        <SimpleGrid columns={7} spacing={1}>
-          {weekDays.map(day => (
-            <Center key={day} py={1}>
-              <Text fontSize="xs" color="gray.500">
-                {day}
-              </Text>
-            </Center>
-          ))}
-          {days.map((day, i) => {
-            const hasLesson = day?.isCurrentMonth && hasLessonOnDate(day.date);
-            
-            return (
-              <Button
-                key={i}
-                size="sm"
-                variant={day?.isSelected ? "solid" : "ghost"}
-                colorScheme={day?.isSelected ? "blue" : day?.isWeekend ? "red" : "gray"}
-                opacity={day?.isCurrentMonth ? 1 : 0}
-                onClick={() => day?.date && onSelectDate(day.date)}
-                h="32px"
-                disabled={!day?.isCurrentMonth}
-                position="relative"
-                _after={hasLesson ? {
-                  content: '""',
-                  position: "absolute",
-                  bottom: "2px",
-                  left: "50%",
-                  transform: "translateX(-50%)",
-                  width: "4px",
-                  height: "4px",
-                  borderRadius: "full",
-                  bg: day?.isSelected ? "white" : "blue.500",
-                  _dark: {
-                    bg: day?.isSelected ? "white" : "blue.300"
-                  }
-                } : undefined}
-                title={hasLesson ? t('journal.pl.lesson.existingLessonHint') : undefined}
-              >
-                <Text
-                  fontSize="xs"
-                  fontWeight={day?.isToday ? "bold" : "normal"}
-                  textDecoration={day?.isToday ? "underline" : "none"}
-                >
-                  {day?.dayOfMonth}
-                </Text>
-              </Button>
-            );
-          })}
-        </SimpleGrid>
-      </Box>
-    );
-  };
-
  return (
    <Card align="left" bg={isAiSuggested ? aiHighlightColor : undefined}>
      <CardHeader display="flex">
@ -419,68 +160,23 @@ export const LessonForm = ({
              control={control}
              name="date"
              rules={{ required: t('journal.pl.common.required') }}
-              render={({ field }) => {
-                const [currentDate = '', currentTime = '00:00:00'] = field.value.split('T');
-                const currentTimeShort = currentTime.split(':').slice(0, 2).join(':');
-                const selectedDate = new Date(currentDate);
-                
-                // Получаем существующие лекции из пропсов компонента
-                const existingLessons2 = existingLessons?.map(lesson => lesson.date) || [];
-                
-                return (
-                  <FormControl>
-                    <FormLabel>{t('journal.pl.lesson.form.date')}</FormLabel>
-                    <SimpleGrid columns={{ base: 1, md: 2 }} spacing={4}>
-                      {/* Календарь */}
-                      <Box>
-                        <Calendar
-                          selectedDate={selectedDate}
-                          existingLessons={existingLessons2}
-                          onSelectDate={(date) => {
-                            const formattedDate = dateToCalendarFormat(date.toISOString()).split('T')[0];
-                            field.onChange(`${formattedDate}T${currentTimeShort}:00`);
-                          }}
-                        />
-                      </Box>
-
-                      {/* Временные слоты */}
-                      <Box>
-                        <Text fontSize="sm" mb={2}>{t('journal.pl.lesson.form.selectTime')}:</Text>
-                        <SimpleGrid columns={1} spacing={4}>
-                          {Object.entries(timeGroups).map(([groupName, slots]) => (
-                            <Box key={groupName}>
-                              <Text fontSize="xs" color="gray.500" mb={1}>
-                                {groupName}
-                              </Text>
-                              <Wrap spacing={1}>
-                                {slots.map(slot => {
-                                  const isSelected = currentTimeShort === slot;
-                                  return (
-                                    <WrapItem key={slot}>
-                                      <Button
-                                        size="xs"
-                                        variant={isSelected ? "solid" : "outline"}
-                                        colorScheme="blue"
-                                        onClick={() => {
-                                          field.onChange(`${currentDate}T${slot}:00`);
-                                        }}
-                                        h="24px"
-                                        minW="54px"
-                                      >
-                                        {slot}
-                                      </Button>
-                                    </WrapItem>
-                                  );
-                                })}
-                              </Wrap>
-                            </Box>
-                          ))}
-                        </SimpleGrid>
-                      </Box>
-                    </SimpleGrid>
-                  </FormControl>
-                );
-              }}
+              render={({ field }) => (
+                <FormControl>
+                  <FormLabel>{t('journal.pl.lesson.form.date')}</FormLabel>
+                  <Input
+                    {...field}
+                    required={false}
+                    placeholder={t('journal.pl.lesson.form.datePlaceholder')}
+                    size="md"
+                    type="datetime-local"
+                  />
+                  {errors.date ? (
+                    <FormErrorMessage>{errors.date?.message}</FormErrorMessage>
+                  ) : (
+                    <FormHelperText>{t('journal.pl.lesson.form.dateTime')}</FormHelperText>
+                  )}
+                </FormControl>
+              )}
            />

            <Controller
--- a/src/pages/lesson-list/lesson-list.tsx
+++ b/src/pages/lesson-list/lesson-list.tsx
@ -359,10 +359,6 @@ const LessonList = () => {
                onSelectAiSuggestion={handleSelectAiSuggestion}
                selectedAiSuggestion={suggestedLessonToCreate}
                onRetryAiGeneration={handleRetryAiGeneration}
-                existingLessons={data?.body?.map(lesson => ({
-                  date: lesson.date,
-                  name: lesson.name
-                }))}
              />
            ) : (
              <Button
--- a/src/pages/user-page.tsx
+++ b/src/pages/user-page.tsx
@ -63,28 +63,28 @@ const UserPage = () => {
  // Эффект для поэтапного появления карточек студентов
  useEffect(() => {
    if (ls.data?.body?.students?.length) {
-      // Обновляем существующих студентов с сохранением их анимации
-      setAnimatedStudents(prevStudents => {
-        const newStudents = ls.data.body.students.map(student => {
-          // Находим существующего студента
-          const existingStudent = prevStudents.find(p => p.sub === student.sub);
-          // Сохраняем флаг isNew если студент уже существует
-          return {
-            ...student,
-            isNew: existingStudent ? existingStudent.isNew : true
-          };
-        });
-        
-        // Если количество студентов не изменилось, сохраняем текущий массив
-        if (prevStudents.length === newStudents.length && 
-            prevStudents.every(student => newStudents.find(n => n.sub === student.sub))) {
-          return prevStudents;
+      // Сначала очищаем список
+      setAnimatedStudents([])
+      
+      // Затем постепенно добавляем студентов для красивой анимации
+      const students = [...ls.data.body.students]
+      const addStudentWithDelay = (index) => {
+        if (index < students.length) {
+          setAnimatedStudents(prev => [...prev, {...students[index], isNew: true}])
+          
+          // Для следующего студента
+          setTimeout(() => {
+            addStudentWithDelay(index + 1)
+          }, 100) // Уменьшенная задержка для более плавной анимации
        }
-        
-        return newStudents;
-      });
+      }
+      
+      // Запускаем процесс добавления с небольшой задержкой для лучшего UX
+      setTimeout(() => {
+        addStudentWithDelay(0)
+      }, 300)
    }
-  }, [ls.data?.body?.students, ls.data?.body?.studentReactions])
+  }, [ls.data?.body?.students])
  
  // Эффект для сброса флага "новизны" студентов
  useEffect(() => {
@ -277,7 +277,7 @@ const UserPage = () => {
                    student={student}
                    present={true}
                    recentlyPresent={student.isNew}
-                    reaction={ls.data?.body?.studentReactions?.find(r => r.sub === student.sub)}
+                    reactions={ls.data?.body?.reactions?.filter(r => r.sub === student.sub) || []}
                  />
                </motion.li>
              ))}
--- a/stubs/api/index.js
+++ b/stubs/api/index.js
@ -35,7 +35,7 @@ function readAndModifyJson(filePath) {
      jsonContent.body.forEach((lesson) => {
        // Случайная дата в пределах последних 3 месяцев
        const randomDate = new Date();
-        randomDate.setDate(randomDate.getDate() - Math.random() * 30);
+        randomDate.setMonth(randomDate.getMonth() - Math.random() * 3);
        lesson.date = randomDate.toISOString();
        lesson.created = new Date(randomDate.getTime() - 86400000).toISOString(); // Создан за день до даты
      });
--- a/stubs/mocks/courses/by-id/success.json
+++ b/stubs/mocks/courses/by-id/success.json
@ -590,8 +590,8 @@
            "sub": "developer",
            "email": "email@email.ml"
        },
-        "startDt": "2024-08-25T17:30:00.000Z",
-        "created": "2024-08-25T17:40:17.000Z",
+        "startDt": "2024-08-25T17:40:17.814Z",
+        "created": "2024-08-25T17:40:17.814Z",
        "examWithJury2": {
            "_id": "66cf3d3f4637d420d6271451",
            "name": "Хакатон",
--- a/stubs/mocks/courses/by-id/with-exam.json
+++ b/stubs/mocks/courses/by-id/with-exam.json
@ -19,7 +19,7 @@
                        "email": "primakovpro@gmail.com"
                    }
                ],
-                "date": "2024-04-16T13:30:00.000Z",
+                "date": "2024-04-16T13:38:00.000Z",
                "created": "2024-04-16T13:38:23.381Z",
                "id": "661e7f4f69f40b0ebebcd5e4"
            },
@ -37,7 +37,7 @@
                        "email": "primakovpro@gmail.com"
                    }
                ],
-                "date": "2024-08-04T08:00:00.000Z",
+                "date": "2024-08-04T07:00:00.000Z",
                "created": "2024-08-04T06:23:28.491Z",
                "id": "66af1e60a0eef5a89f99aa94"
            },
--- a/stubs/mocks/lessons/access-code/create/success.json
+++ b/stubs/mocks/lessons/access-code/create/success.json
@ -27,7 +27,7 @@
                "picture": "https://lh3.googleusercontent.com/a/ACg8ocJUtJBAVBm642AxoGpMDDMV8CPu3MEoLjU3hmO7oisG=s96-c"
            }
          ],
-          "studentReactions": [
+          "reactions": [
            {
              "_id": "r1d73f22-c9ba-422a-b572-c59e515a2901",
              "sub": "fcde3f22-d9ba-412a-a572-c59e515a290f",