diff --git a/resources/js/Components/Common/Reporting/ReportingOverview.vue b/resources/js/Components/Common/Reporting/ReportingOverview.vue index f002f419..bd6f00c9 100644 --- a/resources/js/Components/Common/Reporting/ReportingOverview.vue +++ b/resources/js/Components/Common/Reporting/ReportingOverview.vue @@ -161,8 +161,19 @@ async function createTag(tag: string) { } const reportProperties = computed(() => { + const { billable, ...rest } = getFilterAttributes(); + + let billableValue: boolean | null = null; + // if billable is null keep it if it is 'true' or 'false' convert it to boolean + if (billable === 'true') { + billableValue = true; + } else if (billable === 'false') { + billableValue = false; + } + return { - ...getFilterAttributes(), + ...rest, + billable: billableValue, group: group.value, sub_group: subGroup.value, history_group: getOptimalGroupingOption(startDate.value, endDate.value), diff --git a/resources/js/packages/ui/src/LoadingSpinner.vue b/resources/js/packages/ui/src/LoadingSpinner.vue index df502d16..0eb62649 100644 --- a/resources/js/packages/ui/src/LoadingSpinner.vue +++ b/resources/js/packages/ui/src/LoadingSpinner.vue @@ -8,7 +8,7 @@ const props = defineProps<{