2.4.4

Merge pull request '#25 Отображение только времени в случае сгрупированных по дате лекций' (#26 ) from feature/lesson-date-time into master
Reviewed-on: https://git.inno-js.ru/bro-js/journal.pl/pulls/26
2024-04-27 11:54:26 +03:00 · 2024-04-15 13:48:39 +03:00 · 2024-04-15 13:45:35 +03:00
3 changed files with 4 additions and 4 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "journal.pl",
-    "version": "2.4.3",
+    "version": "2.4.4",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "journal.pl",
-            "version": "2.4.3",
+            "version": "2.4.4",
            "license": "MIT",
            "dependencies": {
                "@chakra-ui/icons": "^2.1.1",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "journal.pl",
-    "version": "2.4.3",
+    "version": "2.4.4",
    "description": "inno-js platform journal ui repo",
    "main": "./src/index.tsx",
    "scripts": {
--- a/src/pages/lesson-list.tsx
+++ b/src/pages/lesson-list.tsx
@@ -453,7 +453,7 @@ const LessonList = () => {
                        </Td>
                      )}
                      <Td textAlign="center">
-                        {dayjs(lesson.date).format('H:mm DD.MM.YY')}
+                        {dayjs(lesson.date).format(groupByDate ? 'HH:mm' : 'HH:mm DD.MM.YY')}
                      </Td>
                      <Td>{lesson.name}</Td>
                      {isTeacher(user) && (
Author	SHA1	Message	Date
primakov	61cfd689f8	2.4.4 All checks were successful platform/bro/pipeline/head This commit looks good Details	2024-04-27 11:54:26 +03:00
primakov	82a54022b2	Merge pull request '#25 Отображение только времени в случае сгрупированных по дате лекций' (#26 ) from feature/lesson-date-time into master All checks were successful platform/bro/pipeline/head This commit looks good Details Reviewed-on: https://git.inno-js.ru/bro-js/journal.pl/pulls/26	2024-04-15 13:48:39 +03:00
primakov	f28c644da5	#25 Отображение только времени в случае сгрупированных по дате лекций All checks were successful platform/bro/pipeline/head This commit looks good Details platform/bro/pipeline/pr-master This commit looks good Details	2024-04-15 13:45:35 +03:00