Add loadTaskDescriptionsByIds function to retrieve task descriptions and update reports to include parent task descriptions
This commit is contained in:
parent
890096ebf5
commit
b575e0306d
|
|
@ -164,6 +164,41 @@ export function loadTasksByIds(ids: Array<string | number>): any[] {
|
|||
return (result.data && result.data.body) || [];
|
||||
}
|
||||
|
||||
export function loadTaskDescriptionsByIds(ids: Array<string | number>): Record<string, string> {
|
||||
const uniqueIds = Array.from(new Set(
|
||||
(ids || [])
|
||||
.map(id => String(id).trim())
|
||||
.filter(id => id !== '' && id !== '0')
|
||||
));
|
||||
|
||||
if (uniqueIds.length === 0) {
|
||||
return {};
|
||||
}
|
||||
|
||||
const result = fetchBalancer(
|
||||
getBitrixMethodUrl('tasks', 'tasks.task.list'),
|
||||
{
|
||||
isRecurrent: true,
|
||||
resultKey: 'tasks',
|
||||
body: {
|
||||
filter: {
|
||||
ID: uniqueIds,
|
||||
},
|
||||
select: ['ID', 'DESCRIPTION'],
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
const descriptions: Record<string, string> = {};
|
||||
const tasks = (result.data && result.data.body) || [];
|
||||
|
||||
tasks.forEach((task: any) => {
|
||||
descriptions[String(task.id)] = task.description == null ? '' : String(task.description);
|
||||
});
|
||||
|
||||
return descriptions;
|
||||
}
|
||||
|
||||
export function getTaskControlSet(taskIds: Array<string | number>): Set<string> {
|
||||
if (!taskIds || taskIds.length === 0) {
|
||||
return new Set();
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import { REPORT_PREFIXES } from '../../core/constants';
|
||||
import { getSourceSheet } from '../../core/config';
|
||||
import { loadTaskDescriptionsByIds } from '../../core/bitrix/client';
|
||||
import { requestDate } from '../../core/ui';
|
||||
import { beforeHash, bitrixBooleanToString, decodeTaskCodes, normalizeTaskName, validateTaskCode } from '../../core/taskCodes';
|
||||
import { diffMinutes, isSameDay } from '../../core/dates';
|
||||
|
|
@ -39,7 +40,9 @@ export function createSingleTimeTasksReport(): void {
|
|||
|
||||
const result: any[][] = [[
|
||||
'Название задачи',
|
||||
'Описание задачи',
|
||||
'Название родительской задачи',
|
||||
'Описание родительской задачи',
|
||||
'ID задачи',
|
||||
'ID родительской задачи',
|
||||
'Статус задачи',
|
||||
|
|
@ -60,10 +63,19 @@ export function createSingleTimeTasksReport(): void {
|
|||
|
||||
reportTasks.sort((a, b) => Number(a[col.parentTaskId]) - Number(b[col.parentTaskId]));
|
||||
|
||||
const parentDescriptions = loadTaskDescriptionsByIds(
|
||||
reportTasks.map(task => task[col.parentTaskId])
|
||||
);
|
||||
|
||||
reportTasks.forEach(mainTask => {
|
||||
const parentTaskId = mainTask[col.parentTaskId];
|
||||
const parentTask = rows.find(row => row[col.id] == parentTaskId);
|
||||
result.push(buildReportRow(mainTask, parentTask || null, col));
|
||||
result.push(buildReportRow(
|
||||
mainTask,
|
||||
parentTask || null,
|
||||
col,
|
||||
parentDescriptions[String(parentTaskId)] || ''
|
||||
));
|
||||
});
|
||||
|
||||
const reportSheet = createTimestampedSheet(reportPrefix, ss);
|
||||
|
|
@ -82,20 +94,27 @@ export function createSingleTimeTasksReport(): void {
|
|||
Logger.log('Отчет успешно сформирован');
|
||||
}
|
||||
|
||||
function buildReportRow(mainTask: any[], subtask: any[] | null, col: Record<string, number>): any[] {
|
||||
function buildReportRow(
|
||||
mainTask: any[],
|
||||
parentTask: any[] | null,
|
||||
col: Record<string, number>,
|
||||
parentDescription: string
|
||||
): any[] {
|
||||
const attention = buildAttentionText(mainTask, col);
|
||||
|
||||
return [
|
||||
mainTask[col.title],
|
||||
subtask ? subtask[col.title] : '',
|
||||
col.description >= 0 ? mainTask[col.description] : '',
|
||||
parentTask ? parentTask[col.title] : '',
|
||||
parentDescription,
|
||||
mainTask[col.id],
|
||||
subtask ? subtask[col.id] : '',
|
||||
parentTask ? parentTask[col.id] : '',
|
||||
mainTask[col.status],
|
||||
mainTask[col.creator],
|
||||
mainTask[col.executor],
|
||||
mainTask[col.deadline],
|
||||
mainTask[col.created],
|
||||
subtask ? subtask[col.deadline] : '',
|
||||
parentTask ? parentTask[col.deadline] : '',
|
||||
mainTask[col.crm],
|
||||
diffMinutes(mainTask[col.startTime], mainTask[col.endTime]),
|
||||
bitrixBooleanToString(mainTask[col.clientLoss]),
|
||||
|
|
@ -146,6 +165,7 @@ function getColumnIndexes(headers: any[]) {
|
|||
return {
|
||||
id: headers.indexOf('ID'),
|
||||
title: headers.indexOf('Название'),
|
||||
description: headers.indexOf('Описание'),
|
||||
deadline: headers.indexOf('Крайний срок'),
|
||||
creator: headers.indexOf('Постановщик'),
|
||||
executor: headers.indexOf('Исполнитель'),
|
||||
|
|
|
|||
|
|
@ -43,8 +43,10 @@ export function sendAttentionTasksToCreatorsForApproval(): void {
|
|||
creators[creator].push([
|
||||
row[col['Название задачи']],
|
||||
cell(row, col, taskCodeDecodeHeader()),
|
||||
row[col['Описание задачи']],
|
||||
row[col['Название родительской задачи']],
|
||||
cell(row, col, taskCodeDecodeHeader('Название родительской задачи')),
|
||||
row[col['Описание родительской задачи']],
|
||||
row[col['ID задачи']],
|
||||
row[col['ID родительской задачи']],
|
||||
row[col['Статус задачи']],
|
||||
|
|
@ -66,8 +68,10 @@ export function sendAttentionTasksToCreatorsForApproval(): void {
|
|||
const pdfHeaders = [
|
||||
'Название задачи',
|
||||
taskCodeDecodeHeader(),
|
||||
'Описание задачи',
|
||||
'Название родительской задачи',
|
||||
taskCodeDecodeHeader('Название родительской задачи'),
|
||||
'Описание родительской задачи',
|
||||
'ID задачи',
|
||||
'ID родительской задачи',
|
||||
'Статус задачи',
|
||||
|
|
|
|||
Loading…
Reference in New Issue