pattern matching improved

This commit is contained in:
L_DA 2020-11-06 09:23:08 +00:00
parent 204695172f
commit b7efc66cba
28 changed files with 6 additions and 4 deletions

0
LICENSE.md Normal file → Executable file
View file

0
README.md Normal file → Executable file
View file

0
amd/build/search.min.js vendored Normal file → Executable file
View file

0
amd/src/search.js Normal file → Executable file
View file

0
classes/output/renderer.php Normal file → Executable file
View file

0
classes/output/searchform.php Normal file → Executable file
View file

0
classes/output/timetable.php Normal file → Executable file
View file

View file

@ -361,7 +361,8 @@ class timetable {
if ($substitution->subjectb && if ($substitution->subjectb &&
(($this->type == 'teacher' && $this->name == $substitution->teacherb) || (($this->type == 'teacher' && $this->name == $substitution->teacherb) ||
($this->type == 'class' && $this->name == $substitution->classb) || // ($this->type == 'class' && $this->name == $substitution->classb) ||
($this->type == 'class' && strpos($substitution->classb, $this->name)) ||
($this->type == 'room' && $this->name == $substitution->roomb)) ($this->type == 'room' && $this->name == $substitution->roomb))
) { ) {
@ -377,7 +378,8 @@ class timetable {
} }
//if ($lesson->week[$this->week-1] != '0') $days[$day]['lessons'][] = $mylesson; //if ($lesson->week[$this->week-1] != '0') $days[$day]['lessons'][] = $mylesson;
} elseif (($this->type == 'teacher' && $this->name == $substitution->teachera) || } elseif (($this->type == 'teacher' && $this->name == $substitution->teachera) ||
($this->type == 'class' && $this->name == $substitution->classa) || // ($this->type == 'class' && $this->name == $substitution->classa) ||
($this->type == 'class' && strpos($substitution->classa, $this->name)) ||
($this->type == 'room' && $this->name == $substitution->rooma)) { ($this->type == 'room' && $this->name == $substitution->rooma)) {
$mylesson['class'] = $substitution->classa; $mylesson['class'] = $substitution->classa;
$mylesson['teacher'] = $substitution->teachera; $mylesson['teacher'] = $substitution->teachera;

0
db/access.php Normal file → Executable file
View file

0
db/install.php Normal file → Executable file
View file

0
db/install.xml Normal file → Executable file
View file

0
db/services.php Normal file → Executable file
View file

0
db/uninstall.php Normal file → Executable file
View file

0
db/upgrade.php Normal file → Executable file
View file

0
externallib.php Normal file → Executable file
View file

0
index.php Normal file → Executable file
View file

0
lang/en/timetable.php Normal file → Executable file
View file

0
lib.php Normal file → Executable file
View file

0
mod_form.php Normal file → Executable file
View file

0
pix/icon.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 745 B

After

Width:  |  Height:  |  Size: 745 B

0
pix/icon.svg Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
settings.php Normal file → Executable file
View file

0
styles.css Normal file → Executable file
View file

0
templates/searchform.mustache Normal file → Executable file
View file

0
templates/searchresult.mustache Normal file → Executable file
View file

0
templates/timetable.mustache Normal file → Executable file
View file

0
version.php Normal file → Executable file
View file

0
view.php Normal file → Executable file
View file