Compare commits

..

No commits in common. "91ea7fddaf4a345a900db28ab67b1368f0aa56d2" and "4d498662f84bbc486b7dbe96f67920de70af1241" have entirely different histories.

3 changed files with 24 additions and 26 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "journal.pl", "name": "journal.pl",
"version": "2.2.1", "version": "2.2.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "journal.pl", "name": "journal.pl",
"version": "2.2.1", "version": "2.2.0",
"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.1", "version": "2.2.0",
"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>
{isTeacher(user) && <Th>action</Th>} <Th>action</Th>
<Th isNumeric>Отмечено</Th> <Th isNumeric>Отмечено</Th>
</Tr> </Tr>
</Thead> </Thead>
@ -401,28 +401,26 @@ 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>
{isTeacher(user) && ( <Td>
<Td> <Menu>
<Menu> <MenuButton as={Button}>
<MenuButton as={Button}> <EditIcon />
<EditIcon /> </MenuButton>
</MenuButton> <MenuList>
<MenuList> <MenuItem
<MenuItem onClick={() => {
onClick={() => { setShowForm(true)
setShowForm(true) setEditLesson(lesson)
setEditLesson(lesson) }}
}} >
> Edit
Edit </MenuItem>
</MenuItem> <MenuItem onClick={() => setlessonToDelete(lesson)}>
<MenuItem onClick={() => setlessonToDelete(lesson)}> Delete
Delete </MenuItem>
</MenuItem> </MenuList>
</MenuList> </Menu>
</Menu> </Td>
</Td>
)}
<Td isNumeric>{lesson.students.length}</Td> <Td isNumeric>{lesson.students.length}</Td>
</Tr> </Tr>
))} ))}