-
Notifications
You must be signed in to change notification settings - Fork 12
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.
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
Add work summary panel #786
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anarute
reviewed
Jan 29, 2024
dmtrek14
force-pushed
the
summary-panel
branch
4 times, most recently
from
January 29, 2024 20:45
bcec3dc
to
cb3ec07
Compare
const { data } = useQuery({ | ||
queryKey: ['workSummary', userId], | ||
queryFn: () => getWorkSummary(apiClient), | ||
initialData: [] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the initialData could be a {}
empty object, so we won't have to do: summary?.something
on WorkSummaryPanel
dmtrek14
force-pushed
the
summary-panel
branch
from
January 31, 2024 16:10
cb3ec07
to
a37e417
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Besides the content overlap, it lgtm!
dmtrek14
force-pushed
the
summary-panel
branch
2 times, most recently
from
January 31, 2024 16:41
9ef840d
to
205b56d
Compare
- Add time helpers to display summary info in a couple different ways - Add tests for new time helpers and for those that were missing tests
- Add services to fetch task sum and vacations - Add schema for data related to summary
- Add more info to mock data - Add more users in conftest for use in summary tests
- Change color of collapse button on left - Change style of collapse button on right to be within panel - Update dark/light toggle to be smaller overall
- Add necessary types for Work Summary and project summary - Add work summary component for use in right panel - Update task hooks to include invalidation of work summary query when changes made to task - Add infra to fetch summary from api
dmtrek14
force-pushed
the
summary-panel
branch
from
January 31, 2024 19:10
205b56d
to
f03c473
Compare
anarute
approved these changes
Feb 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The work summary panel will be visible only from the tasks area and show the user some basic information about the time they have worked for today and the week, as well as vacation time and extra hours. This information is shown in the current version of the application on the left side of the app. Some small improvements have been made here, such as breaking down the worked hours by project for a user and adding tooltips to explain each vacation category (used, scheduled, pending).
A few small UI changes have been made here, as well. The collapse button for the right panel has been modified to be within the panel instead of a floating button. The dark/light mode toggle has been made smaller on the desktop view (same as it appears on mobile).
This is a first version of the component and it might be nice to display the time per project from the 'Worked Hours' panel as a pie chart instead of (or in addition to?) the table. Another planned feature for the 'Vacation' panel would be to add a calendar that shows upcoming vacation at a glance.
Screencast.from.2024-01-24.10-34-25.webm