Kanban #393

Merged
konrad merged 14 commits from feature/kanban into master 2020-04-19 07:27:29 +00:00
4 changed files with 100 additions and 0 deletions
Showing only changes of commit 06c2f0707d - Show all commits

View File

@ -0,0 +1,43 @@
// Vikunja is a to-do list application to facilitate your life.
// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
package migration
import (
"src.techknowlogick.com/xormigrate"
"xorm.io/xorm"
)
type task20200418230432 struct {
BucketID int64 `xorm:"int(11) null"`
}
func (s task20200418230432) TableName() string {
return "tasks"
}
func init() {
migrations = append(migrations, &xormigrate.Migration{
ID: "20200418230432",
Description: "Add bucket id property to task",
Migrate: func(tx *xorm.Engine) error {
return tx.Sync2(task20200418230432{})
},
Rollback: func(tx *xorm.Engine) error {
return tx.DropTables(task20200418230432{})
},
})
}

View File

@ -0,0 +1,49 @@
// Vikunja is a to-do list application to facilitate your life.
// Copyright 2018-2020 Vikunja and contributors. All rights reserved.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
package migration
import (
"code.vikunja.io/api/pkg/timeutil"
"src.techknowlogick.com/xormigrate"
"xorm.io/xorm"
)
type bucket20200418230605 struct {
ID int64 `xorm:"int(11) autoincr not null unique pk"`
Title string `xorm:"text not null"`
ListID int64 `xorm:"int(11) not null"`
Created timeutil.TimeStamp `xorm:"created not null"`
Updated timeutil.TimeStamp `xorm:"updated not null"`
CreatedByID int64 `xorm:"int(11) not null"`
}
func (b *bucket20200418230605) TableName() string {
return "buckets"
}
func init() {
migrations = append(migrations, &xormigrate.Migration{
ID: "20200418230605",
Description: "Add bucket table",
Migrate: func(tx *xorm.Engine) error {
return tx.Sync2(bucket20200418230605{})
},
Rollback: func(tx *xorm.Engine) error {
return tx.DropTables(bucket20200418230605{})
},
})
}

View File

@ -44,6 +44,10 @@ type Bucket struct {
web.CRUDable `xorm:"-" json:"-"`
}
func (b *Bucket) TableName() string {
return "buckets"
}
func getBucketByID(id int64) (b *Bucket, err error) {
b = &Bucket{}
exists, err := x.Where("id = ?", id).Get(b)
@ -59,6 +63,9 @@ func getBucketByID(id int64) (b *Bucket, err error) {
// ReadAll returns all buckets with their tasks for a certain list
func (b *Bucket) ReadAll(auth web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
// Note: I'm ignoring pagination for now since I've yet to figure out a way on how to make it work
// I'll probably just don't do it and instead make individual tasks archivable.
// Get all buckets for this list
buckets := []*Bucket{
{

View File

@ -51,6 +51,7 @@ func GetTables() []interface{} {
&TaskRelation{},
&TaskAttachment{},
&TaskComment{},
&Bucket{},
}
}