From a32a40f41681fe5bad412a3e8e2faeda2210168f Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Thu, 5 Nov 2026 11:12:21 +0100 Subject: [PATCH] Match Notes header to Ontime import screen defaults --- crates/rundown-converter/src/export.rs | 5 +++-- crates/rundown-converter/tests/conversion.rs | 2 +- docs/rundown-converter.md | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/crates/rundown-converter/src/export.rs b/crates/rundown-converter/src/export.rs index 7d4f5ac..179f3cb 100644 --- a/crates/rundown-converter/src/export.rs +++ b/crates/rundown-converter/src/export.rs @@ -14,14 +14,15 @@ use std::{ }; use zip::{ZipWriter, write::SimpleFileOptions}; -// Match the official Ontime v4 spreadsheet template (not the JSON property names). +// Match Ontime v4 import-screen defaults (not the JSON property names). +// The import UI expects plural "notes", unlike Ontime's own XLSX exporter. const SPREADSHEET_HEADERS: [&str; 16] = [ "Time Start", "Time End", "Duration", "Cue", "Title", - "Note", + "Notes", "Timer Type", "Link Start", "Colour", diff --git a/crates/rundown-converter/tests/conversion.rs b/crates/rundown-converter/tests/conversion.rs index 37f1595..4e90ad9 100644 --- a/crates/rundown-converter/tests/conversion.rs +++ b/crates/rundown-converter/tests/conversion.rs @@ -691,7 +691,7 @@ fn xlsx_export_has_ontime_columns_notes_metadata_and_clock_strings() { "Duration", "Cue", "Title", - "Note", + "Notes", "Timer Type", "Link Start", "Colour", diff --git a/docs/rundown-converter.md b/docs/rundown-converter.md index a05792b..7364f17 100644 --- a/docs/rundown-converter.md +++ b/docs/rundown-converter.md @@ -320,12 +320,13 @@ use Ontime's Partial Load when you want to keep an existing project's settings. Native Ontime JSON is the primary target: it lets the exporter control time relationships and project structure without a second column-mapping step. XLSX export writes one `Ontime` worksheet with `Time Start`, `Time End`, `Duration`, `Cue`, -`Title`, `Note`, `Timer Type`, `Link Start`, `Colour`, `ID`, `Flag`, `Count to end`, +`Title`, `Notes`, `Timer Type`, `Link Start`, `Colour`, `ID`, `Flag`, `Count to end`, `End Action`, `Warning Time`, `Danger Time` and `Skip` columns, followed by selected metadata columns. Playback settings match the JSON export: `Link Start` is explicitly `FALSE` so Ontime does not link events across intentional gaps. Notes contain only columns assigned to Notes; metadata remains in separate columns. -These headers match the [official Ontime v4 template](https://docs.google.com/spreadsheets/d/1zT6yRgQUaICEiAFR85VEL-E9hAUDujKg6DaWR0iDYmY/edit). +Headers match Ontime v4's import-screen defaults (case-insensitive). In particular, +`Notes` is plural in XLSX; the native JSON field remains `note`. Native JSON uses Ontime's schema keys such as `timeStart`, `timeEnd` and `timerType`. Times use `HH:MM:SS` strings accepted by Ontime. Import the file with Ontime's [spreadsheet importer](https://docs.getontime.no/features/import-spreadsheet/)