|
|
|
@ -449,17 +449,31 @@ if ($formByDay->validate()) { |
|
|
|
$dateToCheck = $item['login_date']; |
|
|
|
$dateToCheck = $item['login_date']; |
|
|
|
} |
|
|
|
} |
|
|
|
$itemKey = substr($value->format('Y-m-d'), 0, 10); |
|
|
|
$itemKey = substr($value->format('Y-m-d'), 0, 10); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (isset($newList[$itemKey])) { |
|
|
|
|
|
|
|
if ($newList[$itemKey]['login_date']) { |
|
|
|
|
|
|
|
$dateToCheck = $newList[$itemKey]['login_date']; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$newList[$itemKey] = [ |
|
|
|
$newList[$itemKey] = [ |
|
|
|
'login_date' => $dateToCheck, |
|
|
|
'login_date' => $dateToCheck, |
|
|
|
'logout_date' => $end, |
|
|
|
'logout_date' => $end, |
|
|
|
'diff' => 0, |
|
|
|
'diff' => 0, |
|
|
|
]; |
|
|
|
]; |
|
|
|
|
|
|
|
|
|
|
|
$counter++; |
|
|
|
$counter++; |
|
|
|
} |
|
|
|
} |
|
|
|
if (!empty($itemKey)) { |
|
|
|
|
|
|
|
|
|
|
|
if (!empty($itemKey) && isset($newList[$itemKey])) { |
|
|
|
|
|
|
|
if ( |
|
|
|
|
|
|
|
substr(api_get_local_time($newList[$itemKey]['login_date']), 0, 10) === |
|
|
|
|
|
|
|
substr(api_get_local_time($itemLogoutOriginal), 0, 10) |
|
|
|
|
|
|
|
) { |
|
|
|
$newList[$itemKey]['logout_date'] = $itemLogoutOriginal; |
|
|
|
$newList[$itemKey]['logout_date'] = $itemLogoutOriginal; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (!isset($newList[$key])) { |
|
|
|
if (!isset($newList[$key])) { |
|
|
|
$newList[$key] = [ |
|
|
|
$newList[$key] = [ |
|
|
|
|