diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/issue_stopwatch.go | 34 | ||||
| -rw-r--r-- | models/issue_tracked_time.go | 9 | ||||
| -rw-r--r-- | models/issue_tracked_time_test.go | 6 |
3 files changed, 11 insertions, 38 deletions
diff --git a/models/issue_stopwatch.go b/models/issue_stopwatch.go index 530a524218..3be9ad4e3f 100644 --- a/models/issue_stopwatch.go +++ b/models/issue_stopwatch.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/util" ) // ErrIssueStopwatchNotExist represents an error that stopwatch is not exist @@ -53,7 +54,7 @@ func (s Stopwatch) Seconds() int64 { // Duration returns a human-readable duration string based on local server time func (s Stopwatch) Duration() string { - return SecToTime(s.Seconds()) + return util.SecToTime(s.Seconds()) } func getStopwatch(ctx context.Context, userID, issueID int64) (sw *Stopwatch, exists bool, err error) { @@ -164,7 +165,7 @@ func FinishIssueStopwatch(ctx context.Context, user *user_model.User, issue *Iss Doer: user, Issue: issue, Repo: issue.Repo, - Content: SecToTime(timediff), + Content: util.SecToTime(timediff), Type: CommentTypeStopTracking, TimeID: tt.ID, }); err != nil { @@ -263,32 +264,3 @@ func cancelStopwatch(ctx context.Context, user *user_model.User, issue *Issue) e } return nil } - -// SecToTime converts an amount of seconds to a human-readable string (example: 66s -> 1min 6s) -func SecToTime(duration int64) string { - seconds := duration % 60 - minutes := (duration / (60)) % 60 - hours := duration / (60 * 60) - - var hrs string - - if hours > 0 { - hrs = fmt.Sprintf("%dh", hours) - } - if minutes > 0 { - if hours == 0 { - hrs = fmt.Sprintf("%dmin", minutes) - } else { - hrs = fmt.Sprintf("%s %dmin", hrs, minutes) - } - } - if seconds > 0 { - if hours == 0 && minutes == 0 { - hrs = fmt.Sprintf("%ds", seconds) - } else { - hrs = fmt.Sprintf("%s %ds", hrs, seconds) - } - } - - return hrs -} diff --git a/models/issue_tracked_time.go b/models/issue_tracked_time.go index c887baae15..2d7bef19e1 100644 --- a/models/issue_tracked_time.go +++ b/models/issue_tracked_time.go @@ -11,6 +11,7 @@ import ( "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "xorm.io/builder" ) @@ -177,7 +178,7 @@ func AddTime(user *user_model.User, issue *Issue, amount int64, created time.Tim Issue: issue, Repo: issue.Repo, Doer: user, - Content: SecToTime(amount), + Content: util.SecToTime(amount), Type: CommentTypeAddTimeManual, TimeID: t.ID, }); err != nil { @@ -226,7 +227,7 @@ func TotalTimes(options *FindTrackedTimesOptions) (map[*user_model.User]string, } return nil, err } - totalTimes[user] = SecToTime(total) + totalTimes[user] = util.SecToTime(total) } return totalTimes, nil } @@ -260,7 +261,7 @@ func DeleteIssueUserTimes(issue *Issue, user *user_model.User) error { Issue: issue, Repo: issue.Repo, Doer: user, - Content: "- " + SecToTime(removedTime), + Content: "- " + util.SecToTime(removedTime), Type: CommentTypeDeleteTimeManual, }); err != nil { return err @@ -289,7 +290,7 @@ func DeleteTime(t *TrackedTime) error { Issue: t.Issue, Repo: t.Issue.Repo, Doer: t.User, - Content: "- " + SecToTime(t.Time), + Content: "- " + util.SecToTime(t.Time), Type: CommentTypeDeleteTimeManual, }); err != nil { return err diff --git a/models/issue_tracked_time_test.go b/models/issue_tracked_time_test.go index 97efd8bb72..e6c9caf900 100644 --- a/models/issue_tracked_time_test.go +++ b/models/issue_tracked_time_test.go @@ -34,7 +34,7 @@ func TestAddTime(t *testing.T) { assert.Equal(t, int64(3661), tt.Time) comment := unittest.AssertExistsAndLoadBean(t, &Comment{Type: CommentTypeAddTimeManual, PosterID: 3, IssueID: 1}).(*Comment) - assert.Equal(t, comment.Content, "1h 1min 1s") + assert.Equal(t, comment.Content, "1h 1m 1s") } func TestGetTrackedTimes(t *testing.T) { @@ -86,7 +86,7 @@ func TestTotalTimes(t *testing.T) { assert.Len(t, total, 1) for user, time := range total { assert.Equal(t, int64(1), user.ID) - assert.Equal(t, "6min 40s", time) + assert.Equal(t, "6m 40s", time) } total, err = TotalTimes(&FindTrackedTimesOptions{IssueID: 2}) @@ -94,7 +94,7 @@ func TestTotalTimes(t *testing.T) { assert.Len(t, total, 2) for user, time := range total { if user.ID == 2 { - assert.Equal(t, "1h 1min 2s", time) + assert.Equal(t, "1h 1m 2s", time) } else if user.ID == 1 { assert.Equal(t, "20s", time) } else { |