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

Merge branch 'feature-25562/PV21_Datenbankstruktur_fuer_Vertraege_und_Gehaelter' into deploy-PV21

Browse Source
This commit is contained in:
Harald Bamberger
2024-01-12 16:16:56 +01:00
parent fc89224dc8 d95e972e6c
commit 57af22a623
3 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/config/studierendenantrag.php
+1
View File
@@ -126,6 +126,7 @@ $config['antrag_job_systemuser'] = '';
* @var array Array of tbl_status.status_kurzbz's
*/
$config['antrag_prestudentstatus_whitelist'] = ['Student', 'Diplomand'];
$config['antrag_prestudentstatus_whitelist_abmeldung'] = ['Student', 'Diplomand', 'Unterbrecher'];
/**
application/libraries/AntragLib.php
+1 -1
View File
@@ -1249,7 +1249,7 @@ class AntragLib
$result = current(getData($result));
$datumStatus = $result->datum;
if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist_abmeldung'))) {
$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
'prestudent_id' => $prestudent_id,
'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED
cis/private/profile/index.php
+44 -10
View File
@@ -276,15 +276,22 @@ if (!$ansicht)
{
if ($type === 'mitarbeiter')
{
$verwendung = new bisverwendung();
if($verwendung->getLastVerwendung($uid))
if(defined('DIENSTVERHAELTNIS_SUPPORT') && DIENSTVERHAELTNIS_SUPPORT)
{
if (!$verwendung->hauptberuflich)
{
echo 'Hauptberuf: '. $verwendung->hauptberuf;
}
// TODO Hauptberuf wieder anzeigen sobald verfuegbar
}
echo "<br><br>";
else
{
$verwendung = new bisverwendung();
if($verwendung->getLastVerwendung($uid))
{
if (!$verwendung->hauptberuflich)
{
echo 'Hauptberuf: '. $verwendung->hauptberuf;
}
}
echo "<br><br>";
}
}
}
@@ -606,9 +613,36 @@ function printFunctionsTable($query, $headingphrase, $tableid, $showVertragsstun
if ($showVertragsstunden === true && $adminOrOwnUser)
{
$vertragsstunden = 0.00;
$qry = "SELECT sum(vertragsstunden) AS vertragsstdsumme from bis.tbl_bisverwendung
WHERE mitarbeiter_uid = ".$db->db_add_param($uid)."
AND (ende > now() OR ende IS NULL)";
if(defined('DIENSTVERHAELTNIS_SUPPORT') && DIENSTVERHAELTNIS_SUPPORT)
{
$qry = "SELECT
sum(wochenstunden) AS vertragsstdsumme
FROM
hr.tbl_vertragsbestandteil_stunden vbs
JOIN
hr.tbl_vertragsbestandteil vb USING(vertragsbestandteil_id)
JOIN
hr.tbl_dienstverhaeltnis dv USING(dienstverhaeltnis_id)
WHERE
dv.mitarbeiter_uid = ".$db->db_add_param($uid)."
AND NOW() BETWEEN COALESCE(vb.von, '1970-01-01'::date) AND COALESCE(vb.bis, '2170-12-31'::date)
AND NOT EXISTS (
SELECT
1
FROM
hr.tbl_vertragsbestandteil
WHERE
dienstverhaeltnis_id = dv.dienstverhaeltnis_id
AND vertragsbestandteiltyp_kurzbz = 'karenz'
AND NOW() BETWEEN COALESCE(von, '1970-01-01'::date) AND COALESCE(bis, '2170-12-31'::date)
)";
}
else
{
$qry = "SELECT sum(vertragsstunden) AS vertragsstdsumme from bis.tbl_bisverwendung
WHERE mitarbeiter_uid = ".$db->db_add_param($uid)."
AND (ende > now() OR ende IS NULL)";
}
if ($result_vertragsstd = $db->db_query($qry))
{