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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source 
# Conflicts:
#	include/lehreinheitmitarbeiter.class.php
This commit is contained in:
kindlm
2016-02-23 19:30:08 +01:00
parent 77a27f0bd5 d4ff12cd0f
commit 754f24ec7f
42 changed files with 2913 additions and 2098 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/lehrveranstaltung.class.php
+6 -1
View File
@@ -81,6 +81,7 @@ class lehrveranstaltung extends basis_db
public $benotung=false;
public $lvinfo=false;
public $curriculum=true;
/**
* Konstruktor
@@ -1174,7 +1175,8 @@ class lehrveranstaltung extends basis_db
tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
tbl_studienplan_lehrveranstaltung.sort stpllv_sort
tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
tbl_studienplan_lehrveranstaltung.curriculum
FROM lehre.tbl_lehrveranstaltung
JOIN lehre.tbl_studienplan_lehrveranstaltung
USING(lehrveranstaltung_id)
@@ -1243,6 +1245,7 @@ class lehrveranstaltung extends basis_db
$obj->stpllv_koordinator = $row->stpllv_koordinator;
$obj->studienplan_lehrveranstaltung_id = $row->studienplan_lehrveranstaltung_id;
$obj->studienplan_lehrveranstaltung_id_parent = $row->studienplan_lehrveranstaltung_id_parent;
$obj->curriculum = $this->db_parse_bool($row->curriculum);
$obj->new = false;
$this->lehrveranstaltungen[] = $obj;
@@ -1391,6 +1394,7 @@ class lehrveranstaltung extends basis_db
$obj->benotung = $lv->benotung;
$obj->lvinfo = $lv->lvinfo;
$obj->zeugnis = $lv->zeugnis;
$obj->curriculum = $lv->curriculum;
$obj->children = array();
if(count($lv->childs) > 0)
@@ -1419,6 +1423,7 @@ class lehrveranstaltung extends basis_db
$obj->benotung = $this->db_parse_bool($this->benotung);
$obj->lvinfo =$this->db_parse_bool( $this->lvinfo);
$obj->zeugnis = $this->db_parse_bool($this->zeugnis);
$obj->curriculum = $this->db_parse_bool($this->curriculum);
$values[] = $obj;
}