diff --git a/Featurecreep.md b/Featurecreep.md index 2d4d8269a..5cd65e6a3 100644 --- a/Featurecreep.md +++ b/Featurecreep.md @@ -268,7 +268,7 @@ Teams sind global, d.h. Ein Team kann mehrere Namespaces verwalten. * [ ] Mgl. zum Accountlöschen haben (so richtig krass mit emailverifiezierung und dass alle Privaten Listen gelöscht werden und man alle geteilten entweder wem übertragen muss oder auf privat stellen) * [ ] IMAP-Integration -> Man schickt eine email an Vikunja und es macht daraus dann nen task -> Achtung missbrauchsmöglichkeiten * [ ] In und Out webhooks, mit Templates vom Payload -* [ ] Start/Enddatum für Tasks +* [x] Start/Enddatum für Tasks * [ ] Timeline/Calendar view -> Dazu tasks die in einem Bestimmten Bereich due sind, macht dann das Frontend * [ ] "Smart Lists", Listen nach bestimmten Kriterien gefiltert -> nur UI? * [ ] "Performance-Statistik" -> Wie viele Tasks man in bestimmten Zeiträumen so geschafft hat etc diff --git a/docs/docs.go b/docs/docs.go index 03afa240e..f0d96f5b7 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1,6 +1,6 @@ // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT // This file was generated by swaggo/swag at -// 2018-12-21 22:26:31.78967283 +0100 CET m=+0.095021161 +// 2018-12-22 16:18:46.44967995 +0100 CET m=+0.133725013 package docs @@ -91,7 +91,7 @@ var doc = `{ "ApiKeyAuth": [] } ], - "description": "Returns a list by its ID.", + "description": "Returns a team by its ID.", "consumes": [ "application/json" ], @@ -99,13 +99,13 @@ var doc = `{ "application/json" ], "tags": [ - "list" + "team" ], - "summary": "Gets one list", + "summary": "Gets one team", "parameters": [ { "type": "integer", - "description": "List ID", + "description": "Team ID", "name": "id", "in": "path", "required": true @@ -113,14 +113,14 @@ var doc = `{ ], "responses": { "200": { - "description": "The list", + "description": "The team", "schema": { "type": "object", - "$ref": "#/definitions/models.List" + "$ref": "#/definitions/models.Team" } }, "403": { - "description": "The user does not have access to the list", + "description": "The user does not have access to the team", "schema": { "type": "object", "$ref": "#/definitions/code.vikunja.io.web.HTTPError" @@ -2931,6 +2931,9 @@ var doc = `{ "dueDate": { "type": "integer" }, + "endDate": { + "type": "integer" + }, "id": { "type": "integer" }, @@ -2952,6 +2955,9 @@ var doc = `{ "repeatAfter": { "type": "integer" }, + "startDate": { + "type": "integer" + }, "subtasks": { "type": "array", "items": { diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index 143b2c710..dfd885940 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -78,7 +78,7 @@ "ApiKeyAuth": [] } ], - "description": "Returns a list by its ID.", + "description": "Returns a team by its ID.", "consumes": [ "application/json" ], @@ -86,13 +86,13 @@ "application/json" ], "tags": [ - "list" + "team" ], - "summary": "Gets one list", + "summary": "Gets one team", "parameters": [ { "type": "integer", - "description": "List ID", + "description": "Team ID", "name": "id", "in": "path", "required": true @@ -100,14 +100,14 @@ ], "responses": { "200": { - "description": "The list", + "description": "The team", "schema": { "type": "object", - "$ref": "#/definitions/models.List" + "$ref": "#/definitions/models.Team" } }, "403": { - "description": "The user does not have access to the list", + "description": "The user does not have access to the team", "schema": { "type": "object", "$ref": "#/definitions/code.vikunja.io/web.HTTPError" @@ -2917,6 +2917,9 @@ "dueDate": { "type": "integer" }, + "endDate": { + "type": "integer" + }, "id": { "type": "integer" }, @@ -2938,6 +2941,9 @@ "repeatAfter": { "type": "integer" }, + "startDate": { + "type": "integer" + }, "subtasks": { "type": "array", "items": { diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml index 0b6416606..97a6210ca 100644 --- a/docs/swagger/swagger.yaml +++ b/docs/swagger/swagger.yaml @@ -49,6 +49,8 @@ definitions: type: boolean dueDate: type: integer + endDate: + type: integer id: type: integer listID: @@ -63,6 +65,8 @@ definitions: type: array repeatAfter: type: integer + startDate: + type: integer subtasks: items: $ref: '#/definitions/models.ListTask' @@ -392,9 +396,9 @@ paths: get: consumes: - application/json - description: Returns a list by its ID. + description: Returns a team by its ID. parameters: - - description: List ID + - description: Team ID in: path name: id required: true @@ -403,12 +407,12 @@ paths: - application/json responses: "200": - description: The list + description: The team schema: - $ref: '#/definitions/models.List' + $ref: '#/definitions/models.Team' type: object "403": - description: The user does not have access to the list + description: The user does not have access to the team schema: $ref: '#/definitions/code.vikunja.io/web.HTTPError' type: object @@ -419,9 +423,9 @@ paths: type: object security: - ApiKeyAuth: [] - summary: Gets one list + summary: Gets one team tags: - - list + - team post: consumes: - application/json diff --git a/pkg/models/list_tasks.go b/pkg/models/list_tasks.go index f58f339bd..3cbf71404 100644 --- a/pkg/models/list_tasks.go +++ b/pkg/models/list_tasks.go @@ -35,6 +35,8 @@ type ListTask struct { ParentTaskID int64 `xorm:"int(11) INDEX" json:"parentTaskID"` Priority int64 `xorm:"int(11)" json:"priority"` Sorting string `xorm:"-" json:"-" param:"sort"` // Parameter to sort by + StartDateUnix int64 `xorm:"int(11) INDEX" json:"startDate"` + EndDateUnix int64 `xorm:"int(11) INDEX" json:"endDate"` Subtasks []*ListTask `xorm:"-" json:"subtasks"`