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

Make sure that time entry billable status updates when project changes,

Browse Source 
fixes #981
This commit is contained in:
Gregor Vostrak
2026-02-04 17:07:46 +01:00
parent 531443f0df
commit 6804eb098d
5 changed files with 473 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
View File

@@ -74,6 +74,18 @@ watch(
{ immediate: true }
);
watch(
() => editableTimeEntry.value?.project_id,
(value, oldValue) => {
if (oldValue !== undefined && value !== oldValue && editableTimeEntry.value) {
const project = props.projects.find((p) => p.id === value);
if (project) {
editableTimeEntry.value.billable = project.is_billable;
}
}
}
);
const localStart = computed({
get: () =>
editableTimeEntry.value ? getLocalizedDayJs(editableTimeEntry.value.start).format() : '',

2
resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue
View File

@@ -67,10 +67,12 @@ function updateStartEndTime(start: string, end: string | null) {
}
function updateProjectAndTask(projectId: string, taskId: string) {
const project = props.projects.find((p) => p.id === projectId);
props.updateTimeEntry({
...props.timeEntry,
project_id: projectId,
task_id: taskId,
billable: project ? project.is_billable : props.timeEntry.billable,
});
}