From e6ba2e0334d84583caa7e6745d754bad68c0af76 Mon Sep 17 00:00:00 2001
From: kilyabin <65072190+kilyabin@users.noreply.github.com>
Date: Mon, 2 Mar 2026 14:43:16 +0400
Subject: [PATCH] =?UTF-8?q?feat(parser):=20parse=20"=D0=97=D0=B0=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F"=20column"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now schedule can show the data in column "Задание для выполнения" under "Материалы" button
---
 src/app/parser/schedule.ts                | 47 +++++++++++++++++------
 src/widgets/schedule/lesson.tsx           | 10 +++--
 src/widgets/schedule/resources-dialog.tsx |  8 +++-
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/src/app/parser/schedule.ts b/src/app/parser/schedule.ts
index b2668c7..709cc24 100644
--- a/src/app/parser/schedule.ts
+++ b/src/app/parser/schedule.ts
@@ -991,20 +991,43 @@ const parseLesson = (row: Element, isTeacherSchedule: boolean = false): Lesson |
       lesson.topic = cells[4].textContent?.trim() || ''
     }
 
+    // Колонка "Ресурс"
     lesson.resources = []
     if (cells[5]) {
-      Array.from(cells[5].querySelectorAll('a'))
-        .forEach(a => {
-          const title = a.textContent?.trim()
-          const url = a.getAttribute('href')
-          if (title && url) {
-            lesson.resources.push({
-              type: 'link',
-              title,
-              url
-            })
-          }
-        })
+      Array.from(cells[5].querySelectorAll('a')).forEach(a => {
+        const title = a.textContent?.trim()
+        const url = a.getAttribute('href')
+        if (title && url) {
+          lesson.resources.push({
+            type: 'link',
+            title,
+            url,
+          })
+        }
+      })
+    }
+
+    // Колонка "Задание для выполнения"
+    lesson.homework = ''
+    if (cells[6]) {
+      const hwCell = cells[6]
+      const rawText = hwCell.textContent?.replace(/\s+/g, ' ').trim() || ''
+      if (rawText) {
+        lesson.homework = rawText
+      }
+
+      // Добавляем ссылки из задания тоже в список материалов
+      Array.from(hwCell.querySelectorAll('a')).forEach(a => {
+        const title = a.textContent?.trim()
+        const url = a.getAttribute('href')
+        if (title && url) {
+          lesson.resources.push({
+            type: 'link',
+            title,
+            url,
+          })
+        }
+      })
     }
 
     return lesson
diff --git a/src/widgets/schedule/lesson.tsx b/src/widgets/schedule/lesson.tsx
index bc6644c..e33092e 100644
--- a/src/widgets/schedule/lesson.tsx
+++ b/src/widgets/schedule/lesson.tsx
@@ -39,6 +39,9 @@ export function Lesson({ lesson, width = 350, animationDelay, hideTeacher = fals
   const hasSubject = 'subject' in lesson && lesson.subject
   const hasContent = hasSubject || (isFallbackDiscipline && lesson.fallbackDiscipline) || (lesson.topic && lesson.topic.trim())
   const isCancelled = lesson.isChange && !hasContent
+  const hasHomework = Boolean(lesson.homework && lesson.homework.trim())
+  const hasResources = Boolean(lesson.resources.length)
+  const hasAnyMaterials = hasResources || hasHomework
 
   const getTeacherPhoto = (url?: string) => {
     if(url) {
@@ -134,7 +137,7 @@ export function Lesson({ lesson, width = 350, animationDelay, hideTeacher = fals
           </div>
         )}
       </CardContent>
-      {!isCancelled && (Boolean(lesson.resources.length) || ('place' in lesson && lesson.place)) && (
+      {!isCancelled && (hasAnyMaterials || ('place' in lesson && lesson.place)) && (
         <CardFooter className="flex flex-col sm:flex-row justify-between gap-2 mt-auto">
           {('place' in lesson && lesson.place) ? (
             <div className='hidden md:flex flex-col text-muted-foreground text-xs break-words'>
@@ -145,7 +148,7 @@ export function Lesson({ lesson, width = 350, animationDelay, hideTeacher = fals
               </span>
             </div>
           ) : <span />}
-          {Boolean(lesson.resources.length) && (
+          {hasAnyMaterials && (
             <Button onClick={handleOpenResources} className="min-h-[44px] w-full sm:w-auto"><AiOutlineFolderView />&nbsp;Материалы</Button>
           )}
         </CardFooter>
@@ -154,7 +157,8 @@ export function Lesson({ lesson, width = 350, animationDelay, hideTeacher = fals
         open={resourcesDialogOpened} 
         onClose={() => setResourcesDialogOpened(false)}
         teacherName={('teacher' in lesson && lesson.teacher) ? lesson.teacher : undefined}
-        resources={lesson.resources} 
+        resources={lesson.resources}
+        homework={lesson.homework}
       />
     </Card>
   )
diff --git a/src/widgets/schedule/resources-dialog.tsx b/src/widgets/schedule/resources-dialog.tsx
index f9e1742..f37c9e0 100644
--- a/src/widgets/schedule/resources-dialog.tsx
+++ b/src/widgets/schedule/resources-dialog.tsx
@@ -10,11 +10,12 @@ import { Lesson } from '@/shared/model/lesson'
 import Link from 'next/link'
 import { BiLink } from 'react-icons/bi'
 
-export function ResourcesDialog({ open, onClose, teacherName, resources }: {
+export function ResourcesDialog({ open, onClose, teacherName, resources, homework }: {
   open: boolean
   onClose: () => any
   teacherName?: string
   resources: Lesson['resources']
+  homework?: string
 }) {
   const teacherPronouns = teachers.find(t => t.name === teacherName)?.pronouns
 
@@ -38,6 +39,11 @@ export function ResourcesDialog({ open, onClose, teacherName, resources }: {
           )}
         </DialogHeader>
         <div className="grid gap-4 py-4">
+          {homework && homework.trim() && (
+            <div className="text-sm whitespace-pre-wrap break-words">
+              {homework}
+            </div>
+          )}
           {resources.map((resource, i) => <Resource resource={resource} key={i} />)}
         </div>
       </DialogContent>