Compare commits

...

3 Commits

2 changed files with 7 additions and 2 deletions

View File

@ -4,6 +4,10 @@
"htmlFiles": ["DateRangeDialog.html"]
},
"salesOriginal": {
"scriptId": "1Fy_9bPmflJF1UO3lBG8Gmxwo3yOMdsyh0CzwYxAFRlaSuLYSA1gVogbc",
"htmlFiles": ["DateRangeDialog.html"]
},
"salesOriginalTest": {
"scriptId": "1_uIw9bNqPzLk6l5_hEMUeeJAfw78w3v8xXTjOf2l5pQvWueuREKBBKVs",
"htmlFiles": ["DateRangeDialog.html"]
}

View File

@ -2,6 +2,7 @@ import { EXECUTOR_SHEET_NAMES } from '../../../core/constants';
import { loadConfig } from '../../../core/mail/executorTables';
import { loadTaskResultsById } from '../../../core/bitrix/client';
import { stripBitrixMarkup } from '../../../reports/waitingControl/main';
import { formatDateWithTime } from '../../../core/dates';
function getTaskResult(taskId: string): any {
const results = loadTaskResultsById(taskId);
@ -11,7 +12,7 @@ function getTaskResult(taskId: string): any {
const dateB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
return dateA - dateB;
})
.map(r => stripBitrixMarkup(r.text).trim())
.map(r => formatDateWithTime(new Date(r.createdAt)) + ' ' + stripBitrixMarkup(r.text).trim())
.filter(Boolean)
.join('\n\n');
}
@ -88,7 +89,7 @@ export function pullExecutorAnswers(): void {
for (let i = 1; i < reportData.length; i++) {
const row = reportData[i];
const taskId = String(row[reportCol['ID задачи']] || '').trim();
const taskId = Number(String(row[reportCol['ID задачи']] || '').trim());
if (!taskId) continue;
const answer = taskAnswers[taskId];