nzambello/work-timer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: update duration on save time entry

Browse source
This commit is contained in:
Nicola Zambello 2023-03-01 01:32:05 +01:00
parent 3abe667e65
commit 985e205232
Signed by: nzambello
GPG key ID: 56E4A92C2C1E50BA
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/timeEntry.server.ts
View file

@ -154,7 +154,7 @@ export async function updateDuration(userId: User['id']) {
} }
}); });
Promise.all( return Promise.all(
timeEntriesWithoutDuration.map( timeEntriesWithoutDuration.map(
async (entry) => async (entry) =>
await prisma.timeEntry.update({ await prisma.timeEntry.update({

12
app/routes/reports.tsx
View file

@ -40,11 +40,11 @@ export async function loader({ request }: LoaderArgs) {
const url = new URL(request.url); const url = new URL(request.url);
const dateFrom = url.searchParams.get('dateFrom') const dateFrom = url.searchParams.get('dateFrom')
? dayjs(url.searchParams.get('dateFrom')).toDate() ? dayjs(url.searchParams.get('dateFrom')).startOf('day').toDate()
: dayjs().startOf('month').toDate(); : dayjs().startOf('month').startOf('day').toDate();
const dateTo = url.searchParams.get('dateTo') const dateTo = url.searchParams.get('dateTo')
? dayjs(url.searchParams.get('dateTo')).toDate() ? dayjs(url.searchParams.get('dateTo')).endOf('day').toDate()
: dayjs().endOf('month').toDate(); : dayjs().endOf('month').endOf('day').toDate();
await updateDuration(userId); await updateDuration(userId);
@ -62,8 +62,8 @@ export default function ReportPage() {
const reports = useFetcher<typeof loader>(); const reports = useFetcher<typeof loader>();
const [dateRange, setDateRange] = useState<DateRangePickerValue>([ const [dateRange, setDateRange] = useState<DateRangePickerValue>([
dayjs().startOf('month').toDate(), dayjs().startOf('month').startOf('day').toDate(),
dayjs().endOf('month').toDate() dayjs().endOf('month').endOf('day').toDate()
]); ]);
useEffect(() => { useEffect(() => {

3
app/routes/time-entries/$timeEntryId.tsx
View file

@ -35,6 +35,7 @@ import invariant from 'tiny-invariant';
import { import {
deleteTimeEntry, deleteTimeEntry,
getTimeEntry, getTimeEntry,
updateDuration,
updateTimeEntry updateTimeEntry
} from '~/models/timeEntry.server'; } from '~/models/timeEntry.server';
import { requireUserId } from '~/session.server'; import { requireUserId } from '~/session.server';
@ -160,6 +161,8 @@ export async function action({ request, params }: ActionArgs) {
}); });
} }
updateDuration(userId);
return redirect('/time-entries'); return redirect('/time-entries');
} }