Compare commits

..

3 Commits

Author SHA1 Message Date
june
4d9482f363 better way of checking done status 2025-03-10 17:39:03 +13:00
june
b38412a86e getting somewhere 2025-03-10 17:34:05 +13:00
june
254d74bdb4 Begin working on new task feature 2025-03-10 16:05:12 +13:00
2 changed files with 11 additions and 28 deletions

View File

@@ -109,34 +109,26 @@ func AddNewTask(m *model) {
func (m model) View() string { func (m model) View() string {
// The header // The header
s := "" s := ""
currentList := []todo{} currentList := m.todos
s += "GOTD\n\n" s += "GOTD\n"
switch m.tab { switch m.tab {
case 0: case 0:
// s += "Inbox" s += "Inbox"
taskFilter := func(t todo) bool { return t.isInbox } // inboxFilter := func(t todo) bool { return t.isInbox }
currentList = filter(m.todos, taskFilter) // currentList = filter(m.todos, inboxFilter)
case 1: 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: 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: case 3:
// s += "Scheduled" s += "Scheduled"
taskFilter := func(t todo) bool { return t.startdate != -1 }
currentList = filter(m.todos, taskFilter)
case 4: 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 // Iterate over our choices
for i, value := range currentList { for i, value := range currentList {
@@ -157,11 +149,9 @@ func (m model) View() string {
} }
// Render the row // Render the row
s += fmt.Sprintf("%s [%s] %s\n", cursor, checked, value.name) s += fmt.Sprintf("%s [%s] %s\n", cursor, checked, value)
} }
s += "\n\n"
// render tab bar // render tab bar
for i, v := range []string{"Inbox", "Today", "Tomorrow", "Scheduled", "Anytime"} { for i, v := range []string{"Inbox", "Today", "Tomorrow", "Scheduled", "Anytime"} {
if i == m.tab { if i == m.tab {

View File

@@ -2,7 +2,6 @@ package main
import ( import (
"os" "os"
"time"
"os/exec" "os/exec"
"runtime" "runtime"
) )
@@ -16,12 +15,6 @@ func filter[T any](ss []T, test func(T) bool) (ret []T) {
return 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() { func clearTerminal() {
var cmd *exec.Cmd var cmd *exec.Cmd
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {