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

Merge branch 'feature-16655/StundensaldoAllin' into feature-25177/ZeiterfassungMergedBrancheDeploy1

Browse Source
This commit is contained in:
ma0068
2022-10-07 08:51:00 +02:00
parent 11a208de55 cb5c11a6ab
commit 36b4964d53
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/tools/zeitaufzeichnung.php
+21 -1
View File
@@ -1393,7 +1393,27 @@ if ($projekt->getProjekteMitarbeiter($user, true))
}
}
echo '</table>';
echo '</td><td valign="top"><span id="zeitsaldo"></span><br><br>';
echo '</td><td valign="top"><span id="zeitsaldo"></span><br>';
if (defined('DEFAULT_ALLIN_DIENSTVERTRAG') && DEFAULT_ALLIN_DIENSTVERTRAG != '')
{
$bisver = new bisverwendung();
$bisver->getLastVerwendung($user);
// $ba1code = $bisver->ba1code;
$ba1code = null;
if (in_array($bisver->ba1code, DEFAULT_ALLIN_DIENSTVERTRAG))
{
echo '<span id="saldoAllin"></span><br><br>';
}
else
echo '<br>';
}
else
echo '<br>';
if (!$adminView)
{
config/cis.config-default.inc.php
+3
View File
@@ -256,4 +256,7 @@ define('CIS_ZEITWUNSCH_GD', false);
// Covid-Status anzeigen
define('CIS_SHOW_COVID_STATUS', false);
//Vertrag Allin
define ('DEFAULT_ALLIN_DIENSTVERTRAG',[110,111]);
?>