commit bf347f2b1d178483b26132b64bf031dfa1e39fa8
parent 6b7dca72899e5f732ff057cde1659d43ee5dc0c9
Author: Wim Dupont <wim@wimdupont.com>
Date: Sun, 16 Mar 2025 21:22:53 +0100
added enddate for recurring
Diffstat:
| M | scal.c | | | 73 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------ |
1 file changed, 55 insertions(+), 18 deletions(-)
diff --git a/scal.c b/scal.c
@@ -20,6 +20,7 @@ typedef struct
{
Recurring recurring;
struct tm time;
+ struct tm end;
char *description;
} Note ;
@@ -44,6 +45,7 @@ static int get_curnotes(void);
static int get_note_view_col(Recurring recurring);
static int get_days(const struct tm *tm);
static int days_between(struct tm *tsa, struct tm *tsb);
+static int is_relevant(Note *note, struct tm *a);
static int same_day(struct tm *a, struct tm *b, Recurring recurring);
static int compare_note(const void *a, const void *b);
static void move_page_up(void);
@@ -192,9 +194,9 @@ print_month(const int monthadd, int *y)
otm.tm_mday=i+1;
today = same_day(&otm, &curtm, 0);
notecol = get_relevant_recur(&otm);
+
if ((wnote = notecol != -1))
color = get_note_view_col(notecol);
-
if (today)
wattron(wwin, A_UNDERLINE);
if (wnote)
@@ -334,7 +336,8 @@ void
add_note(struct tm *tm) {
size_t len;
int duration = 1;
- char answer[DESCLEN+20], buf[DESCLEN], rec[2], time[6], date[11], prefill[11], span[2], spandur[3];
+ char answer[DESCLEN+20], buf[DESCLEN], rec[2], time[6], date[11], prefill[11], span[2], dur[3];
+ char end[11] = "2999-12-31\0";
if (tm != NULL)
snprintf(prefill, 11, "%04d-%02d-%02d\0",
@@ -344,35 +347,43 @@ add_note(struct tm *tm) {
if (prompt_answer(rec, 1, "Recurring? (0=NO;1=YEARLY;2=MONTHLY;3=WEEKLY)", "3", "0"))
return;
+ if (prompt_answer(date, 10, "Date?", "2999-19-39", prefill))
+ return;
+ if (prompt_answer(time, 5, "Time?", "29:59", NULL))
+ return;
+
if (rec[0] == '0') {
if (prompt_answer(span, 1, "Span? (0=NO;1=YES)", "1", "0"))
return;
if (span[0] == '1') {
- if (prompt_answer(spandur, 2, "Span duration? (in days)", "99", "01"))
+ if (prompt_answer(dur, 2, "Span Duration ? (in days)", "99", "01"))
+ return;
+ duration = atoi(dur);
+ }
+ } else {
+ if (prompt_answer(span, 1, "Set end date? (0=NO;1=YES)", "1", "0"))
+ return;
+ if (span[0] == '1') {
+ if (prompt_answer(end, 10, "End date?", "2999-19-39", NULL))
return;
- duration = atoi(spandur);
}
}
- if (prompt_answer(date, 10, "Date?", "2999-19-39", prefill))
- return;
- if (prompt_answer(time, 5, "Time?", "29:59", NULL))
- return;
if (prompt_answer(buf, DESCLEN, "Description?", NULL, NULL))
return;
- snprintf(answer, DESCLEN+20, "%s|%10sT%s|%s", rec, date, time, buf);
+ snprintf(answer, DESCLEN+20, "%s|%10sT%s|%10s|%s", rec, date, time, end, buf);
len = strlen(answer);
- if (len > 19) {
+ if (len > sizeof(rec) + sizeof(date) + sizeof(end) + sizeof(time)) {
for (int i = 1; i <= duration; i++) {
notes = (Note**) realloc(notes, (sizeof(Note*) * (note_count + 1)));
if (notes == NULL)
fatal("Fatal: failed to reallocate bytes for notes.\n");
notes[note_count] = get_note(answer, len);
- notes[note_count]->time.tm_mday+=(i-1);
+ notes[note_count]->time.tm_mday+=i-1;
timegm(¬es[note_count]->time);
note_count++;
}
@@ -466,13 +477,16 @@ write_notes(void)
qsort(notes, note_count, sizeof(Note*), compare_note);
for (int i = 0; i < note_count; i++)
- fprintf(fp, "%d|%04d-%02d-%02dT%02d:%02d|%s\n",
+ fprintf(fp, "%d|%04d-%02d-%02dT%02d:%02d|%04d-%02d-%02d|%s\n",
notes[i]->recurring,
notes[i]->time.tm_year+1900,
notes[i]->time.tm_mon+1,
notes[i]->time.tm_mday,
notes[i]->time.tm_hour,
notes[i]->time.tm_min,
+ notes[i]->end.tm_year+1900,
+ notes[i]->end.tm_mon+1,
+ notes[i]->end.tm_mday,
notes[i]->description);
fclose(fp);
}
@@ -517,7 +531,7 @@ get_notes(void)
Note *
get_note(char *line_buf, ssize_t line_size)
{
- char timestr[19];
+ char timestr[19], enddate[11];
Note *note = (Note*) calloc(1, sizeof(Note));
if (note == NULL)
@@ -528,9 +542,10 @@ get_note(char *line_buf, ssize_t line_size)
if (note->description == NULL)
fatal("Fatal: failed to allocate bytes for note.\n");
- sscanf(line_buf, "%d|%[^|]|%[^\n]",
+ sscanf(line_buf, "%d|%[^|]|%[^|]|%[^\n]",
¬e->recurring,
timestr,
+ enddate,
note->description);
note->description[line_size-1] = '\0';
@@ -544,6 +559,13 @@ get_note(char *line_buf, ssize_t line_size)
note->time.tm_year-=1900;
note->time.tm_mon-=1;
}
+ if (sscanf(enddate, "%d-%d-%d",
+ &(note->end.tm_year),
+ &(note->end.tm_mon),
+ &(note->end.tm_mday)) >= 3) {
+ note->end.tm_year-=1900;
+ note->end.tm_mon-=1;
+ }
return note;
}
@@ -553,9 +575,10 @@ get_relevant_recur(struct tm *tm)
{
Recurring relevant = -1;
- for (int i = 0; i < note_count; i++)
- if (same_day(&(notes[i]->time), tm, notes[i]->recurring))
+ for (int i = 0; i < note_count; i++) {
+ if (is_relevant(notes[i], tm))
relevant = MIN(notes[i]->recurring, relevant == -1 ? WEEKLY : relevant);
+ }
return relevant;
}
@@ -704,7 +727,7 @@ get_curnotes(void)
fatal("Fatal: failed to allocate bytes for notes.\n");
for (int i = 0; i < note_count; i++) {
- if (same_day(&(notes[i]->time), &highltm, notes[i]->recurring)) {
+ if (is_relevant(notes[i], &highltm)) {
curnotes = (Note**) realloc(curnotes, (sizeof(Note*) * (curnote_count + 1)));
if (curnotes == NULL)
fatal("Fatal: failed to reallocate bytes for notes.\n");
@@ -753,6 +776,20 @@ days_between(struct tm *tsa, struct tm *tsb)
}
int
+is_relevant(Note *note, struct tm *a)
+{
+ timegm(¬e->time);
+ timegm(¬e->end);
+ timegm(a);
+
+ return (note->end.tm_year > a->tm_year
+ || (note->end.tm_yday >= a->tm_yday && note->end.tm_year == a->tm_year))
+ && (note->time.tm_year < a->tm_year
+ || (note->time.tm_yday <= a->tm_yday && note->time.tm_year == a->tm_year))
+ && same_day(&(note->time), a, note->recurring);
+}
+
+int
same_day(struct tm *a, struct tm *b, Recurring recurring)
{
if (a == NULL || b == NULL)
@@ -920,7 +957,7 @@ curdate(void)
{
time_t t = time(NULL);
- curtm = *localtime(&t);
+ curtm = *gmtime(&t);
highltm = curtm;
highlight = highltm.tm_mday-1;
}
