From 83eb1b50002255b99d747f8954eb67a8bfa6be18 Mon Sep 17 00:00:00 2001 From: Dmitriy_Kravchenko Date: Wed, 23 Sep 2026 16:08:02 +0300 Subject: [PATCH] Changed task sort logic. Adjusted test cases. --- src/reports/bigSmall/builder.ts | 7 +++++++ tests/bigSmallBuilder.test.ts | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/reports/bigSmall/builder.ts b/src/reports/bigSmall/builder.ts index 3f69903..938cc66 100644 --- a/src/reports/bigSmall/builder.ts +++ b/src/reports/bigSmall/builder.ts @@ -232,8 +232,15 @@ export function buildBigSmallReportRows( const clientLossIndex = BIG_SMALL_HEADERS.indexOf('Ведет к потере клиента'); const executorIndex = BIG_SMALL_HEADERS.indexOf('Исполнитель'); const taskTypeIndex = BIG_SMALL_HEADERS.indexOf('Большая или мелкая'); + const parentTaskIdIndex = BIG_SMALL_HEADERS.indexOf('ID Р. задачи'); body.sort((a, b) => { + const parentTaskIdA = a[parentTaskIdIndex]; + const parentTaskIdB = b[parentTaskIdIndex]; + if (parentTaskIdA != parentTaskIdB) { + return String(parentTaskIdA).localeCompare(String(parentTaskIdB)); + } + const clientLossA = a[clientLossIndex]; const clientLossB = b[clientLossIndex]; if (clientLossA != clientLossB) { diff --git a/tests/bigSmallBuilder.test.ts b/tests/bigSmallBuilder.test.ts index 923fd11..a6f20a4 100644 --- a/tests/bigSmallBuilder.test.ts +++ b/tests/bigSmallBuilder.test.ts @@ -103,9 +103,9 @@ describe('buildBigSmallReportRows', () => { expect(result.length).toBe(2); expect(result[1][0]).toBe('ЕПМ* Подзадача А'); expect(result[1][1]).toBe('ЕПБ* Родитель'); - expect(result[1][7]).toBe('М'); - expect(result[1][11]).toBe(60); - expect(result[1][12]).toBe('Да'); - expect(result[1][6]).toBe('сделка 1'); + expect(result[1][8]).toBe('М'); + expect(result[1][12]).toBe(60); + expect(result[1][13]).toBe('Да'); + expect(result[1][7]).toBe('сделка 1'); }); });