diff --git a/app/Domain/Menu/Templates/headMenu.blade.php b/app/Domain/Menu/Templates/headMenu.blade.php index 6ff78debdd..442781fd9c 100644 --- a/app/Domain/Menu/Templates/headMenu.blade.php +++ b/app/Domain/Menu/Templates/headMenu.blade.php @@ -221,7 +221,7 @@ class="dropdown-toggle"
  • userNow()->startOfMonth()->setToDbTimezone(); - if (! empty($_POST['dateFrom'])) { - $dateFrom = dtHelper()->parseUserDateTime($_POST['dateFrom'])->setToDbTimezone(); + if (! empty($_POST['dateFrom'])) { + $dateFrom = dtHelper()->parseUserDateTime($_POST['dateFrom'])->startOfDay()->setToDbTimezone(); } $dateTo = dtHelper()->userNow()->endOfMonth()->setToDbTimezone(); - if (! empty($_POST['dateTo'])) { - $dateTo = dtHelper()->parseUserDateTime($_POST['dateTo'])->setToDbTimezone(); + if (! empty($_POST['dateTo'])) { + $dateTo = dtHelper()->parseUserDateTime($_POST['dateTo'])->endOfDay()->setToDbTimezone(); } $invEmplCheck = '-1'; diff --git a/app/Domain/Timesheets/Templates/showAll.tpl.php b/app/Domain/Timesheets/Templates/showAll.tpl.php index 5687a2d030..8d140dcb05 100644 --- a/app/Domain/Timesheets/Templates/showAll.tpl.php +++ b/app/Domain/Timesheets/Templates/showAll.tpl.php @@ -41,6 +41,13 @@ } const projectAllLabel = __('menu.all_projects'))); ?>; + const projectNames = get('allProjects') as $project) { + $projectMap[$project['id']] = $project['name']; + } + echo json_encode($projectMap); + ?>; function updateProjectCountInline() { var checkedCount = document.querySelectorAll('.project-checkbox:checked').length; @@ -50,6 +57,15 @@ function updateProjectCountInline() { if (countElement) { if (allChecked || checkedCount === 0) { countElement.textContent = projectAllLabel; + } else if (checkedCount === 1) { + var checkedProject = document.querySelector('.project-checkbox:checked'); + if (checkedProject) { + var projectId = parseInt(checkedProject.value); + var projectName = projectNames[projectId] || (checkedCount + ' project(s) selected'); + countElement.textContent = projectName; + } else { + countElement.textContent = checkedCount + ' project(s) selected'; + } } else { countElement.textContent = checkedCount + ' project(s) selected'; } @@ -153,7 +169,7 @@ function updateProjectCountInline() { - +
    @@ -188,11 +204,33 @@ function updateProjectCountInline() {