Skip to content

Fix subheader for CSV #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2017
Merged

Fix subheader for CSV #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix subheader for CSV
  • Loading branch information
@vinivf
vinivf committed May 25, 2017
commit 6f019473b5ba1418a8c77c89773bfd939d854e72
15 changes: 11 additions & 4 deletions xlsxwriter.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,15 @@ public function writeSheetHeader($sheet_name, array $header_types, $format = 'xl
return;
}
if ($format == 'csv') {
$this->writeCSVLine($header_types, true, $delimiter);
if (!empty($subheader)) {
$return = '';
$return .= $this->writeCSVLine([' '], NULL, $delimiter);
$return .= $this->writeCSVLine([$subheader], NULL, $delimiter);
$return .= $this->writeCSVLine([' '], NULL, $delimiter);
$return .= $this->writeCSVLine($header_types, true, $delimiter);
return $return;
}
return $this->writeCSVLine($header_types, true, $delimiter);
}
if (!empty($subheader)) {
$this->writeSheetRow($sheet_name, [' '], $format, $delimiter);
Expand Down Expand Up @@ -172,7 +180,7 @@ public function writeSheetRow($sheet_name, array $row, $format = 'xlsx', $delimi
return;
}
if ($format == 'csv') {
$this->writeCSVLine($row, NULL, $delimiter);
return $this->writeCSVLine($row, NULL, $delimiter);
}

self::initializeSheet($sheet_name);
Expand Down Expand Up @@ -220,8 +228,7 @@ protected function finalizeSheet($sheet_name)
$sheet->finalized=true;
}

public function writeCSV(array $data, array $header_types=array(), $delimiter = ';')
{
public function writeCSV(array $data, array $header_types=array(), $delimiter = ';') {
$header_text = array_keys($header_types);

$output = '';
Expand Down