bubbletea.go

@@ -109,26 +109,34 @@ func AddNewTask(m *model) {
 func (m model) View() string {
 	// The header
 	s := ""
-	currentList := m.todos
+	currentList := []todo{}
 
-	s += "GOTD\n"
+	s += "GOTD\n\n"
 
 	switch m.tab {
 	case 0:
-		s += "Inbox"
+		// s += "Inbox"
-		// inboxFilter := func(t todo) bool { return t.isInbox }
+		taskFilter := func(t todo) bool { return t.isInbox }
-		// currentList = filter(m.todos, inboxFilter)
+		currentList = filter(m.todos, taskFilter)
 	case 1:
-		s += "Today"
+		// s += "Today"
+		taskFilter := func(t todo) bool { return t.startdate == int(midnightToUnix()) || t.deadline == int(midnightToUnix()) }
+		currentList = filter(m.todos, taskFilter)
 	case 2:
-		s += "Tomorrow"
+		// s += "Tomorrow"
+		// 86400 seconds in 24h, add it on to today's midnight for tomorrow's midnight
+		taskFilter := func(t todo) bool { return t.startdate == int(midnightToUnix()) + 86400 || t.deadline == int(midnightToUnix()) + 86400}
+		currentList = filter(m.todos, taskFilter)
 	case 3:
-		s += "Scheduled"
+		// s += "Scheduled"
+		taskFilter := func(t todo) bool { return t.startdate != -1 }
+		currentList = filter(m.todos, taskFilter)
 	case 4:
-		s += "Anytime"
+		// s += "Anytime"
+		taskFilter := func(t todo) bool { return t.startdate == -1 }
+		currentList = filter(m.todos, taskFilter)
 	}
 
-	s += "\n\n"
 
 	// Iterate over our choices
 	for i, value := range currentList {
@@ -152,6 +160,8 @@ func (m model) View() string {
 		s += fmt.Sprintf("%s [%s] %s\n", cursor, checked, value.name)
 	}
 
+	s += "\n\n"
+
 	// render tab bar
 	for i, v := range []string{"Inbox", "Today", "Tomorrow", "Scheduled", "Anytime"} {
 		if i == m.tab {

helper.go

@@ -2,6 +2,7 @@ package main
 
 import (
     "os"
+    "time"
     "os/exec"
     "runtime"
 )
@@ -15,6 +16,12 @@ func filter[T any](ss []T, test func(T) bool) (ret []T) {
     return
 }
 
+func midnightToUnix() int64 {
+	now := time.Now()
+	midnight := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+	return midnight.Unix()
+}
+
 func clearTerminal() {
     var cmd *exec.Cmd
     if runtime.GOOS == "windows" {