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
Closed
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
74774a4
Added comment's hashtag to url for mail notifications.
jonasfranz May 4, 2017
f385727
Added comment's hashtag to url for mail notifications.
jonasfranz May 4, 2017
e05eb96
Added comment's hashtag to url for mail notifications.
jonasfranz May 4, 2017
5cb36ca
Added comment's hashtag to url for mail notifications.
jonasfranz May 4, 2017
2dd674e
Replacing in-line link generation with HTMLURL. (+gofmt)
jonasfranz May 4, 2017
716bf81
Replaced action-based model with nil-based model. (+gofmt)
jonasfranz May 4, 2017
edaa576
Replaced mailIssueActionToParticipants with mailIssueCommentToPartici…
jonasfranz May 4, 2017
b0e22ab
Updating comment for mailIssueCommentToParticipants
jonasfranz May 4, 2017
fd70385
Merge branch 'master' of github.com:JonasFranzDEV/gitea
jonasfranz Jun 13, 2017
3c6d4fc
Merge branch 'master' of https://github.com/JonasFranzDEV/gitea
jonasfranz Jun 15, 2017
36ae732
Added link to comment in "Dashboard"
jonasfranz Jun 15, 2017
1826b2b
Added migration
jonasfranz Jun 17, 2017
bb33f2e
Added improved migration to add a CommentID column to action.
jonasfranz Jun 17, 2017
3f1c85c
Added improved migration to add a CommentID column to action.
jonasfranz Jun 17, 2017
5791853
Added improved migration to add a CommentID column to action.
jonasfranz Jun 17, 2017
deddcda
Added improved migration to add a CommentID column to action.
jonasfranz Jun 17, 2017
70d8dd9
Added improved migration to add a CommentID column to action.
jonasfranz Jun 17, 2017
3b99726
Added improved migration to add a CommentID column to action.
jonasfranz Jun 17, 2017
9e18513
Added improved migration to add a CommentID column to action.
jonasfranz Jun 17, 2017
0e20e81
Added improved migration to add a CommentID column to action.
jonasfranz Jun 17, 2017
8818bc7
Added improved links to comments in feed entries. (+ gofmt) Signed-o…
jonasfranz Jun 18, 2017
3e1241c
Fixes #1956 by filtering for deleted comments that are referenced in …
jonasfranz Jun 22, 2017
3ee3dc3
Fixes #1956 by filtering for deleted comments.
jonasfranz Jun 23, 2017
56a64e3
Fixes #1956 by filtering for deleted comments.
jonasfranz Jun 25, 2017
ce6de8a
Merge remote-tracking branch 'root/master'
jonasfranz Jul 24, 2017
c8d270b
Adding design draft (not functional)
jonasfranz Jul 24, 2017
6db864a
Adding design draft (not functional)
jonasfranz Jul 24, 2017
b213c99
Adding translations and improving design
jonasfranz Jul 24, 2017
79d5c74
Implementing stopwatch (for timetracking)
jonasfranz Jul 25, 2017
286dd9b
Implementing timetracking feature
jonasfranz Jul 25, 2017
cff9234
Only showing total time spent if theire is something to show.
jonasfranz Jul 25, 2017
615b3dd
Adding license headers.
jonasfranz Jul 25, 2017
a1dff21
Improved error handling for "Add Time Manual"
jonasfranz Jul 25, 2017
251d50e
Improved error handling for "Add Time Manual"
jonasfranz Jul 25, 2017
3945c0e
Adding @sapks 's changes, refactoring
jonasfranz Jul 25, 2017
0347bb3
Adding API for feature tracking
jonasfranz Jul 25, 2017
c1943c1
Adding DISABLE/ENABLE option to Repository settings page
jonasfranz Jul 25, 2017
edf850d
Improving translations + adding German translation
jonasfranz Jul 25, 2017
9bd4821
Removing repo_unit and using IssuesSetting for disabling/enabling tim…
jonasfranz Jul 25, 2017
d26f4da
Merge pull request #1 from JonasFranzDEV/feature/timetracking
jonasfranz Jul 25, 2017
8675986
Fixing vendor/ folder
jonasfranz Jul 26, 2017
47d3187
Changing timtracking routes by adding subgroups /times and /times/sto…
jonasfranz Jul 26, 2017
ce3c380
Restricting write access to timetracking based on the repo settings
jonasfranz Jul 26, 2017
871a6eb
Restricting write access to timetracking based on the repo settings
jonasfranz Jul 26, 2017
15faf72
Fixed minor permissions bug.
jonasfranz Jul 26, 2017
906b4c9
Removed German translations
jonasfranz Jul 26, 2017
08b0e63
Adding CanUseTimetracker and IsTimetrackerEnabled in ctx.Repo
jonasfranz Jul 26, 2017
3b25d8e
Adding CanUseTimetracker and IsTimetrackerEnabled in ctx.Repo
jonasfranz Jul 26, 2017
b1dfaa7
Removing unused Get...ByID functions
jonasfranz Jul 26, 2017
fcec528
Moving IsTimetrackerEnabled from context.Repository to models.Repository
jonasfranz Jul 26, 2017
2fa55de
Adding a seperate file for issue related repo functions
jonasfranz Jul 26, 2017
4ed6614
Fixed GetUserByParams return 404
jonasfranz Jul 26, 2017
078f59f
Moving /users/:username/times to /repos/:username/:reponame/times/:us…
jonasfranz Jul 27, 2017
3d3b94a
Updating sdk-dependency
jonasfranz Jul 27, 2017
c3b5ecc
Updating swagger.v1.json
jonasfranz Jul 27, 2017
13fb0e3
Adding warning if user has already a running stopwatch (auto-timetrac…
jonasfranz Jul 27, 2017
497f214
Replacing GetTrackedTimesBy... with GetTrackedTimes(options FindTrack…
jonasfranz Jul 28, 2017
43762a0
Merge branch 'master' into feature/timetracking
jonasfranz Jul 28, 2017
6563b5b
Correcting spelling mistake
jonasfranz Jul 28, 2017
b42380c
Updating code.gitea.io/sdk
jonasfranz Jul 28, 2017
4a97d69
Updating vendor.json
jonasfranz Jul 28, 2017
a69b5cd
Updating vendor.json
jonasfranz Jul 28, 2017
9023d24
Changing GET stopwatch/toggle to POST stopwatch/toggle
jonasfranz Jul 29, 2017
2f97858
Changing GET stopwatch/cancel to POST stopwatch/cancel
jonasfranz Jul 29, 2017
6eb51db
Added migration for stopwatches/timetracking
jonasfranz Jul 30, 2017
88d1167
Fixed migration by chaging x.Iterate to x.Find
jonasfranz Jul 30, 2017
f50e0d2
Resorted imports
jonasfranz Jul 31, 2017
55ee4e4
Moved Add Time Manually form to repo_form.go
jonasfranz Jul 31, 2017
10be62f
Added integration test
jonasfranz Aug 1, 2017
77db940
Resorted imports
jonasfranz Aug 1, 2017
76d7509
gofmt
jonasfranz Aug 1, 2017
f051c45
Adding integration test by @lafriks
jonasfranz Aug 1, 2017
c2fa07b
Using last event instead of a fixed event
jonasfranz Aug 1, 2017
0d8d3d5
Adding another integration test by @lafriks
jonasfranz Aug 1, 2017
a8eba6a
Fixed a refactoring bug that resulted in hiding "HasUserStopwatch" wa…
jonasfranz Aug 4, 2017
48e8365
Returning TrackedTime instead of AddTimeOption at AddTime.
jonasfranz Aug 12, 2017
abea9a7
Updating SDK from go-gitea/go-sdk#69
jonasfranz Aug 12, 2017
ba3895a
Merge branch 'master' into feature/timetracking
jonasfranz Aug 12, 2017
17a9a6b
Resetting Go-SDK back to default repository
jonasfranz Aug 14, 2017
44f9898
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
jonasfranz Aug 21, 2017
36db650
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
jonasfranz Aug 21, 2017
28cdef6
Fixing test-vendor by changing ini back to original repository
jonasfranz Aug 21, 2017
2dabf41
Adding "tags" to swagger spec
jonasfranz Aug 21, 2017
4063041
govendor sync
jonasfranz Aug 22, 2017
3222a0f
Removed duplicate
jonasfranz Aug 23, 2017
3840adf
Merge branches 'feature/timetracking' and 'master' of https://github.…
jonasfranz Aug 28, 2017
4727c4b
Formatting templates
jonasfranz Aug 28, 2017
b502d9b
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
jonasfranz Aug 28, 2017
528dd2d
Updating swagger spec
jonasfranz Aug 28, 2017
16de1d2
Fixing integration test caused be translation-changes
jonasfranz Aug 29, 2017
83a73d4
Removed encoding issues in local_en-US.ini.
jonasfranz Aug 31, 2017
3d117fc
Moved unit.IssuesConfig().EnableTimetracker into a != nil check
jonasfranz Sep 2, 2017
e2244a8
Improved javascript by checking if data-context exists
jonasfranz Sep 2, 2017
52be3f5
Replaced manual comment creation with CreateComment
jonasfranz Sep 3, 2017
17684f5
Replaced int>string>duration parsing with int>duration parsing
jonasfranz Sep 4, 2017
3142af3
Fixed encoding issues
jonasfranz Sep 4, 2017
3e08048
Removed unused imports
jonasfranz Sep 4, 2017
63a47bc
Merge branch 'master' into feature/timetracking
bkcsoft Sep 6, 2017
c8ed915
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
jonasfranz Sep 8, 2017
8cb778c
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
jonasfranz Sep 10, 2017
86346e6
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
jonasfranz Sep 12, 2017
d73b085
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
jonasfranz Sep 12, 2017
8e56b2f
Merge branch 'master' of https://github.com/go-gitea/gitea into featu…
jonasfranz Sep 13, 2017
a85040a
Hotfix for "Add time manually"
jonasfranz Sep 13, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions routers/repo/issue_timetrack.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package repo

import (
"net/http"
"strconv"
"time"

"code.gitea.io/gitea/models"
Expand Down Expand Up @@ -33,18 +34,34 @@ func AddTimeManually(c *context.Context, form auth.AddTimeManuallyForm) {
return
}

total := time.Duration(form.Hours)*time.Hour + time.Duration(form.Minutes)*time.Minute
h, err := parseTimeTrackingWithDuration(form.Hours, "h")
if err != nil {
c.Handle(http.StatusInternalServerError, "parseTimeTrackingWithDuration", err)
return
}

m, err := parseTimeTrackingWithDuration(form.Minutes, "m")
if err != nil {
c.Handle(http.StatusInternalServerError, "parseTimeTrackingWithDuration", err)
return
}

total := h + m

if total <= 0 {
c.Flash.Error(c.Tr("repo.issues.add_time_sum_to_small"))
c.Redirect(url, http.StatusSeeOther)
return
}

if _, err := models.AddTime(c.User, issue, int64(total)); err != nil {
if _, err := models.AddTime(c.User, issue, int64(total.Seconds())); err != nil {
c.Handle(http.StatusInternalServerError, "AddTime", err)
return
}

c.Redirect(url, http.StatusSeeOther)
}

func parseTimeTrackingWithDuration(value int, space string) (time.Duration, error) {
return time.ParseDuration(strconv.Itoa(value) + space)
}