Skip to content
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

Jump to bottom

Show total TrackedTime on issue/pull/milestone lists #26672

Merged
merged 44 commits into from
Oct 19, 2023
Merged

Show total TrackedTime on issue/pull/milestone lists #26672

merged 44 commits into from
Oct 19, 2023

Conversation

6543
Copy link
Member

@6543 6543 commented Aug 22, 2023 •
edited
Loading

TODOs:

  • write test for GetIssueTotalTrackedTime
  • frontport kitharas template changes and make them mobile-friendly

image
image

Sponsored by Kithara Software GmbH

@6543 6543 added type/enhancement An improvement of existing functionality topic/ui Change the appearance of the Gitea UI pr/wip This PR is not ready for review labels Aug 22, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 22, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 22, 2023
6543
6543 commented Aug 23, 2023
View reviewed changes
routers/web/repo/issue.go Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the topic/ui Change the appearance of the Gitea UI label Sep 25, 2023
@6543 6543 mentioned this pull request Sep 25, 2023
Merged
lunny pushed a commit that referenced this pull request Sep 29, 2023
@6543
rename TotalTimes() to TotalTimesForEachUser() (#27261)
2a2b0cb 
make function name more descriptive as it would otherwise imply it could
be used for e.g. #26672 too ...

---
*Sponsored by Kithara Software GmbH*
techknowlogick
techknowlogick reviewed Oct 13, 2023
View reviewed changes
Copy link
Member

@techknowlogick techknowlogick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My apologies if I've missed it, but could you add a conditional that if time tracking is disabled, then the query isn't run?

@6543
Copy link
Member Author

6543 commented Oct 13, 2023

uh sure!

@6543
Copy link
Member Author

6543 commented Oct 13, 2023

@techknowlogick done

@6543 6543 requested a review from techknowlogick October 15, 2023 12:43
@techknowlogick
Copy link
Member

This PR looks good, but I don't use time tracking so probably best if someone else more familiar with the usage of time tracking should review.

silverwind
silverwind approved these changes Oct 17, 2023
View reviewed changes
Copy link
Member

@silverwind silverwind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My only concern is the place of this in the issue list because the header is already pretty cramped. I guess I can accept this for now, but I think it might be later better moved below the list, bottom-right, if we have more such "summary" style stuff.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 17, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 19, 2023
@6543 6543 enabled auto-merge (squash) October 19, 2023 13:54
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 19, 2023
@6543 6543 merged commit adbc995 into go-gitea:main Oct 19, 2023
24 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 19, 2023
@6543 6543 deleted the upstream_trackedTimeSummaryOnIssueList branch October 19, 2023 14:09
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 20, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
8879756 
* upstream/main:
  Adapt `.changelog.yml` to new labeling system (go-gitea#27701)
  Update and add new eslint plugins (go-gitea#27698)
  Show total TrackedTime on issue/pull/milestone lists (go-gitea#26672)
  Add doctor dbconsistency fix to delete repos with no owner (go-gitea#27290)
  Delete repos of org when purge delete user (go-gitea#27273)
  Fix required checkboxes in issue forms (go-gitea#27592)
  Upgrade xorm (go-gitea#27673)
  [docs] Add note that PROTOCOL config is case-sensitive (go-gitea#25685)
  Remove network call on `make clean` (go-gitea#27689)
  Add unit tests for action runner token (go-gitea#27670)
  Typos fixed in documentation files (go-gitea#27687)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@puni9869 puni9869 puni9869 approved these changes

@silverwind silverwind silverwind approved these changes

@techknowlogick techknowlogick Awaiting requested review from techknowlogick

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/translation outdated/theme/timetracker size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
5 participants
@6543 @silverwind @techknowlogick @puni9869 @GiteaBot