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}
>
-
- {panel.icon}
-
- {panel.caption}
-
-
+ {panel.icon}
+
+ {panel.caption}
+
)
);
@@ -230,7 +235,12 @@ const P8PPanelsMenuDesktop = ({ group, onItemNavigate, panels = [], defaultGroup
const panelsLinks = getPanelsLinks({ variant: P8P_PANELS_MENU_VARIANT.DESKTOP, panels, group, defaultGroupTytle, onItemNavigate });
//Генерация содержимого
- return {panelsLinks};
+ return (
+
+ {panelsLinks[0]}
+ {panelsLinks.map((l, i) => (i > 0 ? l : null))}
+
+ );
};
//Контроль свойств - Меню панелей - рабочий стол
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