Improve time tracking overview #7733
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
…ation link in list
dieknolle3333
commented
Apr 3, 2024
frontend/javascripts/admin/statistic/time_tracking_detail_view.tsx
Outdated
Show resolved
Hide resolved
philippotto
reviewed
Apr 19, 2024
There was a problem hiding this comment.
nice stuff 👍
during testing I noticed that the user-specific CSV contains timestamps, such as "Fri, 19 Apr 2024 15:42:55 GMT". wouldn't unix timestamps make more sense as they are easier to parse? not sure whether they are coming from back-end or front-end...
frontend/javascripts/oxalis/model/accessors/annotation_accessor.ts
Outdated
Show resolved
Hide resolved
frontend/javascripts/admin/statistic/time_tracking_detail_view.tsx
Outdated
Show resolved
Hide resolved
I had added them in the frontend in the first place, but changed them to unix timestamp now :) |
dieknolle3333
commented
Apr 25, 2024
| @@ -193,7 +193,6 @@ | |||
| "react-dom": "^16.9.0", | |||
| "react-dropzone": "^11.3.1", | |||
| "react-flow-renderer": "^10.3.16", | |||
| "react-google-charts": "^2.0.0", | |||
There was a problem hiding this comment.
i simply ran yarn remove react-google-charts, I hope its good the way it is now :)
philippotto
approved these changes
Apr 25, 2024
|
no worries, thanks for looking into it! I will merge it on monday then :) |
This was referenced May 6, 2024
dieknolle3333
added a commit
that referenced
this pull request
May 8, 2024
* [WIP] [ci skip] add expandable rows to see time tracking details * prepare api for expanded table * unwrap list of annotations with times * add annotationCount to time tracking overview * add projectName to summedByAnnotation response * WIP [ci skip] render expandable table with tasks and annotations * style expandable table * add no. tasks and more stats to overview * WIP [ci skip] add annotation stats * style table * add button to download timespans * adjust api types to new responses, omit detail view and include annotation link in list * remove code duplication * fix sorting in table * add additional fields to timespans * adapt frontend api client to new timespans route * snapshots * add download for user time spans * extract csv helper and put task fields into timetracking csv export * try to fix type in test * enable overview for non-privileged users * fix-frontend * adjust router.tsx to new view, fix fixedExpandableTable and disable teams field for non-admins * lint * improve condition and add changelog * address review * WIP: improve styling of table including annotation stats * remove react-google-charts dependency * change name of navbar menu entry * remove unnecessary casts * avoid margin bottom in annotation table --------- Co-authored-by: Florian M <florian@scm.io> Co-authored-by: Philipp Otto <philipp.4096@gmail.com> Co-authored-by: Florian M <fm3@users.noreply.github.com>
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.
URL of deployed dev instance (used for testing):
Steps to test:
TODOs:
Issues:
(Please delete unneeded items, merge only when none are left open)