adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-16 20:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conditionally show cost column in report tables; Task/Project Modal

Browse Source 
Field cleanup; improve estimated time UX
This commit is contained in:
Gregor Vostrak
2026-02-11 17:09:32 +01:00
parent 2d9f33387e
commit c78c681ec4
18 changed files with 664 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
e2e/dashboard.spec.ts
View File

@@ -8,7 +8,12 @@ import {
startOrStopTimerWithButton,
stoppedTimeEntryResponse,
} from './utils/currentTimeEntry';
import { createBareTimeEntryViaApi } from './utils/api';
import {
createBareTimeEntryViaApi,
createPublicProjectViaApi,
createTimeEntryViaApi,
updateOrganizationSettingViaApi,
} from './utils/api';
async function goToDashboard(page: Page) {
await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
@@ -116,4 +121,70 @@ test.describe('Employee Dashboard Restrictions', () => {
// Team Activity should NOT be visible for employees
await expect(employee.page.getByText('Team Activity', { exact: true })).not.toBeVisible();
});
test('employee cannot see Cost column in This Week table by default', async ({
ctx,
employee,
}) => {
const project = await createPublicProjectViaApi(ctx, {
name: 'EmpDashBillProj',
is_billable: true,
billable_rate: 10000,
});
await createTimeEntryViaApi(
{ ...ctx, memberId: employee.memberId },
{
description: 'Emp dashboard cost entry',
duration: '1h',
projectId: project.id,
billable: true,
}
);
await employee.page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
await expect(employee.page.getByTestId('dashboard_view')).toBeVisible({
timeout: 10000,
});
// This Week table should be visible
await expect(employee.page.getByText('This Week', { exact: true })).toBeVisible();
// Duration column should be visible, but Cost column should NOT
await expect(employee.page.getByText('Duration', { exact: true })).toBeVisible();
await expect(employee.page.getByText('Cost', { exact: true })).not.toBeVisible();
});
test('employee can see Cost column in This Week table when employees_can_see_billable_rates is enabled', async ({
ctx,
employee,
}) => {
await updateOrganizationSettingViaApi(ctx, { employees_can_see_billable_rates: true });
const project = await createPublicProjectViaApi(ctx, {
name: 'EmpDashBillVisProj',
is_billable: true,
billable_rate: 10000,
});
await createTimeEntryViaApi(
{ ...ctx, memberId: employee.memberId },
{
description: 'Emp dashboard cost visible entry',
duration: '1h',
projectId: project.id,
billable: true,
}
);
await employee.page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
await expect(employee.page.getByTestId('dashboard_view')).toBeVisible({
timeout: 10000,
});
// Both Duration and Cost columns should be visible
await expect(employee.page.getByText('Duration', { exact: true })).toBeVisible();
await expect(employee.page.getByText('Cost', { exact: true })).toBeVisible();
// 1h at 100.00/h = 100.00 EUR cost should be visible
await expect(employee.page.getByText('100,00 EUR').first()).toBeVisible();
});
});