3.6.0

openapi-config.ts

@@ -1,12 +0,0 @@
-import type { ConfigFile } from '@rtk-query/codegen-openapi'
-
-const config: ConfigFile = {
-  schemaFile: 'https://platform.bro-js.ru/jrnl-bh/documentation/json',
-  apiFile: './src/__data__/api/api.ts',
-  apiImport: 'api',
-  outputFile: './src/__data__/api/jrnl.ts',
-  exportName: 'jrnlApi',
-  hooks: true,
-}
-
-export default config

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "journal.pl",
-    "version": "3.5.0",
+    "version": "3.6.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "journal.pl",
-            "version": "3.5.0",
+            "version": "3.6.0",
             "license": "MIT",
             "dependencies": {
                 "@brojs/cli": "^0.0.4-beta.0",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "journal.pl",
-    "version": "3.5.0",
+    "version": "3.6.0",
     "description": "bro-js platform journal ui repo",
     "main": "./src/index.tsx",
     "scripts": {
@@ -19,7 +19,6 @@
     "author": "",
     "license": "MIT",
     "devDependencies": {
-        "@rtk-query/codegen-openapi": "^1.2.0",
         "@typescript-eslint/eslint-plugin": "^7.4.0",
         "@typescript-eslint/parser": "^7.4.0",
         "eslint": "^8.57.0",

src/index.tsx

@@ -14,7 +14,7 @@ export default (props) => <App {...props} />;
   
 let rootElement: ReactDOM.Root
   
-export const mount = async (Сomponent, element = document.getElementById('app')) => {
+export const mount = async (Component, element = document.getElementById('app')) => {
   let user = null;
   try {
     await keycloak.init({ onLoad: "login-required" });
@@ -26,11 +26,11 @@ export const mount = async (Сomponent, element = document.getElementById('app')
   const store = createStore({ user });
 
   rootElement = ReactDOM.createRoot(element);
-  rootElement.render(<Сomponent store={store} />);
+  rootElement.render(<Component store={store} />);
 
   if(module.hot) {
       module.hot.accept('./app', ()=> {
-        rootElement.render(<Сomponent store={store} />);
+        rootElement.render(<Component store={store} />);
       })
   }
 };

src/pages/attendance/attendance.tsx

@@ -1,11 +1,10 @@
 import React, { useMemo } from 'react'
 import { useParams } from 'react-router-dom'
-import styled from '@emotion/styled'
+import { Box, Heading, Tooltip, Text } from '@chakra-ui/react'
+import dayjs from 'dayjs'
 
 import { api } from '../../__data__/api/api'
 import { PageLoader } from '../../components/page-loader/page-loader'
-import { Box, Container, Heading } from '@chakra-ui/react'
-import dayjs from 'dayjs'
 
 export const Attendance = () => {
   const { courseId } = useParams()
@@ -25,15 +24,18 @@ export const Attendance = () => {
 
     attendance.forEach((lesson) => {
       lesson.students.forEach((student) => {
+        const current = studentsMap.get(student.sub) || {}
+
         studentsMap.set(student.sub, {
           ...student,
-          value:
+          id: student.sub,
-            student.family_name && student.given_name
+          value: current.value || (student.family_name && student.given_name
               ? `${student.family_name} ${student.given_name}`
-              : student.name || student.email,
+              : student.name || student.email || student.preferred_username || student.family_name || student.given_name),
         })
       })
     })
+
     const compare = Intl.Collator('ru').compare
 
     const students = [...studentsMap.values()]
@@ -61,7 +63,7 @@ export const Attendance = () => {
               <th>Дата</th>
               <th>Название занятия</th>
               {data.students.map((student) => (
-                <th key={student.sub}>{student.name}</th>
+                <th id={student.id || student.sub} key={student.sub}>{student.name || student.value || 'Имя не определено'}</th>
               ))}
             </tr>
           </thead>
@@ -69,14 +71,22 @@ export const Attendance = () => {
             {attendance.map((lesson, index) => (
               <tr key={lesson.name}>
                 <td>{dayjs(lesson.date).format('DD.MM.YYYY')}</td>
-                <td>{lesson.name}</td>
+                <td>{<ShortText text={lesson.name} />}</td>
+
                 {data.students.map((st) => {
                   const wasThere =
                     lesson.students.findIndex((u) => u.sub === st.sub) !== -1
-                  return <td style={{
+                  return (
-                    textAlign: 'center',
+                    <td
-                    backgroundColor: wasThere ? '#8ef78a' : '#e09797',
+                      style={{
-                  }} key={st.sub}>{wasThere ? '+' : '-'}</td>
+                        textAlign: 'center',
+                        backgroundColor: wasThere ? '#8ef78a' : '#e09797',
+                      }}
+                      key={st.sub}
+                    >
+                      {wasThere ? '+' : '-'}
+                    </td>
+                  )
                 })}
               </tr>
             ))}
@@ -86,3 +96,17 @@ export const Attendance = () => {
     </Box>
   )
 }
+
+const ShortText = ({ text }: { text: string }) => {
+  const needShortText = text.length > 20
+
+  if (needShortText) {
+    return (
+      <Tooltip label="На страницу с лекциями" fontSize="12px" top="16px">
+        <Text>{text.slice(0, 20)}...</Text>
+      </Tooltip>
+    )
+  }
+
+  return text
+}

src/pages/course-list/course-card.tsx

@@ -57,21 +57,27 @@ export const CourseCard = ({ course }: { course: Course }) => {
               <CourseDetails populatedCourse={populatedCourse.data} />
             )}
 
-            <Tooltip label="На страницу с лекциями" fontSize="12px" top="16px">
+            {getNavigationsValue('link.journal.attendance') && (
-              <Button
+              <Tooltip
-                leftIcon={<LinkIcon />}
+                label="На страницу с лекциями"
-                as={ConnectedLink}
+                fontSize="12px"
-                variant="outline"
+                top="16px"
-                colorScheme="blue"
-                to={generatePath(
-                  `${getNavigationsValue('journal.main')}${getNavigationsValue('link.journal.attendance')}`,
-                  { courseId: course.id },
-                )}
               >
-                <Box mt={3}></Box>
+                <Button
-                Посещаемость
+                  leftIcon={<LinkIcon />}
-              </Button>
+                  as={ConnectedLink}
-            </Tooltip>
+                  variant="outline"
+                  colorScheme="blue"
+                  to={generatePath(
+                    `${getNavigationsValue('journal.main')}${getNavigationsValue('link.journal.attendance')}`,
+                    { courseId: course.id },
+                  )}
+                >
+                  <Box mt={3}></Box>
+                  Посещаемость
+                </Button>
+              </Tooltip>
+            )}
           </Stack>
         </CardBody>
       )}