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

add fields to import modal (#685)

Browse Source 
Co-authored-by: Fabian Posenau <fabian@fphome.de>
This commit is contained in:
Fabian Posenau
2023-12-30 22:11:06 +01:00
committed by GitHub
parent 5409c0ac6e
commit a5d8b91f34
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/features/modals/upload-modal/preview/PreviewRundown.tsx
+4
View File
@@ -32,6 +32,8 @@ export default function PreviewRundown({ rundown, userFields }: PreviewRundownPr
<th>Time Start</th> <th>Time Start</th>
<th>Time End</th> <th>Time End</th>
<th>Duration</th> <th>Duration</th>
<th>Warning Time</th>
<th>Danger Time</th>
<th>Is Public</th> <th>Is Public</th>
<th>Skip</th> <th>Skip</th>
<th>Colour</th> <th>Colour</th>
@@ -94,6 +96,8 @@ export default function PreviewRundown({ rundown, userFields }: PreviewRundownPr
<td>{millisToString(event.timeStart)}</td> <td>{millisToString(event.timeStart)}</td>
<td>{millisToString(event.timeEnd)}</td> <td>{millisToString(event.timeEnd)}</td>
<td>{millisToString(event.duration)}</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 className={style.center}>{isPublic && <Tag>{isPublic}</Tag>}</td>
<td>{skip && <Tag>{skip}</Tag>}</td> <td>{skip && <Tag>{skip}</Tag>}</td>
<td style={{ ...colour }}>{event.colour}</td> <td style={{ ...colour }}>{event.colour}</td>
apps/client/src/features/modals/upload-modal/upload-options/ExcelFileOptions.tsx
+2
View File
@@ -19,6 +19,8 @@ export default function ExcelFileOptions(props: ExcelFileOptionsProps) {
{ label: 'Start time', title: 'timeStart', value: optionsRef.current.timeStart }, { label: 'Start time', title: 'timeStart', value: optionsRef.current.timeStart },
{ label: 'End Time', title: 'timeEnd', value: optionsRef.current.timeEnd }, { label: 'End Time', title: 'timeEnd', value: optionsRef.current.timeEnd },
{ label: 'Duration', title: 'duration', value: optionsRef.current.duration }, { 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[] = [ const titles: TableEntry[] = [
packages/utils/src/feature/excel-import/excelImport.ts
+2 -2
View File
@@ -32,8 +32,8 @@ export const defaultExcelImportMap = {
user7: 'user7', user7: 'user7',
user8: 'user8', user8: 'user8',
user9: 'user9', user9: 'user9',
timeWarning: 'timeWarning', timeWarning: 'warning time',
timeDanger: 'timeDanger', timeDanger: 'danger time',
}; };
export function isExcelImportMap(obj: unknown): obj is ExcelImportMap { export function isExcelImportMap(obj: unknown): obj is ExcelImportMap {