You can not select more than 25 topics Topics must start with a chinese character,a letter or number, can include dashes ('-') and can be up to 35 characters long.

issue_tracked_time.go 3.3 kB

Feature: Timetracking (#2211) * Added comment's hashtag to url for mail notifications. * Added explanation to return statement + documentation. * Replacing in-line link generation with HTMLURL. (+gofmt) * Replaced action-based model with nil-based model. (+gofmt) * Replaced mailIssueActionToParticipants with mailIssueCommentToParticipants. * Updating comment for mailIssueCommentToParticipants * Added link to comment in "Dashboard" * Deleting feed entry if a comment is going to be deleted * Added migration * Added improved migration to add a CommentID column to action. * Added improved links to comments in feed entries. * Fixes #1956 by filtering for deleted comments that are referenced in actions. * Introducing "IsDeleted" column to action. * Adding design draft (not functional) * Adding database models for stopwatches and trackedtimes * See go-gitea/gitea#967 * Adding design draft (not functional) * Adding translations and improving design * Implementing stopwatch (for timetracking) * Make UI functional * Add hints in timeline for time tracking events * Implementing timetracking feature * Adding "Add time manual" option * Improved stopwatch * Created report of total spent time by user * Only showing total time spent if theire is something to show. * Adding license headers. * Improved error handling for "Add Time Manual" * Adding @sapks 's changes, refactoring * Adding API for feature tracking * Adding unit test * Adding DISABLE/ENABLE option to Repository settings page * Improving translations * Applying @sapk 's changes * Removing repo_unit and using IssuesSetting for disabling/enabling timetracker * Adding DEFAULT_ENABLE_TIMETRACKER to config, installation and admin menu * Improving documentation * Fixing vendor/ folder * Changing timtracking routes by adding subgroups /times and /times/stopwatch (Proposed by @lafriks ) * Restricting write access to timetracking based on the repo settings (Proposed by @lafriks ) * Fixed minor permissions bug. * Adding CanUseTimetracker and IsTimetrackerEnabled in ctx.Repo * Allow assignees and authors to track there time too. * Fixed some build-time-errors + logical errors. * Removing unused Get...ByID functions * Moving IsTimetrackerEnabled from context.Repository to models.Repository * Adding a seperate file for issue related repo functions * Adding license headers * Fixed GetUserByParams return 404 * Moving /users/:username/times to /repos/:username/:reponame/times/:username for security reasons * Adding /repos/:username/times to get all tracked times of the repo * Updating sdk-dependency * Updating swagger.v1.json * Adding warning if user has already a running stopwatch (auto-timetracker) * Replacing GetTrackedTimesBy... with GetTrackedTimes(options FindTrackedTimesOptions) * Changing code.gitea.io/sdk back to code.gitea.io/sdk * Correcting spelling mistake * Updating vendor.json * Changing GET stopwatch/toggle to POST stopwatch/toggle * Changing GET stopwatch/cancel to POST stopwatch/cancel * Added migration for stopwatches/timetracking * Fixed some access bugs for read-only users * Added default allow only contributors to track time value to config * Fixed migration by chaging x.Iterate to x.Find * Resorted imports * Moved Add Time Manually form to repo_form.go * Removed "Seconds" field from Add Time Manually * Resorted imports * Improved permission checking * Fixed some bugs * Added integration test * gofmt * Adding integration test by @lafriks * Added created_unix to comment fixtures * Using last event instead of a fixed event * Adding another integration test by @lafriks * Fixing bug Timetracker enabled causing error 500 at sidebar.tpl * Fixed a refactoring bug that resulted in hiding "HasUserStopwatch" warning. * Returning TrackedTime instead of AddTimeOption at AddTime. * Updating SDK from go-gitea/go-sdk#69 * Resetting Go-SDK back to default repository * Fixing test-vendor by changing ini back to original repository * Adding "tags" to swagger spec * govendor sync * Removed duplicate * Formatting templates * Adding IsTimetrackingEnabled checks to API * Improving translations / english texts * Improving documentation * Updating swagger spec * Fixing integration test caused be translation-changes * Removed encoding issues in local_en-US.ini. * "Added" copyright line * Moved unit.IssuesConfig().EnableTimetracker into a != nil check * Removed some other encoding issues in local_en-US.ini * Improved javascript by checking if data-context exists * Replaced manual comment creation with CreateComment * Removed unnecessary code * Improved error checking * Small cosmetic changes * Replaced int>string>duration parsing with int>duration parsing * Fixed encoding issues * Removed unused imports Signed-off-by: Jonas Franz <info@jonasfranz.software>
7 years ago
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117
  1. // Copyright 2017 The Gitea Authors. All rights reserved.
  2. // Use of this source code is governed by a MIT-style
  3. // license that can be found in the LICENSE file.
  4. package models
  5. import (
  6. "time"
  7. "github.com/go-xorm/builder"
  8. "github.com/go-xorm/xorm"
  9. )
  10. // TrackedTime represents a time that was spent for a specific issue.
  11. type TrackedTime struct {
  12. ID int64 `xorm:"pk autoincr" json:"id"`
  13. IssueID int64 `xorm:"INDEX" json:"issue_id"`
  14. UserID int64 `xorm:"INDEX" json:"user_id"`
  15. Created time.Time `xorm:"-" json:"created"`
  16. CreatedUnix int64 `json:"-"`
  17. Time int64 `json:"time"`
  18. }
  19. // BeforeInsert will be invoked by XORM before inserting a record
  20. // representing this object.
  21. func (t *TrackedTime) BeforeInsert() {
  22. t.CreatedUnix = time.Now().Unix()
  23. }
  24. // AfterSet is invoked from XORM after setting the value of a field of this object.
  25. func (t *TrackedTime) AfterSet(colName string, _ xorm.Cell) {
  26. switch colName {
  27. case "created_unix":
  28. t.Created = time.Unix(t.CreatedUnix, 0).Local()
  29. }
  30. }
  31. // FindTrackedTimesOptions represent the filters for tracked times. If an ID is 0 it will be ignored.
  32. type FindTrackedTimesOptions struct {
  33. IssueID int64
  34. UserID int64
  35. RepositoryID int64
  36. }
  37. // ToCond will convert each condition into a xorm-Cond
  38. func (opts *FindTrackedTimesOptions) ToCond() builder.Cond {
  39. cond := builder.NewCond()
  40. if opts.IssueID != 0 {
  41. cond = cond.And(builder.Eq{"issue_id": opts.IssueID})
  42. }
  43. if opts.UserID != 0 {
  44. cond = cond.And(builder.Eq{"user_id": opts.UserID})
  45. }
  46. if opts.RepositoryID != 0 {
  47. cond = cond.And(builder.Eq{"issue.repo_id": opts.RepositoryID})
  48. }
  49. return cond
  50. }
  51. // GetTrackedTimes returns all tracked times that fit to the given options.
  52. func GetTrackedTimes(options FindTrackedTimesOptions) (trackedTimes []*TrackedTime, err error) {
  53. if options.RepositoryID > 0 {
  54. err = x.Join("INNER", "issue", "issue.id = tracked_time.issue_id").Where(options.ToCond()).Find(&trackedTimes)
  55. return
  56. }
  57. err = x.Where(options.ToCond()).Find(&trackedTimes)
  58. return
  59. }
  60. // AddTime will add the given time (in seconds) to the issue
  61. func AddTime(user *User, issue *Issue, time int64) (*TrackedTime, error) {
  62. tt := &TrackedTime{
  63. IssueID: issue.ID,
  64. UserID: user.ID,
  65. Time: time,
  66. }
  67. if _, err := x.Insert(tt); err != nil {
  68. return nil, err
  69. }
  70. if _, err := CreateComment(&CreateCommentOptions{
  71. Issue: issue,
  72. Repo: issue.Repo,
  73. Doer: user,
  74. Content: secToTime(time),
  75. Type: CommentTypeAddTimeManual,
  76. }); err != nil {
  77. return nil, err
  78. }
  79. return tt, nil
  80. }
  81. // TotalTimes returns the spent time for each user by an issue
  82. func TotalTimes(options FindTrackedTimesOptions) (map[*User]string, error) {
  83. trackedTimes, err := GetTrackedTimes(options)
  84. if err != nil {
  85. return nil, err
  86. }
  87. //Adding total time per user ID
  88. totalTimesByUser := make(map[int64]int64)
  89. for _, t := range trackedTimes {
  90. totalTimesByUser[t.UserID] += t.Time
  91. }
  92. totalTimes := make(map[*User]string)
  93. //Fetching User and making time human readable
  94. for userID, total := range totalTimesByUser {
  95. user, err := GetUserByID(userID)
  96. if err != nil {
  97. if IsErrUserNotExist(err) {
  98. continue
  99. }
  100. return nil, err
  101. }
  102. totalTimes[user] = secToTime(total)
  103. }
  104. return totalTimes, nil
  105. }