Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding OnlyBestAttempts option see BT#8746
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,17 +2,16 @@ | |
| /* For licensing terms, see /license.txt */ | ||
|
|
||
| /** | ||
| * Class ExerciseResult | ||
| * which allows you to export exercises results in multiple presentation forms | ||
| * @package chamilo.exercise | ||
| * @author Yannick Warnier | ||
| */ | ||
| class ExerciseResult | ||
| { | ||
| private $results = array(); | ||
| public $includeAllUsers = false; | ||
| public $onlyBestAttempts = false; | ||
|
|
||
| /** | ||
| * @param bool $includeAllUsers | ||
|
|
@@ -22,6 +21,14 @@ public function setIncludeAllUsers($includeAllUsers) | |
| $this->includeAllUsers = $includeAllUsers; | ||
| } | ||
|
|
||
| /** | ||
| * @param bool $value | ||
| */ | ||
| public function setOnlyBestAttempts($value) | ||
| { | ||
| $this->onlyBestAttempts = $value; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the results of all students (or just one student if access is limited) | ||
| * | ||
|
|
@@ -81,23 +88,11 @@ public function getExercisesReporting( | |
| INNER JOIN $TBL_TRACK_EXERCISES AS te ON (te.exe_exo_id = ce.id) | ||
| INNER JOIN $TBL_USER AS user ON (user.user_id = exe_user_id) | ||
| LEFT JOIN $TBL_TABLE_LP_MAIN AS tlm ON tlm.id = te.orig_lp_id AND tlm.c_id = ce.c_id | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
jmontoyaa
Author
Member
|
||
| WHERE | ||
| ce.c_id = $course_id AND | ||
| te.status != 'incomplete' AND | ||
| te.exe_cours_id='" . Database :: escape_string($cid) . "' $user_id_and $session_id_and AND | ||
| ce.active <>-1"; | ||
|
|
||
| } else { | ||
| $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' '; | ||
|
|
@@ -127,27 +122,28 @@ public function getExercisesReporting( | |
| te.exe_cours_id='" . Database :: escape_string($cid) . "' $user_id_and $session_id_and AND | ||
| ce.active <>-1 AND | ||
| ORDER BY userpart2, te.exe_cours_id ASC, ce.title ASC, te.exe_date DESC"; | ||
| } | ||
|
|
||
| $results = array(); | ||
| $resx = Database::query($sql); | ||
| $bestAttemptPerUser = array(); | ||
| while ($rowx = Database::fetch_array($resx,'ASSOC')) { | ||
| if ($this->onlyBestAttempts) { | ||
| if (!isset($bestAttemptPerUser[$rowx['excruid']])) { | ||
| $bestAttemptPerUser[$rowx['excruid']] = $rowx; | ||
| } else { | ||
| if ($rowx['exresult'] > $bestAttemptPerUser[$rowx['excruid']]['exresult']) { | ||
| $bestAttemptPerUser[$rowx['excruid']] = $rowx; | ||
| } | ||
| } | ||
| } else { | ||
| $results[] = $rowx; | ||
| } | ||
| } | ||
|
|
||
| if ($this->onlyBestAttempts) { | ||
| $results = $bestAttemptPerUser; | ||
| } | ||
|
|
||
| $filter_by_not_revised = false; | ||
| $filter_by_revised = false; | ||
|
|
@@ -165,19 +161,22 @@ public function getExercisesReporting( | |
| } | ||
| } | ||
|
|
||
| // Print the results of tests | ||
| $userWithResults = array(); | ||
| if (is_array($results)) { | ||
| $i = 0; | ||
| foreach ($results as $result) { | ||
| $revised = false; | ||
|
|
||
| //revised or not | ||
| $sql_exe = "SELECT exe_id FROM $TBL_TRACK_ATTEMPT_RECORDING | ||
| WHERE author != '' AND exe_id = ".Database :: escape_string($result['exid'])." | ||
| LIMIT 1"; | ||
| $query = Database::query($sql_exe); | ||
|
|
||
| if (Database:: num_rows($query) > 0) { | ||
| $revised = true; | ||
| } | ||
|
|
||
| if ($filter_by_not_revised && $revised) { | ||
| continue; | ||
|
|
@@ -188,54 +187,25 @@ public function getExercisesReporting( | |
| } | ||
|
|
||
| $return[$i] = array(); | ||
| if (empty($user_id)) { | ||
| $return[$i]['official_code'] = $result['official_code']; | ||
| $return[$i]['first_name'] = $result['userpart1']; | ||
| $return[$i]['last_name'] = $result['userpart2']; | ||
| $return[$i]['user_id'] = $result['excruid']; | ||
| $return[$i]['email'] = $result['exemail']; | ||
| } | ||
| $return[$i]['title'] = $result['extitle']; | ||
| $return[$i]['start_date'] = api_get_local_time($result['exstart']); | ||
| $return[$i]['end_date'] = api_get_local_time($result['exdate']); | ||
| $return[$i]['duration'] = $result['duration']; | ||
| $return[$i]['result'] = $result['exresult']; | ||
| $return[$i]['max'] = $result['exweight']; | ||
| $return[$i]['status'] = $revised ? get_lang('Validated') : get_lang('NotValidated'); | ||
| $return[$i]['lp_id'] = $result['orig_lp_id']; | ||
| $return[$i]['lp_name'] = $result['lp_name']; | ||
|
|
||
| $userWithResults[$result['excruid']] = 1; | ||
| $i++; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -253,50 +223,30 @@ public function getExercisesReporting( | |
| if (!in_array($student['user_id'], $userWithResults)) { | ||
| $i = $latestId; | ||
| $isWestern = api_is_western_name_order(); | ||
|
|
||
| if (empty($user_id)) { | ||
| $return[$i]['official_code'] = $student['official_code']; | ||
| if ($isWestern) { | ||
| $return[$i]['first_name'] = $student['firstname']; | ||
| $return[$i]['last_name'] = $student['lastname']; | ||
| } else { | ||
| $return[$i]['first_name'] = $student['lastname']; | ||
| $return[$i]['last_name'] = $student['firstname']; | ||
| } | ||
|
|
||
| $return[$i]['user_id'] = $student['user_id']; | ||
| $return[$i]['email'] = $student['email']; | ||
| } | ||
| $return[$i]['title'] = null; | ||
| $return[$i]['start_date'] = null; | ||
| $return[$i]['end_date'] = null; | ||
| $return[$i]['duration'] = null; | ||
| $return[$i]['result'] = null; | ||
| $return[$i]['max'] = null; | ||
| $return[$i]['status'] = get_lang('NotAttempted'); | ||
| $return[$i]['lp_id'] = null; | ||
| $return[$i]['lp_name'] = null; | ||
|
|
||
| $latestId++; | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
That's a big chunk of SQL removed (for HotPotatoes). Are you sure it doesn't break anything?