diff --git a/main/gradebook/lib/GradebookUtils.php b/main/gradebook/lib/GradebookUtils.php index 39f3093ff8..9e91154d31 100644 --- a/main/gradebook/lib/GradebookUtils.php +++ b/main/gradebook/lib/GradebookUtils.php @@ -918,7 +918,7 @@ class GradebookUtils $table->updateCellAttributes($row, $column, 'colspan="' . $columns . '" align="center" class="row_odd"'); } - $params = array( + $pdfParams = array( 'filename' => get_lang('FlatView') . '_' . api_get_utc_datetime(), 'pdf_title' => $title, 'course_code' => $course_code, @@ -926,8 +926,10 @@ class GradebookUtils ); $page_format = $params['orientation'] == 'landscape' ? 'A4-L' : 'A4'; - $pdf = new PDF($page_format, $params['orientation'], $params); - $pdf->html_to_pdf_with_template($table->toHtml()); + $pdf = new PDF($page_format, $page_format, $pdfParams); + $pdf->html_to_pdf_with_template($flatviewtable->return_table()); + // Default + //$pdf->html_to_pdf_with_template($table->toHtml()); exit; } diff --git a/main/gradebook/lib/flatview_data_generator.class.php b/main/gradebook/lib/flatview_data_generator.class.php index d5aace389d..325d02d327 100755 --- a/main/gradebook/lib/flatview_data_generator.class.php +++ b/main/gradebook/lib/flatview_data_generator.class.php @@ -197,10 +197,10 @@ class FlatViewDataGenerator $list = []; $list['items'] = $finalList; - $list['header'] = $mainHeader; + $list['header'] = '
'.$mainHeader.'
'; $headers[]= $list; } else { - $headers[] = $mainHeader; + $headers[] = '
'.$mainHeader.'
'; } } } else { @@ -231,7 +231,7 @@ class FlatViewDataGenerator } } - $headers[] = api_strtoupper(get_lang('GradebookQualificationTotal')); + $headers[] = '
'.api_strtoupper(get_lang('GradebookQualificationTotal')).'
'; return $headers; } @@ -499,7 +499,11 @@ class FlatViewDataGenerator if (!$show_all) { if (api_get_configuration_value('gradebook_detailed_admin_view')) { $finalList = array_merge($linkScoreList, $evalScoreList); - $average = array_sum($finalList) / count($finalList); + if (empty($finalList)) { + $average = 0; + } else { + $average = array_sum($finalList) / count($finalList); + } $finalList[] = round($average, 2); foreach ($finalList as $finalValue) { $row[] = '
'.$finalValue.'
';