Compare commits

..

No commits in common. "e30974acb787d5478cf223ef2aacaf23bf393e3b" and "67eb7e1dbcecd46d923b5157f6fda6825dbaaaa0" have entirely different histories.

3 changed files with 37 additions and 45 deletions

View File

@ -3,22 +3,16 @@ import { useParams, Link } from 'react-router-dom'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import QRCode from 'qrcode' import QRCode from 'qrcode'
import { getConfigValue, getNavigationsValue } from '@ijl/cli' import { getConfigValue, getNavigationsValue } from '@ijl/cli'
import { import { Breadcrumb, BreadcrumbItem, BreadcrumbLink } from '@chakra-ui/react'
Box,
Breadcrumb,
BreadcrumbItem,
BreadcrumbLink,
Container,
HStack,
VStack,
Heading,
} from '@chakra-ui/react'
import { import {
MainWrapper,
StartWrapper,
QRCanvas, QRCanvas,
LessonItem, LessonItem,
Lessonname, Lessonname,
AddMissedButton, AddMissedButton,
Wrapper,
UnorderList, UnorderList,
} from './style' } from './style'
import { api } from '../__data__/api/api' import { api } from '../__data__/api/api'
@ -86,8 +80,8 @@ const LessonDetail = () => {
}, [accessCode?.body, AllStudents.data]) }, [accessCode?.body, AllStudents.data])
return ( return (
<Container maxW="container.xl" centerContent px="200"> <MainWrapper>
<VStack align="left"> <StartWrapper>
<Breadcrumb> <Breadcrumb>
<BreadcrumbItem> <BreadcrumbItem>
<BreadcrumbLink as={Link} to={getNavigationsValue('journal.main')}> <BreadcrumbLink as={Link} to={getNavigationsValue('journal.main')}>
@ -108,41 +102,39 @@ const LessonDetail = () => {
<BreadcrumbLink href="#">Лекция</BreadcrumbLink> <BreadcrumbLink href="#">Лекция</BreadcrumbLink>
</BreadcrumbItem> </BreadcrumbItem>
</Breadcrumb> </Breadcrumb>
<Heading as='h3' mt='4' mb='3'>
Тема занятия: <h1 style={{ width: '70%' }}>
</Heading> Тема занятия - {accessCode?.body?.lesson?.name}
<Box as="span"> </h1>
{accessCode?.body?.lesson?.name} <span style={{ display: 'flex' }}>
</Box>
<Box as='span'>
{dayjs(accessCode?.body?.lesson?.date).format('DD MMMM YYYYг.')}{' '} {dayjs(accessCode?.body?.lesson?.date).format('DD MMMM YYYYг.')}{' '}
Отмечено - {accessCode?.body?.lesson?.students?.length}{' '} Отмечено - {accessCode?.body?.lesson?.students?.length}{' '}
{AllStudents.isSuccess ? `/ ${AllStudents?.data?.body?.length}` : ''}{' '} {AllStudents.isSuccess ? `/ ${AllStudents?.data?.body?.length}` : ''}{' '}
человек человек
</Box> </span>
</VStack> <Wrapper>
<HStack spacing="8"> <a href={userUrl}>
<a href={userUrl}> <QRCanvas ref={canvRef} />
<QRCanvas ref={canvRef} /> </a>
</a> <UnorderList>
<UnorderList> {studentsArr.map((student) => (
{studentsArr.map((student) => ( <LessonItem key={student.sub} warn={!student.present}>
<LessonItem key={student.sub} warn={!student.present}> <Lessonname>
<Lessonname> {student.name || student.preferred_username}{' '}
{student.name || student.preferred_username}{' '} {!student.present && (
{!student.present && ( <AddMissedButton
<AddMissedButton onClick={() => manualAdd({ lessonId, user: student })}
onClick={() => manualAdd({ lessonId, user: student })} >
> add
add </AddMissedButton>
</AddMissedButton> )}
)} </Lessonname>
</Lessonname> </LessonItem>
</LessonItem> ))}
))} </UnorderList>
</UnorderList> </Wrapper>
</HStack> </StartWrapper>
</Container> </MainWrapper>
) )
} }

View File

@ -4,7 +4,7 @@
"expires": "2024-03-01T07:52:16.374Z", "expires": "2024-03-01T07:52:16.374Z",
"lesson": { "lesson": {
"_id": "65df996c584b172772d69706", "_id": "65df996c584b172772d69706",
"name": "ВВОДНАЯ ПО JS.ПРИМЕНЕНИЕ И СПОСОБЫ ПОДКЛЮЧЕНИЯ НА СТРАНИЦЕ. LET, CONST. БАЗОВЫЕ ТИПЫ ДАННЫХ, ПРИВЕДЕНИЕ ТИПОВ. ПЕРЕМЕННЫЕ, ОБЛАСТЬ ВИДИМОСТИ ПЕРЕМЕННЫХ", "name": "ВВЕДЕНИЕ В ВЕБ-РАЗРАБОТКУ. ИНСТРУМЕНТАРИЙ, ОБЗОР ВЕБ-ТЕХНОЛОГИЙ",
"students": [ "students": [
{ {
"sub": "f62905b1-e223-40ca-910f-c8d84c6137c1", "sub": "f62905b1-e223-40ca-910f-c8d84c6137c1",

View File

@ -20,7 +20,7 @@
"expires": "2024-03-01T07:52:09.233Z", "expires": "2024-03-01T07:52:09.233Z",
"lesson": { "lesson": {
"_id": "65df996c584b172772d69706", "_id": "65df996c584b172772d69706",
"name": "ВВОДНАЯ ПО JS.ПРИМЕНЕНИЕ И СПОСОБЫ ПОДКЛЮЧЕНИЯ НА СТРАНИЦЕ. LET, CONST. БАЗОВЫЕ ТИПЫ ДАННЫХ, ПРИВЕДЕНИЕ ТИПОВ. ПЕРЕМЕННЫЕ, ОБЛАСТЬ ВИДИМОСТИ ПЕРЕМЕННЫХ", "name": "ВВЕДЕНИЕ В ВЕБ-РАЗРАБОТКУ. ИНСТРУМЕНТАРИЙ, ОБЗОР ВЕБ-ТЕХНОЛОГИЙ",
"students": [], "students": [],
"date": "2024-02-28T20:37:00.057Z", "date": "2024-02-28T20:37:00.057Z",
"created": "2024-02-28T20:37:00.057Z", "created": "2024-02-28T20:37:00.057Z",