winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Ods: Fix small issues

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-11-13 22:40:12 +01:00
parent 8509f04d4d
commit d485f0fda1
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Elwig/Helpers/Export/Ods.cs
View File

@ -161,13 +161,12 @@ namespace Elwig.Helpers.Export {
public async Task AddTable<T>(DataTable<T> table) {
if (Content == null) await AddHeader();
if (Content == null) return;
var totalSpan = table.ColumnSpans.Sum(s => s.Item2);
var totalSpan = table.ColumnSpans.Sum();
_tables.Add(table.FullName);
await Content.WriteAsync($" <table:table table:name=\"{table.FullName}\" table:default-cell-style-name=\"default\">\r\n");
await Content.WriteAsync(
$" <table:table table:name=\"{table.FullName}\">\r\n" +
$" <table:table-column table:default-cell-style-name=\"default\"/>\r\n" +
$" <table:table-row>\r\n" +
FormatCell(table.FullName, colSpan: totalSpan, style: "header") +
$" </table:table-row>\r\n" +
@ -175,7 +174,7 @@ namespace Elwig.Helpers.Export {
$" <table:table-cell table:number-columns-repeated=\"{totalSpan}\"/>\r\n" +
$" </table:table-row>\r\n" +
$" <table:table-row>\r\n");
foreach (var (name, span) in table.ColumnSpans) {
foreach (var (name, span) in table.ColumnNames.Zip(table.ColumnSpans)) {
await Content.WriteAsync(FormatCell(name, colSpan: span, style: "th"));
}
await Content.WriteAsync(" </table:table-row>\r\n");
@ -219,7 +218,7 @@ namespace Elwig.Helpers.Export {
c = $"<table:table-cell office:value-type=\"string\"{add}><text:p>{data}</text:p></table:table-cell>";
}
return c = $" {c}\r\n" + (colSpan > 1 ? $" <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
return $" {c}\r\n" + (colSpan > 1 ? $" <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
}
}
}