Include zero-hour users in Time Analysis table
Some checks failed
Lock Threads / Lock inactive issues (push) Has been cancelled
Frontend / Frontend verification (push) Has been cancelled
Lint PHP / Linting (8.2) (push) Has been cancelled
Check .lock files / Verify lock file integrity (push) Has been cancelled
Release Drafter / Verify repository (push) Has been cancelled
Tests / Integration (8.2) (push) Has been cancelled
Tests / Integration (8.3) (push) Has been cancelled
Tests / Integration (8.4) (push) Has been cancelled
Tests / Integration (8.5) (push) Has been cancelled
Actions Security Analysis / Scan workflows (push) Has been cancelled
Release Drafter / Draft next release (push) Has been cancelled
Renovate / renovate (push) Has been cancelled
Some checks failed
Lock Threads / Lock inactive issues (push) Has been cancelled
Frontend / Frontend verification (push) Has been cancelled
Lint PHP / Linting (8.2) (push) Has been cancelled
Check .lock files / Verify lock file integrity (push) Has been cancelled
Release Drafter / Verify repository (push) Has been cancelled
Tests / Integration (8.2) (push) Has been cancelled
Tests / Integration (8.3) (push) Has been cancelled
Tests / Integration (8.4) (push) Has been cancelled
Tests / Integration (8.5) (push) Has been cancelled
Actions Security Analysis / Scan workflows (push) Has been cancelled
Release Drafter / Draft next release (push) Has been cancelled
Renovate / renovate (push) Has been cancelled
- Remove HAVING total_hours > 0 filter from SQL - Table always renders even when all users have 0 hours - Matches old Kimai 1 behavior
This commit is contained in:
@@ -82,7 +82,6 @@ final class TeamSummaryController extends AbstractController
|
|||||||
LEFT JOIN kimai2_projects p ON ts.project_id = p.id
|
LEFT JOIN kimai2_projects p ON ts.project_id = p.id
|
||||||
WHERE ut.team_id = :teamId AND u.enabled = 1
|
WHERE ut.team_id = :teamId AND u.enabled = 1
|
||||||
GROUP BY u.id, u.username, u.alias
|
GROUP BY u.id, u.username, u.alias
|
||||||
HAVING total_hours > 0
|
|
||||||
ORDER BY u.alias";
|
ORDER BY u.alias";
|
||||||
|
|
||||||
return $this->connection->executeQuery($sql, [
|
return $this->connection->executeQuery($sql, [
|
||||||
|
|||||||
@@ -26,9 +26,6 @@
|
|||||||
<h3>Time Analysis — {{ team.name }}</h3>
|
<h3>Time Analysis — {{ team.name }}</h3>
|
||||||
<small class="text-muted">{{ from }} – {{ to }}</small>
|
<small class="text-muted">{{ from }} – {{ to }}</small>
|
||||||
|
|
||||||
{% if rows is empty %}
|
|
||||||
<div class="alert alert-info mt-3">No time entries found for this period.</div>
|
|
||||||
{% else %}
|
|
||||||
<table class="table table-striped table-hover table-sm mt-3">
|
<table class="table table-striped table-hover table-sm mt-3">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -106,7 +103,6 @@
|
|||||||
{{ self.pivot(projectRows, userColumns, 'Billable Projects') }}
|
{{ self.pivot(projectRows, userColumns, 'Billable Projects') }}
|
||||||
{{ self.pivot(nonbillRows, userColumnsNB, 'Non-Billable Projects') }}
|
{{ self.pivot(nonbillRows, userColumnsNB, 'Non-Billable Projects') }}
|
||||||
{{ self.pivot(unprodRows, userColumnsUP, 'Unproductive Projects') }}
|
{{ self.pivot(unprodRows, userColumnsUP, 'Unproductive Projects') }}
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user