+
+
{# /.report-page #}
+
+{% endblock %}
diff --git a/httpdocs/templates/timetracking/_entry_row.html.twig b/httpdocs/templates/timetracking/_entry_row.html.twig
index 1eb8c66..079bc7a 100644
--- a/httpdocs/templates/timetracking/_entry_row.html.twig
+++ b/httpdocs/templates/timetracking/_entry_row.html.twig
@@ -1,11 +1,12 @@
{# templates/timetracking/_entry_row.html.twig #}
-
+
+
+ {{ 'app.report.heading'|trans }}
+ +
+
+
+ {{ accountName }}
+
+
+
+
+
+
{# /.report-content #}
+
+
+
+ {# ── Toolbar ──────────────────────────────────────────────────────── #}
+
+
+ {# ── Tabellen-Header ───────────────────────────────────────────────── #}
+
{# /.report-card #}
+
+
{# /.report-table #}
+
+
+
+
+ {# ── Einträge ──────────────────────────────────────────────────── #}
+ {% for entry in entries %}
+ {% set service = entry.service %}
+ {% set billable = (service is null or service.billable) %}
+ {% set hourlyRate = entry.project.client.hourlyRate %}
+ {% set weekDateStr = entry.date|date('Y-m-d') %}
+ {% set editUrl = path('timetracking_week_date', {date: weekDateStr}) ~ '?editEntry=' ~ entry.id %}
+ {% set monthShort = monthsShort[entry.date|date('n') - 1] %}
+
+
+ {{ 'app.report.col_date'|trans }}
+
+
+ {{ 'app.report.col_client'|trans }}
+ {{ 'app.report.col_project'|trans }}
+ {{ 'app.report.col_service'|trans }}
+ {{ 'app.report.col_user'|trans }}
+ {{ 'app.report.col_note'|trans }}
+
+ {{ 'app.report.col_hours'|trans }}
+ {{ totalDuration }}
+
+
+ {{ 'app.report.col_revenue'|trans }}
+ {{ totalRevenue|number_format(2, ',', '.') }} €
+
+
+
+
+
+
+
+ {% else %}
+
+ {{ entry.project.client.name }}
+
+
+
+ {{ entry.project.name }}
+
+
+
+ {{ service ? service.name : '' }}
+
+
+
+ {{ userMap[entry.userId] ?? ('User #' ~ entry.userId) }}
+
+
+
+ {{ entry.note }}
+
+
+
+ {{ entry.durationFormatted }}
+
+
+
+ {% if billable and hourlyRate is not null %}
+ {{ (hourlyRate * entry.duration / 60)|number_format(2, ',', '.') }} €
+ {% endif %}
+
+
+
+
+
+
+ {{ 'app.report.no_entries'|trans }}
+ {% endfor %}
+
+ {# ── Pagination-Footer ─────────────────────────────────────────── #}
+
+
+
+
+ {{ 'app.report.show'|trans }}
+ {% for l in validLimits %}
+ {% if l == limit %}
+ {{ l }}
+ {% else %}
+ {{ l }}
+ {% endif %}
+ {% endfor %}
+ {{ 'app.report.of_total'|trans({'%count%': totalCount|number_format(0, ',', '.')}) }}
+
+ {{ totalDuration }}
+ {{ totalRevenue|number_format(2, ',', '.') }} €
+
+
+ data-note="{{ entry.note|default('')|e('html_attr') }}"
+ data-invoiced="{{ entry.invoiced ? 'true' : 'false' }}">
-
@@ -19,56 +20,64 @@
{{ entry.durationFormatted }}
-
-
+ {% if entry.invoiced %}
+
+ {% include '_atoms/icon-lock.html.twig' %}
+
+ {% else %}
+
+
+ {% endif %}
-
diff --git a/httpdocs/templates/timetracking/week.html.twig b/httpdocs/templates/timetracking/week.html.twig
index 023ac01..cd17d45 100644
--- a/httpdocs/templates/timetracking/week.html.twig
+++ b/httpdocs/templates/timetracking/week.html.twig
@@ -74,6 +74,7 @@ window.TT = {
errorZeroDuration: {{ 'app.entry.error_zero_duration'|trans|json_encode|raw }},
errorDurationTooLong: {{ 'app.entry.error_duration_too_long'|trans|json_encode|raw }},
warnDurationLong: {{ 'app.entry.warn_duration_long'|trans|json_encode|raw }},
+ invoicedTitle: {{ 'app.entry.invoiced_title'|trans|json_encode|raw }},
},
};
diff --git a/httpdocs/translations/messages.de.yaml b/httpdocs/translations/messages.de.yaml
index 2f76b1a..7626593 100644
--- a/httpdocs/translations/messages.de.yaml
+++ b/httpdocs/translations/messages.de.yaml
@@ -63,6 +63,28 @@ app:
tab_archived: "Archiviert"
btn_restore: "Wiederherstellen"
+ report:
+ page_title: "Reports: Zeiten"
+ heading: "Reports: Zeiten"
+ tab_times: "Zeiten"
+ tab_projects: "Projekte"
+ toolbar_filter: "Filtern/Gruppieren"
+ toolbar_edit: "Einträge bearbeiten"
+ col_date: "Datum"
+ col_client: "Kunde"
+ col_project: "Projekt"
+ col_service: "Leistung"
+ col_user: "Benutzer"
+ col_note: "Bemerkung"
+ col_hours: "Stunden"
+ col_revenue: "Umsatz"
+ show: "Anzeigen:"
+ of_total: "von insgesamt %count% Einträgen"
+ no_entries: "Keine Einträge vorhanden."
+ btn_lock: "Als abgerechnet markieren"
+ btn_unlock: "Abrechnung aufheben"
+ invoiced_title: "Abgerechnet – Bearbeiten nicht möglich"
+
login:
page_title: "Anmelden – spawntree"
label_email: "E-Mail"
diff --git a/httpdocs/webpack.config.js b/httpdocs/webpack.config.js
index 089ea0d..6c3606d 100644
--- a/httpdocs/webpack.config.js
+++ b/httpdocs/webpack.config.js
@@ -25,6 +25,7 @@ Encore
.addEntry('registration', './assets/scripts/registration.js')
.addEntry('team', './assets/scripts/team.js')
.addEntry('account', './assets/scripts/account.js')
+ .addEntry('report', './assets/scripts/report.js')
// When enabled, Webpack "splits" your files into smaller pieces for greater optimization.
.splitEntryChunks()
+ {% if not entry.invoiced %}
+
+ {% endif %}
+
-
-
-
-
- {% include '_atoms/duration-help.html.twig' %}
-
+
+
+
+ {% include '_atoms/duration-help.html.twig' %}
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+