From 2ec4542e3dd779ece3fc9d175a69e7891c38c749 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 19 Mar 2010 10:44:04 -0500 Subject: [PATCH] Hiding unused date when exporting a classroom assessment --- main/gradebook/gradebook_view_result.php | 1 + main/gradebook/lib/fe/exportgradebook.php | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/main/gradebook/gradebook_view_result.php b/main/gradebook/gradebook_view_result.php index 8290e3e8a1..56eb7569b8 100755 --- a/main/gradebook/gradebook_view_result.php +++ b/main/gradebook/gradebook_view_result.php @@ -338,6 +338,7 @@ if (isset ($_GET['print'])) { foreach ($data_array as $data) { $newarray[] = array_slice($data, 2); } + echo print_table($newarray, $header_names,get_lang('ViewResult'), $eval[0]->get_name()); exit; } else diff --git a/main/gradebook/lib/fe/exportgradebook.php b/main/gradebook/lib/fe/exportgradebook.php index fa0b81d8d2..e802245e4c 100755 --- a/main/gradebook/lib/fe/exportgradebook.php +++ b/main/gradebook/lib/fe/exportgradebook.php @@ -14,6 +14,8 @@ function print_table ($data_array,$header_names,$view,$coursename) { '.get_lang('Print').' + +
'; - + $printdata .= '

'.$view.' : '.$coursename.'

'; - $printdata .= '

'.get_lang('Date').' : '.api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).'

'; + //@todo not necessary here + //$printdata .= '

'.get_lang('Date').' : '.api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).'

'; $printdata .= ''; foreach ($header_names as $header) { $printdata .= ''; - } + foreach ($data_array as $data) { $printdata .= ''; foreach ($data as $rowdata) { @@ -88,7 +91,7 @@ function export_pdf($pdf,$newarray,$header_names,$format) { $pdf->ezSetCmMargins(0,0,0,0); $pdf->ezSetY(($format=='portrait')?'820':'570'); $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm'); - $pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center')); + //$pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center')); if ($format=='portrait') { $pdf->line(40,790,540,790); $pdf->line(40,40,540,40);
'.$header.'