Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the logic from on_start_date_changed_cb() to gcal_schedule_values_set_start_date()

Browse Source 
This also adds a test for syncing the date_end to the date_start if
the date_start happens to be set after the date_end.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/550>
This commit is contained in:
Federico Mena Quintero
2025-08-27 19:59:59 -03:00
committed by Georges Basile Stavracas Neto
parent ba3380206d
commit af4ddc1282
1 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/event-editor/gcal-schedule-section.c
+48 -25
View File
@@ -151,15 +151,18 @@ gcal_schedule_values_set_time_format (const GcalScheduleValues *values, GcalTime
* adjust the other values based on it.
*/
static GcalScheduleValues *
gcal_schedule_values_set_start_date (const GcalScheduleValues *values, GDateTime *t)
gcal_schedule_values_set_start_date (const GcalScheduleValues *values, GDateTime *start)
{
GcalScheduleValues *copy = gcal_schedule_values_copy (values);
/* move from on_start_date_changed_cb */
gcal_set_date_time (&copy->date_start, start);
/* copy t to date_start */
if (g_date_time_compare (start, copy->date_end) == 1)
{
gcal_set_date_time (&copy->date_end, start);
}
/* the conditional is to adjust in case start > end. Write a test for that. */
return copy;
}
static WidgetState *
@@ -312,27 +315,9 @@ on_start_date_changed_cb (GtkWidget *widget,
GParamSpec *pspec,
GcalScheduleSection *self)
{
GDateTime *start, *end;
GCAL_ENTRY;
block_date_signals (self);
start = gcal_date_chooser_row_get_date (self->start_date_row);
end = gcal_date_chooser_row_get_date (self->end_date_row);
if (g_date_time_compare (start, end) == 1)
{
gcal_date_chooser_row_set_date (self->end_date_row, start);
gcal_date_time_chooser_set_date (self->end_date_time_chooser, start);
}
// Keep the date row and the date-time chooser in sync
gcal_date_time_chooser_set_date (self->start_date_time_chooser, start);
unblock_date_signals (self);
GCAL_EXIT;
GDateTime *start = gcal_date_chooser_row_get_date (self->start_date_row);
GcalScheduleValues *updated = gcal_schedule_values_set_start_date (self->values, start);
update_from_values (self, updated);
}
static void
@@ -925,6 +910,42 @@ gcal_schedule_values_free (GcalScheduleValues *values)
g_free (values);
}
static void
test_setting_start_date_after_end_date_resets_end_date (void)
{
/* We start with
* start = 10:00
* end = 11:00
*
* Then we set start to 12:00
*
* We want to test that end becomes 12:00 as well.
*/
g_autoptr (GDateTime) date = g_date_time_new_from_iso8601 ("20250303T10:00:00-06:00", NULL);
g_assert (date != NULL);
g_autoptr (GDateTime) one_hour_later = g_date_time_new_from_iso8601 ("20250303T11:00:00-06:00", NULL);
g_assert (one_hour_later != NULL);
g_autoptr (GcalScheduleValues) values = g_new (GcalScheduleValues, 1);
*values = (GcalScheduleValues) {
.all_day = FALSE,
.orig_date_start = g_date_time_ref (date),
.orig_date_end = g_date_time_ref (one_hour_later),
.date_start = g_date_time_ref (date),
.date_end = g_date_time_ref (one_hour_later),
.recur = NULL,
.time_format = GCAL_TIME_FORMAT_24H,
};
g_autoptr (GDateTime) two_hours_later = g_date_time_new_from_iso8601 ("20250303T12:00:00-06:00", NULL);
g_autoptr (GcalScheduleValues) new_values = gcal_schedule_values_set_start_date (values, two_hours_later);
g_assert (g_date_time_equal (new_values->date_start, two_hours_later));
g_assert (g_date_time_equal (new_values->date_end, two_hours_later));
}
static void
test_turning_all_day_on_displays_sensible_dates (void)
{
@@ -969,6 +990,8 @@ test_turning_all_day_on_displays_sensible_dates (void)
void
gcal_schedule_section_add_tests (void)
{
g_test_add_func ("/event_editor/schedule_section/setting_start_date_after_end_date_resets_end_date",
test_setting_start_date_after_end_date_resets_end_date);
g_test_add_func ("/event_editor/schedule_section/turning_all_day_on_displays_sensible_dates",
test_turning_all_day_on_displays_sensible_dates);
}