From 47532b9c19ff37b261af65db9cd759c310e35718 Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Mon, 18 Nov 2024 19:31:46 +0300
Subject: [PATCH] =?UTF-8?q?WEB=20APP:=20=D0=92=D1=8B=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BA=20=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BC=20=D1=81=D1=82=D0=BE=D0=BB=D0=B5,=20=D0=BC?=
 =?UTF-8?q?=D0=B0=D1=81=D1=88=D1=82=D0=B0=D0=B1=20"=D0=93=D0=BE=D0=B4"=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20P8PGantt,=20=D1=84=D1=83=D0=BD=D0=BA=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B0=D1=82=D1=8B?=
 =?UTF-8?q?=20=D1=81=D0=BE=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BC=20=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B5=20?=
 =?UTF-8?q?=D0=A0=D0=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/p8p_gantt.js       |  5 +++--
 app/components/p8p_panels_menu.js | 28 +++++++++++++++++++---------
 app/core/utils.js                 |  4 ++++
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/app/components/p8p_gantt.js b/app/components/p8p_gantt.js
index 0cb42f8..5e3f20b 100644
--- a/app/components/p8p_gantt.js
+++ b/app/components/p8p_gantt.js
@@ -33,7 +33,7 @@ import { P8PAppInlineError } from "./p8p_app_message"; //Встраиваемо
 //---------
 
 //Уровни масштаба
-const P8P_GANTT_ZOOM = [0, 1, 2, 3, 4];
+const P8P_GANTT_ZOOM = [0, 1, 2, 3, 4, 5];
 
 //Уровни масштаба (строковые наименования в терминах библиотеки)
 const P8P_GANTT_ZOOM_VIEW_MODES = {
@@ -41,7 +41,8 @@ const P8P_GANTT_ZOOM_VIEW_MODES = {
     1: "Half Day",
     2: "Day",
     3: "Week",
-    4: "Month"
+    4: "Month",
+    5: "Year"
 };
 
 //Структура задачи
diff --git a/app/components/p8p_panels_menu.js b/app/components/p8p_panels_menu.js
index 48212d5..edf884a 100644
--- a/app/components/p8p_panels_menu.js
+++ b/app/components/p8p_panels_menu.js
@@ -62,8 +62,15 @@ const STYLES = {
     GRID_PANEL_CARD_CONTENT_TITLE_ICON: { paddingTop: "4px" },
     GRID_PANEL_CARD_ACTIONS: { marginTop: "auto", display: "flex", justifyContent: "flex-end", alignItems: "flex-start" },
     DESKTOP_GROUP_HEADER: { fontWeight: "bold", fontFamily: "tahoma, arial, verdana, sans-serif!important", fontSize: "13px!important" },
-    DESKTOP_ITEM_BUTTON: { fontSize: "12px", textTransform: "none", "&:hover": { backgroundColor: "#c3e1ff" }, maxWidth: "150px" },
-    DESKTOP_ITEM_STACK: { justifyContent: "center", alignItems: "center", fontSize: "12px" },
+    DESKTOP_ITEM_BUTTON: {
+        fontSize: "12px",
+        textTransform: "none",
+        "&:hover": { backgroundColor: "#c3e1ff" },
+        width: "150px",
+        height: "90px",
+        flexDirection: "column",
+        justifyContent: "flex-start"
+    },
     DESKTOP_ITEM_ICON: { width: "48px", height: "48px", fontSize: "48px" },
     DESKTOP_ITEM_CATION: {
         display: "-webkit-box",
@@ -165,12 +172,10 @@ const getPanelsLinks = ({ variant, panels, selectedPanel, group, defaultGroupTyt
                             sx={STYLES.DESKTOP_ITEM_BUTTON}
                             title={panel.caption}
                         >
-                            <Stack sx={STYLES.DESKTOP_ITEM_STACK}>
-                                <Icon sx={STYLES.DESKTOP_ITEM_ICON}>{panel.icon}</Icon>
-                                <Typography sx={STYLES.DESKTOP_ITEM_CATION} variant="body1">
-                                    {panel.caption}
-                                </Typography>
-                            </Stack>
+                            <Icon sx={STYLES.DESKTOP_ITEM_ICON}>{panel.icon}</Icon>
+                            <Typography sx={STYLES.DESKTOP_ITEM_CATION} variant="body1">
+                                {panel.caption}
+                            </Typography>
                         </Button>
                     )
                 );
@@ -230,7 +235,12 @@ const P8PPanelsMenuDesktop = ({ group, onItemNavigate, panels = [], defaultGroup
     const panelsLinks = getPanelsLinks({ variant: P8P_PANELS_MENU_VARIANT.DESKTOP, panels, group, defaultGroupTytle, onItemNavigate });
 
     //Генерация содержимого
-    return <Box p={2}>{panelsLinks}</Box>;
+    return (
+        <Box p={2}>
+            {panelsLinks[0]}
+            <Stack direction="row">{panelsLinks.map((l, i) => (i > 0 ? l : null))}</Stack>
+        </Box>
+    );
 };
 
 //Контроль свойств - Меню панелей - рабочий стол
diff --git a/app/core/utils.js b/app/core/utils.js
index 1ca71b9..205a31b 100644
--- a/app/core/utils.js
+++ b/app/core/utils.js
@@ -140,6 +140,9 @@ const xml2JSON = ({ xmlDoc, isArray, transformTagName, tagValueProcessor, attrib
 //Форматирование даты в формат РФ
 const formatDateRF = value => (value ? dayjs(value).format("DD.MM.YYYY") : null);
 
+//Форматирование даты и времени в формат РФ
+const formatDateTimeRF = value => (value ? dayjs(value).format("DD.MM.YYYY HH:mm:ss") : null);
+
 //Форматирование даты в формат JSON (только дата, без времени)
 const formatDateJSONDateOnly = value => (value ? dayjs(value).format("YYYY-MM-DD") : null);
 
@@ -163,6 +166,7 @@ export {
     object2Base64XML,
     xml2JSON,
     formatDateRF,
+    formatDateTimeRF,
     formatDateJSONDateOnly,
     formatNumberRFCurrency,
     genGUID