fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Treat recurrent events and appointments alike

Browse Source 
The day vector (or "day_items" vector) is used to load the appointments
panel with "day_items" (captions, appointments, events). A multi-day
appointment has several "day_items" in the day vector. This may also be
the case for a recurring item.

The day_item structure has a member "start", which for day_items for
recurring appointments is set to the occurrence found by
recur_item_find_occurrence(), and is used to tell days of a multi-day
appointment apart.

For day_items for recurring events it was set to "day" of the
recur_event structure (the same value for all occurrences) and not used.
The value is now the occurrence found by recur_event_find_occurrence().

The patch is backwards compatible and future-proof.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen 2020-02-08 07:01:05 +01:00 committed by Lukas Fleischer
parent 852e363271
commit 36f98382e7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/day.c
View File

@ -360,7 +360,7 @@ static int day_store_recur_events(time_t date)
p.rev = rev; p.rev = rev;
time_t occurrence; time_t occurrence;
if (recur_event_find_occurrence(rev, date, &occurrence)) { if (recur_event_find_occurrence(rev, date, &occurrence)) {
day_add_item(RECUR_EVNT, rev->day, occurrence, p); day_add_item(RECUR_EVNT, occurrence, occurrence, p);
e_nb++; e_nb++;
} }
} }