Merge branch 'master' of gitlab.steinbeisschule-reutlingen.de:L_DA/mod_timetable

This commit is contained in:
L_DA 2020-11-06 09:23:36 +00:00
commit 83a8dc5d90

View file

@ -126,7 +126,7 @@ class timetable {
$day = new \DateTime($this->monday->format('Y-m-d\TH:i:sP')); $day = new \DateTime($this->monday->format('Y-m-d\TH:i:sP'));
for ($i=0; $i<$this->numdayweek; $i++) { for ($i=0; $i<$this->numdayweek; $i++) {
$sql = "date = '".$day->format('Ymd')."' AND ({$this->type}a LIKE '%{$this->name}%' OR {$this->type}b LIKE '%{$this->name}%')"; $sql = "date = '".$day->format('Ymd')."' AND ({$this->type}a RLIKE '(^|~){$this->name}($|~)' OR {$this->type}b RLIKE '(^|~){$this->name}($|~)')";
if ($result = $DB->get_records_select('timetable_substitution',$sql)) { if ($result = $DB->get_records_select('timetable_substitution',$sql)) {
foreach ($result as $substitution) { foreach ($result as $substitution) {
$this->data[$i+1][$substitution->period]['substitution'][] = $substitution; $this->data[$i+1][$substitution->period]['substitution'][] = $substitution;