diff --git a/apps/client/src/features/modals/upload-modal/preview/PreviewRundown.tsx b/apps/client/src/features/modals/upload-modal/preview/PreviewRundown.tsx index 12f962243..a4fb5813f 100644 --- a/apps/client/src/features/modals/upload-modal/preview/PreviewRundown.tsx +++ b/apps/client/src/features/modals/upload-modal/preview/PreviewRundown.tsx @@ -32,6 +32,8 @@ export default function PreviewRundown({ rundown, userFields }: PreviewRundownPr Time Start Time End Duration + Warning Time + Danger Time Is Public Skip Colour @@ -94,6 +96,8 @@ export default function PreviewRundown({ rundown, userFields }: PreviewRundownPr {millisToString(event.timeStart)} {millisToString(event.timeEnd)} {millisToString(event.duration)} + {millisToString(event.timeWarning)} + {millisToString(event.timeDanger)} {isPublic && {isPublic}} {skip && {skip}} {event.colour} diff --git a/apps/client/src/features/modals/upload-modal/upload-options/ExcelFileOptions.tsx b/apps/client/src/features/modals/upload-modal/upload-options/ExcelFileOptions.tsx index 72b1c5837..563eb6a8b 100644 --- a/apps/client/src/features/modals/upload-modal/upload-options/ExcelFileOptions.tsx +++ b/apps/client/src/features/modals/upload-modal/upload-options/ExcelFileOptions.tsx @@ -19,6 +19,8 @@ export default function ExcelFileOptions(props: ExcelFileOptionsProps) { { label: 'Start time', title: 'timeStart', value: optionsRef.current.timeStart }, { label: 'End Time', title: 'timeEnd', value: optionsRef.current.timeEnd }, { label: 'Duration', title: 'duration', value: optionsRef.current.duration }, + { label: 'Warning Time', title: 'timeWarning', value: optionsRef.current.timeWarning }, + { label: 'Danger Time', title: 'timeDanger', value: optionsRef.current.timeDanger }, ]; const titles: TableEntry[] = [ diff --git a/packages/utils/src/feature/excel-import/excelImport.ts b/packages/utils/src/feature/excel-import/excelImport.ts index de809d991..39abfb42e 100644 --- a/packages/utils/src/feature/excel-import/excelImport.ts +++ b/packages/utils/src/feature/excel-import/excelImport.ts @@ -32,8 +32,8 @@ export const defaultExcelImportMap = { user7: 'user7', user8: 'user8', user9: 'user9', - timeWarning: 'timeWarning', - timeDanger: 'timeDanger', + timeWarning: 'warning time', + timeDanger: 'danger time', }; export function isExcelImportMap(obj: unknown): obj is ExcelImportMap {