remove billable_rate_update_time_entries flag and always update all time entries

This commit is contained in:
Gregor Vostrak
2024-07-15 15:53:18 +02:00
committed by Constantin Graf
parent 1dc35f1f55
commit 7aab3d98fc
14 changed files with 34 additions and 241 deletions

View File

@@ -8,7 +8,7 @@ const show = defineModel('show', { default: false });
const saving = defineModel('saving', { default: false });
const emit = defineEmits<{
submit: [billable_rate_update_time_entries: boolean];
submit: [];
}>();
defineProps<{
@@ -31,15 +31,9 @@ defineProps<{
<PrimaryButton
:class="{ 'opacity-25': saving }"
:disabled="saving"
@click="emit('submit', true)">
@click="emit('submit')">
Yes, update existing time entries
</PrimaryButton>
<PrimaryButton
:class="{ 'opacity-25': saving }"
:disabled="saving"
@click="emit('submit', false)">
No, only for new time entries
</PrimaryButton>
</div>
<p class="text-center pt-3 pb-1">
Learn more about the

View File

@@ -11,13 +11,13 @@ defineProps<{
}>();
defineEmits<{
submit: [billable_rate_update_time_entries: boolean];
submit: [];
}>();
</script>
<template>
<BillableRateModal
@submit="(...args) => $emit('submit', ...args)"
@submit="$emit('submit')"
v-model:show="show"
v-model:saving="saving"
title="Update Member Billable Rate">

View File

@@ -27,9 +27,7 @@ const memberBody = ref<UpdateMemberBody>({
billable_rate: props.member.billable_rate,
});
async function submitBillableRate(billableRateUpdateTimeEntries: boolean) {
memberBody.value.billable_rate_update_time_entries =
billableRateUpdateTimeEntries;
async function submitBillableRate() {
if (memberBody.value.role === 'owner' && props.member.role !== 'owner') {
show.value = false;
showOwnershipTransferConfirmModal.value = true;
@@ -59,7 +57,7 @@ function saveWithChecks() {
show.value = false;
showOwnershipTransferConfirmModal.value = true;
} else {
submitBillableRate(false);
submitBillableRate();
}
}

View File

@@ -10,13 +10,13 @@ defineProps<{
}>();
defineEmits<{
submit: [billable_rate_update_time_entries: boolean];
submit: [];
}>();
</script>
<template>
<BillableRateModal
@submit="(...args) => $emit('submit', ...args)"
@submit="$emit('submit')"
v-model:show="show"
v-model:saving="saving"
title="Update Organization Billable Rate">

View File

@@ -11,13 +11,13 @@ defineProps<{
}>();
defineEmits<{
submit: [billable_rate_update_time_entries: boolean];
submit: [];
}>();
</script>
<template>
<BillableRateModal
@submit="(...args) => $emit('submit', ...args)"
@submit="$emit('submit')"
v-model:show="show"
v-model:saving="saving"
title="Update Project Billable Rate">

View File

@@ -56,9 +56,7 @@ const currentClientName = computed(() => {
return 'No Client';
});
async function submitBillableRate(billableRateUpdateTimeEntries: boolean) {
project.value.billable_rate_update_time_entries =
billableRateUpdateTimeEntries;
async function submitBillableRate() {
await updateProject(props.originalProject.id, project.value);
show.value = false;
showBillableRateModal.value = false;

View File

@@ -7,17 +7,17 @@ const saving = defineModel('saving', { default: false });
defineProps<{
newBillableRate?: number | null;
memberName: string;
memberName?: string;
}>();
defineEmits<{
submit: [billable_rate_update_time_entries: boolean];
submit: [];
}>();
</script>
<template>
<BillableRateModal
@submit="(...args) => $emit('submit', ...args)"
@submit="$emit('submit')"
v-model:show="show"
v-model:saving="saving"
title="Update Project Member Billable Rate">

View File

@@ -39,9 +39,7 @@ async function submit() {
};
}
async function submitBillableRate(billableRateUpdateTimeEntries: boolean) {
projectMemberBody.value.billable_rate_update_time_entries =
billableRateUpdateTimeEntries;
async function submitBillableRate() {
await updateProjectMember(props.projectMember.id, projectMemberBody.value);
show.value = false;
showBillableRateModal.value = false;
@@ -73,7 +71,7 @@ useFocus(projectNameInput, { initialValue: true });
<template #content>
<ProjectMemberBillableRateModal
member-name="props.name"
:member-name="props.name"
v-model:show="showBillableRateModal"
@close="showBillableRateModal = false"
@submit="submitBillableRate"></ProjectMemberBillableRateModal>

View File

@@ -27,10 +27,8 @@ onMounted(async () => {
});
const showConfirmationModal = ref(false);
async function submit(billableRateUpdateTimeEntries: boolean) {
async function submit() {
saving.value = true;
organizationBody.value.billable_rate_update_time_entries =
billableRateUpdateTimeEntries;
await updateOrganization(organizationBody.value);
saving.value = false;
showConfirmationModal.value = false;