Skip to content
Snippets Groups Projects
Commit e39801cc authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fix access to removed column start_time and dremove obsolete duration seminar counter, fixes #4656

Closes #4656

Merge request studip/studip!3467
parent 326f93fa
No related branches found
No related tags found
No related merge requests found
...@@ -84,8 +84,7 @@ ...@@ -84,8 +84,7 @@
</td> </td>
<td> <td>
<?= $semester->absolute_seminars_count ?> <?= $semester->absolute_seminars_count ?>
<?= sprintf(_('(+%u implizit)'), <?= sprintf(_('(+%u implizit)'), $semester->continuous_seminars_count) ?>
$semester->continuous_seminars_count + $semester->duration_seminars_count) ?>
</td> </td>
<td class="actions" nowrap> <td class="actions" nowrap>
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
* @property-read mixed $past additional field * @property-read mixed $past additional field
* @property-read mixed $short_name additional field * @property-read mixed $short_name additional field
* @property mixed $absolute_seminars_count additional field * @property mixed $absolute_seminars_count additional field
* @property mixed $duration_seminars_count additional field
* @property mixed $continuous_seminars_count additional field * @property mixed $continuous_seminars_count additional field
*/ */
class Semester extends SimpleORMap class Semester extends SimpleORMap
...@@ -59,10 +58,6 @@ class Semester extends SimpleORMap ...@@ -59,10 +58,6 @@ class Semester extends SimpleORMap
'get' => 'seminarCounter', 'get' => 'seminarCounter',
'set' => false, 'set' => false,
]; ];
$config['additional_fields']['duration_seminars_count'] = [
'get' => 'seminarCounter',
'set' => false,
];
$config['additional_fields']['continuous_seminars_count'] = [ $config['additional_fields']['continuous_seminars_count'] = [
'get' => 'seminarCounter', 'get' => 'seminarCounter',
'set' => false, 'set' => false,
...@@ -320,17 +315,15 @@ class Semester extends SimpleORMap ...@@ -320,17 +315,15 @@ class Semester extends SimpleORMap
if ($this->seminar_counts === null) { if ($this->seminar_counts === null) {
$query = " $query = "
SELECT SUM(IF(semester_courses.semester_id IS NULL, 1, 0)) AS continuous, SELECT SUM(IF(semester_courses.semester_id IS NULL, 1, 0)) AS continuous,
0 AS duration,
SUM(IF(semester_courses.semester_id IS NOT NULL, 1, 0)) AS absolute SUM(IF(semester_courses.semester_id IS NOT NULL, 1, 0)) AS absolute
FROM seminare FROM seminare
LEFT JOIN semester_courses ON (seminare.Seminar_id = semester_courses.course_id) LEFT JOIN semester_courses ON (seminare.Seminar_id = semester_courses.course_id)
WHERE start_time <= :beginn WHERE semester_courses.semester_id IS NULL
AND (semester_courses.semester_id IS NULL OR semester_courses.semester_id = :semester_id) OR semester_courses.semester_id = :semester_id";
";
$statement = DBManager::get()->prepare($query); $statement = DBManager::get()->prepare($query);
$statement->bindValue(':beginn', $this['beginn']); $statement->bindValue(':semester_id', $this->id);
$statement->bindValue(':semester_id', $this['semester_id']);
$statement->execute(); $statement->execute();
$this->seminar_counts = $statement->fetch(PDO::FETCH_ASSOC); $this->seminar_counts = $statement->fetch(PDO::FETCH_ASSOC);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment