|
80 | 80 | list($incatsql, $incatparams) = $DB->get_in_or_equal($catids, SQL_PARAMS_NAMED);
|
81 | 81 | $params = array_merge($params, $incatparams);
|
82 | 82 |
|
83 |
| -$courseamounts = $DB->get_record_sql('SELECT (COUNT(evalc.id) - COUNT(evalmanualc.id)) as autoevalcourses, ' . |
84 |
| - 'COUNT(evalmanualc.id) as manualevalcourses, COUNT(ereqc.id) as requestcourses, COUNT(*) as allcourses, ' . |
85 |
| - '(COUNT(*) - COUNT(COALESCE(ereqc.id, evalc.id))) as remainingcourses ' . |
| 83 | +$courseamounts = $DB->get_record_sql('SELECT (COUNT(DISTINCT evalc.courseid) - COUNT(DISTINCT evalmanualc.courseid)) as autoevalcourses, ' . |
| 84 | + 'COUNT(DISTINCT evalmanualc.courseid) as manualevalcourses, COUNT(DISTINCT ereqc.courseid) as requestcourses, COUNT(DISTINCT c.id) as allcourses, ' . |
| 85 | + '(COUNT(DISTINCT c.id) - COUNT(DISTINCT COALESCE(ereqc.id, evalc.id))) as remainingcourses ' . |
86 | 86 | 'FROM {course} c ' .
|
87 | 87 | 'JOIN {customfield_data} cfd ON cfd.instanceid = c.id AND cfd.fieldid = :semesterfieldid ' .
|
88 | 88 | 'LEFT JOIN {' . dbtables::EVAL_REQUESTS_COURSES . '} ereqc ON ereqc.courseid = c.id ' .
|
|
97 | 97 | "c.category $incatsql ", array_merge(['semesterfieldid' => $field->id, 'semester' => $data->semester], $params)
|
98 | 98 | );
|
99 | 99 |
|
100 |
| -$courseamountsall = $DB->get_record_sql('SELECT COUNT(errors.id) as errorcourses, COUNT(*) as allcourses ' . |
| 100 | +$courseamountsall = $DB->get_record_sql('SELECT COUNT(DISTINCT errors.courseid) as errorcourses, COUNT(DISTINCT c.id) as allcourses ' . |
101 | 101 | 'FROM {course} c ' .
|
102 | 102 | 'JOIN {customfield_data} cfd ON cfd.instanceid = c.id AND cfd.fieldid = :semesterfieldid ' .
|
103 | 103 | 'LEFT JOIN {' . dbtables::ERRORS . '} errors ON errors.courseid = c.id AND errors.timehandled IS NULL ' .
|
|
0 commit comments