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

Merge branch 'master' into ci

Browse Source
This commit is contained in:
oesi
2017-02-02 15:20:15 +01:00
parent 08c781a5ce bf5120a2a9
commit 81bcda2e40
5 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vertrag.class.php
+18 -1
View File
@@ -88,7 +88,7 @@ class vertrag extends basis_db
* @param $person_id
* @return boolean true wenn ok ,false im Fehlerfall
*/
public function loadVertrag($person_id, $abgerechnet=null)
public function loadVertrag($person_id, $abgerechnet=null, $datum=null)
{
$qry = "SELECT
*,
@@ -106,6 +106,23 @@ class vertrag extends basis_db
if($abgerechnet===false)
$qry.=" AND NOT EXISTS (SELECT 1 FROM lehre.tbl_vertrag_vertragsstatus WHERE vertrag_id=tbl_vertrag.vertrag_id AND vertragsstatus_kurzbz='abgerechnet')";
if(!is_null($datum))
{
$qry.=" AND NOT
(
vertragstyp_kurzbz='Lehrauftrag'
AND EXISTS(SELECT
1
FROM
lehre.tbl_lehreinheitmitarbeiter
JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
WHERE
vertrag_id=tbl_vertrag.vertrag_id
AND studiensemester_kurzbz in (SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE start>=".$this->db_add_param($datum).")
)
)";
}
if($result = $this->db_query($qry))
{
while($row = $this->db_fetch_object($result))