Compare commits

...

2 Commits

Author SHA1 Message Date
91ea7fddaf 2.2.1
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-04-08 11:01:02 +03:00
d084870c49 (#23) Убрал кнопку с действиями для студентов 2024-04-08 11:00:54 +03:00
3 changed files with 26 additions and 24 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "journal.pl", "name": "journal.pl",
"version": "2.2.0", "version": "2.2.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "journal.pl", "name": "journal.pl",
"version": "2.2.0", "version": "2.2.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@chakra-ui/icons": "^2.1.1", "@chakra-ui/icons": "^2.1.1",

View File

@ -1,6 +1,6 @@
{ {
"name": "journal.pl", "name": "journal.pl",
"version": "2.2.0", "version": "2.2.1",
"description": "inno-js platform journal ui repo", "description": "inno-js platform journal ui repo",
"main": "./src/index.tsx", "main": "./src/index.tsx",
"scripts": { "scripts": {

View File

@ -376,7 +376,7 @@ const LessonList = () => {
Дата Дата
</Th> </Th>
<Th>Название</Th> <Th>Название</Th>
<Th>action</Th> {isTeacher(user) && <Th>action</Th>}
<Th isNumeric>Отмечено</Th> <Th isNumeric>Отмечено</Th>
</Tr> </Tr>
</Thead> </Thead>
@ -401,26 +401,28 @@ const LessonList = () => {
{dayjs(lesson.date).format('H:mm DD.MM.YY')} {dayjs(lesson.date).format('H:mm DD.MM.YY')}
</Td> </Td>
<Td>{lesson.name}</Td> <Td>{lesson.name}</Td>
<Td> {isTeacher(user) && (
<Menu> <Td>
<MenuButton as={Button}> <Menu>
<EditIcon /> <MenuButton as={Button}>
</MenuButton> <EditIcon />
<MenuList> </MenuButton>
<MenuItem <MenuList>
onClick={() => { <MenuItem
setShowForm(true) onClick={() => {
setEditLesson(lesson) setShowForm(true)
}} setEditLesson(lesson)
> }}
Edit >
</MenuItem> Edit
<MenuItem onClick={() => setlessonToDelete(lesson)}> </MenuItem>
Delete <MenuItem onClick={() => setlessonToDelete(lesson)}>
</MenuItem> Delete
</MenuList> </MenuItem>
</Menu> </MenuList>
</Td> </Menu>
</Td>
)}
<Td isNumeric>{lesson.students.length}</Td> <Td isNumeric>{lesson.students.length}</Td>
</Tr> </Tr>
))} ))}