mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 19:38:23 +00:00 
			
		
		
		
	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>
This commit is contained in:
		| @@ -126,6 +126,8 @@ var migrations = []Migration{ | ||||
| 	NewMigration("unescape user full names", unescapeUserFullNames), | ||||
| 	// v38 -> v39 | ||||
| 	NewMigration("remove commits and settings unit types", removeCommitsUnitType), | ||||
| 	// v39 -> v40 | ||||
| 	NewMigration("adds time tracking and stopwatches", addTimetracking), | ||||
| } | ||||
|  | ||||
| // Migrate database to current version | ||||
|   | ||||
| @@ -19,9 +19,9 @@ type RepoUnit struct { | ||||
| 	RepoID      int64 `xorm:"INDEX(s)"` | ||||
| 	Type        int   `xorm:"INDEX(s)"` | ||||
| 	Index       int | ||||
| 	Config      map[string]string `xorm:"JSON"` | ||||
| 	CreatedUnix int64             `xorm:"INDEX CREATED"` | ||||
| 	Created     time.Time         `xorm:"-"` | ||||
| 	Config      map[string]interface{} `xorm:"JSON"` | ||||
| 	CreatedUnix int64                  `xorm:"INDEX CREATED"` | ||||
| 	Created     time.Time              `xorm:"-"` | ||||
| } | ||||
|  | ||||
| // Enumerate all the unit types | ||||
| @@ -95,7 +95,7 @@ func addUnitsToTables(x *xorm.Engine) error { | ||||
| 				continue | ||||
| 			} | ||||
|  | ||||
| 			var config = make(map[string]string) | ||||
| 			var config = make(map[string]interface{}) | ||||
| 			switch i { | ||||
| 			case V16UnitTypeExternalTracker: | ||||
| 				config["ExternalTrackerURL"] = repo.ExternalTrackerURL | ||||
|   | ||||
							
								
								
									
										65
									
								
								models/migrations/v39.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										65
									
								
								models/migrations/v39.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,65 @@ | ||||
| // 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 migrations | ||||
|  | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"time" | ||||
|  | ||||
| 	"code.gitea.io/gitea/modules/setting" | ||||
|  | ||||
| 	"github.com/go-xorm/xorm" | ||||
| ) | ||||
|  | ||||
| // Stopwatch see models/issue_stopwatch.go | ||||
| type Stopwatch struct { | ||||
| 	ID          int64     `xorm:"pk autoincr"` | ||||
| 	IssueID     int64     `xorm:"INDEX"` | ||||
| 	UserID      int64     `xorm:"INDEX"` | ||||
| 	Created     time.Time `xorm:"-"` | ||||
| 	CreatedUnix int64 | ||||
| } | ||||
|  | ||||
| // TrackedTime see models/issue_tracked_time.go | ||||
| 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"` | ||||
| } | ||||
|  | ||||
| func addTimetracking(x *xorm.Engine) error { | ||||
| 	if err := x.Sync2(new(Stopwatch)); err != nil { | ||||
| 		return fmt.Errorf("Sync2: %v", err) | ||||
| 	} | ||||
| 	if err := x.Sync2(new(TrackedTime)); err != nil { | ||||
| 		return fmt.Errorf("Sync2: %v", err) | ||||
| 	} | ||||
| 	//Updating existing issue units | ||||
| 	var units []*RepoUnit | ||||
| 	x.Where("type = ?", V16UnitTypeIssues).Find(&units) | ||||
| 	for _, unit := range units { | ||||
| 		if unit.Config == nil { | ||||
| 			unit.Config = make(map[string]interface{}) | ||||
| 		} | ||||
| 		changes := false | ||||
| 		if _, ok := unit.Config["EnableTimetracker"]; !ok { | ||||
| 			unit.Config["EnableTimetracker"] = setting.Service.DefaultEnableTimetracking | ||||
| 			changes = true | ||||
| 		} | ||||
| 		if _, ok := unit.Config["AllowOnlyContributorsToTrackTime"]; !ok { | ||||
| 			unit.Config["AllowOnlyContributorsToTrackTime"] = setting.Service.DefaultAllowOnlyContributorsToTrackTime | ||||
| 			changes = true | ||||
| 		} | ||||
| 		if changes { | ||||
| 			if _, err := x.Id(unit.ID).Cols("config").Update(unit); err != nil { | ||||
| 				return err | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
		Reference in New Issue
	
	Block a user