From 2fd7e3647e70e6a925993c59d8c1751a904ae39a Mon Sep 17 00:00:00 2001 From: El-BG-1970 Date: Wed, 16 Mar 2022 22:00:03 +0100 Subject: added "THIS WEEK" directive --- main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 73127d5..64ac9b2 100644 --- a/main.c +++ b/main.c @@ -78,20 +78,23 @@ int main(int argc, char **argv) { // format nicely char *e; Date td = today(); - Date tm = tomorrow(td); + Date tm = tomorrow(td); + Date nm = nextmonday(td); Date end = nextmonth(td); - Date last_date = (struct Date){ -1, -1, -1 }; + Date last_date = (struct Date){ -1, -1, -1, -1}; for (int i = 0; i < idx; i++) { if (!eql(agenda[i].date, last_date)) { last_date = agenda[i].date; if (!zero(last_date)) { - e = print_date_to_string(last_date); + e = short_date_to_string(last_date); if (strictly_smaller(last_date, td)) printf("\n%s [OUTATIME]:\n", e); else if (eql(last_date, td)) printf("\n%s [TODAY]:\n", e); else if (eql(last_date, tm)) printf("\n%s [TOMORROW]:\n", e); + else if (strictly_smaller(last_date, nm)) + printf("\n%s [THIS WEEK]:\n", e); else if (smaller(last_date, end)) printf("\n%s:\n", e); free(e); -- cgit v1.2.3