Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: Timetracking #2211

Merged
merged 102 commits into from
Sep 12, 2017
Merged

Feature: Timetracking #2211

merged 102 commits into from
Sep 12, 2017

Conversation

jonasfranz
Copy link
Member

Fix #967
This pullrequest adds a timetracking feature for issues.

Tracking methods

Track by a stopwatch

This is the easiest process. You simply click on "Start" at the time tracking section and click "Finish" if you finished your work. This will calculate the time difference between the start time and the end time.
Start Finish

Add time manual

You could add time you tracked outside of gitea by clicking on the "+"-Button in the tracking section. This will open up a modal where you could enter the spent time.
Modal

Time log

Issue history

Every time tracking action will be logged in the history of the issue. The partial times (per stopwatch / manually) are also logged.
History

Total time spent

At the sidebar is a list with the sum of time spent by every user who tracked his / her time.
Total

jonasfranz and others added 30 commits May 4, 2017 17:58
@jonasfranz
Added comment's hashtag to url for mail notifications.
74774a4 
Signed-off-by: Jonas <info@jonasfranz.software>
@jonasfranz
Added comment's hashtag to url for mail notifications.
f385727 
Added explanation to return statement.

Signed-off-by: Jonas <info@jonasfranz.software>
@jonasfranz
Added comment's hashtag to url for mail notifications.
e05eb96 
Added explanation to return statement + documentation.

Signed-off-by: Jonas <info@jonasfranz.software>
@jonasfranz
Added comment's hashtag to url for mail notifications.
5cb36ca 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
@jonasfranz
Replacing in-line link generation with HTMLURL. (+gofmt)
2dd674e 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
@jonasfranz
Replaced action-based model with nil-based model. (+gofmt)
716bf81 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
@jonasfranz
Replaced mailIssueActionToParticipants with mailIssueCommentToPartici…
edaa576 
…pants.

Signed-off-by: Jonas Franz <info@jonasfranz.software>
@jonasfranz
Updating comment for mailIssueCommentToParticipants
b0e22ab 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
@jonasfranz
Merge branch 'master' of github.com:JonasFranzDEV/gitea
fd70385 
Refreshing code base
@jonasfranz
Merge branch 'master' of https://github.com/JonasFranzDEV/gitea
3c6d4fc
@jonasfranz
Added link to comment in "Dashboard"
36ae732 
Deleting feed entry if a comment is going to be deleted

Signed-off-by: Jonas Franz <info@jonasfranz.software>
@jonasfranz
Added migration
1826b2b 
Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Added improved migration to add a CommentID column to action.
bb33f2e 
Added improved links to comments in feed entries.

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Added improved migration to add a CommentID column to action.
3f1c85c 
Added improved links to comments in feed entries.

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Added improved migration to add a CommentID column to action.
5791853 
Added improved links to comments in feed entries.

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Added improved migration to add a CommentID column to action.
deddcda 
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Added improved migration to add a CommentID column to action.
70d8dd9 
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Added improved migration to add a CommentID column to action.
3b99726 
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Added improved migration to add a CommentID column to action.
9e18513 
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Added improved migration to add a CommentID column to action.
0e20e81 
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Added improved links to comments in feed entries. (+ gofmt) Signed-of…
8818bc7 
…f-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Fixes go-gitea#1956 by filtering for deleted comments that are refere…
3e1241c 
…nced in actions.

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Fixes go-gitea#1956 by filtering for deleted comments.
3ee3dc3 
Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Fixes go-gitea#1956 by filtering for deleted comments.
56a64e3 
Introducing "IsDeleted" column to action.

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Merge remote-tracking branch 'root/master'
ce6de8a 
# Conflicts:
#	models/migrations/migrations.go
@jonasfranz
Adding design draft (not functional)
c8d270b 
Adding database models for stopwatches and trackedtimes

See go-gitea#967

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Adding design draft (not functional)
6db864a 
Adding database models for stopwatches and trackedtimes

See go-gitea#967
+gofmt

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Adding translations and improving design
b213c99 
See go-gitea#967

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Implementing stopwatch (for timetracking)
79d5c74 
Make UI functional
Add hints in timeline for time tracking events

See go-gitea#967

Signed-off-by: Jonas Franz <email@jfdev.de>
@jonasfranz
Implementing timetracking feature
286dd9b 
Adding "Add time manual" option
Improved stopwatch
Created report of total spent time by user

See go-gitea#967

Signed-off-by: Jonas Franz <email@jfdev.de>
@lafriks
Copy link
Member

lafriks commented Sep 6, 2017

@sapk still branch is out of date with master and need one LG-TM

@jonasfranz
Copy link
Member Author

@lafriks @bkcsoft merged master into this branch. What is next step for this PR?

@lafriks
Copy link
Member

lafriks commented Sep 7, 2017

Needs one more LG-TM from gitea maintainers than it can be merged to master

@lunny
Copy link
Member

lunny commented Sep 7, 2017

@ethantkoenig @sapk maybe you can give your L-G-T-M since you have give some comments.

@jonasfranz
Copy link
Member Author

@tboerger Why do the test fail? I think that the problem is caused by drone since the previous test passes. (No changes except master-merge since last test)

@cez81 cez81 mentioned this pull request Sep 11, 2017
Closed
@sapk
Copy link
Member

sapk commented Sep 11, 2017

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 11, 2017
@lunny
Copy link
Member

lunny commented Sep 12, 2017

@JonasFranzDEV please rebase so that this PR could be merged.

@jonasfranz
Copy link
Member Author

@lunny Done!

@lafriks
Copy link
Member

lafriks commented Sep 12, 2017

@JonasFranzDEV please rebase again as PR was just merged with tests fixed :) 🎉

@jonasfranz
Copy link
Member Author

@lafriks @lunny Done

@jonasfranz
Copy link
Member Author

@lunny @lafriks Test passes too

@lafriks lafriks merged commit 5ccecb4 into go-gitea:master Sep 12, 2017
@gsantner
Copy link

gsantner commented Sep 12, 2017 •
edited
Loading

Is it wanted to work like this? My last input test at manually "Add" was 5 hours. It is not a display problem, bad value gets written to DB. I'm on 3fecf94

screenshot_2017-09-12__10-23_1
screenshot_2017-09-12__10-23_3

screenshot_2017-09-12__10-26_3

@lunny
Copy link
Member

lunny commented Sep 12, 2017

@gsantner please open a new issue to report that, maybe a bug.

@jonasfranz jonasfranz mentioned this pull request Sep 13, 2017
Closed
@gsantner
Copy link

Sorry, didn't create a explicit issue yet, but Jonas already started fixing it

jonasfranz added a commit to jonasfranz/gitea that referenced this pull request Sep 13, 2017
@jonasfranz
Hotfix for "Add time manually" (go-gitea#2211 (comment))
09f817c 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
@jonasfranz jonasfranz mentioned this pull request Sep 13, 2017
Merged
tboerger pushed a commit that referenced this pull request Sep 13, 2017
@jonasfranz @tboerger
Hotfix for "Add time manually" (#2211 (comment)) (#2499)
633de01 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
lunny pushed a commit that referenced this pull request Sep 18, 2017
@jonasfranz @lunny
Fork permission bug fixes (#2534)
566e8ec 
* Hotfix for "Add time manually" (#2211 (comment))

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Checking if Code unit is enabled before creating a fork.

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Adding a discrete function for RepoIDAssignment

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Improved Documentation
lunny pushed a commit that referenced this pull request Sep 22, 2017
@jonasfranz @lunny
Ctrl + Enter to submit forms (#2540)
b4b0280 
* Hotfix for "Add time manually" (#2211 (comment))

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Submit forms if Ctrl+Enter is pressed inside a textarea

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Adding separate class for Ctrl+Enter-Submit
Checking if alt key is pressed too

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Changing .ctrlenter to .js-quick-submit

Signed-off-by: Jonas Franz <info@jonasfranz.software>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny left review comments

@ethantkoenig ethantkoenig ethantkoenig approved these changes

@bkcsoft bkcsoft bkcsoft approved these changes

@sapk sapk sapk approved these changes

@lafriks lafriks lafriks approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.

Feature request: Time tracking
9 participants
@jonasfranz @ethantkoenig @lunny @sapk @lafriks @daviian @gsantner @bkcsoft @tboerger