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

Merge branch 'master' of github.com:chamilo/chamilo-lms

Browse Source
pull/3064/head
Julio Montoya 5 years ago
parent 4c22629f80 275949f0b4
commit 924da1c191
1 changed files with 24 additions and 19 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. 43
      public/main/exercise/exercise_result.class.php

43
public/main/exercise/exercise_result.class.php
Unescape View File

@ -80,7 +80,8 @@ class ExerciseResult
te.exe_duration as duration,
te.orig_lp_id as orig_lp_id,
tlm.name as lp_name,
user.username
user.username,
te.status as exstatus
FROM $TBL_EXERCISES AS ce
INNER JOIN $TBL_TRACK_EXERCISES AS te
ON (te.exe_exo_id = ce.id)
@ -90,7 +91,6 @@ class ExerciseResult
ON (tlm.id = te.orig_lp_id AND tlm.c_id = ce.c_id)
WHERE
ce.c_id = $course_id AND
te.status != 'incomplete' AND
te.c_id = ce.c_id $user_id_and $session_id_and AND
ce.active <>-1";
} else {
@ -111,7 +111,8 @@ class ExerciseResult
ce.results_disabled as exdisabled,
te.orig_lp_id as orig_lp_id,
tlm.name as lp_name,
user.username
user.username,
te.status as exstatus
FROM $TBL_EXERCISES AS ce
INNER JOIN $TBL_TRACK_EXERCISES AS te
ON (te.exe_exo_id = ce.id)
@ -121,7 +122,6 @@ class ExerciseResult
ON (tlm.id = te.orig_lp_id AND tlm.c_id = ce.c_id)
WHERE
ce.c_id = $course_id AND
te.status != 'incomplete' AND
te.c_id = ce.c_id $user_id_and $session_id_and AND
ce.active <>-1 AND
ORDER BY userpart2, te.c_id ASC, ce.title ASC, te.exe_date DESC";
@ -179,25 +179,29 @@ class ExerciseResult
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;
$revised = 0;
if ($result['exstatus'] === 'incomplete') {
$revised = -1;
} else {
//revised or not
$sql_exe = "SELECT exe_id
FROM $TBL_TRACK_ATTEMPT_RECORDING
WHERE
author != '' AND
exe_id = ".intval($result['exid'])."
LIMIT 1";
$query = Database::query($sql_exe);
if (Database:: num_rows($query) > 0) {
$revised = 1;
}
}
if ($filter_by_not_revised && $revised) {
if ($filter_by_not_revised && $revised === 1) {
continue;
}
if ($filter_by_revised && !$revised) {
if ($filter_by_revised && $revised < 1) {
continue;
}
@ -221,7 +225,8 @@ class ExerciseResult
$return[$i]['duration'] = $result['duration'];
$return[$i]['result'] = $result['exresult'];
$return[$i]['max'] = $result['exweight'];
$return[$i]['status'] = $revised ? get_lang('Validated') : get_lang('Not validated');
// Revised: 1 = revised, 0 = not revised, -1 = not even finished by user
$return[$i]['status'] = $revised === 1 ? get_lang('Validated') : ($revised === 0 ? get_lang('NotValidated') : get_lang('Unclosed') );
$return[$i]['lp_id'] = $result['orig_lp_id'];
$return[$i]['lp_name'] = $result['lp_name'];

Write Preview
Loading…
Cancel
Save