From f5f4967e7d53515e59848a60e6cf01b7561bf238 Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Tue, 22 May 2007 02:05:00 +0000 Subject: [PATCH] some clean ups for gradebook import/export --- grade/export/lib.php | 43 +++++++++++++++++++++++--------------- grade/export/ods/index.php | 10 +++++++-- grade/export/txt/index.php | 8 ++++--- grade/export/xls/index.php | 10 +++++++-- grade/export/xml/index.php | 10 +++++++-- grade/import/csv/index.php | 6 +++++- grade/lib.php | 8 +++++++ 7 files changed, 68 insertions(+), 27 deletions(-) diff --git a/grade/export/lib.php b/grade/export/lib.php index bf7b2f66b7..bdf916d826 100755 --- a/grade/export/lib.php +++ b/grade/export/lib.php @@ -201,41 +201,50 @@ class grade_export { * Displays all the grades on screen as a feedback mechanism */ function display_grades($feedback=false) { - echo get_string("firstname").",". - get_string("lastname").",". - get_string("idnumber").",". - get_string("institution").",". - get_string("department").",". - get_string("email"); + echo ''; + echo ''; + echo '". + '". + '". + '". + '". + '"; foreach ($this->columns as $column) { $column = strip_tags($column); - echo ",$column"; + echo ""; /// add a column_feedback column if ($feedback) { - echo ",{$column}_feedback"; + echo ""; } } - echo ",".get_string("total")."
"; - + echo '"; + echo ''; /// Print all the lines of data. - foreach ($this->grades as $studentid => $studentgrades) { + + + foreach ($this->grades as $studentid => $studentgrades) { + + echo ''; $student = $this->students[$studentid]; if (empty($this->totals[$student->id])) { $this->totals[$student->id] = ''; } - echo "$student->firstname,$student->lastname,$student->idnumber,$student->institution,$student->department,$student->email"; + + + echo ""; foreach ($studentgrades as $grade) { $grade = strip_tags($grade); - echo ",$grade"; + echo ""; if ($feedback) { - echo ",".array_shift($this->comments[$student->id]); + echo ''; } } - echo ",".$this->totals[$student->id]; - echo "
"; - } + echo ''; + echo ""; + } + echo '
'.get_string("firstname")."'.get_string("lastname")."'.get_string("idnumber")."'.get_string("institution")."'.get_string("department")."'.get_string("email")."$column{$column}_feedback'.get_string("total")."
$student->firstname$student->lastname$student->idnumber$student->institution$student->department$student->email$grade'.array_shift($this->comments[$student->id]).''.$this->totals[$student->id].'
'; } } diff --git a/grade/export/ods/index.php b/grade/export/ods/index.php index 7cf7579611..706dd00725 100755 --- a/grade/export/ods/index.php +++ b/grade/export/ods/index.php @@ -38,7 +38,10 @@ if (($data = data_submitted()) && confirm_sesskey()) { } // print the grades on screen for feedbacks - print_header(get_string('grade'),get_string('grade'),get_string('grade')); + $course = get_record('course', 'id', $id); + $action = 'exporttxt'; + print_header($course->shortname.': '.get_string('grades'), $course->fullname, grade_nav($course, $action)); + $export = new grade_export($id, $data->itemids); $export->display_grades($feedback); @@ -46,6 +49,9 @@ if (($data = data_submitted()) && confirm_sesskey()) { redirect('export.php?id='.$id.'&itemids='.$itemidsurl); exit; } - +$course = get_record('course', 'id', $id); +$action = 'exportods'; +print_header($course->shortname.': '.get_string('grades'), $course->fullname, grade_nav($course, $action)); print_gradeitem_selections($id); +print_footer(); ?> \ No newline at end of file diff --git a/grade/export/txt/index.php b/grade/export/txt/index.php index 01bfd338d4..78be9663e3 100755 --- a/grade/export/txt/index.php +++ b/grade/export/txt/index.php @@ -37,8 +37,10 @@ if (($data = data_submitted()) && confirm_sesskey()) { $itemidsurl = implode(",",$data->itemids); } - // print the grades on screen for feedbacks - print_header(get_string('grade'),get_string('grade'),get_string('grade')); + $course = get_record('course', 'id', $id); + $action = 'exporttxt'; + print_header($course->shortname.': '.get_string('grades'), $course->fullname, grade_nav($course, $action)); + $export = new grade_export($id, $data->itemids); $export->display_grades($feedback); @@ -71,7 +73,7 @@ if ($grade_items = grade_get_items($id)) { } echo '
'; echo 'tab'; - echo 'comma'; + echo 'comma'; echo ''; echo ''; echo '
'; diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php index 0d57faae10..30552c6c4d 100755 --- a/grade/export/xls/index.php +++ b/grade/export/xls/index.php @@ -38,7 +38,10 @@ if (($data = data_submitted()) && confirm_sesskey()) { } // print the grades on screen for feedbacks - print_header(get_string('grade'),get_string('grade'),get_string('grade')); + $course = get_record('course', 'id', $id); + $action = 'exporttxt'; + print_header($course->shortname.': '.get_string('grades'), $course->fullname, grade_nav($course, $action)); + $export = new grade_export($id, $data->itemids); $export->display_grades($feedback); @@ -46,6 +49,9 @@ if (($data = data_submitted()) && confirm_sesskey()) { redirect('export.php?id='.$id.'&itemids='.$itemidsurl); exit; } - +$course = get_record('course', 'id', $id); +$action = 'exportxls'; +print_header($course->shortname.': '.get_string('grades'), $course->fullname, grade_nav($course, $action)); print_gradeitem_selections($id); +print_footer(); ?> \ No newline at end of file diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php index 28870ceb95..6c05ef1841 100755 --- a/grade/export/xml/index.php +++ b/grade/export/xml/index.php @@ -38,7 +38,10 @@ if (($data = data_submitted()) && confirm_sesskey()) { } // print the grades on screen for feedbacks - print_header(get_string('grade'),get_string('grade'),get_string('grade')); + $course = get_record('course', 'id', $id); + $action = 'exporttxt'; + print_header($course->shortname.': '.get_string('grades'), $course->fullname, grade_nav($course, $action)); + $export = new grade_export($id, $data->itemids); $export->display_grades($feedback); @@ -46,6 +49,9 @@ if (($data = data_submitted()) && confirm_sesskey()) { redirect('export.php?id='.$id.'&itemids='.$itemidsurl); exit; } - +$course = get_record('course', 'id', $id); +$action = 'exportxml'; +print_header($course->shortname.': '.get_string('grades'), $course->fullname, grade_nav($course, $action)); print_gradeitem_selections($id); +print_footer(); ?> \ No newline at end of file diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php index bd2debac04..8850a43194 100755 --- a/grade/import/csv/index.php +++ b/grade/import/csv/index.php @@ -29,7 +29,11 @@ if (isset($CFG->CSV_DELIMITER)) { require_once('../grade_import_form.php'); -print_header("test","test","test"); + +require_once($CFG->dirroot.'/grade/lib.php'); +$course = get_record('course', 'id', $id); +$action = 'importcsv'; +print_header($course->shortname.': '.get_string('grades'), $course->fullname, grade_nav($course, $action)); $mform = new grade_import_form(); diff --git a/grade/lib.php b/grade/lib.php index be143a8e0e..12c1845760 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -1157,6 +1157,14 @@ function grade_nav($course, $action='grades') { case 'excepts': $strcurpage = get_string('gradeexceptions', 'grades'); break; + case 'exporttxt': + case 'exportxml': + case 'exportods': + case 'exportxls': + case 'importcsv': + case 'importxml': + $strcurpage = get_string($action); + break; default: unset($strcurpage); break; -- 2.39.5