chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r14842] Added optional export of user fields in quiz results export

Browse Source
skala
Yannick Warnier 17 years ago
parent 3ebdbdee28
commit 9d818559d9
2 changed files with 83 additions and 14 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 39
      main/exercice/exercice.php
  2. 58
      main/exercice/exercise_result.class.php

39
main/exercice/exercice.php
Unescape View File

@ -50,6 +50,7 @@ require_once(api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
require_once('hotpotatoes.lib.php');
require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
include(api_get_path(LIBRARY_PATH).'mail.lib.inc.php');
include(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
/*
-----------------------------------------------------------
@ -302,10 +303,23 @@ if($is_allowedToEdit && !empty($choice) && $choice == 'exportqti2')
rmdir($temp_zip_dir);
exit(); //otherwise following clicks may become buggy
}
if($_POST['export_report'] == 'export_report')
if(!empty($_POST['export_user_fields']))
{
switch($_POST['export_user_fields'])
{
case 'export_user_fields':
$_SESSION['export_user_fields'] = true;
break;
case 'do_not_export_user_fields':
default:
$_SESSION['export_user_fields'] = false;
break;
}
}
if(!empty($_POST['export_report']) && $_POST['export_report'] == 'export_report')
{
$user_id = null;
if(empty($_SESSION['export_user_fields'])) $_SESSION['export_user_fields'] = false;
if(!$is_allowedToEdit and !$is_tutor)
{
$user_id = api_get_user_id();
@ -315,13 +329,13 @@ if($_POST['export_report'] == 'export_report')
{
case 'xls':
$export = new ExerciseResult();
$export->exportCompleteReportXLS($documentPath, $user_id);
$export->exportCompleteReportXLS($documentPath, $user_id, $_SESSION['export_user_fields']);
exit;
break;
case 'csv':
default:
$export = new ExerciseResult();
$export->exportCompleteReportCSV($documentPath, $user_id);
$export->exportCompleteReportCSV($documentPath, $user_id, $_SESSION['export_user_fields']);
exit;
break;
}
@ -873,8 +887,21 @@ if($_configuration['tracking_enabled'])
echo '<input type="hidden" name="export_report" value="export_report">';
echo '<input type="hidden" name="export_format" value="xls">';
echo '</form>';
echo '<a class="quiz_export_link" href="#" onclick="document.form1a.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>';
echo '<a class="quiz_export_link" href="#" onclick="document.form1b.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'excel.gif">&nbsp;'.get_lang('ExportAsXLS').'</a>';
echo '<form id="form1c" name="form1c" method="post" action="'.api_get_self().'?show='.Security::remove_XSS($_GET['show']).'">';
if($_SESSION['export_user_fields']==false)
{
$alt = get_lang('ExportWithUserFields');
echo '<input type="hidden" name="export_user_fields" value="export_user_fields">';
}
else
{
$alt = get_lang('ExportWithoutUserFields');
echo '<input type="hidden" name="export_user_fields" value="do_not_export_user_fields">';
}
echo '</form>';
echo '<a class="quiz_export_link" href="#" onclick="document.form1a.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'excel.gif" alt="'.get_lang('ExportAsCSV').'">&nbsp;'.get_lang('ExportAsCSV').'</a>';
echo '<a class="quiz_export_link" href="#" onclick="document.form1b.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'excel.gif" alt="'.get_lang('ExportAsXLS').'">&nbsp;'.get_lang('ExportAsXLS').'</a>';
echo '<a class="quiz_export_link" href="#" onclick="document.form1c.submit();"><img align="absbottom" src="'.api_get_path(WEB_IMG_PATH).'synthese_view.gif" alt="'.$alt.'">&nbsp;'.$alt.'</a>';
echo '<br /><br />';
?>

58
main/exercice/exercise_result.class.php
Unescape View File

@ -125,13 +125,13 @@ class ExerciseResult
//get all results (ourself and the others) as an admin should see them
//AND exe_user_id <> $_user['user_id'] clause has been removed
$sql="SELECT CONCAT(lastname,' ',firstname),ce.title, te.exe_result ,
te.exe_weighting, UNIX_TIMESTAMP(te.exe_date),te.exe_id,email
te.exe_weighting, UNIX_TIMESTAMP(te.exe_date),te.exe_id, user.email, user.user_id
FROM $TBL_EXERCISES ce , $TBL_TRACK_EXERCISES te, $TBL_USER user
WHERE te.exe_exo_id = ce.id AND user_id=te.exe_user_id AND te.exe_cours_id='$cid'
ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date ASC";
$hpsql="SELECT CONCAT(tu.lastname,' ',tu.firstname), tth.exe_name,
tth.exe_result , tth.exe_weighting, UNIX_TIMESTAMP(tth.exe_date)
tth.exe_result , tth.exe_weighting, UNIX_TIMESTAMP(tth.exe_date), tu.email, tu.user_id
FROM $TBL_TRACK_HOTPOTATOES tth, $TBL_USER tu
WHERE tu.user_id=tth.exe_user_id AND tth.exe_cours_id = '".$cid."'
ORDER BY tth.exe_cours_id ASC, tth.exe_date ASC";
@ -139,7 +139,8 @@ class ExerciseResult
}
else
{ // get only this user's results
$sql="SELECT '',ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date),te.exe_id
$sql="SELECT '',ce.title, te.exe_result , te.exe_weighting, " .
"UNIX_TIMESTAMP(te.exe_date),te.exe_id
FROM $TBL_EXERCISES ce , $TBL_TRACK_EXERCISES te
WHERE te.exe_exo_id = ce.id AND te.exe_user_id='".$user_id."' AND te.exe_cours_id='$cid'
ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date ASC";
@ -151,8 +152,8 @@ class ExerciseResult
}
$results=getManyResultsXCol($sql,7);
$hpresults=getManyResultsXCol($hpsql,5);
$results=getManyResultsXCol($sql,8);
$hpresults=getManyResultsXCol($hpsql,7);
$NoTestRes = 0;
$NoHPTestRes = 0;
@ -172,7 +173,8 @@ class ExerciseResult
if(empty($user_id))
{
$user = $results[$i][0];
$return[$i]['user'] = $user;
$return[$i]['user'] = $user;
$return[$i]['user_id'] = $results[$i][7];
}
$return[$i]['title'] = $test;
$return[$i]['time'] = format_locale_date(get_lang('dateTimeFormatLong'),$results[$i][4]);
@ -196,6 +198,7 @@ class ExerciseResult
if(empty($user_id))
{
$return[$j+$i]['user'] = $hpresults[$i][0];
$return[$j+$i]['user_id'] = $results[$i][6];
}
$return[$j+$i]['title'] = $title;
@ -211,9 +214,10 @@ class ExerciseResult
* Exports the complete report as a CSV file
* @param string Document path inside the document tool
* @param integer Optional user ID
* @param boolean Whether to include user fields or not
* @return boolean False on error
*/
public function exportCompleteReportCSV($document_path='',$user_id=null)
public function exportCompleteReportCSV($document_path='',$user_id=null, $export_user_fields)
{
$this->_getExercisesReporting($document_path,$user_id);
$filename = 'exercise_results_'.date('YmdGis').'.csv';
@ -228,6 +232,17 @@ class ExerciseResult
{
$data .= get_lang('User').';';
}
if($export_user_fields)
{
//show user fields section with a big th colspan that spans over all fields
$extra_user_fields = UserManager::get_extra_fields(0,0,5,'ASC',false);
$num = count($extra_user_fields);
foreach($extra_user_fields as $field)
{
$data .= '"'.str_replace("\r\n",' ',html_entity_decode(strip_tags($field[3]))).'";';
}
$display_extra_user_fields = true;
}
$data .= get_lang('Title').';';
$data .= get_lang('Date').';';
$data .= get_lang('Results').';';
@ -240,6 +255,15 @@ class ExerciseResult
{
$data .= str_replace("\r\n",' ',html_entity_decode(strip_tags($row['user']))).';';
}
if($export_user_fields)
{
//show user fields data, if any, for this user
$user_fields_values = UserManager::get_extra_user_data(intval($row['user_id']),false,false);
foreach($user_fields_values as $value)
{
$data .= '"'.str_replace('"','""',html_entity_decode(strip_tags($value))).'";';
}
}
$data .= str_replace("\r\n",' ',html_entity_decode(strip_tags($row['title']))).';';
$data .= str_replace("\r\n",' ',$row['time']).';';
$data .= str_replace("\r\n",' ',$row['result']).';';
@ -274,7 +298,7 @@ class ExerciseResult
* Exports the complete report as an XLS file
* @return boolean False on error
*/
public function exportCompleteReportXLS($document_path='',$user_id=null)
public function exportCompleteReportXLS($document_path='',$user_id=null, $export_user_fields)
{
$this->_getExercisesReporting($document_path,$user_id);
$filename = 'exercise_results_'.date('YmdGis').'.xls';
@ -293,6 +317,17 @@ class ExerciseResult
$worksheet->write($line,$column,get_lang('User'));
$column++;
}
if($export_user_fields)
{
//show user fields section with a big th colspan that spans over all fields
$extra_user_fields = UserManager::get_extra_fields(0,0,5,'ASC',false);
//show the fields names for user fields
foreach($extra_user_fields as $field)
{
$worksheet->write($line,$column,html_entity_decode(strip_tags($field[3])));
$column++;
}
}
$worksheet->write($line,$column,get_lang('Title'));
$column++;
$worksheet->write($line,$column,get_lang('Date'));
@ -310,6 +345,13 @@ class ExerciseResult
$worksheet->write($line,$column,html_entity_decode(strip_tags($row['user'])));
$column++;
}
//show user fields data, if any, for this user
$user_fields_values = UserManager::get_extra_user_data(intval($row['user_id']),false,false);
foreach($user_fields_values as $value)
{
$worksheet->write($line,$column,html_entity_decode(strip_tags($value)));
$column++;
}
$worksheet->write($line,$column,html_entity_decode(strip_tags($row['title'])));
$column++;
$worksheet->write($line,$column,$row['time']);

Write Preview
Loading…
Cancel
Save