cleanup (rd)
This commit is contained in:
parent
784cb23da3
commit
c354318668
2 changed files with 2 additions and 73 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
*.swp
|
|
@ -47,12 +47,11 @@ class block_timetable extends block_base {
|
|||
$this->content = new stdClass();
|
||||
$this->content->items = array();
|
||||
$this->content->icons = array();
|
||||
$this->content->footer = 'Faecher<br>Lehrer<br>Raeume';
|
||||
$this->content->footer = 'Fächer<br>Lehrer<br>Räume';
|
||||
|
||||
// user/index.php expect course context, so get one if page has module context.
|
||||
$currentcontext = $this->page->context->get_course_context(false);
|
||||
|
||||
|
||||
if (! empty($this->config->text)) {
|
||||
$this->content->text = $this->config->text;
|
||||
}
|
||||
|
@ -73,75 +72,7 @@ class block_timetable extends block_base {
|
|||
//$context_id = get_context_instance_by_id($course->id);
|
||||
//echo "Contextid = $contextid->contextlevel\n";
|
||||
|
||||
/*
|
||||
// Verbindung zu localhost auf port 3307
|
||||
$mysqli = new mysqli('mistral:3307', 'timetable_user1', 'd7jzRYpfGS3OkIpHCBEE','timetable');
|
||||
if ($mysqli->connect_errno) {
|
||||
$this->content->text .= 'Verbindung schlug fehl: ' . $mysqli->connect_errno;
|
||||
}
|
||||
*/
|
||||
$period_max = get_config('timetable', 'numperiod');
|
||||
$table = new html_table();
|
||||
$table->cellspacing = 0;
|
||||
$table->cellpadding = 0;
|
||||
$table->attributes['cellpadding'] = '0';
|
||||
$table->attributes['class'] = 'minicalendar calendartable';
|
||||
// $table->align = array('right','center','center','center','center','center');
|
||||
// $table->size = array('50', '50');
|
||||
$table->head = array('','Mo','Di', 'Mi' , 'Do', 'Fr');
|
||||
for ($i = 1; $i <= $period_max; $i++) {
|
||||
$tablerow = new \html_table_row();
|
||||
$tablerow->cells[] = new html_table_cell($i);
|
||||
for ($k = 1; $k <= 5; $k++) {
|
||||
//$cell = new html_table_cell("$i+$k");
|
||||
$cell = new html_table_cell("");
|
||||
$cell->abbr = "";
|
||||
// $cell->attributes['class'] = 'day text-center';
|
||||
$tablerow->cells[] = $cell;
|
||||
//$tablerow->cells[] = '<td class="day text-center">'+"$i+$k</td>";
|
||||
//$tablerow->cells[] = new html_table_cell("$i+$k");
|
||||
}
|
||||
$table->data[] = $tablerow;
|
||||
}
|
||||
//$sql = "Select * from lesson where teacher = 'Hbr' and not (mid(week, 36, 1) = '0')";
|
||||
$sql = "teacher = 'Hbr' and not (mid(week, 26, 1) = '0')";
|
||||
if ($class) {
|
||||
//$sql = "Select * from lesson where class = '$class' and not (mid(week, 37, 1) = '0')";
|
||||
$sql = "class = '$class' and not (mid(week, 26, 1) = '0')";
|
||||
}
|
||||
global $DB;
|
||||
if ($result = $DB->get_records_select('timetable_lesson',$sql)) {
|
||||
foreach ($result as $lesson) {
|
||||
if ($lesson->period < $period_max) {
|
||||
if ($table->data[$lesson->period-1]->cells[$lesson->day]->text)
|
||||
$table->data[$lesson->period-1]->cells[$lesson->day]->text .= "<BR>";
|
||||
$table->data[$lesson->period-1]->cells[$lesson->day]->text .= $lesson->subject;
|
||||
}
|
||||
|
||||
}
|
||||
} else {
|
||||
echo "get_records_select failed\n";
|
||||
}
|
||||
for ($i = 0; $i < $period_max; $i++) {
|
||||
for ($k = 1; $k <= 5; $k++) {
|
||||
if (!$table->data[$i]->cells[$k]->text) $table->data[$i]->cells[$k]->text = "-";
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
if (!$result = $mysqli->query($sql)) {
|
||||
// Oh no! The query failed.
|
||||
$this->content->text .= "Sorry, the website is experiencing problems.";
|
||||
}
|
||||
while ($lesson = $result->fetch_assoc()) {
|
||||
// if ($lesson['period']<5 && $lesson['day']<5);
|
||||
//$table->data[$lesson['period']-1]->cells[$lesson['day']]->text = $lesson['subject'];
|
||||
//$table->data[$lesson['period']-1]->cells[$lesson['day']]->text = $lesson['room'];
|
||||
$table->data[$lesson['period']-1]->cells[$lesson['day']]->text = $lesson['class'];
|
||||
}
|
||||
*/
|
||||
|
||||
//$table->data = array($row1, $row2);
|
||||
$date = new DateTime();
|
||||
$monday = new DateTime();
|
||||
$friday = new DateTime();
|
||||
|
@ -155,11 +86,8 @@ class block_timetable extends block_base {
|
|||
$ttable->read_db($week);
|
||||
$this->content->text .= html_writer::start_tag('div', ['data-region' => 'calendar', 'class' => 'maincalendar']);
|
||||
$this->content->text .= $ttable->print_table('subject');
|
||||
//$this->content->text .= html_writer::table($table);
|
||||
$this->content->text .= html_writer::end_tag('div');
|
||||
|
||||
//$this->content->text .= file_get_contents("/var/www/plaene/25/c/mc00005.htm");
|
||||
//$mysqli->close();
|
||||
return $this->content;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue