mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-06-15 05:22:44 +01:00
Compare commits
7 Commits
048b2e0204
...
8325fea8fe
| Author | SHA1 | Date | |
|---|---|---|---|
|
8325fea8fe | ||
|
|
f8e668790b | ||
|
|
77a5e979c6 | ||
|
|
353a579850 | ||
|
|
bd44a2b376 | ||
|
|
277dbaf6eb | ||
|
|
1cf33ddb3f |
@@ -1,4 +1,4 @@
|
||||
# solidtime - The modern Open-Source Time Tracker
|
||||
# solidtime - The modern Open-Source TimeTracker
|
||||
|
||||
[](https://github.com/solidtime-io/solidtime/blob/main/LICENSE.md)
|
||||
[](https://codecov.io/gh/solidtime-io/solidtime)
|
||||
|
||||
@@ -96,6 +96,30 @@ class LocalizationService
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a duration for reporting contexts (PDF reports, places that display duration
|
||||
* directly next to cost). Promotes the verbose `Hh Mm` format to the compact `HH:MM:SS`
|
||||
* so totals stay narrow and reconcile with cost, which is always computed to the second.
|
||||
*/
|
||||
public function formatIntervalForReporting(CarbonInterval $interval): string
|
||||
{
|
||||
$promoted = [
|
||||
IntervalFormat::HoursMinutes,
|
||||
IntervalFormat::HoursMinutesColonSeparated,
|
||||
];
|
||||
if (! in_array($this->intervalFormat, $promoted, true)) {
|
||||
return $this->formatInterval($interval);
|
||||
}
|
||||
|
||||
$previous = $this->intervalFormat;
|
||||
$this->intervalFormat = IntervalFormat::HoursMinutesSecondsColonSeparated;
|
||||
try {
|
||||
return $this->formatInterval($interval);
|
||||
} finally {
|
||||
$this->intervalFormat = $previous;
|
||||
}
|
||||
}
|
||||
|
||||
public function formatCurrency(Money $money): string
|
||||
{
|
||||
$currencyService = app(CurrencyService::class);
|
||||
|
||||
@@ -230,6 +230,37 @@ test('test that theme can be changed to dark and light', async ({ page }) => {
|
||||
await expect(page.getByText('System default:')).toBeVisible();
|
||||
});
|
||||
|
||||
// =============================================
|
||||
// Group similar time entries
|
||||
// =============================================
|
||||
|
||||
test('test that group similar time entries setting can be toggled', async ({ page }) => {
|
||||
await goToProfilePage(page);
|
||||
|
||||
// Get the checkbox
|
||||
const checkbox = page.getByLabel('Group similar time entries');
|
||||
|
||||
// Get initial value and verify it is checked (default is true)
|
||||
const initialValue = await checkbox.isChecked();
|
||||
await expect(checkbox).toBeChecked();
|
||||
|
||||
// Toggle the checkbox
|
||||
await checkbox.click();
|
||||
|
||||
// Reload
|
||||
await page.reload();
|
||||
|
||||
// Verify the value is toggled
|
||||
const afterValue = await page.getByLabel('Group similar time entries').isChecked();
|
||||
expect(afterValue).toBe(!initialValue);
|
||||
|
||||
// Verify localStorage persists the setting
|
||||
const storedValue = await page.evaluate(() =>
|
||||
localStorage.getItem('group-similar-time-entries')
|
||||
);
|
||||
expect(storedValue).toBe(String(!initialValue));
|
||||
});
|
||||
|
||||
// =============================================
|
||||
// Two Factor Authentication Tests
|
||||
// =============================================
|
||||
|
||||
@@ -32,7 +32,7 @@ test('test that detailed view shows time entries correctly', async ({ page, ctx
|
||||
|
||||
// Verify the time entry is shown with all details
|
||||
await expect(page.getByText(projectName, { exact: true }).first()).toBeVisible();
|
||||
await expect(page.locator('input[name="Duration"]').first()).toHaveValue('1h 00min');
|
||||
await expect(page.locator('input[name="Duration"]').first()).toHaveValue('1:00:00');
|
||||
await expect(page.getByText('Entry for ' + projectName, { exact: true }).first()).toBeVisible();
|
||||
});
|
||||
|
||||
@@ -62,8 +62,8 @@ test('test that updating duration in detailed view works correctly', async ({ pa
|
||||
),
|
||||
]);
|
||||
|
||||
// Verify the new duration is displayed
|
||||
await expect(durationInput).toHaveValue(updatedDuration);
|
||||
// Verify the new duration is displayed (reporting views promote to HH:MM:SS format)
|
||||
await expect(durationInput).toHaveValue('2:30:00');
|
||||
});
|
||||
|
||||
// ──────────────────────────────────────────────────
|
||||
|
||||
@@ -333,7 +333,7 @@ test('test that task filtering works in reporting', async ({ page, ctx }) => {
|
||||
await page.keyboard.press('Escape');
|
||||
|
||||
// Verify the report only shows 1h (task1's duration)
|
||||
await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
|
||||
await expect(page.getByTestId('reporting_view').getByText('1:00:00').first()).toBeVisible();
|
||||
});
|
||||
|
||||
test('test that task multiselect search filters the option list', async ({ page, ctx }) => {
|
||||
@@ -474,7 +474,7 @@ test('test that tag filtering works in reporting', async ({ page, ctx }) => {
|
||||
await page.keyboard.press('Escape');
|
||||
|
||||
// Verify only time entries with tag1 are shown
|
||||
await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
|
||||
await expect(page.getByTestId('reporting_view').getByText('1:00:00').first()).toBeVisible();
|
||||
});
|
||||
|
||||
test('test that tag dropdown search filters the option list', async ({ page, ctx }) => {
|
||||
@@ -594,7 +594,7 @@ test('test that billable status filtering works in reporting', async ({ page, ct
|
||||
waitForReportingUpdate(page),
|
||||
]);
|
||||
|
||||
await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
|
||||
await expect(page.getByTestId('reporting_view').getByText('1:00:00').first()).toBeVisible();
|
||||
});
|
||||
|
||||
test('test that billable filter can switch between all three states', async ({ page }) => {
|
||||
@@ -885,7 +885,7 @@ test.describe('Employee Reporting Restrictions', () => {
|
||||
|
||||
// Employee's data should be visible (1h)
|
||||
await expect(
|
||||
employee.page.getByTestId('reporting_view').getByText('1h 00min').first()
|
||||
employee.page.getByTestId('reporting_view').getByText('1:00:00').first()
|
||||
).toBeVisible();
|
||||
});
|
||||
|
||||
|
||||
@@ -292,8 +292,8 @@ test('test that shared report respects task filter', async ({ page, ctx }) => {
|
||||
await page.goto(shareableLink);
|
||||
await expect(page.getByText('Reporting')).toBeVisible();
|
||||
await expect(page.getByText('Total')).toBeVisible();
|
||||
await expect(page.getByText('1h 00min').first()).toBeVisible();
|
||||
await expect(page.getByText('3h 00min')).not.toBeVisible();
|
||||
await expect(page.getByText('1:00:00').first()).toBeVisible();
|
||||
await expect(page.getByText('3:00:00')).not.toBeVisible();
|
||||
});
|
||||
|
||||
test('test that shared report respects client filter', async ({ page, ctx }) => {
|
||||
@@ -369,8 +369,8 @@ test('test that shared report respects tag filter', async ({ page, ctx }) => {
|
||||
await page.goto(shareableLink);
|
||||
await expect(page.getByText('Reporting')).toBeVisible();
|
||||
await expect(page.getByText('Total')).toBeVisible();
|
||||
await expect(page.getByText('1h 00min').first()).toBeVisible();
|
||||
await expect(page.getByText('3h 00min')).not.toBeVisible();
|
||||
await expect(page.getByText('1:00:00').first()).toBeVisible();
|
||||
await expect(page.getByText('3:00:00')).not.toBeVisible();
|
||||
});
|
||||
|
||||
test('test that shared report respects member filter', async ({ page, ctx }) => {
|
||||
@@ -425,7 +425,7 @@ test('test that shared report with billable filter only shows billable entries',
|
||||
]);
|
||||
|
||||
// Verify only 1h shows before saving
|
||||
await expect(page.getByTestId('reporting_view').getByText('1h 00min').first()).toBeVisible();
|
||||
await expect(page.getByTestId('reporting_view').getByText('1:00:00').first()).toBeVisible();
|
||||
|
||||
const { shareableLink } = await saveAsSharedReport(page, reportName);
|
||||
|
||||
@@ -435,8 +435,8 @@ test('test that shared report with billable filter only shows billable entries',
|
||||
await expect(page.getByText('Total')).toBeVisible();
|
||||
|
||||
// Shared report should only show the 1h billable entry, not the 2h non-billable
|
||||
await expect(page.getByText('1h 00min').first()).toBeVisible();
|
||||
await expect(page.getByText('3h 00min')).not.toBeVisible();
|
||||
await expect(page.getByText('1:00:00').first()).toBeVisible();
|
||||
await expect(page.getByText('3:00:00')).not.toBeVisible();
|
||||
});
|
||||
|
||||
// ──────────────────────────────────────────────────
|
||||
|
||||
@@ -39,6 +39,10 @@ function getMonthFromTimestamp(timestamp: string): number {
|
||||
return new Date(timestamp).getUTCMonth() + 1;
|
||||
}
|
||||
|
||||
async function goToProfilePage(page: Page) {
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
|
||||
}
|
||||
|
||||
async function goToTimeOverview(page: Page) {
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/time');
|
||||
}
|
||||
@@ -67,6 +71,14 @@ async function createEmptyTimeEntry(page: Page) {
|
||||
]);
|
||||
}
|
||||
|
||||
async function setTimeEntriesGrouping(page: Page, enabled: boolean) {
|
||||
await goToProfilePage(page);
|
||||
const checkbox = page.getByLabel('Group similar time entries');
|
||||
const isChecked = await checkbox.isChecked();
|
||||
if (isChecked !== enabled) await checkbox.click();
|
||||
await goToTimeOverview(page);
|
||||
}
|
||||
|
||||
test('test that starting and stopping an empty time entry shows a new time entry in the overview', async ({
|
||||
page,
|
||||
}) => {
|
||||
@@ -333,6 +345,30 @@ test.skip('test that load more works when the end of page is reached', async ({
|
||||
await expect(page.locator('body')).toHaveText(/All time entries are loaded!/);
|
||||
});
|
||||
|
||||
test('test that Group similar time entries option is affected', async ({ page }) => {
|
||||
// Enable grouping
|
||||
await setTimeEntriesGrouping(page, true);
|
||||
|
||||
// Create 2 similar time entries
|
||||
await createEmptyTimeEntry(page);
|
||||
await page.waitForSelector('[data-testid="time_entry_row"]', { timeout: 1000 });
|
||||
await createEmptyTimeEntry(page);
|
||||
|
||||
// Verify similar time entries are grouped
|
||||
await expect(page.getByTestId('grouped_items_count_button').first()).toBeVisible({
|
||||
timeout: 1000,
|
||||
});
|
||||
|
||||
// Disable grouping
|
||||
await setTimeEntriesGrouping(page, false);
|
||||
|
||||
// Verify similar time entries are not grouped
|
||||
await expect(page.locator('[data-testid="time_entry_row"]')).toHaveCount(2, { timeout: 1000 });
|
||||
await expect(page.locator('[data-testid="grouped_items_count_button"]')).toHaveCount(0, {
|
||||
timeout: 1000,
|
||||
});
|
||||
});
|
||||
|
||||
// TODO: Test that updating the time entry start / end times works while it is running
|
||||
|
||||
// TODO: Test for project update
|
||||
|
||||
2489
package-lock.json
generated
2489
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
24
package.json
24
package.json
@@ -19,26 +19,26 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/eslintrc": "^3.2.0",
|
||||
"@eslint/js": "^9.19.0",
|
||||
"@inertiajs/vue3": "^2.0.0",
|
||||
"@eslint/js": "^10.0.1",
|
||||
"@inertiajs/vue3": "^3.0.3",
|
||||
"@playwright/test": "^1.41.1",
|
||||
"@tailwindcss/forms": "^0.5.9",
|
||||
"@tailwindcss/typography": "^0.5.15",
|
||||
"@types/chroma-js": "^3.1.0",
|
||||
"@types/node": "^22.10.10",
|
||||
"@types/node": "^25.6.0",
|
||||
"@vitejs/plugin-vue": "^6.0.3",
|
||||
"@vue/tsconfig": "^0.8.0",
|
||||
"autoprefixer": "^10.4.20",
|
||||
"axios": "^1.6.4",
|
||||
"eslint-plugin-unused-imports": "^4.1.4",
|
||||
"laravel-vite-plugin": "^2.1.0",
|
||||
"laravel-vite-plugin": "^3.0.1",
|
||||
"openapi-zod-client": "^1.16.2",
|
||||
"postcss": "^8.4.47",
|
||||
"postcss-import": "^15.1.0",
|
||||
"postcss-nesting": "^12.1.5",
|
||||
"tailwindcss": "^3.4.13",
|
||||
"typescript": "^5.7.3",
|
||||
"vite": "^7.0.0",
|
||||
"postcss-import": "^16.1.1",
|
||||
"postcss-nesting": "^14.0.0",
|
||||
"tailwindcss": "^4.2.2",
|
||||
"typescript": "^6.0.3",
|
||||
"vite": "^8.0.9",
|
||||
"vite-plugin-checker": "^0.12.0",
|
||||
"vue": "^3.5.0",
|
||||
"vue-tsc": "^3.0.0"
|
||||
@@ -51,7 +51,7 @@
|
||||
"@tailwindcss/container-queries": "^0.1.1",
|
||||
"@tanstack/vue-form": "^1.3.1",
|
||||
"@tanstack/vue-query": "^5.56.2",
|
||||
"@tanstack/vue-query-devtools": "^5.58.0",
|
||||
"@tanstack/vue-query-devtools": "^6.1.18",
|
||||
"@tanstack/vue-table": "^8.21.2",
|
||||
"@vue/eslint-config-prettier": "^10.2.0",
|
||||
"@vue/eslint-config-typescript": "^14.3.0",
|
||||
@@ -64,12 +64,12 @@
|
||||
"dayjs": "^1.11.11",
|
||||
"echarts": "^6.0.0",
|
||||
"focus-trap": "^8.0.0",
|
||||
"lucide-vue-next": "^0.487.0",
|
||||
"lucide-vue-next": "^1.0.0",
|
||||
"parse-duration": "^2.0.1",
|
||||
"pinia": "^3.0.0",
|
||||
"radix-vue": "^1.9.6",
|
||||
"reka-ui": "^2.8.2",
|
||||
"tailwind-merge": "^2.6.0",
|
||||
"tailwind-merge": "^3.5.0",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"vue-echarts": "^8.0.0",
|
||||
"zod": "^3.23.8"
|
||||
|
||||
@@ -57,11 +57,11 @@ const showEditModal = ref(false);
|
||||
</span>
|
||||
</div>
|
||||
<div
|
||||
class="whitespace-nowrap flex items-center px-3 py-4 text-sm font-medium text-text-primary">
|
||||
<span class="text-text-secondary"> {{ projectCount }} Projects </span>
|
||||
class="whitespace-nowrap flex items-center px-3 py-4 text-sm text-text-primary">
|
||||
<span> {{ projectCount }} Projects </span>
|
||||
</div>
|
||||
<div
|
||||
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1.5 items-center font-medium">
|
||||
class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center">
|
||||
<template v-if="client.is_archived">
|
||||
<ArchiveBoxIcon class="w-4 text-icon-default"></ArchiveBoxIcon>
|
||||
<span>Archived</span>
|
||||
|
||||
@@ -83,27 +83,28 @@ const userHasValidMailAddress = computed(() => {
|
||||
{{ member.name }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
|
||||
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
|
||||
{{ member.email }}
|
||||
</div>
|
||||
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
|
||||
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
|
||||
{{ capitalizeFirstLetter(member.role) }}
|
||||
</div>
|
||||
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
|
||||
{{
|
||||
member.billable_rate
|
||||
? formatCents(
|
||||
member.billable_rate,
|
||||
organization?.currency,
|
||||
organization?.currency_format,
|
||||
organization?.currency_symbol,
|
||||
organization?.number_format
|
||||
)
|
||||
: '--'
|
||||
}}
|
||||
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
|
||||
<span v-if="member.billable_rate">
|
||||
{{
|
||||
formatCents(
|
||||
member.billable_rate,
|
||||
organization?.currency,
|
||||
organization?.currency_format,
|
||||
organization?.currency_symbol,
|
||||
organization?.number_format
|
||||
)
|
||||
}}
|
||||
</span>
|
||||
<span v-else class="text-text-tertiary"> -- </span>
|
||||
</div>
|
||||
<div
|
||||
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1.5 items-center font-medium">
|
||||
class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center">
|
||||
<template v-if="member.is_placeholder === false">
|
||||
<CheckCircleIcon class="w-4 text-icon-default"></CheckCircleIcon>
|
||||
<span>Active</span>
|
||||
|
||||
@@ -72,7 +72,7 @@ const billableRateInfo = computed(() => {
|
||||
return 'Default Rate';
|
||||
}
|
||||
}
|
||||
return '--';
|
||||
return null;
|
||||
});
|
||||
|
||||
const showEditProjectModal = ref(false);
|
||||
@@ -98,13 +98,13 @@ const showEditProjectModal = ref(false);
|
||||
</span>
|
||||
<span class="text-text-secondary"> {{ projectTasksCount }} Tasks </span>
|
||||
</div>
|
||||
<div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-text-secondary">
|
||||
<div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-text-primary">
|
||||
<div v-if="project.client_id" class="overflow-ellipsis overflow-hidden">
|
||||
{{ client?.name }}
|
||||
</div>
|
||||
<div v-else>No client</div>
|
||||
<div v-else class="text-text-tertiary">No client</div>
|
||||
</div>
|
||||
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
|
||||
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
|
||||
<div v-if="project.spent_time">
|
||||
{{
|
||||
formatHumanReadableDuration(
|
||||
@@ -114,23 +114,24 @@ const showEditProjectModal = ref(false);
|
||||
)
|
||||
}}
|
||||
</div>
|
||||
<div v-else>--</div>
|
||||
<div v-else class="text-text-tertiary">--</div>
|
||||
</div>
|
||||
<div class="whitespace-nowrap px-3 flex items-center text-sm text-text-secondary">
|
||||
<div class="whitespace-nowrap px-3 flex items-center text-sm text-text-primary">
|
||||
<UpgradeBadge v-if="!isAllowedToPerformPremiumAction()"></UpgradeBadge>
|
||||
<EstimatedTimeProgress
|
||||
v-else-if="project.estimated_time"
|
||||
:estimated="project.estimated_time"
|
||||
:current="project.spent_time"></EstimatedTimeProgress>
|
||||
<span v-else> -- </span>
|
||||
<span v-else class="text-text-tertiary"> -- </span>
|
||||
</div>
|
||||
<div
|
||||
v-if="showBillableRate"
|
||||
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
|
||||
{{ billableRateInfo }}
|
||||
class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
|
||||
<span v-if="billableRateInfo">{{ billableRateInfo }}</span>
|
||||
<span v-else class="text-text-tertiary">--</span>
|
||||
</div>
|
||||
<div
|
||||
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1.5 items-center font-medium">
|
||||
class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center font-medium">
|
||||
<template v-if="project.is_archived">
|
||||
<ArchiveBoxIcon class="w-4 text-icon-default"></ArchiveBoxIcon>
|
||||
<span>Archived</span>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import VChart, { THEME_KEY } from 'vue-echarts';
|
||||
import { computed, provide, inject, shallowRef, type ComputedRef } from 'vue';
|
||||
import LinearGradient from 'zrender/lib/graphic/LinearGradient';
|
||||
import { formatDate, formatHumanReadableDuration, formatWeek } from '@/packages/ui/src/utils/time';
|
||||
import { formatDate, formatReportingDuration, formatWeek } from '@/packages/ui/src/utils/time';
|
||||
import { use } from 'echarts/core';
|
||||
import { CanvasRenderer } from 'echarts/renderers';
|
||||
import { BarChart } from 'echarts/charts';
|
||||
@@ -137,7 +137,7 @@ const option = computed(() => ({
|
||||
type: 'bar',
|
||||
tooltip: {
|
||||
valueFormatter: (value: number) => {
|
||||
return formatHumanReadableDuration(
|
||||
return formatReportingDuration(
|
||||
value,
|
||||
organization?.value?.interval_format,
|
||||
organization?.value?.number_format
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
import { SaveIcon } from 'lucide-vue-next';
|
||||
import { getOrganizationCurrencyString } from '@/utils/money';
|
||||
import {
|
||||
formatHumanReadableDuration,
|
||||
formatReportingDuration,
|
||||
getDayJsInstance,
|
||||
getLocalizedDayJs,
|
||||
} from '@/packages/ui/src/utils/time';
|
||||
@@ -426,7 +426,7 @@ const tableData = computed(() => {
|
||||
class="justify-end flex items-center font-medium"
|
||||
:class="!showBillableRate ? 'pr-6' : ''">
|
||||
{{
|
||||
formatHumanReadableDuration(
|
||||
formatReportingDuration(
|
||||
aggregatedTableTimeEntries.seconds,
|
||||
organization?.interval_format,
|
||||
organization?.number_format
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
TitleComponent,
|
||||
TooltipComponent,
|
||||
} from 'echarts/components';
|
||||
import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
|
||||
import { formatReportingDuration } from '@/packages/ui/src/utils/time';
|
||||
import { useCssVariable } from '@/packages/ui/src';
|
||||
import type { Organization } from '@/packages/api/src';
|
||||
|
||||
@@ -67,7 +67,7 @@ const option = computed(() => ({
|
||||
},
|
||||
tooltip: {
|
||||
valueFormatter: (value: number) => {
|
||||
return formatHumanReadableDuration(
|
||||
return formatReportingDuration(
|
||||
value,
|
||||
organization?.value?.interval_format,
|
||||
organization?.value?.number_format
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
|
||||
import { formatReportingDuration } from '@/packages/ui/src/utils/time';
|
||||
import { formatCents } from '@/packages/ui/src/utils/money';
|
||||
import GroupedItemsCountButton from '@/packages/ui/src/GroupedItemsCountButton.vue';
|
||||
import { ref, inject, type ComputedRef } from 'vue';
|
||||
@@ -44,7 +44,7 @@ const organization = inject<ComputedRef<Organization>>('organization');
|
||||
</div>
|
||||
<div class="justify-end flex items-center" :class="!showCost ? 'pr-6' : ''">
|
||||
{{
|
||||
formatHumanReadableDuration(
|
||||
formatReportingDuration(
|
||||
entry.seconds,
|
||||
organization?.interval_format,
|
||||
organization?.number_format
|
||||
|
||||
@@ -7,8 +7,8 @@ defineProps<{
|
||||
|
||||
<template>
|
||||
<div class="rounded-lg bg-card-background border-card-border shadow-card border px-3.5 py-2.5">
|
||||
<dt class="font-semibold text-sm text-text-secondary">{{ title }}</dt>
|
||||
<dd class="text-xl text-text-primary pt-1 font-semibold">
|
||||
<dt class="font-medium text-sm text-text-secondary">{{ title }}</dt>
|
||||
<dd class="text-xl text-text-primary pt-1 font-medium">
|
||||
{{ value ?? '--' }}
|
||||
</dd>
|
||||
</div>
|
||||
|
||||
@@ -23,7 +23,7 @@ defineProps<{
|
||||
<div class="items-center justify-center flex-1 hidden @2xs:flex">
|
||||
<DayOverviewCardChart :history="history"></DayOverviewCardChart>
|
||||
</div>
|
||||
<div class="flex text-sm items-center justify-center text-text-secondary min-w-[65px]">
|
||||
<div class="flex text-sm items-center justify-center text-text-primary min-w-[65px]">
|
||||
{{
|
||||
formatHumanReadableDuration(
|
||||
duration,
|
||||
|
||||
@@ -47,9 +47,9 @@ async function startTaskTimer() {
|
||||
<template>
|
||||
<div class="px-3.5 py-2 grid grid-cols-5">
|
||||
<div class="col-span-4">
|
||||
<p class="text-text-secondary text-sm pb-1.5 truncate">
|
||||
<p class="text-text-primary text-sm pb-1.5 truncate">
|
||||
<span v-if="timeEntry.description"> {{ timeEntry.description }}</span>
|
||||
<span v-else>No description</span>
|
||||
<span v-else class="text-text-secondary">No description</span>
|
||||
</p>
|
||||
<ProjectBadge size="base" class="min-w-0 max-w-full" :color="project?.color">
|
||||
<div class="flex items-center lg:space-x-0.5 min-w-0">
|
||||
|
||||
@@ -48,7 +48,7 @@ const { data: latestTeamActivity, isLoading } = useQuery({
|
||||
class="text-center flex flex-1 justify-center items-center">
|
||||
<div>
|
||||
<UserGroupIcon class="w-8 text-icon-default inline pb-2"></UserGroupIcon>
|
||||
<h3 class="text-text-primary font-semibold text-sm">Invite your co-workers</h3>
|
||||
<h3 class="text-text-primary font-medium text-sm">Invite your co-workers</h3>
|
||||
<p class="pb-5 text-sm">You can invite your entire team.</p>
|
||||
<SecondaryButton @click="router.visit(route('members'))"
|
||||
>Go to Members
|
||||
|
||||
@@ -11,7 +11,7 @@ defineProps<{
|
||||
<div class="col-span-2">
|
||||
<div class="flex justify-between">
|
||||
<p
|
||||
class="text-xs min-w-0 overflow-ellipsis overflow-hidden flex-1 text-text-secondary">
|
||||
class="text-sm font-medium min-w-0 overflow-ellipsis overflow-hidden flex-1 text-text-primary">
|
||||
{{ name }}
|
||||
</p>
|
||||
<div v-if="working" class="flex space-x-1.5 items-center justify-end">
|
||||
@@ -20,11 +20,11 @@ defineProps<{
|
||||
class="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-500 opacity-75"></span>
|
||||
<span class="relative inline-flex rounded-full h-2 w-2 bg-green-500"></span>
|
||||
</span>
|
||||
<span class="text-green-500 font-medium text-sm block pb-0.5"> working </span>
|
||||
<span class="text-green-500 text-sm block pb-0.5"> working </span>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="text-text-secondary text-sm font-medium text-ellipsis whitespace-nowrap max-w-full overflow-hidden">
|
||||
class="text-text-secondary text-sm text-ellipsis whitespace-nowrap max-w-full overflow-hidden">
|
||||
{{ description }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -16,7 +16,7 @@ import CardTitle from '@/packages/ui/src/CardTitle.vue';
|
||||
import LinearGradient from 'zrender/lib/graphic/LinearGradient';
|
||||
import ProjectsChartCard from '@/Components/Dashboard/ProjectsChartCard.vue';
|
||||
import ThisWeekReportingTable from '@/Components/Dashboard/ThisWeekReportingTable.vue';
|
||||
import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
|
||||
import { formatReportingDuration } from '@/packages/ui/src/utils/time';
|
||||
import { formatCents } from '@/packages/ui/src/utils/money';
|
||||
import { getWeekStart } from '@/packages/ui/src/utils/settings';
|
||||
import { useCssVariable } from '@/packages/ui/src';
|
||||
@@ -223,7 +223,7 @@ const option = computed(() => {
|
||||
type: 'bar',
|
||||
tooltip: {
|
||||
valueFormatter: (value: number) => {
|
||||
return formatHumanReadableDuration(
|
||||
return formatReportingDuration(
|
||||
value,
|
||||
organization?.value?.interval_format,
|
||||
organization?.value?.number_format
|
||||
@@ -252,7 +252,7 @@ const option = computed(() => {
|
||||
title="Spent Time"
|
||||
:value="
|
||||
totalWeeklyTime
|
||||
? formatHumanReadableDuration(
|
||||
? formatReportingDuration(
|
||||
totalWeeklyTime,
|
||||
organization?.interval_format,
|
||||
organization?.number_format
|
||||
@@ -263,7 +263,7 @@ const option = computed(() => {
|
||||
title="Billable Time"
|
||||
:value="
|
||||
totalWeeklyBillableTime
|
||||
? formatHumanReadableDuration(
|
||||
? formatReportingDuration(
|
||||
totalWeeklyBillableTime,
|
||||
organization?.interval_format,
|
||||
organization?.number_format
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import ReportingRow from '@/Components/Common/Reporting/ReportingRow.vue';
|
||||
import ReportingGroupBySelect from '@/Components/Common/Reporting/ReportingGroupBySelect.vue';
|
||||
import {
|
||||
formatHumanReadableDuration,
|
||||
formatReportingDuration,
|
||||
getDayJsInstance,
|
||||
getLocalizedDayJs,
|
||||
} from '@/packages/ui/src/utils/time';
|
||||
@@ -174,7 +174,7 @@ const showBillableRate = computed(() => {
|
||||
class="justify-end flex items-center font-medium"
|
||||
:class="!showBillableRate ? 'pr-6' : ''">
|
||||
{{
|
||||
formatHumanReadableDuration(
|
||||
formatReportingDuration(
|
||||
aggregatedTableTimeEntries.seconds,
|
||||
organization?.interval_format,
|
||||
organization?.number_format
|
||||
|
||||
@@ -28,7 +28,7 @@ const open = useSessionStorage('nav-collapse-state-' + props.title, true);
|
||||
<CollapsibleRoot v-else v-model:open="open"
|
||||
><CollapsibleTrigger class="w-full group py-0.5">
|
||||
<div
|
||||
class="text-text-secondary group-hover:text-text-primary group-hover:bg-menu-active group flex gap-x-2 rounded-md transition leading-6 py-0.5 px-2 font-medium text-sm items-center justify-between">
|
||||
class="text-text-secondary group-hover:text-text-primary group-hover:bg-menu-active group flex gap-x-2 rounded-md transition leading-6 py-0.5 px-2 font-regular text-sm items-center justify-between">
|
||||
<div class="flex items-center gap-x-2">
|
||||
<component
|
||||
:is="icon"
|
||||
|
||||
@@ -2,8 +2,10 @@
|
||||
import FormSection from '@/Components/FormSection.vue';
|
||||
import { Field, FieldLabel, FieldDescription } from '@/packages/ui/src/field';
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
|
||||
import { Checkbox } from '@/packages/ui/src';
|
||||
import { usePreferredColorScheme } from '@vueuse/core';
|
||||
import { themeSetting } from '@/utils/theme';
|
||||
import { groupSimilarTimeEntriesSetting } from '@/utils/timeEntryGrouping';
|
||||
|
||||
const preferredColor = usePreferredColorScheme();
|
||||
</script>
|
||||
@@ -15,6 +17,7 @@ const preferredColor = usePreferredColorScheme();
|
||||
<template #description> Choose how you want solidtime to look on your device </template>
|
||||
|
||||
<template #form>
|
||||
<!-- Theme -->
|
||||
<Field class="col-span-6 sm:col-span-4">
|
||||
<FieldLabel for="theme">Theme</FieldLabel>
|
||||
<Select id="theme" v-model="themeSetting">
|
||||
@@ -31,6 +34,14 @@ const preferredColor = usePreferredColorScheme();
|
||||
System default: {{ preferredColor }}
|
||||
</FieldDescription>
|
||||
</Field>
|
||||
|
||||
<!-- Group similar time entries -->
|
||||
<Field class="col-span-6 sm:col-span-4" orientation="horizontal">
|
||||
<Checkbox
|
||||
id="group_similar_time_entries"
|
||||
v-model:checked="groupSimilarTimeEntriesSetting" />
|
||||
<FieldLabel for="group_similar_time_entries">Group similar time entries</FieldLabel>
|
||||
</Field>
|
||||
</template>
|
||||
</FormSection>
|
||||
</template>
|
||||
|
||||
@@ -390,6 +390,7 @@ async function downloadExport(format: ExportFormat) {
|
||||
:organization-billable-rate="organization?.billable_rate ?? null"
|
||||
:duplicate-time-entry="() => createTimeEntry(entry)"
|
||||
:members="members"
|
||||
is-report
|
||||
show-date
|
||||
show-member
|
||||
:time-entry="entry"
|
||||
|
||||
@@ -3,7 +3,7 @@ import MainContainer from '@/packages/ui/src/MainContainer.vue';
|
||||
import PageTitle from '@/Components/Common/PageTitle.vue';
|
||||
import { ChartBarIcon } from '@heroicons/vue/20/solid';
|
||||
import ReportingChart from '@/Components/Common/Reporting/ReportingChart.vue';
|
||||
import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
|
||||
import { formatReportingDuration } from '@/packages/ui/src/utils/time';
|
||||
import ReportingRow from '@/Components/Common/Reporting/ReportingRow.vue';
|
||||
import ReportingPieChart from '@/Components/Common/Reporting/ReportingPieChart.vue';
|
||||
import { formatCents } from '@/packages/ui/src/utils/money';
|
||||
@@ -231,7 +231,7 @@ onMounted(async () => {
|
||||
</div>
|
||||
<div class="justify-end flex items-center font-medium">
|
||||
{{
|
||||
formatHumanReadableDuration(
|
||||
formatReportingDuration(
|
||||
aggregatedTableTimeEntries.seconds,
|
||||
reportIntervalFormat,
|
||||
reportNumberFormat
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<script setup lang="ts">
|
||||
import FormSection from '@/Components/FormSection.vue';
|
||||
import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { Field, FieldLabel } from '@/packages/ui/src/field';
|
||||
import { computed, onMounted, ref } from 'vue';
|
||||
import { Field, FieldDescription, FieldLabel } from '@/packages/ui/src/field';
|
||||
import type { UpdateOrganizationBody } from '@/packages/api/src';
|
||||
import { useOrganizationStore } from '@/utils/useOrganization';
|
||||
import { storeToRefs } from 'pinia';
|
||||
@@ -52,6 +52,12 @@ onMounted(async () => {
|
||||
}
|
||||
});
|
||||
|
||||
const showsHhMmSsInReports = computed(
|
||||
() =>
|
||||
form.value.interval_format === 'hours-minutes' ||
|
||||
form.value.interval_format === 'hours-minutes-colon-separated'
|
||||
);
|
||||
|
||||
async function submit() {
|
||||
mutation.mutate(form.value);
|
||||
}
|
||||
@@ -149,6 +155,12 @@ async function submit() {
|
||||
>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<FieldDescription v-if="showsHhMmSsInReports">
|
||||
Reports and totals shown next to cost use HH:MM:SS for this format, so the
|
||||
duration reconciles with the billable amount down to the second. Everywhere else
|
||||
(time tracker, calendar, entry rows) seconds are omitted and durations stay in
|
||||
your chosen format.
|
||||
</FieldDescription>
|
||||
</Field>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ import { useElementVisibility } from '@vueuse/core';
|
||||
import { ClockIcon } from '@heroicons/vue/20/solid';
|
||||
import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
|
||||
import { useCurrentTimeEntryStore } from '@/utils/useCurrentTimeEntry';
|
||||
import { groupSimilarTimeEntriesSetting } from '@/utils/timeEntryGrouping';
|
||||
import { useTasksQuery } from '@/utils/useTasksQuery';
|
||||
import { useProjectsQuery } from '@/utils/useProjectsQuery';
|
||||
import TimeEntryGroupedTable from '@/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue';
|
||||
@@ -151,6 +152,7 @@ function deleteSelected() {
|
||||
:tasks="tasks"
|
||||
:currency="getOrganizationCurrencyString()"
|
||||
:time-entries="timeEntries"
|
||||
:group-similar-time-entries="groupSimilarTimeEntriesSetting"
|
||||
:tags="tags"></TimeEntryGroupedTable>
|
||||
<div v-if="isPending" class="flex justify-center items-center py-12">
|
||||
<LoadingSpinner></LoadingSpinner>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@solidtime/ui",
|
||||
"version": "0.0.20",
|
||||
"version": "0.0.21",
|
||||
"description": "Package containing the solidtime ui components",
|
||||
"main": "./dist/solidtime-ui-lib.umd.cjs",
|
||||
"module": "./dist/solidtime-ui-lib.js",
|
||||
|
||||
@@ -32,7 +32,7 @@ const sizeClasses = {
|
||||
:disabled="loading"
|
||||
:class="
|
||||
twMerge(
|
||||
'bg-button-secondary-background border border-button-secondary-border hover:bg-button-secondary-background-hover shadow-sm transition text-text-primary rounded-lg font-semibold inline-flex items-center space-x-1.5 focus-visible:outline-none focus-visible:border-transparent focus-visible:ring-2 focus-visible:ring-ring focus:border-transparent disabled:opacity-25 ease-in-out',
|
||||
'bg-button-secondary-background border border-button-secondary-border hover:bg-button-secondary-background-hover shadow-sm transition text-text-primary rounded-lg font-medium inline-flex items-center space-x-1.5 focus-visible:outline-none focus-visible:border-transparent focus-visible:ring-2 focus-visible:ring-ring focus:border-transparent disabled:opacity-25 ease-in-out',
|
||||
sizeClasses[props.size],
|
||||
props.class
|
||||
)
|
||||
|
||||
@@ -22,7 +22,7 @@ const emit = defineEmits<{
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="flex items-center justify-between bg-background px-2 py-1.5">
|
||||
<div class="flex items-center justify-between bg-default-background px-2 py-1.5">
|
||||
<!-- Left: Navigation -->
|
||||
<div class="flex items-center gap-1">
|
||||
<Button
|
||||
|
||||
@@ -494,7 +494,7 @@ function getEventDurationSeconds(dayEvent: DayEvent, dayStr: string): number {
|
||||
<div
|
||||
class="fc-header-scroll flex border-b border-border shrink-0 sticky top-0 z-10 bg-default-background">
|
||||
<div
|
||||
class="shrink-0 bg-background border-r border-border"
|
||||
class="shrink-0 bg-default-background border-r border-border"
|
||||
:style="{
|
||||
width: TIME_AXIS_WIDTH + 'px',
|
||||
minWidth: TIME_AXIS_WIDTH + 'px',
|
||||
@@ -526,7 +526,7 @@ function getEventDurationSeconds(dayEvent: DayEvent, dayStr: string): number {
|
||||
<div ref="scrollerRef" class="fc-scroller">
|
||||
<div class="flex min-w-0">
|
||||
<div
|
||||
class="shrink-0 bg-background border-r border-border"
|
||||
class="shrink-0 bg-default-background border-r border-border"
|
||||
:style="{
|
||||
width: TIME_AXIS_WIDTH + 'px',
|
||||
minWidth: TIME_AXIS_WIDTH + 'px',
|
||||
@@ -553,7 +553,7 @@ function getEventDurationSeconds(dayEvent: DayEvent, dayStr: string): number {
|
||||
class="flex-1 min-w-0 relative"
|
||||
@pointerdown="guardedSlotPointerDown($event)">
|
||||
<div
|
||||
class="bg-background relative"
|
||||
class="bg-default-background relative"
|
||||
:style="{ height: totalGridHeight + 'px' }">
|
||||
<div
|
||||
class="absolute inset-0 grid"
|
||||
|
||||
@@ -6,10 +6,15 @@ const props = withDefaults(
|
||||
defineProps<{
|
||||
expanded?: boolean;
|
||||
size?: string;
|
||||
/**
|
||||
* Test ID used for Playwright/E2E tests.
|
||||
*/
|
||||
testId?: string;
|
||||
}>(),
|
||||
{
|
||||
expanded: false,
|
||||
size: 'w-7 h-7',
|
||||
testId: 'grouped_items_count_button',
|
||||
}
|
||||
);
|
||||
|
||||
@@ -23,6 +28,7 @@ const expandedStatusClasses = computed(() => {
|
||||
|
||||
<template>
|
||||
<button
|
||||
:data-testid="props.testId"
|
||||
:class="
|
||||
twMerge(
|
||||
'font-medium text-base rounded flex items-center transition justify-center focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:border-transparent',
|
||||
|
||||
@@ -32,10 +32,10 @@ const displaysPlaceholder = computed(() => {
|
||||
|
||||
<template>
|
||||
<div class="relative min-w-0 text-ellipsis whitespace-nowrap overflow-hidden">
|
||||
<div class="relative text-sm font-medium min-w-0">
|
||||
<div class="relative text-sm min-w-0">
|
||||
<div
|
||||
:class="[
|
||||
'opacity-0 h-4 text-sm whitespace-pre font-medium min-w-0 pl-1.5 @lg:pl-3 pr-1',
|
||||
'opacity-0 h-4 text-sm whitespace-pre min-w-0 pl-1.5 @lg:pl-3 pr-1',
|
||||
{ 'min-w-[130px]': displaysPlaceholder },
|
||||
]">
|
||||
{{ liveDataValue }}
|
||||
@@ -44,7 +44,7 @@ const displaysPlaceholder = computed(() => {
|
||||
data-testid="time_entry_description"
|
||||
:value="liveDataValue"
|
||||
placeholder="Add a description"
|
||||
class="absolute px-0 h-full min-w-0 pl-1.5 @lg:pl-3 pr-1 left-0 top-0 w-full text-sm text-text-primary font-medium bg-transparent focus-visible:ring-0 rounded-lg border-0"
|
||||
class="absolute px-0 h-full min-w-0 pl-1.5 @lg:pl-3 pr-1 left-0 top-0 w-full text-sm text-text-primary bg-transparent focus-visible:ring-0 rounded-lg border-0"
|
||||
@blur="onChange"
|
||||
@input="onInput"
|
||||
@keydown.enter="onChange" />
|
||||
|
||||
@@ -37,6 +37,7 @@ const props = defineProps<{
|
||||
organizationBillableRate: number | null;
|
||||
enableEstimatedTime: boolean;
|
||||
canCreateProject: boolean;
|
||||
groupSimilarTimeEntries: boolean;
|
||||
}>();
|
||||
|
||||
const groupedTimeEntries = computed(() => {
|
||||
@@ -58,6 +59,11 @@ const groupedTimeEntries = computed(() => {
|
||||
const newDailyEntries: TimeEntriesGroupedByType[] = [];
|
||||
|
||||
for (const entry of dailyEntries) {
|
||||
if (!props.groupSimilarTimeEntries) {
|
||||
newDailyEntries.push({ ...entry, timeEntries: [entry] });
|
||||
continue;
|
||||
}
|
||||
|
||||
// check if same entry already exists
|
||||
const oldEntriesIndex = newDailyEntries.findIndex(
|
||||
(e) =>
|
||||
|
||||
@@ -36,15 +36,13 @@ const organization = inject<ComputedRef<Organization>>('organization');
|
||||
:class="
|
||||
twMerge(
|
||||
'text-text-secondary px-1 bg-transparent text-center hover:bg-card-background rounded-lg border border-transparent hover:border-card-border focus-visible:outline-none focus:outline-none focus-visible:ring-2 focus-visible:text-text-primary focus-visible:ring-ring focus-visible:bg-tertiary',
|
||||
showDate
|
||||
? 'text-xs py-1.5 font-semibold'
|
||||
: 'text-sm py-1.5 font-medium',
|
||||
showDate ? 'text-xs py-1.5 font-medium' : 'text-sm py-1.5 font-normal',
|
||||
organization?.time_format === '12-hours' ? 'w-[160px]' : 'w-[100px]',
|
||||
open && 'border-card-border bg-card-background'
|
||||
)
|
||||
">
|
||||
{{ formatStartEnd(start, end, organization?.time_format) }}
|
||||
<span v-if="showDate" class="text-text-tertiary font-medium"
|
||||
<span v-if="showDate" class="text-text-tertiary font-normal"
|
||||
>{{ formatDateLocalized(start, organization?.date_format) }}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
@@ -52,6 +52,7 @@ const props = defineProps<{
|
||||
selected?: boolean;
|
||||
canCreateProject: boolean;
|
||||
enableEstimatedTime: boolean;
|
||||
isReport?: boolean;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{ selected: []; unselected: [] }>();
|
||||
@@ -148,8 +149,7 @@ async function handleDeleteTimeEntry() {
|
||||
:task="timeEntry.task_id"
|
||||
@changed="updateProjectAndTask"></TimeTrackerProjectTaskDropdown>
|
||||
</div>
|
||||
<div
|
||||
class="hidden @lg:flex items-center font-medium space-x-1 @lg:space-x-2 shrink-0">
|
||||
<div class="hidden @lg:flex items-center space-x-1 @lg:space-x-2 shrink-0">
|
||||
<div v-if="showMember && members" class="text-sm px-2">
|
||||
{{ memberName }}
|
||||
</div>
|
||||
@@ -173,6 +173,7 @@ async function handleDeleteTimeEntry() {
|
||||
<TimeEntryRowDurationInput
|
||||
:start="timeEntry.start"
|
||||
:end="timeEntry.end"
|
||||
:is-report="props.isReport"
|
||||
@changed="updateStartEndTime"></TimeEntryRowDurationInput>
|
||||
<TimeTrackerStartStop
|
||||
:active="!!(timeEntry.start && !timeEntry.end)"
|
||||
@@ -197,6 +198,7 @@ async function handleDeleteTimeEntry() {
|
||||
<TimeEntryRowDurationInput
|
||||
:start="timeEntry.start"
|
||||
:end="timeEntry.end"
|
||||
:is-report="props.isReport"
|
||||
@changed="updateStartEndTime"></TimeEntryRowDurationInput>
|
||||
</div>
|
||||
<!-- Second row: project/task - tags - billable - start - more -->
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import {
|
||||
calculateDifference,
|
||||
formatHumanReadableDuration,
|
||||
formatReportingDuration,
|
||||
parseTimeInput,
|
||||
} from '@/packages/ui/src/utils/time';
|
||||
import { computed, ref, inject, type ComputedRef } from 'vue';
|
||||
@@ -18,6 +19,7 @@ const organizationSettings = computed(() => ({
|
||||
const props = defineProps<{
|
||||
start: string;
|
||||
end: string | null;
|
||||
isReport?: boolean;
|
||||
}>();
|
||||
const emit = defineEmits<{
|
||||
changed: [start: string, end: string | null];
|
||||
@@ -51,7 +53,8 @@ const currentTime = computed({
|
||||
if (temporaryCustomTimerEntry.value !== '') {
|
||||
return temporaryCustomTimerEntry.value;
|
||||
}
|
||||
return formatHumanReadableDuration(
|
||||
const formatter = props.isReport ? formatReportingDuration : formatHumanReadableDuration;
|
||||
return formatter(
|
||||
calculateDifference(props.start, props.end),
|
||||
organizationSettings.value.intervalFormat,
|
||||
organizationSettings.value.numberFormat
|
||||
|
||||
@@ -47,14 +47,14 @@ function selectUnselectAll(value: boolean) {
|
||||
class="group-hover:block hidden"
|
||||
@update:checked="selectUnselectAll"></Checkbox>
|
||||
</div>
|
||||
<span class="font-medium text-text-secondary">
|
||||
<span class="text-text-primary">
|
||||
{{ formatWeekday(date) }}
|
||||
</span>
|
||||
<span class="text-text-tertiary ml-2">
|
||||
<span class="text-text-secondary ml-2">
|
||||
{{ formatDate(date, organization?.date_format) }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="text-text-secondary pr-2 @lg:pr-[92px]">
|
||||
<div class="text-text-primary pr-2 @lg:pr-[92px]">
|
||||
<span class="font-medium">
|
||||
{{
|
||||
formatHumanReadableDuration(
|
||||
|
||||
@@ -215,7 +215,7 @@ useSelectEvents(
|
||||
v-model="tempDescription"
|
||||
placeholder="What are you working on?"
|
||||
data-testid="time_entry_description"
|
||||
class="w-full rounded-l-lg py-4 sm:py-2.5 px-3.5 border-b border-b-card-background-separator @2xl:px-4 text-base text-text-primary bg-transparent border-none placeholder-text-secondary font-medium focus:ring-0 transition"
|
||||
class="w-full rounded-l-lg py-4 sm:py-2.5 px-3.5 border-b border-b-card-background-separator @2xl:px-4 text-base text-text-primary bg-transparent border-none placeholder-text-secondary focus:ring-0 transition"
|
||||
type="text"
|
||||
@keydown.enter="startTimerIfNotActive"
|
||||
@keydown.esc="showDropdown = false"
|
||||
|
||||
@@ -118,6 +118,26 @@ export function formatHumanReadableDuration(
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a duration for reporting views where cost and duration must reconcile.
|
||||
*
|
||||
* When the org's `hours-minutes` format is selected, seconds are normally dropped for
|
||||
* readability (e.g. "14h 45min"). In reports this can make the total duration appear
|
||||
* inconsistent with the billable cost (which is computed to the second). To keep the
|
||||
* two columns reconcilable without inflating column widths with "14h 45min 06s",
|
||||
* promote to the compact `HH:MM:SS` format in reporting contexts.
|
||||
*/
|
||||
export function formatReportingDuration(
|
||||
duration: number,
|
||||
intervalFormat?: string,
|
||||
numberFormat?: string
|
||||
): string {
|
||||
const promoted =
|
||||
intervalFormat === 'hours-minutes' || intervalFormat === 'hours-minutes-colon-separated';
|
||||
const effectiveFormat = promoted ? 'hours-minutes-seconds-colon-separated' : intervalFormat;
|
||||
return formatHumanReadableDuration(duration, effectiveFormat, numberFormat);
|
||||
}
|
||||
|
||||
export function formatDuration(duration: number): string {
|
||||
const dayJsDuration = dayjs.duration(duration, 's');
|
||||
const hours = Math.floor(dayJsDuration.asHours());
|
||||
|
||||
@@ -14,28 +14,30 @@
|
||||
@tailwind utilities;
|
||||
|
||||
:root.dark {
|
||||
--color-bg-primary: oklch(0.14 0.0041 285.97);
|
||||
--color-bg-secondary: oklch(0.18 0.005 285.97);
|
||||
--color-bg-tertiary: oklch(0.22 0.0112 285.97);
|
||||
--color-bg-quaternary: oklch(0.26 0.015 285.97);
|
||||
--color-bg-background: oklch(0.1 0 0);
|
||||
--color-text-primary: #ffffff;
|
||||
--color-text-secondary: #e3e4e6;
|
||||
--color-text-tertiary: #969799;
|
||||
--color-text-quaternary: #595a5c;
|
||||
/* Linear/Raycast: cool blue-tinted neutrals, content surface at Material floor */
|
||||
--color-bg-primary: oklch(0.17 0 0); /* content surface */
|
||||
--color-bg-secondary: oklch(0.20 0 0); /* cards, input fills */
|
||||
--color-bg-tertiary: oklch(0.25 0 0); /* hover / active row */
|
||||
--color-bg-quaternary: oklch(0.29 0 0); /* pressed / selected */
|
||||
--color-bg-elevated: oklch(0.22 0 0); /* popovers, modals, dropdowns */
|
||||
--color-bg-background: oklch(0.14 0 0); /* sidebar / chrome — recessed */
|
||||
--color-text-primary: oklch(0.97 0 0);
|
||||
--color-text-secondary: oklch(0.85 0 0);
|
||||
--color-text-tertiary: oklch(0.70 0 0);
|
||||
--color-text-quaternary: oklch(0.55 0 0);
|
||||
|
||||
--color-border-primary: #191b1f;
|
||||
--color-border-secondary: oklch(0.25 0.0098 268.31);
|
||||
--color-border-tertiary: #2c2e33;
|
||||
--color-border-quaternary: #393b42;
|
||||
--color-input-border-active: rgba(255, 255, 255, 0.15);
|
||||
--color-border-primary: oklch(0.24 0 0); /* separators — above elevated */
|
||||
--color-border-secondary: oklch(0.28 0 0); /* card borders */
|
||||
--color-border-tertiary: oklch(0.32 0 0); /* input borders */
|
||||
--color-border-quaternary: oklch(0.36 0 0); /* emphasized borders */
|
||||
--color-input-border-active: rgba(255, 255, 255, 0.18);
|
||||
|
||||
--theme-color-chart: var(--color-accent-200);
|
||||
|
||||
--theme-color-menu-active: var(--color-bg-secondary);
|
||||
--theme-color-card-background: var(--color-bg-secondary);
|
||||
--theme-shadow-card: 0 4px 7px 0px rgb(0 0 0 / 15%);
|
||||
--theme-shadow-dropdown: 0 4px 7px 0px rgb(0 0 0 / 40%);
|
||||
--theme-shadow-dropdown: 0 8px 24px -4px rgb(0 0 0 / 55%), 0 2px 6px 0 rgb(0 0 0 / 35%);
|
||||
|
||||
--theme-color-card-background-active: var(--color-bg-tertiary);
|
||||
|
||||
@@ -187,7 +189,7 @@ body {
|
||||
--foreground: var(--color-text-primary);
|
||||
--card: var(--theme-color-card-background);
|
||||
--card-foreground: var(--color-text-primary);
|
||||
--popover: var(--color-bg-secondary);
|
||||
--popover: var(--color-bg-elevated, var(--color-bg-secondary));
|
||||
--popover-foreground: var(--color-text-primary);
|
||||
--primary: var(--color-bg-primary);
|
||||
--primary-foreground: var(--color-text-primary);
|
||||
|
||||
6
resources/js/utils/timeEntryGrouping.ts
Normal file
6
resources/js/utils/timeEntryGrouping.ts
Normal file
@@ -0,0 +1,6 @@
|
||||
import { useStorage } from '@vueuse/core';
|
||||
|
||||
export const groupSimilarTimeEntriesSetting = useStorage<boolean>(
|
||||
'group-similar-time-entries',
|
||||
true
|
||||
);
|
||||
@@ -150,7 +150,7 @@
|
||||
<div style="padding: 8px 12px; border-radius: 8px;">
|
||||
<div style="color: #71717a; font-weight: 600;">Duration</div>
|
||||
<div
|
||||
style="font-size: 24px; font-weight: 500; margin-top: 2px;">{{ $localization->formatInterval(CarbonInterval::seconds($aggregatedData['seconds'])) }} </div>
|
||||
style="font-size: 24px; font-weight: 500; margin-top: 2px;">{{ $localization->formatIntervalForReporting(CarbonInterval::seconds($aggregatedData['seconds'])) }} </div>
|
||||
</div>
|
||||
@if($showBillableRate)
|
||||
<div style="padding: 8px 12px; border-radius: 8px;">
|
||||
@@ -199,7 +199,7 @@
|
||||
</span>
|
||||
</td>
|
||||
<td style="text-align: left;">
|
||||
{{ $localization->formatInterval(CarbonInterval::seconds($group1Entry['seconds'])) }}
|
||||
{{ $localization->formatIntervalForReporting(CarbonInterval::seconds($group1Entry['seconds'])) }}
|
||||
</td>
|
||||
@if($showBillableRate)
|
||||
<td style="text-align: right;">
|
||||
@@ -214,7 +214,7 @@
|
||||
Total
|
||||
</td>
|
||||
<td style="font-weight: 500;color: #18181b;">
|
||||
{{ $localization->formatInterval(CarbonInterval::seconds($aggregatedData['seconds'])) }}
|
||||
{{ $localization->formatIntervalForReporting(CarbonInterval::seconds($aggregatedData['seconds'])) }}
|
||||
</td>
|
||||
@if($showBillableRate)
|
||||
<td style="text-align: right; font-weight: 500;color: #18181b;">
|
||||
@@ -282,7 +282,7 @@
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
{{ $localization->formatInterval($duration) }}
|
||||
{{ $localization->formatIntervalForReporting($duration) }}
|
||||
</td>
|
||||
<td>
|
||||
{{ $localization->formatNumber($duration->totalHours) }}
|
||||
@@ -403,7 +403,7 @@
|
||||
type: "bar",
|
||||
data: {!! json_encode(collect($dataHistoryChart['grouped_data'])->map(fn($value) => (object) [
|
||||
'value' => $value['seconds'],
|
||||
'name' => ((int) $value['seconds']) === 0 ? '' : $localization->formatInterval(CarbonInterval::seconds((int) $value['seconds']))
|
||||
'name' => ((int) $value['seconds']) === 0 ? '' : $localization->formatIntervalForReporting(CarbonInterval::seconds((int) $value['seconds']))
|
||||
])->toArray()) !!},
|
||||
itemStyle: {
|
||||
borderColor: "#7dd3fc",
|
||||
|
||||
@@ -138,7 +138,7 @@
|
||||
<div style="padding: 8px 12px; border-radius: 8px;">
|
||||
<div style="color: #71717a; font-weight: 600;">Duration</div>
|
||||
<div
|
||||
style="font-size: 24px; font-weight: 500; margin-top: 2px;">{{ $localization->formatInterval(CarbonInterval::seconds($aggregatedData['seconds'])) }} </div>
|
||||
style="font-size: 24px; font-weight: 500; margin-top: 2px;">{{ $localization->formatIntervalForReporting(CarbonInterval::seconds($aggregatedData['seconds'])) }} </div>
|
||||
</div>
|
||||
@if($showBillableRate)
|
||||
<div style="padding: 8px 12px; border-radius: 8px;">
|
||||
@@ -189,7 +189,7 @@
|
||||
{{ $localization->formatTime($timeEntry->start->timezone($timezone)) }} - {{ $localization->formatTime($timeEntry->end->timezone($timezone)) }}
|
||||
</td>
|
||||
<td style="overflow-wrap: break-word; min-width: 75px;">
|
||||
{{ $localization->formatInterval($timeEntry->getDuration()) }}
|
||||
{{ $localization->formatIntervalForReporting($timeEntry->getDuration()) }}
|
||||
</td>
|
||||
<td style="overflow-wrap: break-word;">{{ $timeEntry->billable ? 'Yes' : 'No' }}</td>
|
||||
<td style="overflow-wrap: break-word; min-width: 75px;">{{ count($timeEntry->tagsRelation) === 0 ? '-' : $timeEntry->tagsRelation->implode('name', ', ') }}</td>
|
||||
|
||||
@@ -129,6 +129,58 @@ class LocalizationServiceTest extends TestCaseWithDatabase
|
||||
$this->assertSame('30001:03:04', $formatted);
|
||||
}
|
||||
|
||||
public function test_format_interval_for_reporting_with_type_decimal(): void
|
||||
{
|
||||
// Arrange
|
||||
$interval = CarbonInterval::seconds(4 + (60 * 3) + (60 * 60 * 30001));
|
||||
$this->localizationService->setIntervalFormat(IntervalFormat::Decimal);
|
||||
|
||||
// Act
|
||||
$formatted = $this->localizationService->formatIntervalForReporting($interval);
|
||||
|
||||
// Assert
|
||||
$this->assertSame('30.001,05 h', $formatted);
|
||||
}
|
||||
|
||||
public function test_format_interval_for_reporting_with_type_hours_minutes(): void
|
||||
{
|
||||
// Arrange
|
||||
$interval = CarbonInterval::seconds(4 + (60 * 3) + (60 * 60 * 30001));
|
||||
$this->localizationService->setIntervalFormat(IntervalFormat::HoursMinutes);
|
||||
|
||||
// Act
|
||||
$formatted = $this->localizationService->formatIntervalForReporting($interval);
|
||||
|
||||
// Assert
|
||||
$this->assertSame('30001:03:04', $formatted);
|
||||
}
|
||||
|
||||
public function test_format_interval_for_reporting_with_type_hours_minutes_colon_separated(): void
|
||||
{
|
||||
// Arrange
|
||||
$interval = CarbonInterval::seconds(4 + (60 * 3) + (60 * 60 * 30001));
|
||||
$this->localizationService->setIntervalFormat(IntervalFormat::HoursMinutesColonSeparated);
|
||||
|
||||
// Act
|
||||
$formatted = $this->localizationService->formatIntervalForReporting($interval);
|
||||
|
||||
// Assert
|
||||
$this->assertSame('30001:03:04', $formatted);
|
||||
}
|
||||
|
||||
public function test_format_interval_for_reporting_with_type_hours_minutes_seconds_colon_separated(): void
|
||||
{
|
||||
// Arrange
|
||||
$interval = CarbonInterval::seconds(4 + (60 * 3) + (60 * 60 * 30001));
|
||||
$this->localizationService->setIntervalFormat(IntervalFormat::HoursMinutesSecondsColonSeparated);
|
||||
|
||||
// Act
|
||||
$formatted = $this->localizationService->formatIntervalForReporting($interval);
|
||||
|
||||
// Assert
|
||||
$this->assertSame('30001:03:04', $formatted);
|
||||
}
|
||||
|
||||
public function test_format_currency_with_type_symbol_after_with_space_and_number_format_thousands_space_decimal_comma(): void
|
||||
{
|
||||
// Arrange
|
||||
|
||||
Reference in New Issue
Block a user