From 11e232abfa56dbbf3c5a760c3616c7cc213fecf2 Mon Sep 17 00:00:00 2001
From: Suraj Patil <sapatil@live.com>
Date: Sun, 7 Aug 2016 14:39:17 +0530
Subject: [PATCH] ability to hide tasks from the timeline

---
 db/tasks.go         | 30 +++++++++++++++++-------------
 templates/edit.html |  1 +
 templates/home.html |  2 ++
 types/types.go      |  1 +
 views/addViews.go   | 14 ++++++++++----
 views/api.go        |  9 ++++++++-
 6 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/db/tasks.go b/db/tasks.go
index 52dde8d..36cfad2 100644
--- a/db/tasks.go
+++ b/db/tasks.go
@@ -85,15 +85,15 @@ func GetTasks(username, status, category string) (types.Context, error) {
 		return context, err
 	}
 
-	basicSQL := "select t.id, title, content, created_date, priority, case when c.name is null then 'NA' else c.name end from task t, status s, user u left outer join  category c on c.id=t.cat_id where u.username=? and s.id=t.task_status_id and u.id=t.user_id"
+	basicSQL := "select t.id, title, content, created_date, priority, case when c.name is null then 'NA' else c.name end from task t, status s, user u left outer join  category c on c.id=t.cat_id where u.username=? and s.id=t.task_status_id and u.id=t.user_id "
 	if category == "" {
 		switch status {
 		case "pending":
-			getTaskSQL = basicSQL + " and s.status='PENDING'"
+			getTaskSQL = basicSQL + " and s.status='PENDING' and t.hide!=1"
 		case "deleted":
-			getTaskSQL = basicSQL + " and s.status='DELETED' "
+			getTaskSQL = basicSQL + " and s.status='DELETED' and t.hide!=1"
 		case "completed":
-			getTaskSQL = basicSQL + " and s.status='COMPLETE'"
+			getTaskSQL = basicSQL + " and s.status='COMPLETE' and t.hide!=1"
 		}
 
 		getTaskSQL += " order by t.created_date asc"
@@ -152,12 +152,12 @@ func GetTaskByID(username string, id int) (types.Context, error) {
 	var tasks []types.Task
 	var task types.Task
 
-	getTaskSQL := "select t.id, t.title, t.content, t.priority, 'UNCATEGORIZED' from task t join user u where t.user_id=u.id and t.cat_id=0 union select t.id, t.title, t.content, t.priority, c.name from task t join user u left outer join category c  where c.id = t.cat_id and t.user_id=u.id and t.id=? and u.username=?;"
+	getTaskSQL := "select t.id, t.title, t.content, t.priority, t.hide, 'UNCATEGORIZED' from task t join user u where t.user_id=u.id and t.cat_id=0 union select t.id, t.title, t.content, t.priority, c.name from task t join user u left outer join category c  where c.id = t.cat_id and t.user_id=u.id and t.id=? and u.username=?;"
 
 	rows := database.query(getTaskSQL, id, username)
 	defer rows.Close()
 	if rows.Next() {
-		err := rows.Scan(&task.Id, &task.Title, &task.Content, &task.Priority, &task.Category)
+		err := rows.Scan(&task.Id, &task.Title, &task.Content, &task.Priority, &task.IsHidden, &task.Category)
 		if err != nil {
 			log.Println(err)
 			//send email to respective people
@@ -205,23 +205,27 @@ func DeleteTask(username string, id int) error {
 }
 
 //AddTask is used to add the task in the database
-func AddTask(title, content, category string, taskPriority int, username, dueDate string) error {
+//TODO: add dueDate feature later
+func AddTask(title, content, category string, taskPriority int, username string, hidden int) error {
 	log.Println("AddTask: started function")
 	var err error
-	timeDueDate, err := time.Parse("31/12/2016", dueDate)
-	if err != nil {
-		log.Fatal(err)
-	}
+	// var timeDueDate time.Time
+	// if dueDate != "" {
+	// 	timeDueDate, err = time.Parse("31/12/2016", dueDate)
+	// 	if err != nil {
+	// 		log.Fatal(err)
+	// 	}
+	// }
 	userID, err := GetUserID(username)
 	if err != nil && (title != "" || content != "") {
 		return err
 	}
 
 	if category == "" {
-		err = taskQuery("insert into task(title, content, priority, task_status_id, created_date, last_modified_at, user_id,due_date) values(?,?,?,?,datetime(), datetime(),?)", title, content, taskPriority, taskStatus["PENDING"], userID, timeDueDate)
+		err = taskQuery("insert into task(title, content, priority, task_status_id, created_date, last_modified_at, user_id,hide) values(?,?,?,?,datetime(), datetime(),?,?)", title, content, taskPriority, taskStatus["PENDING"], userID, hidden)
 	} else {
 		categoryID := GetCategoryByName(username, category)
-		err = taskQuery("insert into task(title, content, priority, created_date, last_modified_at, cat_id, task_status_id, user_id,due_date) values(?,?,?,datetime(), datetime(), ?,?,?)", title, content, taskPriority, categoryID, taskStatus["PENDING"], userID, timeDueDate)
+		err = taskQuery("insert into task(title, content, priority, created_date, last_modified_at, cat_id, task_status_id, user_id,hide) values(?,?,?,datetime(), datetime(), ?,?,?,?)", title, content, taskPriority, categoryID, taskStatus["PENDING"], userID, hidden)
 	}
 	return err
 }
diff --git a/templates/edit.html b/templates/edit.html
index 3134c33..e4ea9ea 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -18,6 +18,7 @@
                     <input type="radio" name="priority" value="2" {{if eq .Priority "2"}} checked="checked" {{end}} /> Medium
                     <input type="radio" name="priority" value="1" {{if eq .Priority "1"}} checked="checked" {{end}} /> Low
                 </div>
+                <input type="checkbox" name="hide" id="hideChk"> Hide from timeline
                 Category:
                 <select name="category">
                     <option>---</option>
diff --git a/templates/home.html b/templates/home.html
index be6b0eb..8880616 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -30,6 +30,8 @@
                         <input type="radio" name="priority" value="3" /> High
                         <input type="radio" name="priority" value="2" /> Medium
                         <input type="radio" name="priority" value="1" /> Low
+                        <br>
+                        <input type="checkbox" name="hide" id="hideChk"> Hide from timeline
                     </div>
                     Category:
                     <select name="category" class="dropdown">
diff --git a/types/types.go b/types/types.go
index f454b18..f5becbf 100644
--- a/types/types.go
+++ b/types/types.go
@@ -15,6 +15,7 @@ type Task struct {
 	Referer   string    `json:"referer,omitempty"`
 	Comments  []Comment `json:"comments,omitempty"`
 	IsOverdue bool      `json:"isoverdue, omitempty"`
+	IsHidden  int       `json:"ishidden, omitempty`
 }
 
 type Tasks []Task
diff --git a/views/addViews.go b/views/addViews.go
index 38fc8b8..e5937dd 100644
--- a/views/addViews.go
+++ b/views/addViews.go
@@ -64,8 +64,14 @@ func AddTaskFunc(w http.ResponseWriter, r *http.Request) {
 		if !found {
 			taskPriority = 1
 		}
-
-		dueDate := r.FormValue("dueDate")
+		var hidden int
+		hideTimeline := r.FormValue("hide")
+		if hideTimeline != "" {
+			hidden = 1
+		} else {
+			hidden = 0
+		}
+		// dueDate := r.FormValue("dueDate")
 		category := r.FormValue("category")
 		title := template.HTMLEscapeString(r.Form.Get("title"))
 		content := template.HTMLEscapeString(r.Form.Get("content"))
@@ -103,8 +109,8 @@ func AddTaskFunc(w http.ResponseWriter, r *http.Request) {
 					log.Println("error adding task to db")
 				}
 			}
-			taskTruth := db.AddTask(title, content, category, taskPriority, username, dueDate)
-
+			//taskTruth := db.AddTask(title, content, category, taskPriority, username, dueDate)
+			taskTruth := db.AddTask(title, content, category, taskPriority, username, hidden)
 			if taskTruth != nil {
 				message = "Error adding task"
 				log.Println("error adding task to db")
diff --git a/views/api.go b/views/api.go
index 784093d..9c5bf50 100644
--- a/views/api.go
+++ b/views/api.go
@@ -183,10 +183,17 @@ func AddTaskFuncAPI(w http.ResponseWriter, r *http.Request) {
 		if !found {
 			taskPriority = 1
 		}
+		var hidden int
+		hideTimeline := r.FormValue("hide")
+		if hideTimeline != "" {
+			hidden = 1
+		} else {
+			hidden = 0
+		}
 		var taskErr bool
 
 		if title != "" && content != "" {
-			taskTruth := db.AddTask(title, content, category, taskPriority, username, "")
+			taskTruth := db.AddTask(title, content, category, taskPriority, username, hidden)
 			if taskTruth != nil {
 				taskErr = true
 			}