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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Manfred Kindl
2020-05-26 10:19:14 +02:00
parent c9da68687d ad42aece5a
commit bade5cb237
5 changed files with 100 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/lehreinheitmitarbeiter.class.php
+4 -4
View File
@@ -507,8 +507,8 @@ class lehreinheitmitarbeiter extends basis_db
public function getLehreinheiten_SWS_BISMeldung($uid, $studiensemester)
{
$qry = '
SELECT
round(sum(semesterstunden) / 15) AS sws
SELECT
round(sum(semesterstunden) / 15, 2) AS sws
FROM (
SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, mitarbeiter_uid, semesterstunden
FROM lehre.tbl_lehreinheitmitarbeiter lema
@@ -565,8 +565,8 @@ class lehreinheitmitarbeiter extends basis_db
JOIN public.tbl_studiensemester ss USING (studiensemester_kurzbz)
WHERE mitarbeiter_uid = '. $this->db_add_param($uid). '
AND (
ss.start BETWEEN
'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
ss.start BETWEEN
'. $this->db_add_param($beginn->format('Y-m-d')). ' AND
'. $this->db_add_param($ende->format('Y-m-d')). ')
-- nur lehre, die bisgemeldet wird
AND lema.bismelden