Skip to content

convert billable query string to boolean for shared report #876 #881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

convert billable query string to boolean for shared report #876 #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d228f1
convert billable query string to boolean for shared report #876
Onatcer Aug 6, 2025
da34aa3
fix loading spinner layout shifts, add attributes to avoid 1pw autofill
Onatcer Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion resources/js/Components/Common/Reporting/ReportingOverview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion resources/js/packages/ui/src/LoadingSpinner.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const props = defineProps<{

<template>
<svg
:class="twMerge('animate-spin -ml-1 mr-3 h-5 w-5 text-text-primary', props.class)"
:class="twMerge('animate-spin -ml-1 mr-3 h-4 w-4 text-text-primary', props.class)"
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24">
Expand Down
2 changes: 2 additions & 0 deletions resources/js/packages/ui/src/TimeTracker/TimeTrackerRangeSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ function closeAndFocusInput() {
data-testid="time_entry_time"
class="w-[110px] lg:w-[130px] h-full text-text-primary py-2.5 rounded-lg border-border-secondary border text-center px-4 text-base lg:text-lg font-semibold bg-card-background border-none placeholder-muted focus:ring-0 transition"
type="text"
autocomplete="off"
name="time_duration_input"
@focus="pauseLiveTimerUpdate"
@focusin="openModalOnTab"
@keydown.exact.tab="focusNextElement"
Expand Down
Loading