cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-24 00:19:21 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

style: cleanup to excel import

Browse Source
This commit is contained in:
Carlos Valente
2025-06-28 08:11:40 +02:00
committed by Carlos Valente
parent 310dde4465
commit b66eac3c9f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/api-data/excel/excel.parser.ts
+1
View File
@@ -176,6 +176,7 @@ export const parseExcel = (
if (maybeTimeType === 'block') { if (maybeTimeType === 'block') {
// we leave this as a clue for the object filtering later on // we leave this as a clue for the object filtering later on
entry.type = SupportedEntry.Block; entry.type = SupportedEntry.Block;
entry.entries = [];
} else if (maybeTimeType === '' || maybeTimeType === 'event' || isKnownTimerType(maybeTimeType)) { } else if (maybeTimeType === '' || maybeTimeType === 'event' || isKnownTimerType(maybeTimeType)) {
// @ts-expect-error -- we leave this as a clue for the object filtering later on // @ts-expect-error -- we leave this as a clue for the object filtering later on
entry.type = SupportedEntry.Event; entry.type = SupportedEntry.Event;
apps/server/src/api-data/excel/excel.service.ts
+3 -3
View File
@@ -50,13 +50,13 @@ export function generateRundownPreview(options: ImportMap): { rundown: Rundown;
const parsedCustomFields = parseCustomFields(dataFromExcel); const parsedCustomFields = parseCustomFields(dataFromExcel);
// we run the parsed data through an extra step to ensure the objects shape // we run the parsed data through an extra step to ensure the objects shape
const Rundown = parseRundown(dataFromExcel.rundown, parsedCustomFields); const rundown = parseRundown(dataFromExcel.rundown, parsedCustomFields);
if (Rundown.order.length === 0) { if (rundown.order.length === 0) {
throw new Error(`Could not find data to import in the worksheet: ${options.worksheet}`); throw new Error(`Could not find data to import in the worksheet: ${options.worksheet}`);
} }
// clear the data // clear the data
excelData = xlsx.utils.book_new(); excelData = xlsx.utils.book_new();
return { rundown: Rundown, customFields: parsedCustomFields }; return { rundown, customFields: parsedCustomFields };
} }