README.md

@@ -5,10 +5,5 @@ This Module provides a timetable block for moodle based on untis export-files: l
 
 ## Screenshot:
 
-Students view:
-
 ![image](doc/timetable_screenshot1.png)
 
-Teachers view:
-
-![image](doc/timetable_screenshot2.png)

block_timetable.php

@@ -73,7 +73,7 @@ class block_timetable extends block_base {
 		$class = $this->page->course->shortname;
             	$this->content->text .= "Stundenplan der Klasse $class<br>";
 		$ttable = new timetable('class',$class);
-	} elseif ($USER->department == "Lehrer" || $USER->department == "Lehrer_fvs") {
+	} elseif ($USER->department == "Lehrer") {
 		$teacher = $USER->username;
 		$teacher = str_replace("l_", "", $teacher);
 		$teacher = str_replace("-fvs", "", $teacher);

classes/timetable.php

@@ -87,8 +87,14 @@ class timetable {
 		}
 	}
 	$day = new \DateTime($this->monday->format('Y-m-d\TH:i:sP'));
+	// TODO CHANGE DATABASE: table substitution: classesa -> classa, classesb -> classb !!!
 	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}%')";
+		if ($this->type == 'class') {
+			$sql = "date = '".$day->format('Ymd')."' AND ({$this->type}esa LIKE '%{$this->name}%' OR {$this->type}esb LIKE '%{$this->name}%')";
+		} else {
+			$sql = "date = '".$day->format('Ymd')."' AND ({$this->type}a LIKE '%{$this->name}%' OR {$this->type}b LIKE '%{$this->name}%')";
+
+		}
 
 		if ($result = $DB->get_records_select('timetable_substitution',$sql)) {
 			foreach ($result as $substitution) {