From a5d8b91f34fa99b9944dd381ecb4c3feadf1d1be Mon Sep 17 00:00:00 2001
From: Fabian Posenau <19673098+kellhogs@users.noreply.github.com>
Date: Sat, 30 Dec 2023 22:11:06 +0100
Subject: [PATCH] add fields to import modal (#685)

Co-authored-by: Fabian Posenau <fabian@fphome.de>
---
 .../features/modals/upload-modal/preview/PreviewRundown.tsx   | 4 ++++
 .../modals/upload-modal/upload-options/ExcelFileOptions.tsx   | 2 ++
 packages/utils/src/feature/excel-import/excelImport.ts        | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

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
             <th>Time Start</th>
             <th>Time End</th>
             <th>Duration</th>
+            <th>Warning Time</th>
+            <th>Danger Time</th>
             <th>Is Public</th>
             <th>Skip</th>
             <th>Colour</th>
@@ -94,6 +96,8 @@ export default function PreviewRundown({ rundown, userFields }: PreviewRundownPr
                   <td>{millisToString(event.timeStart)}</td>
                   <td>{millisToString(event.timeEnd)}</td>
                   <td>{millisToString(event.duration)}</td>
+                  <td>{millisToString(event.timeWarning)}</td>
+                  <td>{millisToString(event.timeDanger)}</td>
                   <td className={style.center}>{isPublic && <Tag>{isPublic}</Tag>}</td>
                   <td>{skip && <Tag>{skip}</Tag>}</td>
                   <td style={{ ...colour }}>{event.colour}</td>
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 {