From 69a55fc931a2838ce1930c54242838526ce1de5a Mon Sep 17 00:00:00 2001 From: Gerald Raab Date: Mon, 14 Jan 2019 14:31:26 +0100 Subject: [PATCH] =?UTF-8?q?Arztbesuch=20und=20Beh=C3=B6rdenweg=20in=20Proj?= =?UTF-8?q?ektliste=20von=20der=20Tagesarbeitszeit=20abziehen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/tools/zeitaufzeichnung_projektliste.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 cis/private/tools/zeitaufzeichnung_projektliste.php diff --git a/cis/private/tools/zeitaufzeichnung_projektliste.php b/cis/private/tools/zeitaufzeichnung_projektliste.php old mode 100644 new mode 100755 index da435c5dc..36bf00ff5 --- a/cis/private/tools/zeitaufzeichnung_projektliste.php +++ b/cis/private/tools/zeitaufzeichnung_projektliste.php @@ -69,7 +69,7 @@ $ztauf->getListeUserFromTo($uid, $year.'-'.$month.'-01', $year.'-'.$month.'-'.$d $projectlines = []; $dayStart = $dayEnd = ''; $projectnames = $tosubtract = $allpauseranges = []; -$activitiesToSubtract = ['Pause', 'LehreExtern'];//aktivitaetstypen which should be subtracted fromworktime +$activitiesToSubtract = ['Pause', 'LehreExtern', 'Arztbesuch', 'Behoerde'];//aktivitaetstypen which should be subtracted fromworktime $ztaufdata = $ztauf->result; $monthsums = [0 => 0.00]; @@ -232,6 +232,10 @@ for ($i = 0; $i < count($ztaufdata); $i++) $projectlines[$day]->arbeitszeit -= $subtraction->diff; $lehreExternExists = true; } + else + { + $projectlines[$day]->arbeitszeit -= $subtraction->diff; + } } //subtract pauses from project worktimes