lion187
/
TaskFlow
forked from OrgGo/Tasks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

two statuses had the same meaning, pending and incomplete. removed incomplete

This commit is contained in:
Suraj Patil 2016-05-14 16:07:20 +05:30
parent 6721b2d993
commit eeab05f73b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/tasks.go
View File

@ -57,7 +57,7 @@ func (db Database) query(q string, args ...interface{}) (rows *sql.Rows) {
func init() { func init() {
database.db, err = sql.Open("sqlite3", "./tasks.db") database.db, err = sql.Open("sqlite3", "./tasks.db")
taskStatus = map[string]int{"COMPLETE": 1, "PENDING": 2, "DELETED": 3, "INCOMPLETE": 4} taskStatus = map[string]int{"COMPLETE": 1, "PENDING": 2, "DELETED": 3}
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -89,7 +89,7 @@ func GetTasks(username, status, category string) (types.Context, error) {
if category == "" { if category == "" {
switch status { switch status {
case "pending": case "pending":
getTaskSQL = basicSQL + " and s.status='INCOMPLETE'" getTaskSQL = basicSQL + " and s.status='PENDING'"
case "deleted": case "deleted":
getTaskSQL = basicSQL + " and s.status='DELETED' " getTaskSQL = basicSQL + " and s.status='DELETED' "
case "completed": case "completed":
@ -182,13 +182,13 @@ func DeleteAll(username string) error {
//RestoreTask is used to restore tasks from the Trash //RestoreTask is used to restore tasks from the Trash
func RestoreTask(username string, id int) error { func RestoreTask(username string, id int) error {
err := taskQuery("update task set task_status_id=?,last_modified_at=datetime(),finish_date=null where id=? and user_id=(select id from user where username=?)", taskStatus["INCOMPLETE"], id, username) err := taskQuery("update task set task_status_id=?,last_modified_at=datetime(),finish_date=null where id=? and user_id=(select id from user where username=?)", taskStatus["PENDING"], id, username)
return err return err
} }
//RestoreTaskFromComplete is used to restore tasks from the Trash //RestoreTaskFromComplete is used to restore tasks from the Trash
func RestoreTaskFromComplete(username string, id int) error { func RestoreTaskFromComplete(username string, id int) error {
err := taskQuery("update task set finish_date=null,last_modified_at=datetime(), task_status_id=? where id=? and user_id=(select id from user where username=?)", taskStatus["INCOMPLETE"], id, username) err := taskQuery("update task set finish_date=null,last_modified_at=datetime(), task_status_id=? where id=? and user_id=(select id from user where username=?)", taskStatus["PENDING"], id, username)
return err return err
} }
@ -208,10 +208,10 @@ func AddTask(title, content, category string, taskPriority int, username string)
} }
if category == "" { if category == "" {
err = taskQuery("insert into task(title, content, priority, task_status_id, created_date, last_modified_at, user_id) values(?,?,?,?,datetime(), datetime(),?)", title, content, taskPriority, taskStatus["INCOMPLETE"], userID) err = taskQuery("insert into task(title, content, priority, task_status_id, created_date, last_modified_at, user_id) values(?,?,?,?,datetime(), datetime(),?)", title, content, taskPriority, taskStatus["PENDING"], userID)
} else { } else {
categoryID := GetCategoryByName(username, category) categoryID := GetCategoryByName(username, category)
err = taskQuery("insert into task(title, content, priority, created_date, last_modified_at, cat_id, task_status_id, user_id) values(?,?,?,datetime(), datetime(), ?,?,?)", title, content, taskPriority, categoryID, taskStatus["INCOMPLETE"], userID) err = taskQuery("insert into task(title, content, priority, created_date, last_modified_at, cat_id, task_status_id, user_id) values(?,?,?,datetime(), datetime(), ?,?,?)", title, content, taskPriority, categoryID, taskStatus["PENDING"], userID)
} }
return err return err
} }

1
schema.sql
View File

@ -43,4 +43,3 @@ CREATE TABLE user (
insert into status(status) values('COMPLETE'); insert into status(status) values('COMPLETE');
insert into status(status) values('PENDING'); insert into status(status) values('PENDING');
insert into status(status) values('DELETED'); insert into status(status) values('DELETED');
insert into status(status) values('INCOMPLETE');