mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 08:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'w50_MDL-37171_m25_outdatedexcel' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-12-18 00:13:45 +01:00
commit 7039c823dc
10 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/user/user_bulk_download.php
View File

@ -81,7 +81,7 @@ function user_download_ods($fields) {
$worksheet = array();
$worksheet[0] =& $workbook->add_worksheet('');
$worksheet[0] = $workbook->add_worksheet('');
$col = 0;
foreach ($fields as $fieldname) {
$worksheet[0]->write(0, $col, $fieldname);
@ -119,7 +119,7 @@ function user_download_xls($fields) {
$worksheet = array();
$worksheet[0] =& $workbook->add_worksheet('');
$worksheet[0] = $workbook->add_worksheet('');
$col = 0;
foreach ($fields as $fieldname) {
$worksheet[0]->write(0, $col, $fieldname);

4
course/lib.php
View File

@ -665,7 +665,7 @@ function print_log_xls($course, $user, $date, $order='l.time DESC', $modname,
// Creating worksheets
for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) {
$sheettitle = get_string('logs').' '.$wsnumber.'-'.$nroPages;
$worksheet[$wsnumber] =& $workbook->add_worksheet($sheettitle);
$worksheet[$wsnumber] = $workbook->add_worksheet($sheettitle);
$worksheet[$wsnumber]->set_column(1, 1, 30);
$worksheet[$wsnumber]->write_string(0, 0, get_string('savedat').
userdate(time(), $strftimedatetime));
@ -779,7 +779,7 @@ function print_log_ods($course, $user, $date, $order='l.time DESC', $modname,
// Creating worksheets
for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) {
$sheettitle = get_string('logs').' '.$wsnumber.'-'.$nroPages;
$worksheet[$wsnumber] =& $workbook->add_worksheet($sheettitle);
$worksheet[$wsnumber] = $workbook->add_worksheet($sheettitle);
$worksheet[$wsnumber]->set_column(1, 1, 30);
$worksheet[$wsnumber]->write_string(0, 0, get_string('savedat').
userdate(time(), $strftimedatetime));

2
grade/export/ods/grade_export_ods.php
View File

@ -41,7 +41,7 @@ class grade_export_ods extends grade_export {
// Sending HTTP headers
$workbook->send($downloadfilename);
// Adding the worksheet
$myxls =& $workbook->add_worksheet($strgrades);
$myxls = $workbook->add_worksheet($strgrades);
// Print names of all the fields.

2
grade/export/xls/grade_export_xls.php
View File

@ -40,7 +40,7 @@ class grade_export_xls extends grade_export {
// Sending HTTP headers
$workbook->send($downloadfilename);
// Adding the worksheet
$myxls =& $workbook->add_worksheet($strgrades);
$myxls = $workbook->add_worksheet($strgrades);
// Print names of all the fields
$profilefields = grade_helper::get_user_profile_fields($this->course->id, $this->usercustomfields);

2
lib/odslib.class.php
View File

@ -50,7 +50,7 @@ class MoodleODSWorkbook {
/* Create one Moodle Worksheet
* @param string $name Name of the sheet
*/
function &add_worksheet($name = '') {
function add_worksheet($name = '') {
/// Create the Moodle Worksheet. Returns one pointer to it
$ws = new MoodleODSWorksheet($name);
$this->worksheets[] =& $ws;

4
mod/choice/report.php
View File

@ -76,7 +76,7 @@
/// Send HTTP headers
$workbook->send($filename);
/// Creating the first worksheet
$myxls =& $workbook->add_worksheet($strresponses);
$myxls = $workbook->add_worksheet($strresponses);
/// Print names of all the fields
$myxls->write_string(0,0,get_string("lastname"));
@ -129,7 +129,7 @@
/// Send HTTP headers
$workbook->send($filename);
/// Creating the first worksheet
$myxls =& $workbook->add_worksheet($strresponses);
$myxls = $workbook->add_worksheet($strresponses);
/// Print names of all the fields
$myxls->write_string(0,0,get_string("lastname"));

4
mod/data/lib.php
View File

@ -2686,7 +2686,7 @@ function data_export_xls($export, $dataname, $count) {
$workbook = new MoodleExcelWorkbook($filearg);
$workbook->send($filename);
$worksheet = array();
$worksheet[0] =& $workbook->add_worksheet('');
$worksheet[0] = $workbook->add_worksheet('');
$rowno = 0;
foreach ($export as $row) {
$colno = 0;
@ -2720,7 +2720,7 @@ function data_export_ods($export, $dataname, $count) {
$workbook = new MoodleODSWorkbook($filearg);
$workbook->send($filename);
$worksheet = array();
$worksheet[0] =& $workbook->add_worksheet('');
$worksheet[0] = $workbook->add_worksheet('');
$rowno = 0;
foreach ($export as $row) {
$colno = 0;

4
mod/feedback/analysis_to_excel.php
View File

@ -123,8 +123,8 @@ $xls_formats->procent = $workbook->add_format(array(
// Creating the worksheets
$sheetname = clean_param($feedback->name, PARAM_ALPHANUM);
error_reporting(0);
$worksheet1 =& $workbook->add_worksheet(substr($sheetname, 0, 31));
$worksheet2 =& $workbook->add_worksheet('detailed');
$worksheet1 = $workbook->add_worksheet(substr($sheetname, 0, 31));
$worksheet2 = $workbook->add_worksheet('detailed');
error_reporting($CFG->debug);
$worksheet1->hide_gridlines();
$worksheet1->set_column(0, 0, 10);

32
mod/scorm/report/basic/report.php
View File

@ -193,24 +193,24 @@ class scorm_basic_report extends scorm_default_report {
$workbook->send($filename);
// Creating the first worksheet
$sheettitle = get_string('report', 'scorm');
$myxls =& $workbook->add_worksheet($sheettitle);
$myxls = $workbook->add_worksheet($sheettitle);
// format types
$format =& $workbook->add_format();
$format = $workbook->add_format();
$format->set_bold(0);
$formatbc =& $workbook->add_format();
$formatbc = $workbook->add_format();
$formatbc->set_bold(1);
$formatbc->set_align('center');
$formatb =& $workbook->add_format();
$formatb = $workbook->add_format();
$formatb->set_bold(1);
$formaty =& $workbook->add_format();
$formaty = $workbook->add_format();
$formaty->set_bg_color('yellow');
$formatc =& $workbook->add_format();
$formatc = $workbook->add_format();
$formatc->set_align('center');
$formatr =& $workbook->add_format();
$formatr = $workbook->add_format();
$formatr->set_bold(1);
$formatr->set_color('red');
$formatr->set_align('center');
$formatg =& $workbook->add_format();
$formatg = $workbook->add_format();
$formatg->set_bold(1);
$formatg->set_color('green');
$formatg->set_align('center');
@ -232,24 +232,24 @@ class scorm_basic_report extends scorm_default_report {
$workbook->send($filename);
// Creating the first worksheet
$sheettitle = get_string('report', 'scorm');
$myxls =& $workbook->add_worksheet($sheettitle);
$myxls = $workbook->add_worksheet($sheettitle);
// format types
$format =& $workbook->add_format();
$format = $workbook->add_format();
$format->set_bold(0);
$formatbc =& $workbook->add_format();
$formatbc = $workbook->add_format();
$formatbc->set_bold(1);
$formatbc->set_align('center');
$formatb =& $workbook->add_format();
$formatb = $workbook->add_format();
$formatb->set_bold(1);
$formaty =& $workbook->add_format();
$formaty = $workbook->add_format();
$formaty->set_bg_color('yellow');
$formatc =& $workbook->add_format();
$formatc = $workbook->add_format();
$formatc->set_align('center');
$formatr =& $workbook->add_format();
$formatr = $workbook->add_format();
$formatr->set_bold(1);
$formatr->set_color('red');
$formatr->set_align('center');
$formatg =& $workbook->add_format();
$formatg = $workbook->add_format();
$formatg->set_bold(1);
$formatg->set_color('green');
$formatg->set_align('center');

36
mod/scorm/report/interactions/report.php
View File

@ -259,24 +259,24 @@ class scorm_interactions_report extends scorm_default_report {
$workbook->send($filename);
// Creating the first worksheet
$sheettitle = get_string('report', 'scorm');
$myxls =& $workbook->add_worksheet($sheettitle);
$myxls = $workbook->add_worksheet($sheettitle);
// format types
$format =& $workbook->add_format();
$format = $workbook->add_format();
$format->set_bold(0);
$formatbc =& $workbook->add_format();
$formatbc = $workbook->add_format();
$formatbc->set_bold(1);
$formatbc->set_align('center');
$formatb =& $workbook->add_format();
$formatb = $workbook->add_format();
$formatb->set_bold(1);
$formaty =& $workbook->add_format();
$formaty = $workbook->add_format();
$formaty->set_bg_color('yellow');
$formatc =& $workbook->add_format();
$formatc = $workbook->add_format();
$formatc->set_align('center');
$formatr =& $workbook->add_format();
$formatr = $workbook->add_format();
$formatr->set_bold(1);
$formatr->set_color('red');
$formatr->set_align('center');
$formatg =& $workbook->add_format();
$formatg = $workbook->add_format();
$formatg->set_bold(1);
$formatg->set_color('green');
$formatg->set_align('center');
@ -298,24 +298,24 @@ class scorm_interactions_report extends scorm_default_report {
$workbook->send($filename);
// Creating the first worksheet
$sheettitle = get_string('report', 'scorm');
$myxls =& $workbook->add_worksheet($sheettitle);
$myxls = $workbook->add_worksheet($sheettitle);
// format types
$format =& $workbook->add_format();
$format = $workbook->add_format();
$format->set_bold(0);
$formatbc =& $workbook->add_format();
$formatbc = $workbook->add_format();
$formatbc->set_bold(1);
$formatbc->set_align('center');
$formatb =& $workbook->add_format();
$formatb = $workbook->add_format();
$formatb->set_bold(1);
$formaty =& $workbook->add_format();
$formaty = $workbook->add_format();
$formaty->set_bg_color('yellow');
$formatc =& $workbook->add_format();
$formatc = $workbook->add_format();
$formatc->set_align('center');
$formatr =& $workbook->add_format();
$formatr = $workbook->add_format();
$formatr->set_bold(1);
$formatr->set_color('red');
$formatr->set_align('center');
$formatg =& $workbook->add_format();
$formatg = $workbook->add_format();
$formatg->set_bold(1);
$formatg->set_color('green');
$formatg->set_align('center');
@ -327,8 +327,8 @@ class scorm_interactions_report extends scorm_default_report {
}
$rownum = 1;
} else if ($download == 'CSV') {
$csvexport = new csv_export_writer("tab");
$csvexport->set_filename($filename, ".txt");
$csvexport = new csv_export_writer("tab");
$csvexport->set_filename($filename, ".txt");
$csvexport->add_data($headers);
}