diff --git a/shiftcounter.php b/shiftcounter.php index 9bd3c40..124da73 100644 --- a/shiftcounter.php +++ b/shiftcounter.php @@ -36,7 +36,8 @@ uasort($worklists, function($a, $b) { return $a[1] > $b[1] ? -1 : 1; }); -$all_names = []; +$nameCount = []; +$nameHours = []; $totalShifted = 0; $total = 0; $checkedLists = []; @@ -80,10 +81,15 @@ if (isset($_GET['worklist']) || count($checkedLists) > 0) { preg_match_all('/(.*?)<\/span>/s', $blockNames[1][0], $names); foreach ($names[1] as $name) { - if (!array_key_exists($name, $all_names)) { - $all_names[$name] = $diff; + if (!array_key_exists($name, $nameCount)) { + $nameCount[$name] = 1; } else { - $all_names[$name] += $diff; + $nameCount[$name] += 1; + } + if (!array_key_exists($name, $nameHours)) { + $nameHours[$name] = $diff; + } else { + $nameHours[$name] += $diff; } $totalShifted += $diff; } @@ -93,8 +99,8 @@ if (isset($_GET['worklist']) || count($checkedLists) > 0) { } $avg = 0; -if ($totalShifted !== 0 & count($all_names) !== 0) - $avg = $totalShifted / count($all_names); +if ($totalShifted !== 0 & count($nameHours) !== 0) + $avg = $totalShifted / count($nameHours); ?> @@ -119,7 +125,7 @@ if ($totalShifted !== 0 & count($all_names) !== 0)

Wina shift counter

- $list) { echo ""; @@ -154,12 +160,13 @@ if ($totalShifted !== 0 & count($all_names) !== 0) Naam Uren + Shiften $val) { - echo "$name" . floor($val) . 'h ' . ($val - floor($val)) * 60 . 'min' . ""; + foreach ($nameHours as $name => $val) { + echo "$name" . floor($val) . 'h ' . ($val - floor($val)) * 60 . 'min' . "" . $nameCount[$name] . ""; } ?> @@ -183,7 +190,7 @@ if ($totalShifted !== 0 & count($all_names) !== 0)