blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-25 07:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass studiengang to lehrelisthelper

Browse Source
This commit is contained in:
Harald Bamberger
2021-11-01 15:51:20 +01:00
parent 8c100ba993
commit 487da82e33
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/anwesenheitsliste.pdf.php
+3 -2
View File
@@ -65,11 +65,12 @@ if(isset($_GET['output']) && ($output='odt' || $output='doc'))
isset($_GET['stg_kz']) ? $studiengang = $_GET['stg_kz'] : $studiengang = NULL;
isset($_GET['lehreinheit_id']) ? $lehreinheit = $_GET['lehreinheit_id'] : $lehreinheit = NULL;
$stg = new studiengang();
$stg->load($this->lv->studiengang_kz);
$doc = new dokument_export('Anwesenheitslist');
$lehrelisthelper = new LehreListHelper($db, $studiensemester, $lvid, $lv, $lehreinheit);
$lehrelisthelper = new LehreListHelper($db, $studiensemester, $lvid, $lv, $stg, $lehreinheit);
$arr_lehrende = $lehrelisthelper->getArr_Lehrende();
$data = $lehrelisthelper->getData();
$studentuids = $lehrelisthelper->getStudentUids();
cis/private/lehre/covidstatusliste.php
+4 -1
View File
@@ -62,7 +62,10 @@ if( !$berechtigung->isBerechtigt('admin')
isset($_GET['stg_kz']) ? $studiengang = $_GET['stg_kz'] : $studiengang = NULL;
isset($_GET['lehreinheit_id']) ? $lehreinheit = $_GET['lehreinheit_id'] : $lehreinheit = NULL;
$lehrelisthelper = new LehreListHelper($db, $studiensemester, $lvid, $lv, $lehreinheit);
$stg = new studiengang();
$stg->load($this->lv->studiengang_kz);
$lehrelisthelper = new LehreListHelper($db, $studiensemester, $lvid, $lv, $stg, $lehreinheit);
$arr_lehrende = $lehrelisthelper->getArr_Lehrende();
$data = $lehrelisthelper->getData();
$studentuids = $lehrelisthelper->getStudentUids();
include/lehrelisthelper.class.php
+6 -7
View File
@@ -40,6 +40,7 @@ class LehreListHelper
protected $lvid;
protected $lv;
protected $lehreinheit;
protected $stg;
protected $arr_lehrende;
protected $studentuids;
@@ -50,13 +51,14 @@ class LehreListHelper
protected $raum_string;
public function __construct(basis_db $db, $studiensemester, $lvid,
lehrveranstaltung $lv, $lehreinheit='')
lehrveranstaltung $lv, studiengang $stg, $lehreinheit='')
{
$this->db = $db;
$this->studiensemester = $studiensemester;
$this->lvid = $lvid;
$this->lv = $lv;
$this->lehreinheit = $lehreinheit;
$this->stg = $stg;
$this->arr_lehrende = array();
$this->studentuids = array();
@@ -153,12 +155,9 @@ class LehreListHelper
protected function initData()
{
$stg = new studiengang();
$stg->load($this->lv->studiengang_kz);
$studiengang_bezeichnung=$this->stg->bezeichnung;
$studiengang_bezeichnung=$stg->bezeichnung;
$stg->getAllTypes();
$this->stg->getAllTypes();
$this->data = array(
'gruppen'=>$this->gruppen_string,
@@ -166,7 +165,7 @@ class LehreListHelper
'lehrveranstaltung_id'=>$this->lv->lehrveranstaltung_id,
'studiengang'=>$studiengang_bezeichnung,
'studiengang_kz'=>$this->lv->studiengang_kz,
'typ'=>$stg->studiengang_typ_arr[$stg->typ],
'typ'=>$this->stg->studiengang_typ_arr[$this->stg->typ],
'ects'=>$this->lv->ects,
'sprache'=>$this->lv->sprache,
'studiensemester'=>$this->studiensemester,