jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added css class to target running records in timesheet tables (#1042)

Browse Source
This commit is contained in:
Kevin Papst
2019-08-16 22:34:41 +02:00
committed by GitHub
parent 388c3ec188
commit 025c6b0e7b
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/timesheet-team/index.html.twig
View File

@@ -45,7 +45,7 @@
{{ tables.data_table_header(tableName, columns, false, 'kimai.timesheetUpdate') }}
{% for entry in entries %}
<tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit" data-href="{{ path('admin_timesheet_edit', {'id': entry.id}) }}"{% endif %}>
<tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit{% if not entry.end %} recording{% endif %}" data-href="{{ path('admin_timesheet_edit', {'id': entry.id}) }}"{% endif %}>
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'date') }}">{{ entry.begin|date_short }}</td>
{% if showStartEndTime %}

2
templates/timesheet/index.html.twig
View File

@@ -60,7 +60,7 @@
{% set dayDuration = 0 %}
{% set dayRate = {} %}
{%- endif -%}
<tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit" data-href="{{ path('timesheet_edit', {'id': entry.id}) }}"{% endif %}>
<tr{% if is_granted('edit', entry) %} class="modal-ajax-form open-edit{% if not entry.end %} recording{% endif %}" data-href="{{ path('timesheet_edit', {'id': entry.id}) }}"{% endif %}>
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'date') }}">{{ entry.begin|date_short }}</td>
{% if showStartEndTime %}

7
tests/Controller/TimesheetControllerTest.php
View File

@@ -53,6 +53,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setAmountRunning(2);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setStartDate($start);
$this->importFixture($em, $fixture);
@@ -72,7 +73,11 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertHasDataTable($client);
$this->assertDataTableRowCount($client, 'datatable_timesheet', 5);
$this->assertDataTableRowCount($client, 'datatable_timesheet', 7);
// make sure the recording css class exist on tr for targeting running record rows
$node = $client->getCrawler()->filter('section.content div#datatable_timesheet table.table-striped tbody tr.recording');
self::assertEquals(2, $node->count());
}
public function testExportAction()

7
tests/Controller/TimesheetTeamControllerTest.php
View File

@@ -55,6 +55,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$user = $this->getUserByRole($em, User::ROLE_USER);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setAmountRunning(3);
$fixture->setUser($user);
$fixture->setStartDate($start);
$this->importFixture($em, $fixture);
@@ -75,7 +76,11 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertHasDataTable($client);
$this->assertDataTableRowCount($client, 'datatable_timesheet_admin', 10);
$this->assertDataTableRowCount($client, 'datatable_timesheet_admin', 13);
// make sure the recording css class exist on tr for targeting running record rows
$node = $client->getCrawler()->filter('section.content div#datatable_timesheet_admin table.table-striped tbody tr.recording');
self::assertEquals(3, $node->count());
}
public function testExportAction()