Shows total tracked time in issue and milestone list #3341

jonasfranz · 2018-01-09T22:49:42Z

Fixes #3003 (partially)

Shows total tracked time in issue and milestone list
Shows total tracked time at issue detail page

Milestone List:

Issue List:

Issue Detail Page:

Show total tracked time at issue page Signed-off-by: Jonas Franz <[email protected]>

…timetracking

lafriks · 2018-01-09T23:19:21Z

models/issue.go

@@ -68,6 +68,24 @@ func init() {
 	issueTasksDonePat = regexp.MustCompile(issueTasksDoneRegexpStr)
 }

+func (issue *Issue) totalTimes(e Engine) (string, error) {
+	times, err := GetTrackedTimes(FindTrackedTimesOptions{IssueID: issue.ID})


It would be better to select total time from database already as single value

This would mean a higher maintenance effort, wouldn't it?

Just reuse FindTrackedTimesOptions and use x.Where(options.ToCond()).Sum(&TrackedTime{}, "time")

Signed-off-by: Jonas Franz <[email protected]>

codecov-io · 2018-01-10T00:50:06Z

Codecov Report

Merging #3341 into master will increase coverage by 0.29%.
The diff coverage is 66.94%.

@@            Coverage Diff            @@
##           master   #3341      +/-   ##
=========================================
+ Coverage      23%   23.3%   +0.29%     
=========================================
  Files         126     126              
  Lines       24892   24999     +107     
=========================================
+ Hits         5726    5825      +99     
+ Misses      18289   18286       -3     
- Partials      877     888      +11

Impacted Files	Coverage Δ
routers/repo/issue.go	`0.96% <0%> (-0.01%)`	⬇️
models/issue_stopwatch.go	`75% <100%> (ø)`	⬆️
models/issue.go	`31.48% <41.17%> (+0.16%)`	⬆️
models/issue_list.go	`54.19% <69.23%> (+2.37%)`	⬆️
models/issue_tracked_time.go	`70.42% <72.72%> (-2.72%)`	⬇️
models/issue_milestone.go	`59.56% <79.54%> (+3.39%)`	⬆️
models/login_source.go	`0.84% <0%> (+0.84%)`	⬆️
models/repo_unit.go	`37.93% <0%> (+31.03%)`	⬆️
models/repo_issue.go	`52.63% <0%> (+52.63%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e3028d1...e9562ad. Read the comment docs.

lafriks · 2018-01-13T18:52:52Z

I don't know if this can be done with xorm but for list it would be better to load it with one select (group by and sum). Might be that @lunny can answer that

lunny · 2018-01-14T07:58:55Z

If you want join, just add Join.

e.Join("INNER", "issue", "issue.id = tracked_time.issue_id").Where(opts.ToCond()).SumInt(&TrackedTime{}, "tracked_time.time")

jonasfranz · 2018-01-14T08:14:41Z

@lunny I am using this JOIN already (https://github.com/JonasFranzDEV/gitea/blob/187503832073280c4c994753778e1d69c307a000/models/issue_tracked_time.go#L71). I think that @lafriks meant that it would be better to make a query for everything like listing issues and sum of tracked time.

Adding unit tests for total times Signed-off-by: Jonas Franz <[email protected]>

lafriks · 2018-02-03T14:30:47Z

models/issue.go

+// IsTimetrackerEnabled returns true if the repo enables timetracking
+func (issue *Issue) IsTimetrackerEnabled() bool {
+	if issue.loadRepo(x) != nil {
+		return false


If error is ignored than at least it should be logged

Signed-off-by: Jonas Franz <[email protected]>

…tracking

Signed-off-by: Jonas Franz <[email protected]>

lunny · 2018-02-26T01:29:01Z

LGTM

lafriks · 2018-02-26T10:18:52Z

models/issue.go

+
+// TotalTimes returns the total amount of tracked time for the issue
+func (issue *Issue) TotalTimes() string {
+	times, _ := issue.totalTimes(x)


Error should be at least logged

lafriks · 2018-02-26T10:21:21Z

templates/user/dashboard/issues.tmpl

@@ -80,6 +80,10 @@
 								<span class="comment ui right"><i class="octicon octicon-comment"></i> {{.NumComments}}</span>
 							{{end}}

+							{{if and .IsTimetrackerEnabled .TotalTimes}}


Result of .TotalTimes be assigned probably to some variable otherwise currently if there is value this query will be executed twice

Add variable for totalTimes Signed-off-by: Jonas Franz <[email protected]>

Load TotalTrackedTimes by loading attributes of IssueList Load TotalTrackedTimes by loading attributes of single issue Add Sec2Time as helper to use it in templates Signed-off-by: Jonas Franz <[email protected]>

lafriks · 2018-04-16T05:28:11Z

@JonasFranzDEV in model just like IssueList

Signed-off-by: Jonas Franz <[email protected]>

jonasfranz · 2018-04-16T20:37:54Z

@lafriks Done

Signed-off-by: Jonas Franz <[email protected]>

…tracking

Signed-off-by: Jonas Franz <[email protected]>

lafriks · 2018-04-19T12:08:33Z

models/issue_milestone.go

+	}
+	var trackedTimes = make(map[int64]int64, len(milestones))
+
+	// SELECT milestone_id, sum(time) as time FROM `issue`


This comment should be removed

Signed-off-by: Jonas Franz <[email protected]>

lafriks · 2018-04-19T14:25:55Z

Need to resolve conflicts but otherwise LG-TM

jonasfranz · 2018-04-19T19:52:16Z

@lafriks Done

Signed-off-by: Jonas Franz <[email protected]>

lafriks · 2018-04-20T12:16:38Z

templates/repo/issue/milestones.tmpl

@@ -64,6 +64,7 @@
 						<span class="issue-stats">
 							<i class="octicon octicon-issue-opened"></i> {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}}
 							<i class="octicon octicon-issue-closed"></i> {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}}
+							{{if .TotalTrackedTime}}<i class="octicon octicon-clock"></i> {{.TotalTrackedTime|Sec2Time}}{{end}}


This should probably also change to same as in issues.tmpl: {{if and .IsTimetrackerEnabled .TotalTrackedTime}}

No, because .TotalTrackedTime is zero if timetracker is disabled because TotalTrackedTime is only loaded if it is enabled. (https://github.com/go-gitea/gitea/pull/3341/files#diff-ece22e0fe138da6e0fe0f25213406313R1142)

Than probably there also needs to be such check added so that it would behave same in both places: https://github.com/JonasFranzDEV/gitea/blob/d6237809c472de482cc31fb954af1a8fd6ef54b4/models/issue.go#L248

@lafriks Done

Signed-off-by: Jonas Franz <[email protected]>

jonasfranz · 2018-04-23T19:47:09Z

@lafriks Build failure is not related to this PR, could you please merge?

* SECURITY * Limit uploaded avatar image-size to 4096x3072 by default (go-gitea#4353) * Do not allow to reuse TOTP passcode (go-gitea#3878) * FEATURE * Add cli commands to regen hooks & keys (go-gitea#3979) * Add support for FIDO U2F (go-gitea#3971) * Added user language setting (go-gitea#3875) * LDAP Public SSH Keys synchronization (go-gitea#1844) * Add topic support (go-gitea#3711) * Multiple assignees (go-gitea#3705) * Add protected branch whitelists for merging (go-gitea#3689) * Global code search support (go-gitea#3664) * Add label descriptions (go-gitea#3662) * Add issue search via API (go-gitea#3612) * Add repository setting to enable/disable health checks (go-gitea#3607) * Emoji Autocomplete (go-gitea#3433) * Implements generator cli for secrets (go-gitea#3531) * ENHANCEMENT * Add more webhooks support and refactor webhook templates directory (go-gitea#3929) * Add new option to allow only OAuth2/OpenID user registration (go-gitea#3910) * Add option to use paged LDAP search when synchronizing users (go-gitea#3895) * Symlink icons (go-gitea#1416) * Improve release page UI (go-gitea#3693) * Add admin dashboard option to run health checks (go-gitea#3606) * Add branch link in branch list (go-gitea#3576) * Reduce sql query times in retrieveFeeds (go-gitea#3547) * Option to enable or disable swagger endpoints (go-gitea#3502) * Add missing licenses (go-gitea#3497) * Reduce repo indexer disk usage (go-gitea#3452) * Enable caching on assets and avatars (go-gitea#3376) * Add repository search ordered by stars/forks. Forks column in admin repo list (go-gitea#3969) * Add Environment Variables to Docker template (go-gitea#4012) * LFS: make HTTP auth period configurable (go-gitea#4035) * Add config path as an optionial flag when changing pass via CLI (go-gitea#4184) * Refactor User Settings sections (go-gitea#3900) * Allow square brackets in external issue patterns (go-gitea#3408) * Add Attachment API (go-gitea#3478) * Add EnableTimetracking option to app settings (go-gitea#3719) * Add config option to enable or disable log executed SQL (go-gitea#3726) * Shows total tracked time in issue and milestone list (go-gitea#3341) * TRANSLATION * Improve English grammar and consistency (go-gitea#3614) * DEPLOYMENT * Allow Gitea to run as different USER in Docker (go-gitea#3961) * Provide compressed release binaries (go-gitea#3991) * Sign release binaries (go-gitea#4188)

jonasfranz added 2 commits January 9, 2018 23:43

Show total tracked time in issue and milestone list

72c4296

Show total tracked time at issue page Signed-off-by: Jonas Franz <[email protected]>

Merge branch 'master' of https://github.com/go-gitea/gitea into 3003-…

1c0201f

…timetracking

lafriks reviewed Jan 9, 2018

View reviewed changes

tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 9, 2018

Optimizing TotalTimes by using SumInt

1875038

Signed-off-by: Jonas Franz <[email protected]>

lunny added the type/enhancement An improvement of existing functionality label Jan 11, 2018

lunny added this to the 1.x.x milestone Jan 11, 2018

jonasfranz added 2 commits February 3, 2018 12:26

Merge branch 'master' into 3003-timetracking

b849f54

Fixing wrong total times for milestones caused by a missing JOIN

fda4dd4

Adding unit tests for total times Signed-off-by: Jonas Franz <[email protected]>

lafriks requested changes Feb 3, 2018

View reviewed changes

jonasfranz added 6 commits February 3, 2018 15:38

Logging error instead of ignoring it

983c1e1

Signed-off-by: Jonas Franz <[email protected]>

Merge branch 'master' into 3003-timetracking

707f3db

Correcting spelling mistakes

26a1e02

Signed-off-by: Jonas Franz <[email protected]>

Merge remote-tracking branch 'jonas/3003-timetracking' into 3003-time…

67be8bd

…tracking

Change error message to a short version

f1cfe62

Signed-off-by: Jonas Franz <[email protected]>

Merge branch 'master' into 3003-timetracking

770fea4

lunny modified the milestones: 1.x.x, 1.5.0 Feb 26, 2018

tboerger 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 Feb 26, 2018

lafriks requested changes Feb 26, 2018

View reviewed changes

jonasfranz added 4 commits February 26, 2018 22:15

Merge branch 'master' into 3003-timetracking

3c8507a

Add error handling to TotalTimes

c5c812c

Add variable for totalTimes Signed-off-by: Jonas Franz <[email protected]>

Merge branch 'master' into 3003-timetracking

e92cc12

Introduce TotalTrackedTimes as variable of issue

8481f2d

Load TotalTrackedTimes by loading attributes of IssueList Load TotalTrackedTimes by loading attributes of single issue Add Sec2Time as helper to use it in templates Signed-off-by: Jonas Franz <[email protected]>

Load TotalTrackedTimes via MilestoneList instead of single requests

ec0d41c

Signed-off-by: Jonas Franz <[email protected]>

jonasfranz added 5 commits April 16, 2018 22:38

Merge branch 'master' into 3003-timetracking

856087e

Add documentation for MilestoneList

02dc1cf

Signed-off-by: Jonas Franz <[email protected]>

Merge remote-tracking branch 'onion/3003-timetracking' into 3003-time…

9508985

…tracking

Add documentation for MilestoneList

0ba269b

Signed-off-by: Jonas Franz <[email protected]>

Fix test

70e9bbd

Signed-off-by: Jonas Franz <[email protected]>

lafriks reviewed Apr 19, 2018

View reviewed changes

Change comment from SQL query to description

221a327

Signed-off-by: Jonas Franz <[email protected]>

Merge branch 'master' into 3003-timetracking

90658cc

jonasfranz added 2 commits April 19, 2018 22:07

Fix unit test by using int64 instead of int

ca5243c

Signed-off-by: Jonas Franz <[email protected]>

Fix unit test by using int64 instead of int

d623780

Signed-off-by: Jonas Franz <[email protected]>

lafriks reviewed Apr 20, 2018

View reviewed changes

jonasfranz and others added 3 commits April 20, 2018 20:07

Check if timetracker is enabled

6a97bf7

Signed-off-by: Jonas Franz <[email protected]>

Fix test by enabling timetracking

62f9962

Signed-off-by: Jonas Franz <[email protected]>

Merge branch 'master' into 3003-timetracking

2835f08

lafriks approved these changes Apr 21, 2018

View reviewed changes

Merge branch 'master' into 3003-timetracking

526f7db

Merge branch 'master' into 3003-timetracking

e9562ad

lunny merged commit 8d5f58d into go-gitea:master Apr 29, 2018

lafriks added the type/changelog Adds the changelog for a new Gitea version label Jul 3, 2018

MrHaroldA mentioned this pull request Aug 13, 2018

Add time tracking features for project management #3003

Closed

go-gitea locked and limited conversation to collaborators Nov 24, 2020

delvh removed the type/changelog Adds the changelog for a new Gitea version label Oct 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shows total tracked time in issue and milestone list #3341

Shows total tracked time in issue and milestone list #3341

jonasfranz commented Jan 9, 2018 •

edited

Loading

lafriks Jan 9, 2018

jonasfranz Jan 9, 2018

lafriks Jan 9, 2018

codecov-io commented Jan 10, 2018 •

edited

Loading

lafriks commented Jan 13, 2018

lunny commented Jan 14, 2018

jonasfranz commented Jan 14, 2018

lafriks Feb 3, 2018

lunny commented Feb 26, 2018

lafriks Feb 26, 2018

lafriks Feb 26, 2018

lafriks commented Apr 16, 2018

jonasfranz commented Apr 16, 2018

lafriks Apr 19, 2018

lafriks commented Apr 19, 2018

jonasfranz commented Apr 19, 2018

lafriks Apr 20, 2018

jonasfranz Apr 20, 2018

lafriks Apr 20, 2018

jonasfranz Apr 20, 2018

jonasfranz commented Apr 23, 2018

Shows total tracked time in issue and milestone list #3341

Shows total tracked time in issue and milestone list #3341

Conversation

jonasfranz commented Jan 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Jan 10, 2018 • edited Loading

Codecov Report

lafriks commented Jan 13, 2018

lunny commented Jan 14, 2018

jonasfranz commented Jan 14, 2018

Choose a reason for hiding this comment

lunny commented Feb 26, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lafriks commented Apr 16, 2018

jonasfranz commented Apr 16, 2018

Choose a reason for hiding this comment

lafriks commented Apr 19, 2018

jonasfranz commented Apr 19, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonasfranz commented Apr 23, 2018

jonasfranz commented Jan 9, 2018 •

edited

Loading

codecov-io commented Jan 10, 2018 •

edited

Loading