Skip to content

fix empty files in yearly download #2138

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
benderl merged 1 commit into from
Jan 13, 2025
Merged

fix empty files in yearly download #2138

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
8 changes: 6 additions & 2 deletions web/settings/downloadChargeLog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
$month = $_GET["month"];
// Format the file name based on the year and month
$file_name = sprintf('%04d%02d', $year, $month);
$output_file_name = $file_name;
$charge_log_file = $charge_log_path . $file_name . ".json";

// Attempt to load the charge log file for the specific month
Expand All @@ -66,12 +67,15 @@
for ($month = 1; $month <= 12; $month++) {
// Format the file name based on the year and month
$file_name = sprintf('%04d%02d', $year, $month);
$output_file_name = sprintf('%04d', $year);
$charge_log_file = $charge_log_path . $file_name . ".json";

// Append data from each month's charge log file if it exists
if (file_exists($charge_log_file)) {
$monthly_data = json_decode(file_get_contents($charge_log_file), true);
$charge_log_data = array_merge($charge_log_data, $monthly_data);
if (is_array($monthly_data)) {
$charge_log_data = array_merge($charge_log_data, $monthly_data);
}
}
}
}
Expand Down Expand Up @@ -159,7 +163,7 @@ function formatEnergy($value)

if (is_array($charge_log_data)) {
header("Content-Type: text/csv");
header("Content-Disposition: attachment; filename=ChargeLog-" . $file_name . ".csv");
header("Content-Disposition: attachment; filename=ChargeLog-" . $output_file_name . ".csv");

# Output CSV header
$csv_header = newRow();
Expand Down