diff --git a/src/Platform/modules/ExcelFile.cc b/src/Platform/modules/ExcelFile.cc index 3149480..0300ab3 100644 --- a/src/Platform/modules/ExcelFile.cc +++ b/src/Platform/modules/ExcelFile.cc @@ -86,6 +86,7 @@ namespace platform { } else if (name == "text") { format_set_font_size(style, normalSize); format_set_border(style, LXW_BORDER_THIN); + format_set_align(style, LXW_ALIGN_VERTICAL_CENTER); } else if (name == "bodyHeader") { format_set_bold(style); format_set_font_size(style, normalSize); @@ -118,7 +119,6 @@ namespace platform { lxw_format* style; for (std::string name : styleNames) { lxw_format* style = workbook_add_format(workbook); - style = workbook_add_format(workbook); createStyle(name, style, true); styles[name + "_odd"] = style; style = workbook_add_format(workbook); diff --git a/src/Platform/modules/ReportExcel.cc b/src/Platform/modules/ReportExcel.cc index fadcaaf..1feb28b 100644 --- a/src/Platform/modules/ReportExcel.cc +++ b/src/Platform/modules/ReportExcel.cc @@ -103,11 +103,17 @@ namespace platform { } lxw_format* style = NULL; style = styles.at("text" + suffix); - worksheet_merge_range(notes_worksheet, row, 0, row, 1, r["dataset"].get().c_str(), style); + if (row == 1) { + // Add header + worksheet_merge_range(notes_worksheet, 0, 0, 0, 1, "Dataset", styles["bodyHeader_even"]); + worksheet_merge_range(notes_worksheet, 0, 2, 0, 9, "Note", styles["bodyHeader_even"]); + } + auto initial_row = row; for (const auto& note : r["notes"]) { - worksheet_merge_range(notes_worksheet, row, 2, row, 8, note.get().c_str(), style); + worksheet_merge_range(notes_worksheet, row, 2, row, 9, note.get().c_str(), style); row++; } + worksheet_merge_range(notes_worksheet, initial_row, 0, row - 1, 1, r["dataset"].get().c_str(), style); } void ReportExcel::body() @@ -128,7 +134,7 @@ namespace platform { bool only_one_result = data["results"].size() == 1; bool first_note = true; lxw_worksheet* notes_worksheet; - int notes_row = 0; + int notes_row = 1; for (const auto& r : data["results"]) { writeString(row, col, r["dataset"].get(), "text"); writeInt(row, col + 1, r["samples"].get(), "ints");