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

Remove user_students references

Browse Source
This commit is contained in:
moodler 2006-10-06 06:39:29 +00:00
parent cf85513250
commit f0c9f676db
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/exercise/lib.php
View File

@ -686,14 +686,13 @@ function exercise_get_mean_submission_grades($exercise) {
$timenow = time();
$grades = get_records_sql("SELECT DISTINCT u.userid, AVG(a.grade) AS grade FROM
{$CFG->prefix}exercise_submissions s,
{$CFG->prefix}exercise_assessments a, {$CFG->prefix}user_students u
WHERE u.course = $exercise->course
AND s.userid = u.userid
{$CFG->prefix}exercise_assessments a
WHERE
AND s.exerciseid = $exercise->id
AND s.late = 0
AND a.submissionid = s.id
AND a.timecreated < $timenow
GROUP BY u.userid");
GROUP BY s.userid");
return $grades;
}

34
mod/exercise/locallib.php
View File

@ -243,8 +243,8 @@ function exercise_count_student_submissions($exercise) {
$select = '';
}
return count_records_sql("SELECT count(*) FROM {$CFG->prefix}exercise_submissions s, {$CFG->prefix}user_students u
WHERE $select s.userid = u.userid
return count_records_sql("SELECT count(*) FROM {$CFG->prefix}exercise_submissions s
WHERE $select
AND s.exerciseid = $exercise->id
AND timecreated > 0");
}
@ -492,14 +492,14 @@ function exercise_get_best_submission_grades($exercise) {
$select = '';
}
return get_records_sql("SELECT DISTINCT u.userid, MAX(a.grade) AS grade FROM
return get_records_sql("SELECT DISTINCT s.userid, MAX(a.grade) AS grade FROM
{$CFG->prefix}exercise_submissions s,
{$CFG->prefix}exercise_assessments a, {$CFG->prefix}user_students u
WHERE $select s.userid = u.userid
{$CFG->prefix}exercise_assessments a
WHERE $select
AND s.exerciseid = $exercise->id
AND s.late = 0
AND a.submissionid = s.id
GROUP BY u.userid");
GROUP BY s.userid");
}
@ -545,12 +545,10 @@ function exercise_get_student_submissions($exercise, $order = "time", $groupid =
$select = '';
}
return get_records_sql("SELECT s.*, AVG(a.grade) AS grade FROM {$CFG->prefix}user_students u,
return get_records_sql("SELECT s.*, AVG(a.grade) AS grade FROM
{$CFG->prefix}groups_members g, {$CFG->prefix}exercise_submissions s,
{$CFG->prefix}exercise_assessments a
WHERE $select g.groupid = $groupid
AND u.userid = g.userid
AND s.userid = u.userid
AND s.exerciseid = $exercise->id
AND a.submissionid = s.id
GROUP BY s.id
@ -571,12 +569,9 @@ function exercise_get_student_submissions($exercise, $order = "time", $groupid =
$select = '';
}
return get_records_sql("SELECT s.* FROM {$CFG->prefix}user_students u, {$CFG->prefix}user n,
return get_records_sql("SELECT s.* FROM {$CFG->prefix}user n,
{$CFG->prefix}groups_members g, {$CFG->prefix}exercise_submissions s
WHERE $select g.groupid = $groupid
AND u.userid = g.userid
AND s.userid = u.userid
AND n.id = u.userid
AND s.exerciseid = $exercise->id
ORDER BY $order");
@ -592,8 +587,8 @@ function exercise_get_student_submissions($exercise, $order = "time", $groupid =
}
return get_records_sql("SELECT s.*, AVG(a.grade) AS grade FROM {$CFG->prefix}exercise_submissions s,
{$CFG->prefix}user_students u, {$CFG->prefix}exercise_assessments a
WHERE $select s.userid = u.userid
{$CFG->prefix}exercise_assessments a
WHERE $select
AND s.exerciseid = $exercise->id
AND a.submissionid = s.id
GROUP BY s.id
@ -615,9 +610,8 @@ function exercise_get_student_submissions($exercise, $order = "time", $groupid =
}
return get_records_sql("SELECT s.* FROM {$CFG->prefix}exercise_submissions s,
{$CFG->prefix}user_students u, {$CFG->prefix}user n
WHERE $select s.userid = u.userid
AND n.id = u.userid
{$CFG->prefix}user n
WHERE $select
AND s.exerciseid = $exercise->id
ORDER BY $order");
}
@ -669,9 +663,9 @@ function exercise_get_ungraded_assessments_student($exercise) {
}
$cutofftime =time() - $CFG->maxeditingtime;
return get_records_sql("SELECT a.* FROM {$CFG->prefix}exercise_submissions s, {$CFG->prefix}user_students u,
return get_records_sql("SELECT a.* FROM {$CFG->prefix}exercise_submissions s
{$CFG->prefix}exercise_assessments a
WHERE $select s.userid = u.userid
WHERE $select
AND s.exerciseid = $exercise->id
AND a.submissionid = s.id
AND (a.timegraded = 0 OR a.timegraded > $cutofftime)