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

Now inkludierte Lehre also checking former (past) BIS Verwendungen

Browse Source 
This allows display of column 'Betrag' in Lehraufträge annehmen.
(Important for external lectors, who want to see Betrag of their new
Lehrauftraege. They usually don't have active BIS Verwendung at the
beginning of each term, therefor last (past) BIS Verwendung needs to be
checked)
This commit is contained in:
Cris
2020-01-29 09:55:59 +01:00
committed by hainberg
parent 9bdee6d0f8
commit 98bb9987da
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/lehre/lehrauftrag/LehrauftragAkzeptieren.php
+2 -2
View File
@@ -184,14 +184,14 @@ class LehrauftragAkzeptieren extends Auth_Controller
}
/**
* Check if lectors latest active Verwendung has inkludierte Lehre
* Check if lectors latest Verwendung has inkludierte Lehre
* - inkludierte_lehre is null OR 0: freelancer lector -> has NO inkludierte Lehre
* - inkludierte_lehre -1: fix employed lector -> has inkludierte Lehre (all inclusive)
* - inkludierte_lehre > 0: fix employed lector -> has inkludierte Lehre (value is amount of hours included)
*/
public function checkInkludierteLehre()
{
$result = $this->BisverwendungModel->getLast($this->_uid);
$result = $this->BisverwendungModel->getLast($this->_uid, false);
if (hasData($result))
{
application/models/codex/Bisverwendung_model.php
+3 -3
View File
@@ -15,7 +15,7 @@ class Bisverwendung_model extends DB_Model
/**
* Get latest (active) Verwendung of the user.
* @param string $uid
* @param bool $active If false, returns latest Verwendung no matter if actual or not (ignores ending/beginning date).
* @param bool $active If false, returns latest Verwendung no matter if it is still actual.
* @return array
*/
public function getLast($uid, $active = true)
@@ -28,14 +28,14 @@ class Bisverwendung_model extends DB_Model
mitarbeiter_uid = '. $this->escape($uid). '
AND ( beginn <= NOW() OR beginn IS NULL )
AND ( ende >= NOW() OR ende IS NULL )
ORDER BY ende DESC NULLS LAST, beginn DESC NULLS LAST
ORDER BY ende DESC NULLS FIRST, beginn DESC NULLS LAST
';
}
else
{
$condition = '
mitarbeiter_uid = '. $this->escape($uid). '
ORDER BY ende DESC NULLS LAST, beginn DESC NULLS LAST
ORDER BY ende DESC NULLS FIRST, beginn DESC NULLS LAST
';
}