Alan Lam 8 лет назад
Родитель
Сommit
54b3cead19
1 измененных файлов с 11 добавлено и 3 удалено
  1. 11 3
      controllers/test_pdf.php

+ 11 - 3
controllers/test_pdf.php

@@ -11,6 +11,9 @@ $keys = array_column($test_values, "name");
 $values = array_column($test_values, "value");
 
 $values = array_combine($keys, $values);
+$values = array_filter($values, function($value) {
+	return strlen($value) !== 0;
+});
 
 $tiny_font_size = 8;
 $small_font_size = 10;
@@ -23,12 +26,17 @@ $cell_margin = 2;
 list($date_start, $time_start) = explode(" ", $test->dts_start);
 list($date_end, $time_end) = explode(" ", $test->dts_end);
 
-$dt_start = new DateTime($test->dts_start);
-$dt_end = new DateTime($test->dts_end);
+$dt_start = new DateTime($test->dts_start . " UTC");
+$dt_start->setTimezone(new DateTimeZone(TIMEZONE));
+$dt_end = new DateTime($test->dts_end . " UTC");
+$dt_end->setTimezone(new DateTimeZone(TIMEZONE));
+
+$time_start = $dt_start->format("H:i:s");
+$time_end = $dt_end->format("H:i:s");
 
 $diff = $dt_start->diff($dt_end, true);
 
-$date_start = date("d/m/Y", strtotime($test->dts_start));
+$date_start = date("d/m/Y", strtotime($test->dts_start . " UTC"));
 
 // A4 size: 210x297mm