Skip to content

Hotifx: Add time manually adds time in nanoseconds #2498

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.

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

Closed
wants to merge 104 commits into from

Conversation

jonasfranz
Copy link
Member

@jonasfranz jonasfranz commented Sep 13, 2017

The add time manually form adds the time as nanoseconds but it should be seconds.
This issue is reported by @gsantner (#2211 (comment)).

For more information please have a look at @gsantner comment: #2211 (comment)

I simply reverted to the last working version of this file. The changes were made here: #2211 (comment)

jonasfranz and others added 30 commits May 4, 2017 17:58
Added explanation to return statement.

Signed-off-by: Jonas <[email protected]>
Added explanation to return statement + documentation.

Signed-off-by: Jonas <[email protected]>
Deleting feed entry if a comment is going to be deleted

Signed-off-by: Jonas Franz <[email protected]>
Signed-off-by: Jonas Franz <[email protected]>
Added improved links to comments in feed entries.

Signed-off-by: Jonas Franz <[email protected]>
Added improved links to comments in feed entries.

Signed-off-by: Jonas Franz <[email protected]>
Added improved links to comments in feed entries.

Signed-off-by: Jonas Franz <[email protected]>
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <[email protected]>
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <[email protected]>
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <[email protected]>
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <[email protected]>
Added improved links to comments in feed entries.
(+ gofmt)

Signed-off-by: Jonas Franz <[email protected]>
Introducing "IsDeleted" column to action.

Signed-off-by: Jonas Franz <[email protected]>
# Conflicts:
#	models/migrations/migrations.go
Adding database models for stopwatches and trackedtimes

See go-gitea#967

Signed-off-by: Jonas Franz <[email protected]>
Adding database models for stopwatches and trackedtimes

See go-gitea#967
+gofmt

Signed-off-by: Jonas Franz <[email protected]>
Make UI functional
Add hints in timeline for time tracking events

See go-gitea#967

Signed-off-by: Jonas Franz <[email protected]>
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 protected]>
jonasfranz and others added 23 commits August 21, 2017 18:44
Signed-off-by: Gitea <[email protected]>
Signed-off-by: Gitea <[email protected]>
Adding IsTimetrackingEnabled checks to API
Improving translations / english texts
Improving documentation

Signed-off-by: Jonas Franz <[email protected]>
Signed-off-by: Jonas Franz <[email protected]>
"Added" copyright line

Signed-off-by: Jonas Franz <[email protected]>
Removed some other encoding issues in local_en-US.ini

Signed-off-by: Jonas Franz <[email protected]>
Removed unnecessary code
Improved error checking
Small cosmetic changes

Signed-off-by: Jonas Franz <[email protected]>
Signed-off-by: Jonas Franz <[email protected]>
+gofmt

Signed-off-by: Jonas Franz <[email protected]>
…re/timetracking

Signed-off-by: Jonas Franz <[email protected]>

# Conflicts:
#	integrations/timetracking_test.go
@lafriks
Copy link
Member

lafriks commented Sep 13, 2017

Please create new branch from upstream/master and do changes there as otherwise there are 104 commits :)
I think only change needed is in this line

if _, err := models.AddTime(c.User, issue, int64(total)); err != nil {

change int64(total) to int64(total.Seconds()) other changes in your hotfix is not needed

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 13, 2017
@codecov-io
Copy link

Codecov Report

Merging #2498 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2498   +/-   ##
=======================================
  Coverage   27.85%   27.85%           
=======================================
  Files          83       83           
  Lines       16825    16825           
=======================================
  Hits         4686     4686           
  Misses      11464    11464           
  Partials      675      675

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3e89e89...a85040a. Read the comment docs.

@jonasfranz
Copy link
Member Author

Replaced by #2499

@jonasfranz jonasfranz closed this Sep 13, 2017
@jonasfranz jonasfranz deleted the feature/timetracking branch September 13, 2017 16:03
@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.
Labels
lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants