Issue due date

models/issue.go

@@ -46,10 +46,13 @@ type Issue struct {
 	NumComments     int
 	Ref             string
 
-	DeadlineUnix util.TimeStamp `xorm:"INDEX"`
-	CreatedUnix  util.TimeStamp `xorm:"INDEX created"`
-	UpdatedUnix  util.TimeStamp `xorm:"INDEX updated"`
-	ClosedUnix   util.TimeStamp `xorm:"INDEX"`
+	DeadlineUnix   util.TimeStamp `xorm:"INDEX"`
+	DeadlineString string         `xorm:"-"`
+	IsOverDue      bool           `xorm:"-"`
+
+	CreatedUnix util.TimeStamp `xorm:"INDEX created"`
+	UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+	ClosedUnix  util.TimeStamp `xorm:"INDEX"`
 
 	Attachments []*Attachment `xorm:"-"`
 	Comments    []*Comment    `xorm:"-"`
@@ -69,6 +72,14 @@ func init() {
 	issueTasksDonePat = regexp.MustCompile(issueTasksDoneRegexpStr)
 }
 
+// AfterLoad formats the unix deadline into a human-readable format
+func (issue *Issue) AfterLoad() {
+	issue.DeadlineString = issue.DeadlineUnix.Format("2006-01-02")
+	if util.TimeStampNow() >= issue.DeadlineUnix {
+		issue.IsOverDue = true
+	}
+}
+
 func (issue *Issue) loadRepo(e Engine) (err error) {
 	if issue.Repo == nil {
 		issue.Repo, err = getRepositoryByID(e, issue.RepoID)
@@ -324,6 +335,9 @@ func (issue *Issue) APIFormat() *api.Issue {
 			apiIssue.PullRequest.Merged = issue.PullRequest.MergedUnix.AsTimePtr()
 		}
 	}
+	if issue.DeadlineUnix != 0 {
+		apiIssue.Deadline = issue.DeadlineUnix.AsTimePtr()
+	}
 
 	return apiIssue
 }
@@ -1498,3 +1512,41 @@ func updateIssue(e Engine, issue *Issue) error {
 func UpdateIssue(issue *Issue) error {
 	return updateIssue(x, issue)
 }
+
+// UpdateIssueDeadline does what it says
+func UpdateIssueDeadline(issue *Issue, doer *User) (err error) {
+
+	// Check if the new date was added or modified
+	var actualIssue Issue
+	if _, err := x.ID(issue.ID).Get(&actualIssue); err != nil {
+		return fmt.Errorf("getActualIssue: %v", err)
+	}
+
+	sess := x.NewSession()
+	defer sess.Close()
+
+	if err = issue.loadRepo(sess); err != nil {
+		return fmt.Errorf("loadRepo: %v", err)
+	}
+
+	// Make the comment
+	if issue.DeadlineUnix == 0 {
+		if _, err = createRemovedDeadlineComment(sess, doer, issue.Repo, issue, actualIssue.DeadlineUnix); err != nil {
+			return fmt.Errorf("createRemovedDueDateComment: %v", err)
+		}
+	} else {
+		// Check if the new date was added or modified
+		// If the actual deadline is 0 => deadline added
+		if actualIssue.DeadlineUnix == 0 {
+			if _, err = createAddedDeadlineComment(sess, doer, issue.Repo, issue, issue.DeadlineUnix); err != nil {
+				return fmt.Errorf("createRemovedDueDateComment: %v", err)
+			}
+		} else { // Otherwise modified
+			if _, err = createModifiedDeadlineComment(sess, doer, issue.Repo, issue, issue.DeadlineUnix); err != nil {
+				return fmt.Errorf("createRemovedDueDateComment: %v", err)
+			}
+		}
+	}
+
+	return UpdateIssue(issue)
+}

models/issue_comment.go

@@ -60,6 +60,12 @@ const (
 	CommentTypeAddTimeManual
 	// Cancel a stopwatch for time tracking
 	CommentTypeCancelTracking
+	// Added a due date
+	CommentTypeAddedDeadline
+	// Modified the due date
+	CommentTypeModifiedDeadline
+	// Removed a due date
+	CommentTypeRemovedDeadline
 )
 
 // CommentTag defines comment tag type
@@ -485,6 +491,45 @@ func createAssigneeComment(e *xorm.Session, doer *User, repo *Repository, issue
 	})
 }
 
+func createAddedDeadlineComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, dateUnix util.TimeStamp) (*Comment, error) {
+	// Make string from unix date
+	date := dateUnix.Format("2006-01-02")
+
+	return createComment(e, &CreateCommentOptions{
+		Type:    CommentTypeAddedDeadline,
+		Doer:    doer,
+		Repo:    repo,
+		Issue:   issue,
+		Content: date,
+	})
+}
+
+func createModifiedDeadlineComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, dateUnix util.TimeStamp) (*Comment, error) {
+	// Make string from unix date
+	date := dateUnix.Format("2006-01-02")
+
+	return createComment(e, &CreateCommentOptions{
+		Type:    CommentTypeModifiedDeadline,
+		Doer:    doer,
+		Repo:    repo,
+		Issue:   issue,
+		Content: date,
+	})
+}
+
+func createRemovedDeadlineComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, dateUnix util.TimeStamp) (*Comment, error) {
+	// Make string from unix date
+	date := dateUnix.Format("2006-01-02")
+
+	return createComment(e, &CreateCommentOptions{
+		Type:    CommentTypeRemovedDeadline,
+		Doer:    doer,
+		Repo:    repo,
+		Issue:   issue,
+		Content: date,
+	})
+}
+
 func createChangeTitleComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, oldTitle, newTitle string) (*Comment, error) {
 	return createComment(e, &CreateCommentOptions{
 		Type:     CommentTypeChangeTitle,

models/pull.go

@@ -207,6 +207,7 @@ func (pr *PullRequest) APIFormat() *api.PullRequest {
 		Base:      apiBaseBranchInfo,
 		Head:      apiHeadBranchInfo,
 		MergeBase: pr.MergeBase,
+		Deadline:  apiIssue.Deadline,
 		Created:   pr.Issue.CreatedUnix.AsTimePtr(),
 		Updated:   pr.Issue.UpdatedUnix.AsTimePtr(),
 	}

modules/auth/repo_form.go

@@ -521,3 +521,13 @@ func (f *AddTimeManuallyForm) Validate(ctx *macaron.Context, errs binding.Errors
 type SaveTopicForm struct {
 	Topics []string `binding:"topics;Required;"`
 }
+
+// DeadlineForm hold the validation rules for deadlines
+type DeadlineForm struct {
+	DateString string `form:"date" binding:"Required;MaxSize(10)"`
+}
+
+// Validate validates the fields
+func (f *DeadlineForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}

options/locale/locale_en-US.ini

@@ -737,6 +737,19 @@ issues.add_time_sum_to_small = No time was entered
 issues.cancel_tracking = Cancel
 issues.cancel_tracking_history = `cancelled time tracking %s`
 issues.time_spent_total = Total time spent
+issues.due_date = Due date
+issues.invalid_due_date_format = "Due date format is invalid, must be 'yyyy-mm-dd'."
+issues.error_modifying_due_date = "An error occured while modifying the due date."
+issues.error_removing_due_date = "An error occured while remvoing the due date."
+issues.due_date_form = "Due date, format yyyy-mm-dd"
+issues.due_date_form_add = "Add due date"
+issues.due_date_form_update = "Update due date"
+issues.due_date_form_remove = "Remove due date"
+issues.due_date_not_writer = "You need to have at least write access to this repository in order to update the due date for this issue."
+issues.due_date_not_set = "No due date set."
+issues.due_date_added = "added the due date %s %s"
+issues.due_date_modified = "modified the due date to %s %s"
+issues.due_date_remove = "removed the due date %s %s"
 
 pulls.desc = Pulls management your code review and merge requests
 pulls.new = New Pull Request

public/js/index.js

@@ -2193,4 +2193,15 @@ function initTopicbar() {
             },
         },
     });
-}
+}
+function toggleDuedateForm() {
+    $('#add_deadline_form').fadeToggle(150);
+}
+
+function deleteDueDate(url) {
+    $.post(url, {
+        '_csrf': csrf,
+    },function( data ) {
+        window.location.reload();
+    });
+}

public/less/_repository.less

@@ -1544,6 +1544,9 @@
                 margin-top: -5px;
                 margin-right: 5px;
             }
+            .overdue{
+              color: red;
+            }
         }
     }
 }

public/swagger.v1.json

@@ -4325,6 +4325,32 @@
         }
       }
     },
+    "/topics/search": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "search topics via keyword",
+        "operationId": "topicSearch",
+        "parameters": [
+          {
+            "type": "integer",
+            "description": "id of the repo to get",
+            "name": "keyword",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/Repository"
+          }
+        }
+      }
+    },
     "/user": {
       "get": {
         "produces": [
@@ -5521,6 +5547,12 @@
           "type": "boolean",
           "x-go-name": "Closed"
         },
+        "due_date": {
+          "description": "deadline",
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Deadline"
+        },
         "labels": {
           "description": "list of label ids",
           "type": "array",
@@ -5657,6 +5689,11 @@
           "type": "string",
           "x-go-name": "Body"
         },
+        "due_date": {
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Deadline"
+        },
         "head": {
           "type": "string",
           "x-go-name": "Head"
@@ -5962,6 +5999,11 @@
           "type": "string",
           "x-go-name": "Body"
         },
+        "due_date": {
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Deadline"
+        },
         "milestone": {
           "type": "integer",
           "format": "int64",
@@ -6052,6 +6094,11 @@
           "type": "string",
           "x-go-name": "Body"
         },
+        "due_date": {
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Deadline"
+        },
         "labels": {
           "type": "array",
           "items": {
@@ -6315,6 +6362,11 @@
           "format": "date-time",
           "x-go-name": "Created"
         },
+        "due_date": {
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Deadline"
+        },
         "id": {
           "type": "integer",
           "format": "int64",
@@ -6733,6 +6785,11 @@
           "type": "string",
           "x-go-name": "DiffURL"
         },
+        "due_date": {
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Deadline"
+        },
         "head": {
           "$ref": "#/definitions/PRBranchInfo"
         },

routers/api/v1/repo/issue.go

@@ -163,12 +163,20 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
 	// responses:
 	//   "201":
 	//     "$ref": "#/responses/Issue"
+
+	var deadline util.TimeStamp
+	deadline = util.TimeStamp(0)
+	if form.Deadline != nil {
+		deadline = util.TimeStamp(form.Deadline.Unix())
+	}
+
 	issue := &models.Issue{
-		RepoID:   ctx.Repo.Repository.ID,
-		Title:    form.Title,
-		PosterID: ctx.User.ID,
-		Poster:   ctx.User,
-		Content:  form.Body,
+		RepoID:       ctx.Repo.Repository.ID,
+		Title:        form.Title,
+		PosterID:     ctx.User.ID,
+		Poster:       ctx.User,
+		Content:      form.Body,
+		DeadlineUnix: deadline,
 	}
 
 	if ctx.Repo.IsWriter() {
@@ -265,6 +273,15 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
 		issue.Content = *form.Body
 	}
 
+	if form.Deadline != nil && !form.Deadline.IsZero() {
+		issue.DeadlineUnix = util.TimeStamp(form.Deadline.Unix())
+	} else {
+		issue.DeadlineUnix = util.TimeStamp(0)
+	}
+	if err := models.UpdateIssueDeadline(issue, ctx.User); err != nil {
+		ctx.Error(500, "UpdateIssueDeadline", err)
+	}
+
 	if ctx.Repo.IsWriter() && form.Assignee != nil &&
 		(issue.Assignee == nil || issue.Assignee.LowerName != strings.ToLower(*form.Assignee)) {
 		if len(*form.Assignee) == 0 {