mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	* 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>
		
			
				
	
	
		
			118 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			118 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2017 The Gitea Authors. All rights reserved.
 | |
| // Use of this source code is governed by a MIT-style
 | |
| // license that can be found in the LICENSE file.
 | |
| 
 | |
| package models
 | |
| 
 | |
| import (
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/go-xorm/builder"
 | |
| 	"github.com/go-xorm/xorm"
 | |
| )
 | |
| 
 | |
| // TrackedTime represents a time that was spent for a specific issue.
 | |
| type TrackedTime struct {
 | |
| 	ID          int64     `xorm:"pk autoincr" json:"id"`
 | |
| 	IssueID     int64     `xorm:"INDEX" json:"issue_id"`
 | |
| 	UserID      int64     `xorm:"INDEX" json:"user_id"`
 | |
| 	Created     time.Time `xorm:"-" json:"created"`
 | |
| 	CreatedUnix int64     `json:"-"`
 | |
| 	Time        int64     `json:"time"`
 | |
| }
 | |
| 
 | |
| // BeforeInsert will be invoked by XORM before inserting a record
 | |
| // representing this object.
 | |
| func (t *TrackedTime) BeforeInsert() {
 | |
| 	t.CreatedUnix = time.Now().Unix()
 | |
| }
 | |
| 
 | |
| // AfterSet is invoked from XORM after setting the value of a field of this object.
 | |
| func (t *TrackedTime) AfterSet(colName string, _ xorm.Cell) {
 | |
| 	switch colName {
 | |
| 	case "created_unix":
 | |
| 		t.Created = time.Unix(t.CreatedUnix, 0).Local()
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // FindTrackedTimesOptions represent the filters for tracked times. If an ID is 0 it will be ignored.
 | |
| type FindTrackedTimesOptions struct {
 | |
| 	IssueID      int64
 | |
| 	UserID       int64
 | |
| 	RepositoryID int64
 | |
| }
 | |
| 
 | |
| // ToCond will convert each condition into a xorm-Cond
 | |
| func (opts *FindTrackedTimesOptions) ToCond() builder.Cond {
 | |
| 	cond := builder.NewCond()
 | |
| 	if opts.IssueID != 0 {
 | |
| 		cond = cond.And(builder.Eq{"issue_id": opts.IssueID})
 | |
| 	}
 | |
| 	if opts.UserID != 0 {
 | |
| 		cond = cond.And(builder.Eq{"user_id": opts.UserID})
 | |
| 	}
 | |
| 	if opts.RepositoryID != 0 {
 | |
| 		cond = cond.And(builder.Eq{"issue.repo_id": opts.RepositoryID})
 | |
| 	}
 | |
| 	return cond
 | |
| }
 | |
| 
 | |
| // 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)
 | |
| 	return
 | |
| }
 | |
| 
 | |
| // AddTime will add the given time (in seconds) to the issue
 | |
| func AddTime(user *User, issue *Issue, time int64) (*TrackedTime, error) {
 | |
| 	tt := &TrackedTime{
 | |
| 		IssueID: issue.ID,
 | |
| 		UserID:  user.ID,
 | |
| 		Time:    time,
 | |
| 	}
 | |
| 	if _, err := x.Insert(tt); err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	if _, err := CreateComment(&CreateCommentOptions{
 | |
| 		Issue:   issue,
 | |
| 		Repo:    issue.Repo,
 | |
| 		Doer:    user,
 | |
| 		Content: secToTime(time),
 | |
| 		Type:    CommentTypeAddTimeManual,
 | |
| 	}); err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	return tt, nil
 | |
| }
 | |
| 
 | |
| // TotalTimes returns the spent time for each user by an issue
 | |
| func TotalTimes(options FindTrackedTimesOptions) (map[*User]string, error) {
 | |
| 	trackedTimes, err := GetTrackedTimes(options)
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	//Adding total time per user ID
 | |
| 	totalTimesByUser := make(map[int64]int64)
 | |
| 	for _, t := range trackedTimes {
 | |
| 		totalTimesByUser[t.UserID] += t.Time
 | |
| 	}
 | |
| 
 | |
| 	totalTimes := make(map[*User]string)
 | |
| 	//Fetching User and making time human readable
 | |
| 	for userID, total := range totalTimesByUser {
 | |
| 		user, err := GetUserByID(userID)
 | |
| 		if err != nil {
 | |
| 			if IsErrUserNotExist(err) {
 | |
| 				continue
 | |
| 			}
 | |
| 			return nil, err
 | |
| 		}
 | |
| 		totalTimes[user] = secToTime(total)
 | |
| 	}
 | |
| 	return totalTimes, nil
 | |
| }
 |