Skip to content

Commit

Permalink
Bug 797215 - Add sorting to QIF duplicates page
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bob-IT
Bob-IT committed May 12, 2019
1 parent e353804 commit b41cb2f
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 7 deletions.
2 changes: 1 addition & 1 deletion gnucash/gtkbuilder/assistant-qif-import.glade
View file
Expand Up @@ -1252,7 +1252,7 @@ Click "Next" to review the possible matches.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame45">
<property name="visible">True</property>
Expand Down
53 changes: 47 additions & 6 deletions gnucash/import-export/qif-imp/assistant-qif-import.c
View file
Expand Up @@ -90,12 +90,18 @@ enum account_cols
NUM_ACCOUNT_COLS
};

/* to simplify sorting and hence use the default sort function
* we store the date as an int64 and convert the gnc_numeric
* to a double which can be stored in the liststore.
*/
enum qif_trans_cols
{
QIF_TRANS_COL_INDEX = 0,
QIF_TRANS_COL_DATE,
QIF_TRANS_COL_DATE_INT64, // used only for sorting
QIF_TRANS_COL_DESCRIPTION,
QIF_TRANS_COL_AMOUNT,
QIF_TRANS_COL_AMOUNT_DOUBLE, // used only for sorting
QIF_TRANS_COL_CHECKED,
NUM_QIF_TRANS_COLS
};
Expand Down Expand Up @@ -1141,6 +1147,7 @@ refresh_old_transactions (QIFImportWindow * wind, int selection)

while (!scm_is_null (possible_matches))
{
gdouble amount_gd = 0;
char datebuff [MAX_DATE_LENGTH + 1];
memset (datebuff, 0, sizeof (datebuff));
current_xtn = SCM_CAR(possible_matches);
Expand All @@ -1161,6 +1168,7 @@ refresh_old_transactions (QIFImportWindow * wind, int selection)
xaccPrintAmount (gnc_numeric_abs (xaccSplitGetValue (gnc_split)),
gnc_account_print_info
(xaccSplitGetAccount (gnc_split), TRUE));
amount_gd = gnc_numeric_to_double (xaccSplitGetValue(gnc_split));
}

gtk_list_store_append (store, &iter);
Expand All @@ -1170,8 +1178,10 @@ refresh_old_transactions (QIFImportWindow * wind, int selection)
(store, &iter,
QIF_TRANS_COL_INDEX, rownum++,
QIF_TRANS_COL_DATE, datebuff,
QIF_TRANS_COL_DATE_INT64, xaccTransRetDatePosted(gnc_xtn), // used for sorting
QIF_TRANS_COL_DESCRIPTION, xaccTransGetDescription (gnc_xtn),
QIF_TRANS_COL_AMOUNT, amount_str,
QIF_TRANS_COL_AMOUNT_DOUBLE, amount_gd, // used for sorting
QIF_TRANS_COL_CHECKED, selected != SCM_BOOL_F,
-1);

Expand Down Expand Up @@ -3214,6 +3224,7 @@ gnc_ui_qif_import_duplicates_match_prepare (GtkAssistant *assistant,
duplicates = wind->match_transactions;
while (!scm_is_null (duplicates))
{
gdouble amount_gd = 0;
time64 send_time = 0;
char datebuff [MAX_DATE_LENGTH + 1];
memset (datebuff, 0, sizeof (datebuff));
Expand All @@ -3231,17 +3242,19 @@ gnc_ui_qif_import_duplicates_match_prepare (GtkAssistant *assistant,
xaccPrintAmount (gnc_numeric_abs (xaccSplitGetValue (gnc_split)),
gnc_account_print_info
(xaccSplitGetAccount (gnc_split), TRUE));
amount_gd = gnc_numeric_to_double (xaccSplitGetValue(gnc_split));
}
gtk_list_store_append (store, &iter);
send_time = xaccTransRetDatePosted (gnc_xtn);
qof_print_date_buff (datebuff, sizeof (datebuff), send_time);
gtk_list_store_set
(store, &iter,
QIF_TRANS_COL_INDEX, rownum++,
QIF_TRANS_COL_DATE,
datebuff,
QIF_TRANS_COL_DATE, datebuff,
QIF_TRANS_COL_DATE_INT64, send_time, // used for sorting
QIF_TRANS_COL_DESCRIPTION, xaccTransGetDescription (gnc_xtn),
QIF_TRANS_COL_AMOUNT, amount_str,
QIF_TRANS_COL_AMOUNT_DOUBLE, amount_gd, // used for sorting
-1);

duplicates = SCM_CDR(duplicates);
Expand Down Expand Up @@ -3591,35 +3604,49 @@ build_views (QIFImportWindow *wind)

/* Set up the new transaction view */
view = GTK_TREE_VIEW(wind->new_transaction_view);
store = gtk_list_store_new (NUM_QIF_TRANS_COLS, G_TYPE_INT, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
store = gtk_list_store_new (NUM_QIF_TRANS_COLS, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT64,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
gtk_tree_view_set_model (view, GTK_TREE_MODEL(store));

/* default sort order */
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
QIF_TRANS_COL_DATE_INT64,
GTK_SORT_ASCENDING);
g_object_unref (store);

/* prevent the rows being dragged to a different order */
gtk_tree_view_set_reorderable (view, FALSE);

renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Date"),
renderer,
"text",
QIF_TRANS_COL_DATE,
NULL);
g_object_set (G_OBJECT(column), "reorderable", TRUE, "resizable", TRUE, NULL);
gtk_tree_view_append_column (view, column);
gtk_tree_view_column_set_sort_column_id (column, QIF_TRANS_COL_DATE_INT64);

renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Description"),
renderer,
"text",
QIF_TRANS_COL_DESCRIPTION,
NULL);
g_object_set (G_OBJECT(column), "reorderable", TRUE, "resizable", TRUE, NULL);
gtk_tree_view_append_column (view, column);
gtk_tree_view_column_set_expand(column, TRUE);
gtk_tree_view_column_set_sort_column_id (column, QIF_TRANS_COL_DESCRIPTION);

renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Amount"),
renderer,
"text",
QIF_TRANS_COL_AMOUNT,
NULL);
g_object_set (G_OBJECT(column), "reorderable", TRUE, "resizable", TRUE, NULL);
gtk_tree_view_append_column (view, column);
gtk_tree_view_column_set_sort_column_id (column, QIF_TRANS_COL_AMOUNT_DOUBLE);

selection = gtk_tree_view_get_selection (view);
g_signal_connect (selection, "changed",
Expand All @@ -3628,35 +3655,49 @@ build_views (QIFImportWindow *wind)

/* Set up the old transaction view */
view = GTK_TREE_VIEW(wind->old_transaction_view);
store = gtk_list_store_new (NUM_QIF_TRANS_COLS, G_TYPE_INT, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
store = gtk_list_store_new (NUM_QIF_TRANS_COLS, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT64,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
gtk_tree_view_set_model (view, GTK_TREE_MODEL(store));

/* default sort order */
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
QIF_TRANS_COL_DATE_INT64,
GTK_SORT_ASCENDING);
g_object_unref (store);

/* prevent the rows being dragged to a different order */
gtk_tree_view_set_reorderable (view, FALSE);

renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Date"),
renderer,
"text",
QIF_TRANS_COL_DATE,
NULL);
g_object_set (G_OBJECT(column), "reorderable", TRUE, "resizable", TRUE, NULL);
gtk_tree_view_append_column (view, column);
gtk_tree_view_column_set_sort_column_id (column, QIF_TRANS_COL_DATE_INT64);

renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Description"),
renderer,
"text",
QIF_TRANS_COL_DESCRIPTION,
NULL);
g_object_set (G_OBJECT(column), "reorderable", TRUE, "resizable", TRUE, NULL);
gtk_tree_view_append_column (view, column);
gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_set_sort_column_id (column, QIF_TRANS_COL_DESCRIPTION);

renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Amount"),
renderer,
"text",
QIF_TRANS_COL_AMOUNT,
NULL);
g_object_set (G_OBJECT(column), "reorderable", TRUE, "resizable", TRUE, NULL);
gtk_tree_view_append_column (view, column);
gtk_tree_view_column_set_sort_column_id (column, QIF_TRANS_COL_AMOUNT_DOUBLE);

renderer = gtk_cell_renderer_toggle_new ();
column = gtk_tree_view_column_new_with_attributes (_("Match?"),
Expand Down

0 comments on commit b41cb2f

Please sign in to comment.