callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I#1712 - Tasks: Correct overdue calculation for DATE value type

Browse Source 
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1712
This commit is contained in:
Milan Crha
2021-11-24 17:00:41 +01:00
parent 6e46217384
commit 46fb2d9312
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/calendar/gui/e-cal-model-tasks.c
View File

@ -332,10 +332,8 @@ get_due_status (ECalModelTasks *model,
g_object_unref (due_tt);
g_object_unref (prop);
if (cmp < 0)
if (cmp <= 0)
return E_CAL_MODEL_TASKS_DUE_OVERDUE;
else if (cmp == 0)
return E_CAL_MODEL_TASKS_DUE_TODAY;
else
return E_CAL_MODEL_TASKS_DUE_FUTURE;
} else {

5
src/calendar/gui/e-to-do-pane.c
View File

@ -222,7 +222,8 @@ etdp_date_time_to_string (const ECalComponentDateTime *dt,
etdp_itt_to_zone (*out_itt, e_cal_component_datetime_get_tzid (dt), client, default_zone);
is_overdue = is_task && etdp_create_date_mark (*out_itt) < today_date_mark;
is_overdue = is_task && (etdp_create_date_mark (*out_itt) < today_date_mark ||
(i_cal_time_is_date (*out_itt) && etdp_create_date_mark (*out_itt) <= today_date_mark));
if (i_cal_time_is_date (*out_itt) && !is_overdue)
return NULL;
@ -903,7 +904,7 @@ etdp_get_comp_colors (EToDoPane *to_do_pane,
now = i_cal_time_new_current_with_zone (default_zone);
if ((is_date && i_cal_time_compare_date_only (itt, now) < 0) ||
if ((is_date && i_cal_time_compare_date_only (itt, now) <= 0) ||
(!is_date && i_cal_time_compare (itt, now) <= 0)) {
bgcolor = to_do_pane->priv->overdue_color;
} else if (out_nearest_due) {