Shows total tracked time in issue and milestone list

models/issue.go

@@ -68,6 +68,21 @@ func init() {
 	issueTasksDonePat = regexp.MustCompile(issueTasksDoneRegexpStr)
 }
 
+func (issue *Issue) totalTimes(e Engine) (string, error) {
+	opts := FindTrackedTimesOptions{IssueID: issue.ID}
+	totalTime, err := opts.ToSession(e).SumInt(&TrackedTime{}, "time")
+	if err != nil {
+		return "", err
+	}
+	return secToTime(totalTime), nil
+}
+
+// TotalTimes returns the total amount of tracked time for the issue
+func (issue *Issue) TotalTimes() string {
+	times, _ := issue.totalTimes(x)
+	return times
+}
+
 func (issue *Issue) loadRepo(e Engine) (err error) {
 	if issue.Repo == nil {
 		issue.Repo, err = getRepositoryByID(e, issue.RepoID)
@@ -78,6 +93,15 @@ func (issue *Issue) loadRepo(e Engine) (err error) {
 	return nil
 }
 
+// IsTimetrackerEnabled returns true if the repo enables timetracking
+func (issue *Issue) IsTimetrackerEnabled() bool {
+	if err := issue.loadRepo(x); err != nil {
+		log.Error(4, fmt.Sprintf("loadRepo: %v", err))
+		return false
+	}
+	return issue.Repo.IsTimetrackerEnabled()
+}
+
 // GetPullRequest returns the issue pull request
 func (issue *Issue) GetPullRequest() (pr *PullRequest, err error) {
 	if !issue.IsPull {

models/issue_milestone.go

@@ -86,6 +86,27 @@ func (m *Milestone) APIFormat() *api.Milestone {
 	return apiMilestone
 }
 
+func (m *Milestone) totalTimes(e Engine) (string, error) {
+	opts := FindTrackedTimesOptions{MilestoneID: m.ID}
+	totalTime, err := opts.ToSession(e).SumInt(&TrackedTime{}, "time")
+	if err != nil {
+		return "", err
+	}
+	return secToTime(totalTime), nil
+}
+
+// TotalTimes returns the amount of tracked time of the issues inside the milestone
+func (m *Milestone) TotalTimes() string {
+	times, _ := m.totalTimes(x)
+	return times
+}
+
+// MustGetRepo returns milestone's repository by ignoring errors
+func (m *Milestone) MustGetRepo() *Repository {
+	repo, _ := GetRepositoryByID(m.RepoID)
+	return repo
+}
+
 // NewMilestone creates new milestone of repository.
 func NewMilestone(m *Milestone) (err error) {
 	sess := x.NewSession()

models/issue_milestone_test.go

@@ -251,3 +251,11 @@ func TestDeleteMilestoneByRepoID(t *testing.T) {
 
 	assert.NoError(t, DeleteMilestoneByRepoID(NonexistentID, NonexistentID))
 }
+
+func TestMilestone_TotalTimes(t *testing.T) {
+	assert.NoError(t, PrepareTestDatabase())
+	ms, err := GetMilestoneByRepoID(1, 1)
+	assert.NoError(t, err)
+	times := ms.TotalTimes()
+	assert.Equal(t, "1h 1min 2s", times)
+}

models/issue_test.go

@@ -279,3 +279,11 @@ func TestGetUserIssueStats(t *testing.T) {
 		assert.Equal(t, test.ExpectedIssueStats, *stats)
 	}
 }
+
+func TestIssue_TotalTimes(t *testing.T) {
+	assert.NoError(t, PrepareTestDatabase())
+	ms, err := GetIssueByID(2)
+	assert.NoError(t, err)
+	times := ms.TotalTimes()
+	assert.Equal(t, "1h 1min 2s", times)
+}

models/issue_tracked_time.go

@@ -11,6 +11,7 @@ import (
 	api "code.gitea.io/sdk/gitea"
 
 	"github.com/go-xorm/builder"
+	"github.com/go-xorm/xorm"
 )
 
 // TrackedTime represents a time that was spent for a specific issue.
@@ -44,6 +45,7 @@ type FindTrackedTimesOptions struct {
 	IssueID      int64
 	UserID       int64
 	RepositoryID int64
+	MilestoneID  int64
 }
 
 // ToCond will convert each condition into a xorm-Cond
@@ -58,16 +60,23 @@ func (opts *FindTrackedTimesOptions) ToCond() builder.Cond {
 	if opts.RepositoryID != 0 {
 		cond = cond.And(builder.Eq{"issue.repo_id": opts.RepositoryID})
 	}
+	if opts.MilestoneID != 0 {
+		cond = cond.And(builder.Eq{"issue.milestone_id": opts.MilestoneID})
+	}
 	return cond
 }
 
+// ToSession will convert the given options to a xorm Session by using the conditions from ToCond and joining with issue table if required
+func (opts *FindTrackedTimesOptions) ToSession(e Engine) *xorm.Session {
+	if opts.RepositoryID > 0 || opts.MilestoneID > 0 {
+		return e.Join("INNER", "issue", "issue.id = tracked_time.issue_id").Where(opts.ToCond())
+	}
+	return x.Where(opts.ToCond())
+}
+
 // GetTrackedTimes returns all tracked times that fit to the given options.
 func GetTrackedTimes(options FindTrackedTimesOptions) (trackedTimes []*TrackedTime, err error) {
-	if options.RepositoryID > 0 {
-		err = x.Join("INNER", "issue", "issue.id = tracked_time.issue_id").Where(options.ToCond()).Find(&trackedTimes)
-		return
-	}
-	err = x.Where(options.ToCond()).Find(&trackedTimes)
+	err = options.ToSession(x).Find(&trackedTimes)
 	return
 }
 

options/locale/locale_en-US.ini

@@ -731,7 +731,7 @@ issues.add_time_minutes = Minutes
 issues.add_time_sum_to_small = No time was entered
 issues.cancel_tracking = Cancel
 issues.cancel_tracking_history = `cancelled time tracking %s`
-issues.time_spent_total = Total time spent
+issues.time_spent_from_all_authors = `Total time spent: %s`
 
 pulls.desc = Pulls management your code review and merge requests
 pulls.new = New Pull Request

templates/repo/issue/list.tmpl

@@ -198,6 +198,10 @@
 						<span class="comment ui right"><i class="octicon octicon-comment"></i> {{.NumComments}}</span>
 					{{end}}
 
+					{{if and .IsTimetrackerEnabled .TotalTimes}}
+						<span class="comment ui right"><i class="octicon octicon-clock"></i> {{.TotalTimes}}</span>
+					{{end}}
+
 					<p class="desc">
 						{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}}
 						{{$tasks := .GetTasks}}

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 and .TotalTimes .MustGetRepo.IsTimetrackerEnabled}}<i class="octicon octicon-clock"></i> {{.TotalTimes}}{{end}}
 						</span>
 					</div>
 					{{if $.IsRepositoryWriter}}

templates/repo/issue/view_content/sidebar.tmpl

@@ -171,7 +171,7 @@
 			{{if gt (len .WorkingUsers) 0}}
 				<div class="ui divider"></div>
 				<div class="ui participants comments">
-					<span class="text"><strong>{{.i18n.Tr "repo.issues.time_spent_total"}}</strong></span>
+					<span class="text"><strong>{{.i18n.Tr "repo.issues.time_spent_from_all_authors"  $.Issue.TotalTimes | Safe}}</strong></span>
 					<div>
 						{{range $user, $trackedtime := .WorkingUsers}}
 							<div class="comment">

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}}
+								<span class="comment ui right"><i class="octicon octicon-clock"></i> {{.TotalTimes}}</span>
+							{{end}}
+
 							<p class="desc">
 								{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}}
 								{{if .Assignee}}