|
82 | 82 |
|
83 | 83 | $courseamounts = $DB->get_record_sql('SELECT (COUNT(evalc.id) - COUNT(evalmanualc.id)) as autoevalcourses, ' .
|
84 | 84 | 'COUNT(evalmanualc.id) as manualevalcourses, COUNT(ereqc.id) as requestcourses, ' .
|
85 |
| - '(COUNT(*) - COUNT(COALESCE(ereqc.id, evalc.id))) as remainingcourses, COUNT(errors.id) as errorcourses ' . |
| 85 | + '(COUNT(*) - COUNT(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 ' .
|
|
92 | 92 | JOIN {' . dbtables::EVAL_VERANSTS . '} evalver1 ON evalver1.evalid = c1.evalid ' .
|
93 | 93 | "WHERE evalver1.state $inmanualsql " .
|
94 | 94 | ') evalmanualc ON evalmanualc.courseid = c.id ' .
|
95 |
| - 'LEFT JOIN {' . dbtables::ERRORS . '} errors ON errors.courseid = c.id AND errors.timehandled IS NULL ' . |
96 | 95 | "WHERE cfd.intvalue = :semester AND " .
|
97 | 96 | "c.idnumber <> '' AND " .
|
98 | 97 | "c.category $incatsql ", array_merge(['semesterfieldid' => $field->id, 'semester' => $data->semester], $params)
|
99 | 98 | );
|
100 | 99 |
|
| 100 | +$courseamountswithidnumber = $DB->get_record_sql('SELECT COUNT(errors.id) as errorcourses ' . |
| 101 | + 'FROM {course} c ' . |
| 102 | + 'JOIN {customfield_data} cfd ON cfd.instanceid = c.id AND cfd.fieldid = :semesterfieldid ' . |
| 103 | + 'LEFT JOIN {' . dbtables::ERRORS . '} errors ON errors.courseid = c.id AND errors.timehandled IS NULL ' . |
| 104 | + "WHERE cfd.intvalue = :semester AND " . |
| 105 | + "c.category $incatsql ", array_merge(['semesterfieldid' => $field->id, 'semester' => $data->semester], $params) |
| 106 | +); |
| 107 | + |
| 108 | + |
| 109 | + |
101 | 110 | echo $OUTPUT->header();
|
102 | 111 |
|
103 | 112 | /* @var \block_evasys_sync\output\renderer $renderer */
|
|
124 | 133 |
|
125 | 134 | $table->setup();
|
126 | 135 |
|
127 |
| -if ($courseamounts->errorcourses) { |
| 136 | +if ($courseamountswithidnumber->errorcourses) { |
128 | 137 | $table->add_data([
|
129 | 138 | html_writer::link(new moodle_url('/blocks/evasys_sync/managecategory_errors.php', ['id' => $id]),
|
130 |
| - get_string('courses_with_errors', 'block_evasys_sync')), $courseamounts->errorcourses |
| 139 | + get_string('courses_with_errors', 'block_evasys_sync')), $courseamountswithidnumber->errorcourses |
131 | 140 | ], 'table-warning');
|
132 | 141 | }
|
133 | 142 |
|
|
0 commit comments