From 35e52aaa29375ac13716ca642168453bf7a206c8 Mon Sep 17 00:00:00 2001 From: Andrey Epifancev Date: Thu, 8 Oct 2026 03:31:27 +0400 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=9E=D0=A1=D0=92=20=D0=B7=D0=B0=201=20?= =?UTF-8?q?=D0=BA=D0=B2=D0=B0=D1=80=D1=82=D0=B0=D0=BB=20=D0=BD=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D0=B0=D1=8E=D1=89=D0=B8=D0=BC=20=D0=B8=D1=82?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=D0=BC=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B?= =?UTF-8?q?=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=C2=AB2024=20=D0=9A1?= =?UTF-8?q?=C2=BB,=20=D0=BA=D0=B0=D0=BA=20=D0=B2=20=D0=BC=D0=B0=D0=BA?= =?UTF-8?q?=D0=B5=D1=82=D0=B5=20[39]=20(#3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01EAKRDNzXtRrwmWz9z6PZu3 --- src/utils/labels.test.ts | 2 ++ src/utils/labels.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/labels.test.ts b/src/utils/labels.test.ts index 4449c71..13b2ce6 100644 --- a/src/utils/labels.test.ts +++ b/src/utils/labels.test.ts @@ -25,6 +25,8 @@ describe('labels', () => { }); it('период', () => { expect(periodLabel(2024, 'Q1', false)).toBe('2024 К1'); + // нарастающий итог за Q1 — это и есть первый квартал (как в макете [39]) + expect(periodLabel(2024, 'Q1', true)).toBe('2024 К1'); expect(periodLabel(2024, 'Q3', true)).toBe('2024 · 9 мес.'); expect(periodLabel(2024, 'Q4', true)).toBe('2024 · 12 мес.'); expect(periodLabel(2024, null, null)).toBe('период не определён'); diff --git a/src/utils/labels.ts b/src/utils/labels.ts index 3b1cd83..a3959d8 100644 --- a/src/utils/labels.ts +++ b/src/utils/labels.ts @@ -29,7 +29,7 @@ export function periodLabel(year: number | null, quarter: Quarter | null, isCumu if (year === null || quarter === null) { return 'период не определён'; } - return isCumulative ? `${year} · ${MONTHS[quarter]} мес.` : `${year} К${quarter.slice(1)}`; + return isCumulative && quarter !== 'Q1' ? `${year} · ${MONTHS[quarter]} мес.` : `${year} К${quarter.slice(1)}`; } export function documentStatusLabel(status: DocumentStatus): string {