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

Minor - format code.

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent 83df5475b6
commit 420ee10cbf
4 changed files with 95 additions and 32 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. 85
      main/gradebook/gradebook_view_result.php
  2. 2
      main/gradebook/lib/be/result.class.php
  3. 9
      main/gradebook/lib/fe/resulttable.class.php
  4. 31
      main/gradebook/lib/results_data_generator.class.php

85
main/gradebook/gradebook_view_result.php
Unescape View File

@ -69,7 +69,7 @@ if (isset($_GET['editres'])) {
$values = $edit_res_form->exportValues();
$result = new Result();
$resultlog = new Result();
$resultlog->add_result__log($values['hid_user_id'], $select_eval);
$resultlog->addResultLog($values['hid_user_id'], $select_eval);
$result->set_id($edit_res_xml);
$result->set_user_id($values['hid_user_id']);
$result->set_evaluation_id($select_eval);
@ -162,7 +162,9 @@ if (isset($_GET['import'])) {
$result = new Result();
$result->set_user_id($importedresult['user_id']);
if (!empty($importedresult['score'])) {
$result->set_score(api_number_format($importedresult['score'], api_get_setting('gradebook_number_decimals')));
$result->set_score(
api_number_format($importedresult['score'], api_get_setting('gradebook_number_decimals'))
);
}
if (!empty($importedresult['date'])) {
$result->set_date(api_get_utc_datetime($importedresult['date']));
@ -240,7 +242,7 @@ if (isset($_GET['export'])) {
$export = $export_result_form->exportValues();
$file_type = $export['file_type'];
$filename = 'export_results_'.gmdate('Y-m-d_H-i-s');
$results = Result :: load(null, null, $select_eval);
$results = Result::load(null, null, $select_eval);
$data = array(); //when file type is csv, add a header to the output file
if ($file_type == 'csv') {
$alldata[] = array(
@ -307,9 +309,21 @@ if (isset($_GET['export'])) {
// get data table
if (api_sort_by_first_name()) {
$data_array = $datagen->get_data(ResultsDataGenerator :: RDG_SORT_FIRSTNAME, 0, null, false, true);
$data_array = $datagen->get_data(
ResultsDataGenerator::RDG_SORT_FIRSTNAME,
0,
null,
false,
true
);
} else {
$data_array = $datagen->get_data(ResultsDataGenerator :: RDG_SORT_LASTNAME, 0, null, false, true);
$data_array = $datagen->get_data(
ResultsDataGenerator::RDG_SORT_LASTNAME,
0,
null,
false,
true
);
}
$data_table = array();
@ -341,6 +355,7 @@ if (isset($_GET['export'])) {
}
$data_table[] = $result;
}
export_pdf_with_html(
$head_table,
$data_table,
@ -364,11 +379,16 @@ if (isset($_GET['export'])) {
switch ($file_type) {
case 'xml':
Export :: arrayToXml($alldata, $filename, 'Result', 'XMLResults');
Export::arrayToXml(
$alldata,
$filename,
'Result',
'XMLResults'
);
exit;
break;
case 'csv':
Export :: arrayToCsv($alldata, $filename);
Export::arrayToCsv($alldata, $filename);
exit;
break;
}
@ -407,15 +427,35 @@ $addparams = array('selecteval' => $eval[0]->get_id());
if (isset($_GET['print'])) {
$datagen = new ResultsDataGenerator($eval[0], $allresults);
if (api_sort_by_first_name()) {
$data_array = $datagen->get_data(ResultsDataGenerator :: RDG_SORT_FIRSTNAME, 0, null, true);
$data_array = $datagen->get_data(
ResultsDataGenerator :: RDG_SORT_FIRSTNAME,
0,
null,
true
);
} else {
$data_array = $datagen->get_data(ResultsDataGenerator :: RDG_SORT_LASTNAME, 0, null, true);
$data_array = $datagen->get_data(
ResultsDataGenerator :: RDG_SORT_LASTNAME,
0,
null,
true
);
}
if ($displayscore->is_custom()) {
if (api_is_western_name_order()) {
$header_names = array(get_lang('FirstName'), get_lang('LastName'), get_lang('Score'), get_lang('Display'));
$header_names = array(
get_lang('FirstName'),
get_lang('LastName'),
get_lang('Score'),
get_lang('Display')
);
} else {
$header_names = array(get_lang('LastName'), get_lang('FirstName'), get_lang('Score'), get_lang('Display'));
$header_names = array(
get_lang('LastName'),
get_lang('FirstName'),
get_lang('Score'),
get_lang('Display')
);
}
} else {
if (api_is_western_name_order()) {
@ -429,7 +469,12 @@ if (isset($_GET['print'])) {
$newarray[] = array_slice($data, 3);
}
echo print_table($newarray, $header_names, get_lang('ViewResult'), $eval[0]->get_name());
echo print_table(
$newarray,
$header_names,
get_lang('ViewResult'),
$eval[0]->get_name()
);
exit;
} else {
$resulttable = new ResultTable($eval[0], $allresults, $iscourse, $addparams);
@ -498,19 +543,25 @@ if (isset($_GET['overwritemax'])) {
if (isset($_GET['import_user_error'])) {
$userinfo = api_get_user_info($_GET['import_user_error']);
echo Display::return_message(
get_lang('UserInfoDoesNotMatch').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']),
get_lang('UserInfoDoesNotMatch').' '.
api_get_person_name($userinfo['firstname'], $userinfo['lastname']),
'warning'
);
}
if (isset($_GET['import_score_error'])) {
$userinfo = api_get_user_info($_GET['import_score_error']);
echo Display::return_message(get_lang('ScoreDoesNotMatch').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']), 'warning');
echo Display::return_message(
get_lang('ScoreDoesNotMatch').' '.
api_get_person_name($userinfo['firstname'], $userinfo['lastname']),
'warning'
);
}
if ($file_type == null) {
//show the result header
if (isset($export_result_form) && !(isset($edit_res_form))) {
echo $export_result_form->display();
DisplayGradebook :: display_header_result($eval[0], $currentcat[0]->get_id(), 1);
DisplayGradebook::display_header_result($eval[0], $currentcat[0]->get_id(), 1);
} else {
if (isset($import_result_form)) {
echo $import_result_form->display();
@ -518,9 +569,9 @@ if ($file_type == null) {
if (isset($edit_res_form)) {
echo $edit_res_form->toHtml();
}
DisplayGradebook :: display_header_result($eval[0], $currentcat[0]->get_id(), 1);
DisplayGradebook::display_header_result($eval[0], $currentcat[0]->get_id(), 1);
}
// Letter-based scores are built from lib/results_data_generator.class.php::get_score_display()
$resulttable->display();
Display :: display_footer();
Display::display_footer();
}

2
main/gradebook/lib/be/result.class.php
Unescape View File

@ -223,7 +223,7 @@ class Result
/**
* insert log result
*/
public function add_result__log($userid, $evaluationid)
public function addResultLog($userid, $evaluationid)
{
if (isset($userid) && isset($evaluationid)) {
$tbl_grade_results_log = Database::get_main_table(TABLE_MAIN_GRADEBOOK_RESULT_LOG);

9
main/gradebook/lib/fe/resulttable.class.php
Unescape View File

@ -18,8 +18,13 @@ class ResultTable extends SortableTable
/**
* Constructor
*/
public function __construct($evaluation, $results = array(), $iscourse, $addparams = null, $forprint = false)
{
public function __construct(
$evaluation,
$results = array(),
$iscourse,
$addparams = null,
$forprint = false
) {
parent:: __construct(
'resultlist',
null,

31
main/gradebook/lib/results_data_generator.class.php
Unescape View File

@ -28,11 +28,11 @@ class ResultsDataGenerator
*/
public function __construct(
$evaluation,
$results = array(),
$results = [],
$include_edit = false
) {
$this->evaluation = $evaluation;
$this->results = (isset($results) ? $results : array());
$this->results = isset($results) ? $results : array();
}
/**
@ -129,7 +129,6 @@ class ResultsDataGenerator
$return = array_slice($table, $start, $count);
return $return;
}
/**
@ -137,19 +136,22 @@ class ResultsDataGenerator
* @param float Current absolute score (max score is taken from $this->evaluation->get_max()
* @param bool Whether we want the real score (2/4 (50 %)) or the transformation (A, B, C, etc)
* @param bool Whether we want to ignore the score color
* @param boolean $realscore
* @param bool $realscore
* @return string The score as we want to show it
*/
private function get_score_display($score, $realscore, $ignore_score_color = false)
{
private function get_score_display(
$score,
$realscore,
$ignore_score_color = false
) {
if ($score != null) {
$scoredisplay = ScoreDisplay::instance();
$scoreDisplay = ScoreDisplay::instance();
$type = SCORE_CUSTOM;
if ($realscore === true) {
$type = SCORE_DIV_PERCENT;
}
return $scoredisplay->display_score(
return $scoreDisplay->display_score(
array($score, $this->evaluation->get_max()),
$type,
SCORE_BOTH,
@ -161,17 +163,22 @@ class ResultsDataGenerator
}
// Sort functions - used internally
function sort_by_last_name($item1, $item2)
public function sort_by_last_name($item1, $item2)
{
return api_strcmp($item1['lastname'], $item2['lastname']);
}
function sort_by_first_name($item1, $item2)
public function sort_by_first_name($item1, $item2)
{
return api_strcmp($item1['firstname'], $item2['firstname']);
}
function sort_by_score($item1, $item2)
/**
* @param array $item1
* @param array $item2
* @return int
*/
public function sort_by_score($item1, $item2)
{
if ($item1['percentage_score'] == $item2['percentage_score']) {
return 0;
@ -180,7 +187,7 @@ class ResultsDataGenerator
}
}
function sort_by_mask($item1, $item2)
public function sort_by_mask($item1, $item2)
{
$score1 = (isset($item1['score']) ? array($item1['score'], $this->evaluation->get_max()) : null);
$score2 = (isset($item2['score']) ? array($item2['score'], $this->evaluation->get_max()) : null);

Write Preview
Loading…
Cancel
Save