Skip to content

Commit

Permalink
Merge pull request #162 from WhyAsh5114/incorrect-chart
Browse files Browse the repository at this point in the history
fix: correct ordering to dashboard chart
  • Loading branch information
WhyAsh5114 authored Dec 28, 2024
2 parents 62383b3 + f88ca9d commit 56ad77b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/lib/trpc/routes/mesocycles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ export const mesocycles = t.router({

return await prisma.workout.findMany({
where: { workoutOfMesocycle: { mesocycleId: activeMesocycle.id, splitDayIndex }, userId: ctx.userId },
include: includeClause
include: includeClause,
orderBy: { startedAt: 'asc' }
});
})
});
2 changes: 1 addition & 1 deletion src/routes/(components)/layout/ChangelogDialog.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
changelogShownOf.localeCompare(latestRelease!.tag_name, undefined, { numeric: true }) === -1
) {
open = true;
loadChangelog(changelogShownOf);
while (checkForUpdates === null) {
await new Promise((resolve) => setTimeout(resolve, 500));
}
await checkForUpdates();
loadChangelog(changelogShownOf);
}
ls.setItem('changelogShownOf', latestRelease!.tag_name);
checkingForUpdate = false;
Expand Down

0 comments on commit 56ad77b

Please sign in to comment.