From a5f3f0e375a6ac380dd979b4532c96f583c86328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A1=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D1=8C=D0=B5=D0=B2?= <solovyev.da@nstart.space>
Date: Mon, 15 Jun 2026 11:10:49 +0300
Subject: [PATCH] =?UTF-8?q?fix(tgu-ui):=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=D1=86=D0=B0=20=D1=81=D0=BB=D0=BE=D1=82=D0=BE=D0=B2=20=E2=80=94?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=B8=D1=82=D1=8C=20=D0=B2=D0=B8=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BA/=D1=86=D0=B8=D0=BA=D0=BB,=20=D1=81=D0=B5=D0=BA=D1=83?=
 =?UTF-8?q?=D0=BD=D0=B4=D1=8B=20=D0=B2=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B5,=20=D0=B4=D0=BB=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

По замечаниям: Крен и Статус не помещались (8 колонок на узкую панель).
- «Виток» теперь = виток / ветвь / цикл (281 / восх / 1); отдельная «Слот/цикл» убрана
- «Начало» с секундами (formatLocalDateTimeSeconds) — слоты короткие, без секунд начало=конец
- «Конец» заменён на «Длит., с» (slotDurationSec); colSpan распорок 8→7
- Крен и Статус снова видны

Тесты 70/70, build чисто.
---
 .../src/features/tgu-slots/TguSlotsTab.tsx    | 24 ++++++++++---------
 .../pcp-tgu-ui-service/src/utils/localTime.ts | 12 ++++++++++
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/services/pcp-tgu-ui-service/src/features/tgu-slots/TguSlotsTab.tsx b/services/pcp-tgu-ui-service/src/features/tgu-slots/TguSlotsTab.tsx
index 46f14fb..62d4479 100644
--- a/services/pcp-tgu-ui-service/src/features/tgu-slots/TguSlotsTab.tsx
+++ b/services/pcp-tgu-ui-service/src/features/tgu-slots/TguSlotsTab.tsx
@@ -23,7 +23,7 @@ import type { Tgu2DMapLayersState } from "../tgu-map-2d/model/mapLayerTypes";
 import type { Tgu2DMapSelection } from "../tgu-map-2d/model/mapSelectionTypes";
 import { MapObjectInspector } from "../tgu-map-2d/MapObjectInspector";
 import { Tgu2DMapView } from "../tgu-map-2d/Tgu2DMapView";
-import { formatLocalDateTime, parseLocal, toLocalInputValue, toLocalIso } from "../../utils/localTime";
+import { formatLocalDateTimeSeconds, parseLocal, toLocalInputValue, toLocalIso } from "../../utils/localTime";
 import { SlotDaySelector, type SlotDay } from "./SlotDaySelector";
 import { SlotPickMenu, type SlotPick } from "./SlotPickMenu";
 import { chunk, selectionAfterCheck } from "./slotSelection";
@@ -830,9 +830,8 @@ export function TguSlotsTab({ range }: TguSlotsTabProps) {
                         </th>
                         <th>КА</th>
                         <th>Виток</th>
-                        <th>Слот / цикл</th>
                         <th>Начало</th>
-                        <th>Конец</th>
+                        <th>Длит.</th>
                         <th>Крен</th>
                         <th>Статус</th>
                       </tr>
@@ -840,7 +839,7 @@ export function TguSlotsTab({ range }: TguSlotsTabProps) {
                     <tbody>
                       {padTop > 0 && (
                         <tr aria-hidden="true" style={{ height: padTop }}>
-                          <td colSpan={8} />
+                          <td colSpan={7} />
                         </tr>
                       )}
                       {virtualRows.map((vrow) => {
@@ -868,13 +867,11 @@ export function TguSlotsTab({ range }: TguSlotsTabProps) {
                             </td>
                             <td>{slot.satelliteId}</td>
                             <td>
-                              {slot.revolution} / {slot.revolutionSign === "DESC" ? "нисх" : "восх"}
+                              {slot.revolution} / {slot.revolutionSign === "DESC" ? "нисх" : "восх"} /{" "}
+                              {slot.cycle}
                             </td>
-                            <td>
-                              {slot.slotNumber} / {slot.cycle}
-                            </td>
-                            <td>{formatLocalDateTime(parseLocal(slot.tn))}</td>
-                            <td>{formatLocalDateTime(parseLocal(slot.tk))}</td>
+                            <td>{formatLocalDateTimeSeconds(parseLocal(slot.tn))}</td>
+                            <td>{slotDurationSec(slot)} с</td>
                             <td>{slot.roll.toFixed(1)}°</td>
                             <td>
                               {booked ? (
@@ -888,7 +885,7 @@ export function TguSlotsTab({ range }: TguSlotsTabProps) {
                       })}
                       {padBottom > 0 && (
                         <tr aria-hidden="true" style={{ height: padBottom }}>
-                          <td colSpan={8} />
+                          <td colSpan={7} />
                         </tr>
                       )}
                     </tbody>
@@ -1040,6 +1037,11 @@ function strategyLabel(strategy: SlotCoverageStrategy): string {
   return strategy === "CONTINUOUS" ? "непрерывный" : "жадный";
 }
 
+/** Длительность слота в секундах (tk − tn). Слоты короткие, поэтому показываем секунды. */
+function slotDurationSec(slot: SlotDTO): number {
+  return Math.max(0, Math.round((parseLocal(slot.tk) - parseLocal(slot.tn)) / 1000));
+}
+
 function slotStateLabel(state: string): string {
   switch (state) {
     case "AVAILABLE":
diff --git a/services/pcp-tgu-ui-service/src/utils/localTime.ts b/services/pcp-tgu-ui-service/src/utils/localTime.ts
index 35e5364..fe249e4 100644
--- a/services/pcp-tgu-ui-service/src/utils/localTime.ts
+++ b/services/pcp-tgu-ui-service/src/utils/localTime.ts
@@ -31,6 +31,18 @@ export function formatLocalDateTime(ms: number): string {
   });
 }
 
+/** Дата-время с секундами (дд.мм.гггг, чч:мм:сс) — для коротких слотов, где важны секунды. */
+export function formatLocalDateTimeSeconds(ms: number): string {
+  return new Date(ms).toLocaleString("ru-RU", {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit"
+  });
+}
+
 /** Дата (дд.мм) в локальной зоне. */
 export function formatLocalDate(ms: number): string {
   return new Date(ms).toLocaleDateString("ru-RU", { day: "2-digit", month: "2-digit" });