- |
+ {% if is_granted('edit', entry) %} class="modal-ajax-form open-edit{{ class }}" data-href="{{ path(editRoute, {'id': entry.id}) }}"{% endif %}
+{% endblock %}
+
+{% block datatable_column %}
+ |
+ {% if column == 'id' %}
{% if is_granted('edit', entry) or is_granted('delete', entry) %}
{{ tables.datatable_multiupdate_row(entry.id) }}
{% endif %}
- |
- {{ entry.begin|date_short }} |
-
- {% if showStartEndTime %}
- {{ entry.begin|time }} |
-
- {% if entry.end %}
- {{ entry.end|time }}
- {% else %}
- ‐
- {% endif %}
- |
- {% endif %}
-
+ {% elseif column == 'date' %}
+ {{ entry.begin|date_short }}
+ {% elseif column == 'starttime' %}
+ {{ entry.begin|time }}
+ {% elseif column == 'endtime' %}
{% if entry.end %}
- {{ entry.duration|duration }} |
+ {{ entry.end|time }}
{% else %}
-
- {{ entry|duration }}
- |
+ ‐
{% endif %}
-
- {% if canSeeRate %}
-
- {{ entryHourlyRate }}
- |
-
- {% if not entry.end or not is_granted('view_rate', entry) %}
- ‐
- {% else %}
- {{ entry.rate|money(customerCurrency) }}
- {% endif %}
- |
+ {% elseif column == 'duration' %}
+ {% if entry.end %}
+ {{ entry.duration|duration }}
+ {% else %}
+ {{ entry|duration }}
{% endif %}
-
-
- {{ widgets.label_customer(entry.project.customer) }}
- |
-
- {{ widgets.label_project(entry.project) }}
- |
-
- {% if entry.activity is not null %}
- {{ widgets.label_activity(entry.activity) }}
- {% endif %}
- |
-
- {% if allowMarkdown %}
- {{ entry.description|desc2html }}
- {% else %}
- {{ entry.description|nl2br }}
- {% endif %}
- |
- {{ widgets.tag_list(entry.tags) }} |
-
- {% for field in metaColumns %}
-
- {{ tables.datatable_meta_column(entry, field) }}
- |
- {% endfor %}
-
- {% if canSeeUsername %}
-
- {{ widgets.label_user(entry.user) }}
- |
+ {% elseif column == 'hourlyRate' %}
+ {{ entryHourlyRate }}
+ {% elseif column == 'rate' %}
+ {% if not entry.end or not is_granted('view_rate', entry) %}
+ ‐
+ {% else %}
+ {{ entry.rate|money(customerCurrency) }}
{% endif %}
-
-
- {{ widgets.label_boolean(entry.billable) }}
- |
-
- {{ widgets.label_boolean(entry.exported) }}
- |
-
- {% set event = actions(app.user, action_single, 'index', {'timesheet': entry}) %}
- {{ widgets.table_actions(event.actions) }}
- |
-
- {%- if entry.end -%}
- {% if dayRate[customerCurrency] is not defined %}
- {% set dayRate = dayRate|merge({(customerCurrency): 0}) %}
+ {% elseif column == 'customer' %}
+ {{ widgets.label_customer(entry.project.customer) }}
+ {% elseif column == 'project' %}
+ {{ widgets.label_project(entry.project) }}
+ {% elseif column == 'activity' %}
+ {% if entry.activity is not null %}
+ {{ widgets.label_activity(entry.activity) }}
{% endif %}
- {% set dayRate = dayRate|merge({(customerCurrency): dayRate[customerCurrency] + entry.rate}) %}
- {%- endif -%}
- {% if dayHourlyRate is not null %}
- {% if dayHourlyRate == 0 %}
- {% set dayHourlyRate = entryHourlyRate %}
- {% elseif dayHourlyRate != entryHourlyRate %}
- {% set dayHourlyRate = null %}
+ {% elseif column == 'description' %}
+ {% if allowMarkdown %}
+ {{ entry.description|desc2html }}
+ {% else %}
+ {{ entry.description|nl2br }}
{% endif %}
+ {% elseif column == 'tags' %}
+ {{ widgets.tag_list(entry.tags) }}
+ {% elseif column == 'billable' %}
+ {{ widgets.label_boolean(entry.billable) }}
+ {% elseif column == 'exported' %}
+ {{ widgets.label_boolean(entry.exported) }}
+ {% elseif column == 'username' %}
+ {{ widgets.label_user(entry.user) }}
+ {% elseif column == 'actions' %}
+ {% set event = actions(app.user, action_single, 'index', {'timesheet': entry}) %}
+ {{ widgets.table_actions(event.actions) }}
+ {% elseif column starts with 'mf_' %}
+ {{ widgets.meta_field_value(entry, data) }}
{% endif %}
- {%- set dayDuration = dayDuration + entry.duration -%}
- {% set lastEntry = entry %}
+
{% endblock %}
-{% macro summary(day, duration, dayHourlyRate, dayRates, columns, canSeeRate, canSeeUsername, showStartEndTime, tableName, metaColumns) %}
+{% macro summary(day, duration, dayHourlyRate, dayRates, sortedColumns, dataTable) %}
{% import "macros/datatables.html.twig" as tables %}
- |
- {{ day }} |
- {% if showStartEndTime %}
- |
- |
- {% endif %}
- {{ duration|duration }} |
- {% if canSeeRate %}
-
- {% if dayHourlyRate is not null and dayHourlyRate != 0 %}
- {{ dayHourlyRate }}
+ {% for column, data in sortedColumns %}
+ |
+ {% if column == 'date' %}
+ {{ day }}
+ {% elseif column == 'duration' %}
+ {{ duration|duration }}
+ {% elseif column == 'hourlyRate' %}
+ {% if dayHourlyRate is not null and dayHourlyRate != 0 %}
+ {{ dayHourlyRate }}
+ {% endif %}
+ {% elseif column == 'rate' %}
+ {% for currency, rate in dayRates %}
+ {{ rate|money(currency) }}
+ {% if not loop.last %}
+
{% endif %}
- |
-
- {% for currency, rate in dayRates %}
- {{ rate|money(currency) }}
- {% if not loop.last %}
-
- {% endif %}
- {% endfor %}
- |
+ {% endfor %}
+ {% else %}
+
{% endif %}
- |
- |
- |
- |
- |
- {% for field in metaColumns %}
- |
- {% endfor %}
- {% if canSeeUsername %}
- |
- {% endif %}
- |
- |
- |
+
+ {% endfor %}
{% endmacro %}
diff --git a/templates/wizard/profile.html.twig b/templates/wizard/profile.html.twig
index 8b75ecef..bcd0dc30 100644
--- a/templates/wizard/profile.html.twig
+++ b/templates/wizard/profile.html.twig
@@ -25,6 +25,14 @@
document.body.classList.add('theme-' + skinChooser.value);
});
}
+
+ const localeChooser = document.getElementById('form_language');
+ if (localeChooser !== null) {
+ localeChooser.addEventListener('change', (ev) => {
+ document.getElementById('form_reload').value = '1';
+ ev.target.form.submit();
+ });
+ }
});
{% endblock %}
diff --git a/tests/Command/CreateUserCommandTest.php b/tests/Command/CreateUserCommandTest.php
index 1136e8eb..85083257 100644
--- a/tests/Command/CreateUserCommandTest.php
+++ b/tests/Command/CreateUserCommandTest.php
@@ -99,7 +99,7 @@ class CreateUserCommandTest extends KernelTestCase
$commandTester = $this->createUser('MyTestUser2', 'user@example.com', 'ROLE_USER', 'foobar');
$output = $commandTester->getDisplay();
- $this->assertStringContainsString('[ERROR] email: The email is already used.', $output);
+ $this->assertStringContainsString('[ERROR] email: This e-mail address is already in use.', $output);
}
public function testUserEmail(): void
diff --git a/tests/Command/KimaiImporterCommandTest.php b/tests/Command/KimaiImporterCommandTest.php
deleted file mode 100644
index 19dff846..00000000
--- a/tests/Command/KimaiImporterCommandTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-application = new Application($kernel);
-
- $encoder = $this->createMock(UserPasswordHasherInterface::class);
- $registry = $this->createMock(ManagerRegistry::class);
- $validator = $this->createMock(ValidatorInterface::class);
-
- $this->application->add(new KimaiImporterCommand($encoder, $registry, $validator));
- }
-
- public function testCommandName()
- {
- $command = $this->application->find('kimai:import-v1');
- self::assertInstanceOf(KimaiImporterCommand::class, $command);
- }
-}
diff --git a/tests/Controller/Security/SelfRegistrationControllerTest.php b/tests/Controller/Security/SelfRegistrationControllerTest.php
index 8f70a7c3..33eb479c 100644
--- a/tests/Controller/Security/SelfRegistrationControllerTest.php
+++ b/tests/Controller/Security/SelfRegistrationControllerTest.php
@@ -116,7 +116,7 @@ class SelfRegistrationControllerTest extends ControllerBaseTest
$content = $client->getResponse()->getContent();
$this->assertStringContainsString('Kimai – Time Tracking', $content);
- $this->assertStringContainsString('An email has been sent to register@example.com. It contains an activation link you must click to activate your account.', $content);
+ $this->assertStringContainsString('An e-mail has been sent to register@example.com. It contains a link you must click to activate your account.', $content);
$this->assertStringContainsString('', $content);
}
diff --git a/tests/Plugin/Fixtures/TestPlugin/composer.json b/tests/Plugin/Fixtures/TestPlugin/composer.json
index 1507bc96..0b55ad0a 100644
--- a/tests/Plugin/Fixtures/TestPlugin/composer.json
+++ b/tests/Plugin/Fixtures/TestPlugin/composer.json
@@ -5,8 +5,7 @@
"type": "kimai-plugin",
"version": "1.0",
"require": {
- "kimai/kimai2-composer": "*",
- "kevinpapst/kimai2": "*"
+ "kimai/kimai": "*"
},
"keywords": [
"kimai",
diff --git a/tests/Twig/RuntimeExtensionsTest.php b/tests/Twig/RuntimeExtensionsTest.php
index 82427890..26960ffd 100644
--- a/tests/Twig/RuntimeExtensionsTest.php
+++ b/tests/Twig/RuntimeExtensionsTest.php
@@ -49,6 +49,7 @@ class RuntimeExtensionsTest extends TestCase
'encore_entry_css_source',
'render_widget',
'icon',
+ 'qr_code_data_uri',
];
$i = 0;
diff --git a/tests/phpstan.neon b/tests/phpstan.neon
index 4752109b..4e907935 100644
--- a/tests/phpstan.neon
+++ b/tests/phpstan.neon
@@ -2302,11 +2302,6 @@ parameters:
count: 1
path: Command/InvoiceCreateCommandTest.php
- -
- message: "#^Method App\\\\Tests\\\\Command\\\\KimaiImporterCommandTest\\:\\:testCommandName\\(\\) has no return type specified\\.$#"
- count: 1
- path: Command/KimaiImporterCommandTest.php
-
-
message: "#^Method App\\\\Tests\\\\Command\\\\PluginCommandTest\\:\\:getCommandTester\\(\\) has no return type specified\\.$#"
count: 1
- 
+ 