5/6 day week (saturday)
block on dashboard too automatic detection wheater class or teacher plan automatic next week detection (rd)
This commit is contained in:
parent
cd4a4c19a3
commit
60c4b8e1f8
5 changed files with 57 additions and 25 deletions
|
|
@ -33,7 +33,7 @@ class block_timetable extends block_base {
|
|||
}
|
||||
|
||||
function get_content() {
|
||||
global $CFG, $OUTPUT;
|
||||
global $CFG, $OUTPUT, $USER;
|
||||
|
||||
if ($this->content !== null) {
|
||||
return $this->content;
|
||||
|
|
@ -47,8 +47,10 @@ class block_timetable extends block_base {
|
|||
$this->content = new stdClass();
|
||||
$this->content->items = array();
|
||||
$this->content->icons = array();
|
||||
$this->content->footer = 'Fächer<br>Lehrer<br>Räume';
|
||||
$this->content->footer = 'Fächer<br>Lehrer<br>Räume';
|
||||
$this->content->text = "";
|
||||
|
||||
/*
|
||||
// user/index.php expect course context, so get one if page has module context.
|
||||
$currentcontext = $this->page->context->get_course_context(false);
|
||||
|
||||
|
|
@ -63,29 +65,53 @@ class block_timetable extends block_base {
|
|||
if ($this->page->course->id == SITEID) {
|
||||
$this->content->text .= "site context";
|
||||
}
|
||||
*/
|
||||
$view = 'subject';
|
||||
if ($this->page->course->idnumber && $this->page->course->shortname) {
|
||||
$class = $this->page->course->shortname;
|
||||
$class = 'TG11/3';
|
||||
$this->content->text .= "Stundenplan der Klasse $class<br>";
|
||||
} //elseif ($USER->
|
||||
$this->content->text .= "Stundenplan der Klasse $class<br>";
|
||||
$ttable = new timetable('class',$class);
|
||||
} elseif ($USER->department == "Lehrer") {
|
||||
$teacher = $USER->username;
|
||||
$teacher = str_replace("l_", "", $teacher);
|
||||
$teacher = str_replace("-fvs", "", $teacher);
|
||||
//echo var_dump($USER);
|
||||
$this->content->text .= "Stundenplan von Lehrer*in $teacher<br>";
|
||||
$ttable = new timetable('teacher',$teacher);
|
||||
$view = 'class';
|
||||
} elseif ($USER->department) {
|
||||
$class = $USER->department;
|
||||
$class = str_replace("_", "/", $class);
|
||||
$this->content->text .= "Stundenplan der Klasse $class<br>";
|
||||
$ttable = new timetable('class',$class);
|
||||
} else {
|
||||
return $this->content;
|
||||
}
|
||||
|
||||
//$context_id = get_context_instance_by_id($course->id);
|
||||
//echo "Contextid = $contextid->contextlevel\n";
|
||||
|
||||
|
||||
$numdayweek = 5 + get_config('timetable', 'saturday');
|
||||
|
||||
$date = new DateTime();
|
||||
$monday = new DateTime();
|
||||
$friday = new DateTime();
|
||||
$week = $date->format("W");
|
||||
|
||||
$dayofweek = $date->format('w')-1;
|
||||
|
||||
$monday->sub(new DateInterval("P{$dayofweek}D"));
|
||||
$friday->add(new DateInterval("P".(4-$dayofweek)."D"));
|
||||
$this->content->text .= $monday->format('d.m') . " - " . $friday->format('d.m');
|
||||
$ttable = new timetable('class','TG11/3');
|
||||
if ($dayofweek >= $numdayweek) {
|
||||
$monday->add(new DateInterval("P".(7-$dayofweek)."D"));
|
||||
} else {
|
||||
$monday->sub(new DateInterval("P{$dayofweek}D"));
|
||||
}
|
||||
|
||||
$week = $monday->format("W");
|
||||
$lastday = new DateTime($monday->format('Y-m-d\TH:i:sP'));
|
||||
$lastday->add(new DateInterval("P".($numdayweek-1)."D"));
|
||||
$this->content->text .= $monday->format('d.m') . " - " . $lastday->format('d.m');
|
||||
//$ttable = new timetable('class',$class);
|
||||
$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 .= $ttable->print_table($view);
|
||||
$this->content->text .= html_writer::end_tag('div');
|
||||
|
||||
return $this->content;
|
||||
|
|
@ -93,7 +119,7 @@ class block_timetable extends block_base {
|
|||
|
||||
// my moodle can only have SITEID and it's redundant here, so take it away
|
||||
public function applicable_formats() {
|
||||
return array('all' => false,
|
||||
return array('all' => true,
|
||||
'site' => true,
|
||||
'site-index' => true,
|
||||
'course-view' => true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue