| {{ entry.begin|date(kimai_context.date_1) }} |
- {{ entry.begin|date("H:i") }} |
+
+ {% if not duration_only %}
+ {{ entry.begin|date("H:i") }} |
+ {% endif %}
+
{% if entry.end %}
- {{ entry.end|date("H:i") }} |
+ {% if not duration_only %}
+ {{ entry.end|date("H:i") }} |
+ {% endif %}
{{ entry.duration|duration }} |
{{ entry.rate|money(entry.activity.project.customer.currency) }} |
{% else %}
- ‐ |
- ‐ |
+ {% if not duration_only %}
+ ‐ |
+ {% endif %}
+ {{ entry.duration|duration }} |
‐ |
{% endif %}
+
{{ widgets.label_activity(entry.activity) }}
|
diff --git a/templates/timesheet/index.html.twig b/templates/timesheet/index.html.twig
index beb8888a..7a285b92 100644
--- a/templates/timesheet/index.html.twig
+++ b/templates/timesheet/index.html.twig
@@ -6,38 +6,54 @@
{% block page_subtitle %}{{ 'timesheet.subtitle'|trans }}{% endblock %}
{% block main %}
+
{% if entries.count == 0 %}
{{ widgets.callout('warning', 'error.no_entries_found') }}
{% endif %}
- {{ tables.data_table_header({
- 'label.date': '',
- 'label.starttime': '',
- 'label.endtime': '',
+ {% set columns = {'label.date': ''} %}
+
+ {% if not duration_only %}
+ {% set columns = columns|merge({'label.starttime': '', 'label.endtime': ''}) %}
+ {% endif %}
+
+ {% set columns = columns|merge({
'label.duration': 'hidden-xs',
'label.rate': 'hidden-xs',
'label.activity': 'hidden-xs hidden-sm',
'label.description': 'hidden-xs hidden-sm',
'label.actions': '',
- }, toolbarForm, {'plus-square': path('timesheet_create')}) }}
+ }) %}
+
+ {{ tables.data_table_header(columns, toolbarForm, {'plus-square': path('timesheet_create')}) }}
{% for entry in entries %}
| {{ entry.begin|date(kimai_context.date_1) }} |
- {{ entry.begin|date("H:i") }} |
+
+ {% if not duration_only %}
+ {{ entry.begin|date("H:i") }} |
+ {% endif %}
+
{% if entry.end %}
- {{ entry.end|date("H:i") }} |
+ {% if not duration_only %}
+ {{ entry.end|date("H:i") }} |
+ {% endif %}
{{ entry.duration|duration }} |
{{ entry.rate|money(entry.activity.project.customer.currency) }} |
{% else %}
- ‐ |
+ {% if not duration_only %}
+ ‐ |
+ {% endif %}
{{ entry.duration|duration }} |
‐ |
{% endif %}
+
{{ widgets.label_activity(entry.activity) }} |
{{ entry.description }} |
{% set actionButtons = {'edit': path('timesheet_edit', {'id' : entry.id, 'page': page})} %}
+
{% if entry.end %}
{% if is_granted('start', entry.activity) %}
{% set actionButtons = {'repeat': path('timesheet_start', {'id' : entry.activity.id})}|merge(actionButtons) %}
@@ -47,6 +63,7 @@
{% set actionButtons = {'stop': path('timesheet_stop', {'id' : entry.id})}|merge(actionButtons) %}
{% endif %}
{% endif %}
+
{% set actionButtons = actionButtons|merge({'trash': path('timesheet_delete', {'id' : entry.id, 'page': page})}) %}
{{ widgets.button_group(actionButtons) }}
|
@@ -54,4 +71,5 @@
{% endfor %}
{{ tables.data_table_footer(entries, 'timesheet_paginated') }}
+
{% endblock %}
diff --git a/tests/Twig/ExtensionsTest.php b/tests/Twig/ExtensionsTest.php
new file mode 100644
index 00000000..8c1551b2
--- /dev/null
+++ b/tests/Twig/ExtensionsTest.php
@@ -0,0 +1,128 @@
+getFilters();
+ $this->assertCount(count($filters), $twigFilters);
+ $i = 0;
+ foreach ($twigFilters as $filter) {
+ $this->assertInstanceOf(TwigFilter::class, $filter);
+ $this->assertEquals($filters[$i++], $filter->getName());
+ }
+ }
+
+ public function testGetFunctions()
+ {
+ $functions = ['locales'];
+ $sut = new Extensions('de');
+ $twigFunctions = $sut->getFunctions();
+ $this->assertCount(count($functions), $twigFunctions);
+ $i = 0;
+ foreach ($twigFunctions as $filter) {
+ $this->assertInstanceOf(\Twig_SimpleFunction::class, $filter);
+ $this->assertEquals($functions[$i++], $filter->getName());
+ }
+ }
+
+ public function testLocales()
+ {
+ $locales = [
+ ['code' => 'en', 'name' => 'English'],
+ ['code' => 'de', 'name' => 'Deutsch'],
+ ['code' => 'ru', 'name' => 'русский'],
+ ];
+
+ $sut = new Extensions('en|de|ru');
+ $this->assertEquals($locales, $sut->getLocales());
+ }
+
+ public function testCurrency()
+ {
+ $symbols = [
+ 'EUR' => '€',
+ 'USD' => '$',
+ 'RUB' => 'RUB',
+ ];
+
+ $sut = new Extensions('en');
+ foreach ($symbols as $name => $symbol) {
+ $this->assertEquals($symbol, $sut->currency($name));
+ }
+ }
+
+ public function testCountry()
+ {
+ $countries = [
+ 'DE' => 'Germany',
+ 'RU' => 'Russia',
+ 'ES' => 'Spain',
+ ];
+
+ $sut = new Extensions('en');
+ foreach ($countries as $locale => $name) {
+ $this->assertEquals($name, $sut->country($locale));
+ }
+ }
+
+ public function testMoney()
+ {
+ $money = [
+ [2222, 'EUR', '2,222.00 €'],
+ [13.75, 'USD', '13.75 $'],
+ ];
+
+ $sut = new Extensions('en');
+ foreach ($money as $entry) {
+ $amount = $entry[0];
+ $currency = $entry[1];
+ $expected = $entry[2];
+ $this->assertEquals($expected, $sut->money($amount, $currency));
+ }
+ }
+
+ public function testDuration()
+ {
+ $record = $this->getTimesheet(9437);
+
+ $sut = new Extensions('en');
+ $this->assertEquals('02:37 h', $sut->duration($record->getDuration()));
+ $this->assertEquals('02:37:17 h', $sut->duration($record->getDuration(), true));
+
+ $this->assertEquals('02:37 h', $sut->durationForEntry($record));
+ $this->assertEquals('02:37:17 h', $sut->durationForEntry($record, true));
+ }
+
+ protected function getTimesheet($seconds)
+ {
+ $begin = new \DateTime();
+ $end = clone $begin;
+ $end->setTimestamp($begin->getTimestamp() + $seconds);
+ $record = new Timesheet();
+ $record->setBegin($begin);
+ $record->setEnd($end);
+ $record->setDuration($seconds);
+ return $record;
+ }
+}
diff --git a/tests/Utils/DurationTest.php b/tests/Utils/DurationTest.php
new file mode 100644
index 00000000..2385a784
--- /dev/null
+++ b/tests/Utils/DurationTest.php
@@ -0,0 +1,94 @@
+assertEquals('02:38', $sut->format(9494));
+ $this->assertEquals('02:38:14', $sut->format(9494, true));
+ }
+
+ /**
+ * @dataProvider getParseDurationTestData
+ */
+ public function testParseDurationString($expected, $duration, $mode)
+ {
+ $sut = new Duration();
+ $this->assertEquals($expected, $sut->parseDurationString($duration));
+ }
+
+ /**
+ * @dataProvider getParseDurationTestData
+ */
+ public function testParseDuration($expected, $duration, $mode)
+ {
+ $sut = new Duration();
+ $this->assertEquals($expected, $sut->parseDuration($duration, $mode));
+ }
+
+ public function getParseDurationTestData()
+ {
+ return [
+ [0, '', Duration::FORMAT_SECONDS],
+ [0, 0, Duration::FORMAT_SECONDS],
+ [0, -12, Duration::FORMAT_SECONDS],
+ [3600, 3600, Duration::FORMAT_SECONDS],
+
+ [0, '', Duration::FORMAT_NATURAL],
+ [0, 0, Duration::FORMAT_NATURAL],
+ [7200, '2h', Duration::FORMAT_NATURAL],
+ [2280, '38m', Duration::FORMAT_NATURAL],
+ [9480, '2h38m', Duration::FORMAT_NATURAL],
+ [9497, '2h38m17s', Duration::FORMAT_NATURAL],
+ [9497, '1h96m137s', Duration::FORMAT_NATURAL],
+
+ [0, '', Duration::FORMAT_COLON],
+ [0, 0, Duration::FORMAT_COLON],
+ [48420, '13:27', Duration::FORMAT_COLON],
+ [48474, '13:27:54', Duration::FORMAT_COLON],
+ [48474, '12:87:54', Duration::FORMAT_COLON],
+ ];
+ }
+
+ public function getParseDurationInvalidData()
+ {
+ return [
+ // invalid input
+ ['13', Duration::FORMAT_COLON],
+ ['13-13', Duration::FORMAT_COLON],
+ ['13.13', Duration::FORMAT_COLON],
+ [1111, 1111, Duration::FORMAT_NATURAL],
+
+ // invalid modes
+ [17, 'foo'],
+ [12, ''],
+ ];
+ }
+
+ /**
+ * @dataProvider getParseDurationInvalidData
+ * @expectedException \InvalidArgumentException
+ */
+ public function testParseDurationThrowsInvalidArgumentException($duration, $mode)
+ {
+ $sut = new Duration();
+ $sut->parseDuration($duration, $mode);
+ }
+}
diff --git a/var/docs/configurations.md b/var/docs/configurations.md
index d06cb7e5..d6ec18c0 100644
--- a/var/docs/configurations.md
+++ b/var/docs/configurations.md
@@ -2,6 +2,19 @@
There are several configurations that can be configured with the yaml files in `config/packages/*.yaml
+## Duration only
+
+Kimai supports two modes for displaying and recording timesheet entries:
+
+- `begin` and `end` time (default)
+- `date` and `duration` (the so called `duration_only` mode)
+
+When activating the `duration_only` mode all timesheet tables will only display the `date` and `duration` of all records.
+In addition, the "edit timesheet" forms will be changed and instead of displaying the `end` date you will see a field for `duration`.
+The `start` date is only visible in these forms when editing an active or starting a new record.
+
+You can activate the `duration_only` mode by switching the configuration key `kimai.timesheet.duration_only` to `true` in the file [kimai.yaml](../../config/packages/kimai.yaml).
+
## Remember me login
The default period for the `Remember me` option can be changed in the config file [security.yaml](../../config/packages/security.yaml).