From: toyomoyo Date: Wed, 13 Jun 2007 09:07:39 +0000 (+0000) Subject: previews specified number of lines for grade imports X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=870a603f9c386b2a4306bfb86aa3a00b055ebc50;p=moodle.git previews specified number of lines for grade imports --- diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php index 7e6ee73cf0..baf480b765 100755 --- a/grade/import/csv/index.php +++ b/grade/import/csv/index.php @@ -222,6 +222,7 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) { $filename = $mform->get_userfile_name(); + // Large files are likely to take their time and memory. Let PHP know // that we'll take longer, and that the process should be recycled soon // to free up memory. @@ -248,6 +249,28 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) { // --- get header (field names) --- $header = split($csv_delimiter, fgets($fp,1024)); + // print some preview + $numlines = 0; // 0 preview lines displayed + + print_heading(get_string('importpreview', 'grades')); + echo ''; + echo ''; + foreach ($header as $h) { + echo ''; + } + echo ''; + while (!feof ($fp) && $numlines <= $formdata->previewrows) { + $lines = split($csv_delimiter, fgets($fp,1024)); + echo ''; + foreach ($lines as $line) { + echo '';; + } + $numlines ++; + echo ''; + } + echo '
'.$h.'
'.$line.'
'; + + // display the mapping form with header info processed $mform2 = new grade_import_mapping_form(qualified_me(), array('id'=>$id, 'header'=>$header, 'filename'=>$filename)); $mform2->display(); diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php index ab6083134f..170a16357e 100755 --- a/grade/import/xml/index.php +++ b/grade/import/xml/index.php @@ -56,7 +56,24 @@ if ( $formdata = $mform->get_data()) { $importcode = time(); $status = true; - foreach ($results as $result) { + $numlines = 0; + + // print some previews + print_heading(get_string('importpreview', 'grades')); + + echo ''; + foreach ($results as $i => $result) { + if ($numlines < $formdata->previewrows && isset($results[$i+1])) { + echo ''; + foreach ($result['#'] as $fieldname => $val) { + echo ''; + } + echo ''; + $numlines ++; + } else if ($numlines == $formdata->previewrows || !isset($results[$i+1])) { + echo '
'.$fieldname.' > '.$val[0]['#'].'
'; + $numlines ++; + } include_once($CFG->libdir.'/grade/grade_item.php'); if (!$gradeitem = new grade_item(array('idnumber'=>$result['#']['assignment'][0]['#']))) {