From a698f0d4f5df245ad1094e6f81b7ff6f6a31ec83 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Thu, 17 Jan 2019 14:24:51 -0300 Subject: [PATCH] remove repeated code in tour list --- src/tour_list.vala | 48 +++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/src/tour_list.vala b/src/tour_list.vala index ea1bed4..8549320 100644 --- a/src/tour_list.vala +++ b/src/tour_list.vala @@ -234,21 +234,9 @@ namespace Sernatur { delete_tour.sensitive = false; reset_columns (); - tour_list = Tour.get_all_tours (conn.db); - list_store.clear (); - tour_list.foreach ((entry) => { - Gtk.TreeIter iter; - list_store.append (out iter); - list_store.set (iter, - Column.TOUR_NAME, entry.nombre_tour, - Column.INDIV_COST, Money.format_uint (entry.costo_indiv), - Column.GROUP_COST, Money.format_uint (entry.costo_grupal), - Column.MINIMUM_PEOPLE, entry.minima_personas, - Column.CITY, entry.ciudad.nombre_ciudad, - Column.REGION, entry.ciudad.region.nombre_region, - Column.TOUR, entry); - }); + + update_list_store (); } /** @@ -473,6 +461,23 @@ namespace Sernatur { region.sort_order = Gtk.SortType.DESCENDING; } + private void update_list_store () { + tour_list = Tour.get_all_tours (conn.db); + + tour_list.foreach ((entry) => { + Gtk.TreeIter iter; + list_store.append (out iter); + list_store.set (iter, + Column.TOUR_NAME, entry.nombre_tour, + Column.INDIV_COST, Money.format_uint (entry.costo_indiv), + Column.GROUP_COST, Money.format_uint (entry.costo_grupal), + Column.MINIMUM_PEOPLE, entry.minima_personas, + Column.CITY, entry.ciudad.nombre_ciudad, + Column.REGION, entry.ciudad.region.nombre_region, + Column.TOUR, entry); + }); + } + /** * Initialize the tour list class * @param application The application used to make the GLib object @@ -498,20 +503,7 @@ namespace Sernatur { typeof (string), typeof (Tour)); - tour_list = Tour.get_all_tours (conn.db); - - tour_list.foreach ((entry) => { - Gtk.TreeIter iter; - list_store.append (out iter); - list_store.set (iter, - Column.TOUR_NAME, entry.nombre_tour, - Column.INDIV_COST, Money.format_uint (entry.costo_indiv), - Column.GROUP_COST, Money.format_uint (entry.costo_grupal), - Column.MINIMUM_PEOPLE, entry.minima_personas, - Column.CITY, entry.ciudad.nombre_ciudad, - Column.REGION, entry.ciudad.region.nombre_region, - Column.TOUR, entry); - }); + update_list_store (); tour_tree.set_model (list_store); }