Add completed source sheet configuration and enhance completed tasks report with parent task details
This commit is contained in:
parent
38caf5152d
commit
450209ba10
|
|
@ -29,6 +29,7 @@ npm run deploy -- universal
|
|||
| Ключ | Смысл |
|
||||
|------|--------|
|
||||
| SOURCE_SHEET_ID | gid листа выгрузки задач |
|
||||
| COMPLETED_SOURCE_SHEET_ID | gid листа выгрузки завершенных задач |
|
||||
| EMAILS_SHEET_ID | gid листа email сотрудников |
|
||||
| ROLES_SHEET_ID | gid листа ролей (ячейки B1–B6: РОП, зам. РОПа, рукфил, зам. рукфила, директор, контролёр) |
|
||||
| BACKUP_EMAILS_SPREADSHEET_ID | таблица с запасными email (листы РП и АП) |
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
| key | value |
|
||||
|-----|--------|
|
||||
| SOURCE_SHEET_ID | 0 |
|
||||
| COMPLETED_SOURCE_SHEET_ID | 0 |
|
||||
| EMAILS_SHEET_ID | 1859185202 |
|
||||
| ROLES_SHEET_ID | 1881045695 |
|
||||
| BACKUP_EMAILS_SPREADSHEET_ID | id_таблицы_запасных_email |
|
||||
|
|
|
|||
|
|
@ -164,6 +164,21 @@ export function loadTasksByIds(ids: Array<string | number>): any[] {
|
|||
return (result.data && result.data.body) || [];
|
||||
}
|
||||
|
||||
export function getTaskControlSet(taskIds: Array<string | number>): Set<string> {
|
||||
if (!taskIds || taskIds.length === 0) {
|
||||
return new Set();
|
||||
}
|
||||
|
||||
const controlSet = new Set<string>();
|
||||
loadTasksByIds(taskIds).forEach((task: any) => {
|
||||
if (task.taskControl === 'Y') {
|
||||
controlSet.add(String(task.id));
|
||||
}
|
||||
});
|
||||
|
||||
return controlSet;
|
||||
}
|
||||
|
||||
export function loadTaskResultsById(id: string | number): any[] {
|
||||
if (!id) {
|
||||
return [];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import { CONFIG_SHEET_NAME, OPTIONAL_CONFIG_DEFAULTS } from './constants';
|
|||
|
||||
export interface AppConfig {
|
||||
sourceSheetId: number;
|
||||
completedSourceSheetId: number;
|
||||
emailsSheetId: number;
|
||||
rolesSheetId: number;
|
||||
backupEmailsSpreadsheetId: string;
|
||||
|
|
@ -69,6 +70,7 @@ export function getAppConfig(): AppConfig {
|
|||
|
||||
appConfigCache = {
|
||||
sourceSheetId: Number(sheetMap.SOURCE_SHEET_ID),
|
||||
completedSourceSheetId: Number(sheetMap.COMPLETED_SOURCE_SHEET_ID),
|
||||
emailsSheetId: Number(sheetMap.EMAILS_SHEET_ID),
|
||||
rolesSheetId: Number(sheetMap.ROLES_SHEET_ID),
|
||||
backupEmailsSpreadsheetId: String(sheetMap.BACKUP_EMAILS_SPREADSHEET_ID || '').trim(),
|
||||
|
|
@ -109,6 +111,17 @@ export function getSourceSheet(spreadsheet?: GoogleAppsScript.Spreadsheet.Spread
|
|||
return sheet;
|
||||
}
|
||||
|
||||
export function getCompletedSourceSheet(spreadsheet?: GoogleAppsScript.Spreadsheet.Spreadsheet) {
|
||||
const ss = spreadsheet || SpreadsheetApp.getActiveSpreadsheet();
|
||||
const sheet = ss.getSheetById(getAppConfig().completedSourceSheetId);
|
||||
|
||||
if (!sheet) {
|
||||
throw new Error('Не найден лист выгрузки завершенных задач (COMPLETED_SOURCE_SHEET_ID)');
|
||||
}
|
||||
|
||||
return sheet;
|
||||
}
|
||||
|
||||
export function getBitrixMethodUrl(webhookKey: 'tasks' | 'users' | 'templates', method: string) {
|
||||
return getAppConfig().webhooks[webhookKey] + method;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { REPORT_PREFIXES } from '../../../core/constants';
|
||||
import { getSourceSheet } from '../../../core/config';
|
||||
import { requestDate } from '../../../core/ui';
|
||||
import { loadTasksByIds } from '../../../core/bitrix/client';
|
||||
import { getTaskControlSet } from '../../../core/bitrix/client';
|
||||
import { bitrixBooleanToString } from '../../../core/taskCodes';
|
||||
import { addDropdownValidations, createTimestampedSheet, setReportSheetFormat } from '../../../core/sheets/reportLifecycle';
|
||||
import { appendFromConfig } from '../../../core/sheets/reportNotes';
|
||||
|
|
@ -76,20 +76,3 @@ export function createSingleTimeTasksReport(): void {
|
|||
SpreadsheetApp.flush();
|
||||
Logger.log('Отчет успешно сформирован');
|
||||
}
|
||||
|
||||
function getTaskControlSet(taskIds: any[]): Set<string> {
|
||||
if (!taskIds || taskIds.length === 0) {
|
||||
return new Set();
|
||||
}
|
||||
|
||||
const tasks = loadTasksByIds(taskIds);
|
||||
const controlSet = new Set<string>();
|
||||
|
||||
tasks.forEach((task: any) => {
|
||||
if (task.taskControl === 'Y') {
|
||||
controlSet.add(String(task.id));
|
||||
}
|
||||
});
|
||||
|
||||
return controlSet;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ export function getYesterdayClosedTasksByPerformers(performerNames: string[], af
|
|||
result.get(performerName).push({
|
||||
id: task.id,
|
||||
title: task.title,
|
||||
parentTaskId: task.parentTaskId,
|
||||
parentTaskTitle: task.parentTaskTitle,
|
||||
createdDate: new Date(task.createdDate),
|
||||
deadline: new Date(task.deadline),
|
||||
creator: task.creator.name,
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ export const completedPlugin: ReportPlugin = {
|
|||
},
|
||||
requiredConfigKeys: [
|
||||
'SOURCE_SHEET_ID',
|
||||
'COMPLETED_SOURCE_SHEET_ID',
|
||||
'EMAILS_SHEET_ID',
|
||||
'ROLES_SHEET_ID',
|
||||
'BACKUP_EMAILS_SPREADSHEET_ID',
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
import { REPORT_PREFIXES } from '../../core/constants';
|
||||
import { getAppConfig, getSourceSheet } from '../../core/config';
|
||||
import { getTaskControlSet } from '../../core/bitrix/client';
|
||||
import { getAppConfig, getCompletedSourceSheet, getSourceSheet } from '../../core/config';
|
||||
import { requestDate } from '../../core/ui';
|
||||
import { decodeTaskCodes, getTaskStatusName } from '../../core/taskCodes';
|
||||
import { formatDate, hoursToMinutes, parseDurationToHours, secondsToHours } from '../../core/dates';
|
||||
import { bitrixBooleanToString, decodeTaskCodes, getTaskStatusName } from '../../core/taskCodes';
|
||||
import { diffMinutes, formatDate, hoursToMinutes, parseDurationToHours, secondsToHours } from '../../core/dates';
|
||||
import { compareNames } from '../../core/mail/emailConfig';
|
||||
import { createTimestampedSheet, getColumnIndexesByName } from '../../core/sheets/reportLifecycle';
|
||||
import { MetricsStorage } from '../../core/metrics/storage';
|
||||
import { getYesterdayClosedTasksByPerformers } from './fetchCompletedTasks';
|
||||
|
||||
const REPORT_HEADERS = [
|
||||
'ID задачи', 'Наименование задачи', 'ID Р. задачи', 'Наименование Р. задачи', 'Дата создания', 'Крайний срок задачи',
|
||||
|
|
@ -83,8 +83,128 @@ function getAllExecutorNames(): any[] {
|
|||
return [...new Set(executorColumnValues.map(row => row[0]))];
|
||||
}
|
||||
|
||||
const COMPLETED_SOURCE_COLUMNS = {
|
||||
id: 'ID',
|
||||
title: 'Название',
|
||||
parentTaskId: 'ID базовой задачи',
|
||||
parentTaskTitle: 'Название базовой задачи',
|
||||
createdDate: 'Дата создания',
|
||||
deadline: 'Крайний срок',
|
||||
creator: 'Постановщик',
|
||||
responsible: 'Исполнитель',
|
||||
status: 'Статус',
|
||||
closedDate: 'Дата закрытия',
|
||||
plannedDuration: 'Планируемая длительность',
|
||||
planStart: 'Планируемая дата начала',
|
||||
planEnd: 'Планируемая дата окончания',
|
||||
price: 'Цена задачи',
|
||||
clientLoss: 'Может привести к потере клиента',
|
||||
};
|
||||
|
||||
function loadCompletedTasks(afterDate: Date) {
|
||||
return getYesterdayClosedTasksByPerformers(getAllExecutorNames(), afterDate);
|
||||
const sheet = getCompletedSourceSheet();
|
||||
const values = sheet.getDataRange().getValues();
|
||||
if (values.length < 2) {
|
||||
throw new Error('На листе выгрузки завершенных задач нет данных');
|
||||
}
|
||||
|
||||
const headers = values[0].map(header => String(header).trim());
|
||||
const col: Record<string, number> = {};
|
||||
headers.forEach((header, index) => {
|
||||
if (header) col[header] = index;
|
||||
});
|
||||
|
||||
const missingColumns = Object.values(COMPLETED_SOURCE_COLUMNS).filter(name => !(name in col));
|
||||
if (missingColumns.length) {
|
||||
throw new Error('На листе выгрузки завершенных задач не найдены колонки: ' + missingColumns.join(', '));
|
||||
}
|
||||
|
||||
const performerNames = getAllExecutorNames().map(name => String(name ?? '').trim()).filter(Boolean);
|
||||
const result = new Map<string, any[]>();
|
||||
performerNames.forEach(name => result.set(name, []));
|
||||
|
||||
const from = startOfDay(afterDate).getTime();
|
||||
const to = startOfDay(new Date()).getTime();
|
||||
const loaded: Array<{ performerName: string; task: any }> = [];
|
||||
|
||||
for (let i = 1; i < values.length; i++) {
|
||||
const row = values[i];
|
||||
const id = row[col[COMPLETED_SOURCE_COLUMNS.id]];
|
||||
if (id === '' || id == null) continue;
|
||||
|
||||
const closedDate = toDate(row[col[COMPLETED_SOURCE_COLUMNS.closedDate]]);
|
||||
if (!closedDate) continue;
|
||||
const closedTime = closedDate.getTime();
|
||||
if (closedTime < from || closedTime >= to) continue;
|
||||
|
||||
const performerName = String(row[col[COMPLETED_SOURCE_COLUMNS.responsible]] ?? '').trim();
|
||||
if (!performerName || !result.has(performerName)) continue;
|
||||
|
||||
loaded.push({
|
||||
performerName,
|
||||
task: {
|
||||
id,
|
||||
title: row[col[COMPLETED_SOURCE_COLUMNS.title]],
|
||||
parentTaskId: row[col[COMPLETED_SOURCE_COLUMNS.parentTaskId]],
|
||||
parentTaskTitle: row[col[COMPLETED_SOURCE_COLUMNS.parentTaskTitle]],
|
||||
createdDate: toDate(row[col[COMPLETED_SOURCE_COLUMNS.createdDate]]),
|
||||
deadline: toDate(row[col[COMPLETED_SOURCE_COLUMNS.deadline]]),
|
||||
creator: row[col[COMPLETED_SOURCE_COLUMNS.creator]],
|
||||
responsible: performerName,
|
||||
status: row[col[COMPLETED_SOURCE_COLUMNS.status]],
|
||||
timeEstimate: plannedDurationSeconds(row, col),
|
||||
clientLoss: bitrixBooleanToString(row[col[COMPLETED_SOURCE_COLUMNS.clientLoss]]),
|
||||
price: row[col[COMPLETED_SOURCE_COLUMNS.price]],
|
||||
taskControl: 'N',
|
||||
completedDate: closedDate,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
const taskControlSet = getTaskControlSet(loaded.map(item => item.task.id));
|
||||
loaded.forEach(item => {
|
||||
if (taskControlSet.has(String(item.task.id))) {
|
||||
item.task.taskControl = 'Y';
|
||||
}
|
||||
const performerTasks = result.get(item.performerName);
|
||||
if (performerTasks) performerTasks.push(item.task);
|
||||
});
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function plannedDurationSeconds(row: any[], col: Record<string, number>): number {
|
||||
const planStart = toDate(row[col[COMPLETED_SOURCE_COLUMNS.planStart]]);
|
||||
const planEnd = toDate(row[col[COMPLETED_SOURCE_COLUMNS.planEnd]]);
|
||||
if (planStart && planEnd) {
|
||||
const minutes = diffMinutes(planStart, planEnd);
|
||||
if (minutes !== '') return Number(minutes) * 60;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
function startOfDay(date: Date): Date {
|
||||
return new Date(date.getFullYear(), date.getMonth(), date.getDate());
|
||||
}
|
||||
|
||||
function toDate(value: any): Date | null {
|
||||
if (value instanceof Date && !isNaN(value.getTime())) return value;
|
||||
if (typeof value !== 'string') return null;
|
||||
|
||||
const match = value.trim().match(/^(\d{1,2})\.(\d{1,2})\.(\d{4})(?:\s+(\d{1,2}):(\d{2})(?::(\d{2}))?)?$/);
|
||||
if (!match) return null;
|
||||
|
||||
const date = new Date(
|
||||
Number(match[3]),
|
||||
Number(match[2]) - 1,
|
||||
Number(match[1]),
|
||||
Number(match[4] || 0),
|
||||
Number(match[5] || 0),
|
||||
Number(match[6] || 0)
|
||||
);
|
||||
|
||||
return isNaN(date.getTime()) ? null : date;
|
||||
}
|
||||
|
||||
function loadWaitingControlTasks(sheet: GoogleAppsScript.Spreadsheet.Sheet) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue