From f6eb15ade13b28f6bf80c2bedb3c24f3af35a65b Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Mon, 13 Aug 2007 08:50:17 +0000 Subject: [PATCH] adding preview rows for export --- grade/export/grade_export_form.php | 4 ++++ grade/export/lib.php | 10 +++++++--- grade/export/ods/index.php | 2 +- grade/export/txt/grade_export_txt_form.php | 4 +++- grade/export/txt/index.php | 2 +- grade/export/xls/index.php | 2 +- grade/export/xml/grade_export_xml.php | 4 ++-- grade/export/xml/index.php | 2 +- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php index 1c996b2add..657fbe279e 100755 --- a/grade/export/grade_export_form.php +++ b/grade/export/grade_export_form.php @@ -24,6 +24,10 @@ class grade_export_form extends moodleform { $mform->addElement($element); } } + + $options = array('10'=>10, '20'=>20, '100'=>100, '1000'=>1000, '100000'=>100000); + $mform->addElement('select', 'previewrows', 'Preview rows', $options); // TODO: localize + $mform->setType('previewrows', PARAM_INT); $this->add_action_buttons(false, get_string('submit')); } } diff --git a/grade/export/lib.php b/grade/export/lib.php index 7d59b82fff..4dc81538f2 100755 --- a/grade/export/lib.php +++ b/grade/export/lib.php @@ -219,7 +219,7 @@ class grade_export { * Displays all the grades on screen as a feedback mechanism * TODO finish PHPdoc */ - function display_grades($feedback=false) { + function display_grades($feedback=false, $rows=10) { echo ''; echo ''; echo '". @@ -241,9 +241,13 @@ class grade_export { echo ''; /// Print all the lines of data. - + $i = 0; foreach ($this->grades as $studentid => $studentgrades) { - + + // number of preview rows + if ($i++ == $rows) { + break; + } echo ''; $student = $this->students[$studentid]; if (empty($this->totals[$student->id])) { diff --git a/grade/export/ods/index.php b/grade/export/ods/index.php index d8e8ca37e9..86edb81be4 100755 --- a/grade/export/ods/index.php +++ b/grade/export/ods/index.php @@ -59,7 +59,7 @@ if (($data = data_submitted()) && confirm_sesskey()) { // print the grades on screen for feedbacks $export = new grade_export($id, $data->itemids, $data->export_letters); - $export->display_grades($feedback); + $export->display_grades($feedback, $data->previewrows); // this redirect should trigger a download prompt redirect('export.php?id='.$id.'&itemids='.$itemidsurl.'&export_letters='.$data->export_letters); diff --git a/grade/export/txt/grade_export_txt_form.php b/grade/export/txt/grade_export_txt_form.php index fba28f0587..3f5de952ba 100755 --- a/grade/export/txt/grade_export_txt_form.php +++ b/grade/export/txt/grade_export_txt_form.php @@ -16,7 +16,9 @@ class grade_export_txt_form extends moodleform { $mform->addElement($element); } } - + $options = array('10'=>10, '20'=>20, '100'=>100, '1000'=>1000, '100000'=>100000); + $mform->addElement('select', 'previewrows', 'Preview rows', $options); // TODO: localize + $mform->setType('previewrows', PARAM_INT); include_once($CFG->libdir.'/pear/HTML/QuickForm/radio.php'); $radio = array(); $radio[] = &MoodleQuickForm::createElement('radio', 'separator', null, get_string('septab', 'grades'), 'tab'); diff --git a/grade/export/txt/index.php b/grade/export/txt/index.php index c86a88fd4b..878fc86c93 100755 --- a/grade/export/txt/index.php +++ b/grade/export/txt/index.php @@ -58,7 +58,7 @@ if (($data = data_submitted()) && confirm_sesskey()) { } $export = new grade_export($id, $data->itemids, $data->export_letters); - $export->display_grades($feedback); + $export->display_grades($feedback, $data->previewrows); // this redirect should trigger a download prompt redirect('export.php?id='.$id.'&itemids='.$itemidsurl.'&separator='.$data->separator.'&export_letters='.$data->export_letters); diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php index 940fcd0eab..356ca76979 100755 --- a/grade/export/xls/index.php +++ b/grade/export/xls/index.php @@ -59,7 +59,7 @@ if (($data = data_submitted()) && confirm_sesskey()) { // print the grades on screen for feedbacks $export = new grade_export($id, $data->itemids, $data->export_letters); - $export->display_grades($feedback); + $export->display_grades($feedback, $data->previewrows); // this redirect should trigger a download prompt redirect('export.php?id='.$id.'&itemids='.$itemidsurl.'&export_letters='.$data->export_letters); diff --git a/grade/export/xml/grade_export_xml.php b/grade/export/xml/grade_export_xml.php index 3af8df6481..bcf47dfaba 100755 --- a/grade/export/xml/grade_export_xml.php +++ b/grade/export/xml/grade_export_xml.php @@ -51,8 +51,8 @@ class grade_export_xml extends grade_export { /// Calculate file name $downloadfilename = clean_filename("{$this->course->shortname} $this->strgrades.xml"); - header("Content-type: text/xml; charset=UTF-8"); - header("Content-Disposition: attachment; filename=\"$downloadfilename\""); + //header("Content-type: text/xml; charset=UTF-8"); + //header("Content-Disposition: attachment; filename=\"$downloadfilename\""); /// time stamp to ensure uniqueness of batch export echo ''; diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php index 4914091451..c07b231f8f 100755 --- a/grade/export/xml/index.php +++ b/grade/export/xml/index.php @@ -59,7 +59,7 @@ if (($data = data_submitted()) && confirm_sesskey()) { // print the grades on screen for feedbacks $export = new grade_export($id, $data->itemids, $data->export_letters); - $export->display_grades($feedback); + $export->display_grades($feedback, $data->previewrows); // this redirect should trigger a download prompt redirect('export.php?id='.$id.'&itemids='.$itemidsurl.'&export_letters='.$data->export_letters); -- 2.39.5
'.get_string("firstname")."