Skip to content
Snippets Groups Projects
Commit 56018dca authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fixes #3925 

Closes #3925

Merge request studip/studip!2780
parent f59e6bd9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/controllers/my_courses.php
+ 6
− 16
View file @ 56018dca
...@@ -131,26 +131,16 @@ class MyCoursesController extends AuthenticatedController ...@@ -131,26 +131,16 @@ class MyCoursesController extends AuthenticatedController
throw new AccessDeniedException(); throw new AccessDeniedException();
} }
$this->with_modules = Request::bool('modules'); $template = $this->get_template_factory()->open('my_courses/courseexport');
$template->sem_courses = MyRealmModel::getPreparedCourses('', [
$this->sem_data = Semester::getAllAsArray(); 'group_field' => 'sem_number',
$this->group_field = 'sem_number';
// Needed parameters for selecting courses
$params = [
'group_field' => $this->group_field,
'order_by' => null, 'order_by' => null,
'order' => 'asc', 'order' => 'asc',
'studygroups_enabled' => Config::get()->MY_COURSES_ENABLE_STUDYGROUPS, 'studygroups_enabled' => Config::get()->MY_COURSES_ENABLE_STUDYGROUPS,
'deputies_enabled' => Config::get()->DEPUTIES_ENABLE, 'deputies_enabled' => Config::get()->DEPUTIES_ENABLE,
]; ]);
$template->sem_data = Semester::getAllAsArray();
$this->sem_courses = MyRealmModel::getPreparedCourses('all', $params); $template->with_modules = Request::bool('modules');
$factory = $this->get_template_factory();
$template = $factory->open('my_courses/courseexport');
$template->set_attributes($this->get_assigned_variables());
$template->image_style = 'height: 6px; width: 8px;'; $template->image_style = 'height: 6px; width: 8px;';
$doc = new ExportPDF(); $doc = new ExportPDF();
......
app/views/my_courses/courseexport.php
+ 6
− 0
View file @ 56018dca
<?php
/**
* @var array|null $sem_courses
* @var array $sem_data
*/
?>
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
......
lib/classes/MyRealmModel.php
+ 3
− 1
View file @ 56018dca
...@@ -232,7 +232,9 @@ class MyRealmModel ...@@ -232,7 +232,9 @@ class MyRealmModel
$current_sem = null; $current_sem = null;
foreach ($sem_data as $sem_key => $one_sem) { foreach ($sem_data as $sem_key => $one_sem) {
$current_sem = $sem_key; $current_sem = $sem_key;
if (!$one_sem['past']) break; if (!$one_sem['past']) {
break;
}
} }
if (isset($sem_data[$current_sem + 1])) { if (isset($sem_data[$current_sem + 1])) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment