Merge pull request 'implemented date adding for tracked time. it is r…

…equired to calculate monthly timesheets' (go-gitea#8) from feature/7-date-to-time into integra Reviewed-on: http://gitea.corp.sarov-site.online/integra/gitea/pulls/8
fuzzing-stuff · Aug 27, 2021 · b5c38a4 · b5c38a4
2 parents 43494f6 + 328ca6e
commit b5c38a4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/models/issue_tracked_time.go b/models/issue_tracked_time.go
@@ -20,7 +20,7 @@ type TrackedTime struct {
 	UserID      int64     `xorm:"INDEX"`
 	User        *User     `xorm:"-"`
 	Created     time.Time `xorm:"-"`
-	CreatedUnix int64     `xorm:"created"`
+	CreatedUnix int64     `xorm:"created_unix"`
 	Time        int64     `xorm:"NOT NULL"`
 	Deleted     bool      `xorm:"NOT NULL DEFAULT false"`
 }
@@ -175,10 +175,11 @@ func addTime(e Engine, user *User, issue *Issue, amount int64, created time.Time
 		created = time.Now()
 	}
 	tt := &TrackedTime{
-		IssueID: issue.ID,
-		UserID:  user.ID,
-		Time:    amount,
-		Created: created,
+		IssueID:     issue.ID,
+		UserID:      user.ID,
+		Time:        amount,
+		Created:     created,
+		CreatedUnix: created.Unix(),
 	}
 	if _, err := e.Insert(tt); err != nil {
 		return nil, err

diff --git a/routers/web/repo/issue_timetrack.go b/routers/web/repo/issue_timetrack.go
@@ -26,7 +26,6 @@ func AddTimeManually(c *context.Context) {
 		return
 	}
 	url := issue.HTMLURL()
-
 	if c.HasError() {
 		c.Flash.Error(c.GetErrMsg())
 		c.Redirect(url)
@@ -40,8 +39,11 @@ func AddTimeManually(c *context.Context) {
 		c.Redirect(url, http.StatusSeeOther)
 		return
 	}
-
-	if _, err := models.AddTime(c.User, issue, int64(total.Seconds()), time.Now()); err != nil {
+	created, err := time.Parse("2006-01-02", form.Created)
+	if err != nil {
+		created = time.Now()
+	}
+	if _, err := models.AddTime(c.User, issue, int64(total.Seconds()), created); err != nil {
 		c.ServerError("AddTime", err)
 		return
 	}

diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go
@@ -804,8 +804,9 @@ func (f *DeleteRepoFileForm) Validate(req *http.Request, errs binding.Errors) bi
 
 // AddTimeManuallyForm form that adds spent time manually.
 type AddTimeManuallyForm struct {
-	Hours   int `binding:"Range(0,1000)"`
-	Minutes int `binding:"Range(0,1000)"`
+	Created string `form:"created" binding:"OmitEmpty;Size(10)"`
+	Hours   int    `binding:"Range(0,1000)"`
+	Minutes int    `binding:"Range(0,1000)"`
 }
 
 // Validate validates the fields

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
@@ -354,11 +354,12 @@
 								</div>
 							{{end}}
 							<button class="ui fluid button poping up issue-start-time" data-content='{{.i18n.Tr "repo.issues.start_tracking"}}' data-position="top center" data-variation="small inverted">{{.i18n.Tr "repo.issues.start_tracking_short"}}</button>
-							<div class="ui mini modal issue-start-time-modal">
+							<div class="ui tiny modal issue-start-time-modal">
 								<div class="header">{{.i18n.Tr "repo.issues.add_time"}}</div>
 								<div class="content">
 									<form method="POST" id="add_time_manual_form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/times/add" class="ui action input fluid">
 										{{$.CsrfTokenHtml}}
+										<input type="date" name="created">
 										<input placeholder='{{.i18n.Tr "repo.issues.add_time_hours"}}' type="number" name="hours">
 										<input placeholder='{{.i18n.Tr "repo.issues.add_time_minutes"}}' type="number" name="minutes" class="ui compact">
 									</form>