/* HomeBank -- Free, easy, personal accounting for everyone.
- * Copyright (C) 1995-2014 Maxime DOYEN
+ * Copyright (C) 1995-2016 Maxime DOYEN
*
* This file is part of HomeBank.
*
#include "ui-payee.h"
#include "ui-category.h"
#include "ui-filter.h"
+#include "ui-transaction.h"
+
/****************************************************************************/
/* Debug macros */
/* prototypes */
static void ui_reptime_action_viewlist(GtkAction *action, gpointer user_data);
+//static void ui_reptime_action_viewcolumn(GtkAction *action, gpointer user_data);
static void ui_reptime_action_viewline(GtkAction *action, gpointer user_data);
static void ui_reptime_action_detail(GtkAction *action, gpointer user_data);
//static void ui_reptime_action_filter(GtkAction *action, gpointer user_data);
static void ui_reptime_action_refresh(GtkAction *action, gpointer user_data);
static void ui_reptime_action_export(GtkAction *action, gpointer user_data);
-//static void ui_reptime_list_set_cur(GtkTreeView *treeview, guint32 kcur);
+static void ui_reptime_list_set_cur(GtkTreeView *treeview, guint32 kcur);
static GtkActionEntry entries[] = {
- { "List" , "hb-view-list" , N_("List") , NULL, N_("View results as list"), G_CALLBACK (ui_reptime_action_viewlist) },
- { "Line" , "hb-view-line" , N_("Line") , NULL, N_("View results as lines"), G_CALLBACK (ui_reptime_action_viewline) },
+ { "List" , ICONNAME_HB_VIEW_LIST , N_("List") , NULL, N_("View results as list") , G_CALLBACK (ui_reptime_action_viewlist) },
+ { "Line" , ICONNAME_HB_VIEW_LINE , N_("Line") , NULL, N_("View results as lines") , G_CALLBACK (ui_reptime_action_viewline) },
+// { "Column" , ICONNAME_HB_VIEW_COLUMN, N_("Column") , NULL, N_("View results as column"), G_CALLBACK (ui_reptime_action_viewcolumn) },
-// { "Filter" , "hb-filter" , N_("Filter") , NULL, N_("Edit the filter"), G_CALLBACK (ui_reptime_action_filter) },
- { "Refresh" , GTK_STOCK_REFRESH , N_("Refresh"), NULL, N_("Refresh results"), G_CALLBACK (ui_reptime_action_refresh) },
+// { "Filter" , ICONNAME_HB_FILTER , N_("Filter") , NULL, N_("Edit the filter"), G_CALLBACK (ui_reptime_action_filter) },
+ { "Refresh" , ICONNAME_REFRESH , N_("Refresh"), NULL, N_("Refresh results"), G_CALLBACK (ui_reptime_action_refresh) },
- { "Export" , "hb-file-export", N_("Export") , NULL, N_("Export as CSV"), G_CALLBACK (ui_reptime_action_export) },
+ { "Export" , ICONNAME_HB_FILE_EXPORT, N_("Export") , NULL, N_("Export as CSV"), G_CALLBACK (ui_reptime_action_export) },
};
static guint n_entries = G_N_ELEMENTS (entries);
static GtkToggleActionEntry toggle_entries[] = {
- { "Detail", "hb-ope-show", /* name, stock id */
+ { "Detail", ICONNAME_HB_OPE_SHOW, /* name, icon-name */
N_("Detail"), NULL, /* label, accelerator */
N_("Toggle detail"), /* tooltip */
G_CALLBACK (ui_reptime_action_detail),
" <toolbar name='ToolBar'>"
" <toolitem action='List'/>"
" <toolitem action='Line'/>"
+//" <toolitem action='Column'/>"
" <separator/>"
" <toolitem action='Detail'/>"
" <separator/>"
{
struct ui_reptime_data *data = user_data;
+ data->charttype = CHART_TYPE_NONE;
gtk_notebook_set_current_page(GTK_NOTEBOOK(data->GR_result), 0);
ui_reptime_sensitive(data->window, NULL);
}
+static void ui_reptime_action_viewline(GtkAction *action, gpointer user_data)
+{
+struct ui_reptime_data *data = user_data;
+ data->charttype = CHART_TYPE_LINE;
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(data->GR_result), 1);
+ ui_reptime_sensitive(data->window, NULL);
+ ui_reptime_update(data->window, NULL);
+}
-
-
-
-
-
-
-static void ui_reptime_action_viewline(GtkAction *action, gpointer user_data)
+/*static void ui_reptime_action_viewcolumn(GtkAction *action, gpointer user_data)
{
struct ui_reptime_data *data = user_data;
+ data->charttype = CHART_TYPE_COL;
gtk_notebook_set_current_page(GTK_NOTEBOOK(data->GR_result), 1);
ui_reptime_sensitive(data->window, NULL);
+ ui_reptime_update(data->window, NULL);
-}
+}*/
static void ui_reptime_action_detail(GtkAction *action, gpointer user_data)
data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
- data->filter->mindate = gtk_dateentry_get_date(GTK_DATE_ENTRY(data->PO_mindate));
- data->filter->maxdate = gtk_dateentry_get_date(GTK_DATE_ENTRY(data->PO_maxdate));
+ data->filter->mindate = gtk_date_entry_get_date(GTK_DATE_ENTRY(data->PO_mindate));
+ data->filter->maxdate = gtk_date_entry_get_date(GTK_DATE_ENTRY(data->PO_maxdate));
// set min/max date for both widget
- gtk_dateentry_set_maxdate(GTK_DATE_ENTRY(data->PO_mindate), data->filter->maxdate);
- gtk_dateentry_set_mindate(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->mindate);
+ gtk_date_entry_set_maxdate(GTK_DATE_ENTRY(data->PO_mindate), data->filter->maxdate);
+ gtk_date_entry_set_mindate(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->mindate);
g_signal_handler_block(data->CY_range, data->handler_id[HID_REPTIME_RANGE]);
gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_range), FLT_RANGE_OTHER);
}
+static void ui_reptime_update_quickdate(GtkWidget *widget, gpointer user_data)
+{
+struct ui_reptime_data *data;
+
+ DB( g_print("\n[reptime] update quickdate\n") );
+
+ data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
+
+ g_signal_handler_block(data->PO_mindate, data->handler_id[HID_REPTIME_MINDATE]);
+ g_signal_handler_block(data->PO_maxdate, data->handler_id[HID_REPTIME_MAXDATE]);
+
+ gtk_date_entry_set_date(GTK_DATE_ENTRY(data->PO_mindate), data->filter->mindate);
+ gtk_date_entry_set_date(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->maxdate);
+
+ g_signal_handler_unblock(data->PO_mindate, data->handler_id[HID_REPTIME_MINDATE]);
+ g_signal_handler_unblock(data->PO_maxdate, data->handler_id[HID_REPTIME_MAXDATE]);
+
+}
+
static void ui_reptime_range_change(GtkWidget *widget, gpointer user_data)
{
if(range != FLT_RANGE_OTHER)
{
- filter_preset_daterange_set(data->filter, range);
+ filter_preset_daterange_set(data->filter, range, data->accnum);
- g_signal_handler_block(data->PO_mindate, data->handler_id[HID_REPTIME_MINDATE]);
- g_signal_handler_block(data->PO_maxdate, data->handler_id[HID_REPTIME_MAXDATE]);
-
- gtk_dateentry_set_date(GTK_DATE_ENTRY(data->PO_mindate), data->filter->mindate);
- gtk_dateentry_set_date(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->maxdate);
-
- g_signal_handler_unblock(data->PO_mindate, data->handler_id[HID_REPTIME_MINDATE]);
- g_signal_handler_unblock(data->PO_maxdate, data->handler_id[HID_REPTIME_MAXDATE]);
+ ui_reptime_update_quickdate(widget, NULL);
ui_reptime_compute(widget, NULL);
ui_reptime_update_daterange(widget, NULL);
guint active = GPOINTER_TO_INT(user_data);
guint tmpfor, tmpslice;
gboolean showall;
-guint32 from, to;
+guint32 from;
guint i;
GList *list;
GtkTreeModel *model;
//get our min max date
from = data->filter->mindate;
- to = data->filter->maxdate;
+ //to = data->filter->maxdate;
/* clear and detach our model */
model = gtk_tree_view_get_model(GTK_TREE_VIEW(data->LV_detail));
gtk_tree_view_set_model(GTK_TREE_VIEW(data->LV_detail), NULL); /* Detach model from view */
/* fill in the model */
- list = g_list_first(GLOBALS->ope_list);
+ list = g_queue_peek_head_link(data->txn_queue);
while (list != NULL)
{
Transaction *ope = list->data;
- Account *acc;
+ guint32 pos = 0;
+ gboolean include = FALSE;
//DB( g_print(" get %s\n", ope->ope_Word) );
- acc = da_acc_get(ope->kacc);
- if(acc == NULL) goto next1;
- if((acc->flags & (AF_CLOSED|AF_NOREPORT))) goto next1;
-
- //filter here
- if( !(ope->flags & OF_REMIND) && ope->date >= from && ope->date <= to)
+ switch(tmpfor)
{
- guint32 pos = 0;
- gboolean include = FALSE;
-
- switch(tmpfor)
+ case FOR_REPTIME_ACCOUNT:
+ if( selkey == ope->kacc )
+ include = TRUE;
+ break;
+ case FOR_REPTIME_CATEGORY:
{
- case FOR_REPTIME_ACCOUNT:
- if( selkey == ope->kacc )
- include = TRUE;
- break;
- case FOR_REPTIME_CATEGORY:
+ Category *catentry;
+
+ if( ope->flags & OF_SPLIT )
{
- Category *catentry;
+ guint nbsplit = da_splits_count(ope->splits);
+ Split *split;
- if( ope->flags & OF_SPLIT )
+ for(i=0;i<nbsplit;i++)
{
- guint nbsplit = da_transaction_splits_count(ope);
- Split *split;
-
- for(i=0;i<nbsplit;i++)
- {
- split = ope->splits[i];
- catentry = da_cat_get(split->kcat);
- if(catentry != NULL) //#1340142
- {
- if( selkey == catentry->parent || selkey == catentry->key )
- include = TRUE;
-
- }
- }
- }
- else
- {
- catentry = da_cat_get(ope->kcat);
+ split = ope->splits[i];
+ catentry = da_cat_get(split->kcat);
if(catentry != NULL) //#1340142
{
if( selkey == catentry->parent || selkey == catentry->key )
}
}
}
- break;
- case FOR_REPTIME_PAYEE:
- if( selkey == ope->kpay )
- include = TRUE;
- break;
+ else
+ {
+ catentry = da_cat_get(ope->kcat);
+ if(catentry != NULL) //#1340142
+ {
+ if( selkey == catentry->parent || selkey == catentry->key )
+ include = TRUE;
+
+ }
+ }
}
+ break;
+ case FOR_REPTIME_PAYEE:
+ if( selkey == ope->kpay )
+ include = TRUE;
+ break;
+ }
- if( include == TRUE || showall == TRUE )
- {
+ if( include == TRUE || showall == TRUE )
+ {
- switch(tmpslice)
- {
- case GROUPBY_REPTIME_DAY:
- pos = ope->date - from;
- break;
+ switch(tmpslice)
+ {
+ case GROUPBY_REPTIME_DAY:
+ pos = ope->date - from;
+ break;
- case GROUPBY_REPTIME_WEEK:
- pos = (ope->date - from)/7;
- break;
+ case GROUPBY_REPTIME_WEEK:
+ pos = (ope->date - from)/7;
+ break;
- case GROUPBY_REPTIME_MONTH:
- pos = DateInMonth(from, ope->date);
- break;
+ case GROUPBY_REPTIME_MONTH:
+ pos = DateInMonth(from, ope->date);
+ break;
- case GROUPBY_REPTIME_QUARTER:
- pos = DateInQuarter(from, ope->date);
- break;
+ case GROUPBY_REPTIME_QUARTER:
+ pos = DateInQuarter(from, ope->date);
+ break;
- case GROUPBY_REPTIME_YEAR:
- pos = DateInYear(from, ope->date);
- break;
- }
+ case GROUPBY_REPTIME_YEAR:
+ pos = DateInYear(from, ope->date);
+ break;
+ }
- DB( g_print("** pos=%d\n", pos) );
+ DB( g_print("** pos=%d\n", pos) );
- //insert
- if( pos == active )
- {
+ //insert
+ if( pos == active )
+ {
- gtk_list_store_append (GTK_LIST_STORE(model), &iter);
- gtk_list_store_set (GTK_LIST_STORE(model), &iter,
- LST_DSPOPE_DATAS, ope,
- -1);
- }
+ gtk_list_store_append (GTK_LIST_STORE(model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE(model), &iter,
+ LST_DSPOPE_DATAS, ope,
+ -1);
}
}
-next1:
+
list = g_list_next(list);
}
gtk_tree_view_set_model(GTK_TREE_VIEW(data->LV_detail), model);
g_object_unref(model);
+ gtk_tree_view_columns_autosize( GTK_TREE_VIEW(data->LV_detail) );
}
}
{
struct ui_reptime_data *data;
GtkTreeModel *model;
+gint page;
gint tmpfor;
gchar *title;
//gboolean xval;
//tmpslice = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_view));
// ensure not exp & inc for piechart
- //page = gtk_notebook_get_current_page(GTK_NOTEBOOK(data->GR_result));
+ page = gtk_notebook_get_current_page(GTK_NOTEBOOK(data->GR_result));
- //DB( g_print(" page %d\n\n", page) );
+ DB( g_print(" page %d\n\n", page) );
//DB( g_print(" tmpslice %d\n\n", tmpslice) );
//DB( g_print(" sort on column %d\n\n", column) );
//gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model), column, GTK_SORT_DESCENDING);
- //gtk_chart_set_datas(GTK_CHART(data->RE_line), model, LST_STAT_AMOUNT, NULL);
gtk_chart_show_legend(GTK_CHART(data->RE_line), FALSE, FALSE);
gtk_chart_show_xval(GTK_CHART(data->RE_line), TRUE);
////TRANSLATORS: example 'Expense by Category'
title = g_strdup_printf(_("%s Over Time"), _(CYA_TIMESELECT[tmpfor]) );
- gtk_chart_set_datas(GTK_CHART(data->RE_line), model, LST_REPTIME_AMOUNT, title);
+ gtk_chart_set_datas(GTK_CHART(data->RE_line), model, LST_REPTIME_AMOUNT, title, NULL);
g_free(title);
-
+
+ if(page == 1)
+ {
+ DB( g_print(" change chart type to %d\n", data->charttype) );
+ gtk_chart_set_type (GTK_CHART(data->RE_line), data->charttype);
+ gtk_chart_set_showmono(GTK_CHART(data->RE_line), TRUE);
+ }
+
}
static void ui_reptime_export_csv(GtkWidget *widget, gpointer user_data)
tmpfor = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_for));
- name = g_strdup_printf("hb-ui_reptime_%s.csv", CYA_TIMESELECT[tmpfor]);
+ name = g_strdup_printf("hb-reptime_%s.csv", CYA_TIMESELECT[tmpfor]);
if( ui_file_chooser_csv(GTK_WINDOW(data->window), GTK_FILE_CHOOSER_ACTION_SAVE, &filename, name) == TRUE )
{
}
+static void ui_reptime_update_for(GtkWidget *widget, gpointer user_data)
+{
+struct ui_reptime_data *data;
+gint tmpfor;
+gboolean visible;
+
+ DB( g_print("\n[reptime] update for\n") );
+
+ data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
+
+ tmpfor = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_for));
+
+ visible = tmpfor == 0 ? TRUE : FALSE;
+ hb_widget_visible(data->LB_acc, visible);
+ hb_widget_visible(data->PO_acc, visible);
+
+ visible = tmpfor == 1 ? TRUE : FALSE;
+ hb_widget_visible(data->LB_cat, visible);
+ hb_widget_visible(data->PO_cat, visible);
+
+ visible = tmpfor == 2 ? TRUE : FALSE;
+ hb_widget_visible(data->LB_pay, visible);
+ hb_widget_visible(data->PO_pay, visible);
+
+}
+
+
+
static void ui_reptime_for(GtkWidget *widget, gpointer user_data)
{
struct ui_reptime_data *data;
-gint page;
DB( g_print("\n[reptime] for\n") );
data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
- page = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_for));
- gtk_notebook_set_current_page(GTK_NOTEBOOK(data->GR_select), page);
+ ui_reptime_update_for(widget, data);
ui_reptime_compute(widget, data);
}
gboolean cumul;
gboolean showall;
-gdouble cumulation;
+gdouble cumulation, average;
GtkTreeModel *model;
GtkTreeIter iter;
cumul = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_cumul));
showall = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_all));
selkey = 0;
+
+ data->accnum = 0;
switch(tmpfor)
{
case FOR_REPTIME_ACCOUNT:
selkey = ui_acc_comboboxentry_get_key(GTK_COMBO_BOX(data->PO_acc));
+ if(showall == FALSE)
+ data->accnum = selkey;
break;
case FOR_REPTIME_CATEGORY:
selkey = ui_cat_comboboxentry_get_key(GTK_COMBO_BOX(data->PO_cat));
DB( g_print(" for=%d, view by=%d :: key=%d\n", tmpfor, tmpslice, selkey) );
- /* do nothing if no transaction */
- if(g_list_length(GLOBALS->ope_list) == 0) return;
+ //to remove > 5.0.2
+ //filter_preset_daterange_set(data->filter, data->filter->range, data->accnum);
+ //ui_reptime_update_quickdate(widget, NULL);
//get our min max date
from = data->filter->mindate;
to = data->filter->maxdate;
if(to < from) return;
+ g_queue_free (data->txn_queue);
+ data->txn_queue = hbfile_transaction_get_partial(data->filter->mindate, data->filter->maxdate);
+
+
/* count number or results */
switch(tmpslice)
{
if(tmp_amount)
{
- Account *acc;
+ guint32 kcur;
/* set currency */
- /*
+ kcur = GLOBALS->kcur;
if( (tmpfor == FOR_REPTIME_ACCOUNT) && (showall == FALSE) )
{
- if(acc = da_acc_get(selkey))
+ Account *acc = da_acc_get(selkey);
+
+ if( acc != NULL )
{
- //ui_reptime_list_set_cur(GTK_TREE_VIEW(data->LV_report), acc->kcur);
- //gtk_chart_set_currency(GTK_CHART(data->RE_line), acc->kcur);
+ kcur = acc->kcur;
}
}
- else
- {
- //ui_reptime_list_set_cur(GTK_TREE_VIEW(data->LV_report), GLOBALS->kcur);
- //gtk_chart_set_currency(GTK_CHART(data->RE_line), GLOBALS->kcur);
- }*/
-
+
+ ui_reptime_list_set_cur(GTK_TREE_VIEW(data->LV_report), kcur);
+ gtk_chart_set_currency(GTK_CHART(data->RE_line), kcur);
+
/* compute the results */
- list = g_list_first(GLOBALS->ope_list);
+ list = g_queue_peek_head_link(data->txn_queue);
while (list != NULL)
{
Transaction *ope = list->data;
+ gboolean include = FALSE;
//debug
DB( g_print("** testing '%s', cat=%d==> %d\n", ope->wording, ope->kcat, filter_test(data->filter, ope)) );
- acc = da_acc_get(ope->kacc);
- if(acc == NULL) goto next1;
- if((acc->flags & (AF_CLOSED|AF_NOREPORT))) goto next1;
-
-
// add usage of payee or category
- if( !(ope->flags & OF_REMIND) && ope->date >= from && ope->date <= to)
- //if( (filter_test(data->filter, ope) == 1) )
+ switch(tmpfor)
{
- gboolean include = FALSE;
-
- switch(tmpfor)
+ case FOR_REPTIME_ACCOUNT:
+ if( selkey == ope->kacc )
+ include = TRUE;
+ break;
+ case FOR_REPTIME_CATEGORY:
{
- case FOR_REPTIME_ACCOUNT:
- if( selkey == ope->kacc )
- include = TRUE;
- break;
- case FOR_REPTIME_CATEGORY:
+ Category *catentry;
+
+ if( ope->flags & OF_SPLIT )
{
- Category *catentry;
+ guint nbsplit = da_splits_count(ope->splits);
+ Split *split;
- if( ope->flags & OF_SPLIT )
+ for(i=0;i<nbsplit;i++)
{
- guint nbsplit = da_transaction_splits_count(ope);
- Split *split;
-
- for(i=0;i<nbsplit;i++)
- {
- split = ope->splits[i];
- catentry = da_cat_get(split->kcat);
- if(catentry != NULL) //#1340142
- {
- if( selkey == catentry->parent || selkey == catentry->key )
- include = TRUE;
- }
- }
- }
- else
- {
- catentry = da_cat_get(ope->kcat);
+ split = ope->splits[i];
+ catentry = da_cat_get(split->kcat);
if(catentry != NULL) //#1340142
{
if( selkey == catentry->parent || selkey == catentry->key )
include = TRUE;
}
}
-
}
- break;
- case FOR_REPTIME_PAYEE:
- if( selkey == ope->kpay )
- include = TRUE;
- break;
+ else
+ {
+ catentry = da_cat_get(ope->kcat);
+ if(catentry != NULL) //#1340142
+ {
+ if( selkey == catentry->parent || selkey == catentry->key )
+ include = TRUE;
+ }
+ }
+
}
+ break;
+ case FOR_REPTIME_PAYEE:
+ if( selkey == ope->kpay )
+ include = TRUE;
+ break;
+ }
- if( include == TRUE || showall == TRUE)
+ if( include == TRUE || showall == TRUE)
+ {
+ guint32 pos = 0;
+ gdouble trn_amount;
+
+ switch(tmpslice)
{
- guint32 pos = 0;
- gdouble trn_amount;
-
- switch(tmpslice)
- {
- case GROUPBY_REPTIME_DAY:
- pos = ope->date - from;
- break;
+ case GROUPBY_REPTIME_DAY:
+ pos = ope->date - from;
+ break;
- case GROUPBY_REPTIME_WEEK:
- pos = (ope->date - from)/7;
- break;
+ case GROUPBY_REPTIME_WEEK:
+ pos = (ope->date - from)/7;
+ break;
- case GROUPBY_REPTIME_MONTH:
- pos = DateInMonth(from, ope->date);
- break;
+ case GROUPBY_REPTIME_MONTH:
+ pos = DateInMonth(from, ope->date);
+ break;
- case GROUPBY_REPTIME_QUARTER:
- pos = DateInQuarter(from, ope->date);
- break;
+ case GROUPBY_REPTIME_QUARTER:
+ pos = DateInQuarter(from, ope->date);
+ break;
- case GROUPBY_REPTIME_YEAR:
- pos = DateInYear(from, ope->date);
- break;
- }
+ case GROUPBY_REPTIME_YEAR:
+ pos = DateInYear(from, ope->date);
+ break;
+ }
- acc = da_acc_get(ope->kacc);
- trn_amount = 0.0;
-
- if( tmpfor == FOR_REPTIME_CATEGORY && ope->flags & OF_SPLIT )
+ trn_amount = 0.0;
+
+ if( tmpfor == FOR_REPTIME_CATEGORY && ope->flags & OF_SPLIT )
+ {
+ guint nbsplit = da_splits_count(ope->splits);
+ Split *split;
+ Category *catentry;
+
+ for(i=0;i<nbsplit;i++)
{
- guint nbsplit = da_transaction_splits_count(ope);
- Split *split;
- Category *catentry;
-
- for(i=0;i<nbsplit;i++)
+ split = ope->splits[i];
+ catentry = da_cat_get(split->kcat);
+ if(catentry != NULL) //#1340142
{
- split = ope->splits[i];
- catentry = da_cat_get(split->kcat);
- if(catentry != NULL) //#1340142
- {
- if( selkey == catentry->parent || selkey == catentry->key )
- trn_amount += split->amount;
- }
+ if( selkey == catentry->parent || selkey == catentry->key )
+ trn_amount += split->amount;
}
}
- else
- trn_amount = ope->amount;
+ }
+ else
+ trn_amount = ope->amount;
-
- //trn_amount = to_base_amount(trn_amount, acc->kcur);
+ trn_amount = hb_amount_base(trn_amount, ope->kcur);
- DB( g_print("** pos=%d will add %.2f to \n", pos, trn_amount) );
+ DB( g_print("** pos=%d will add %.2f to \n", pos, trn_amount) );
- tmp_amount[pos] += trn_amount;
+ tmp_amount[pos] += trn_amount;
- }
}
-next1:
+
list = g_list_next(list);
}
g_free(fullcatname);
}
+
+ /* update column 0 title */
+ GtkTreeViewColumn *column = gtk_tree_view_get_column( GTK_TREE_VIEW(data->LV_report), 0);
+ gtk_tree_view_column_set_title(column, _(CYA_VIEWBY[tmpslice]));
+
+ gtk_tree_view_columns_autosize (GTK_TREE_VIEW(data->LV_report));
/* Re-attach model to view */
gtk_tree_view_set_model(GTK_TREE_VIEW(data->LV_report), model);
g_object_unref(model);
+
+ //update average
+ {
+ gchar *info;
+ gchar buf[128];
+
+ average = cumulation / n_result;
+
+ hb_strfmon(buf, 127, average, kcur, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->CM_minor)) );
+
+ ////TRANSLATORS: count of transaction in balancedrawn / count of total transaction under abalancedrawn amount threshold
+ info = g_strdup_printf(_("Average: %s"), buf);
+ gtk_label_set_text(GTK_LABEL(data->TX_info), info);
+ g_free(info);
+ }
}
/* free our memory */
g_free(tmp_amount);
-
-
+
ui_reptime_update(widget, user_data);
}
// gtk_widget_set_sensitive(data->TB_buttons[ACTION_REPBUDGET_DETAIL], sensitive);
gtk_action_set_sensitive(gtk_ui_manager_get_action(data->ui, "/ToolBar/Detail"), sensitive);
- //view = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_view));
+ sensitive = page == 0 ? FALSE : TRUE;
+ gtk_widget_set_sensitive(data->LB_zoomx, sensitive);
+ gtk_widget_set_sensitive(data->RG_zoomx, sensitive);
+
+}
+
+
+static void ui_reptime_detail_onRowActivated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *col,
+ gpointer userdata)
+{
+struct ui_reptime_data *data;
+Transaction *active_txn;
+gboolean result;
+
+ data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(GTK_WIDGET(treeview), GTK_TYPE_WINDOW)), "inst_data");
+
+ DB( g_print ("\n[reptime] A detail row has been double-clicked!\n") );
+ active_txn = list_txn_get_active_transaction(GTK_TREE_VIEW(data->LV_detail));
+ if(active_txn)
+ {
+ Transaction *old_txn, *new_txn;
+
+ old_txn = da_transaction_clone (active_txn);
+ new_txn = active_txn;
+ result = deftransaction_external_edit(GTK_WINDOW(data->window), old_txn, new_txn);
+
+ if(result == GTK_RESPONSE_ACCEPT)
+ {
+ //#1640885
+ GLOBALS->changes_count++;
+ ui_reptime_compute(data->window, NULL);
+ }
+
+ da_transaction_free (old_txn);
+ }
}
+
static void ui_reptime_update_detail(GtkWidget *widget, gpointer user_data)
{
struct ui_reptime_data *data;
data->detail ^= 1;
- DB( printf("(stats) toggledetail to %d\n", data->detail) );
+ DB( g_print("(stats) toggledetail to %d\n", data->detail) );
ui_reptime_update_detail(widget, user_data);
{
DB( g_print("\n[reptime] setup\n") );
- data->detail = 0;
-
+ data->txn_queue = g_queue_new ();
data->filter = da_filter_malloc();
filter_default_all_set(data->filter);
+ data->detail = 0;
+
/* 3.4 : make int transfer out of stats */
data->filter->option[FILTER_PAYMODE] = 1;
data->filter->paymode[PAYMODE_INTXFER] = FALSE;
- filter_preset_daterange_set(data->filter, PREFS->date_range_rep);
+ filter_preset_daterange_set(data->filter, PREFS->date_range_rep, data->accnum);
g_signal_handler_block(data->PO_mindate, data->handler_id[HID_REPTIME_MINDATE]);
g_signal_handler_block(data->PO_maxdate, data->handler_id[HID_REPTIME_MAXDATE]);
- gtk_dateentry_set_date(GTK_DATE_ENTRY(data->PO_mindate), data->filter->mindate);
- gtk_dateentry_set_date(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->maxdate);
+ gtk_date_entry_set_date(GTK_DATE_ENTRY(data->PO_mindate), data->filter->mindate);
+ gtk_date_entry_set_date(GTK_DATE_ENTRY(data->PO_maxdate), data->filter->maxdate);
g_signal_handler_unblock(data->PO_mindate, data->handler_id[HID_REPTIME_MINDATE]);
g_signal_handler_unblock(data->PO_maxdate, data->handler_id[HID_REPTIME_MAXDATE]);
ui_acc_comboboxentry_set_active(GTK_COMBO_BOX(data->PO_acc), accnum);
ui_pay_comboboxentry_populate(GTK_COMBO_BOX(data->PO_pay), GLOBALS->h_pay);
- gtk_combo_box_set_active(GTK_COMBO_BOX(data->PO_pay), 0);
+ ui_pay_comboboxentry_set_active(GTK_COMBO_BOX(data->PO_pay), 0);
ui_cat_comboboxentry_populate(GTK_COMBO_BOX(data->PO_cat), GLOBALS->h_cat);
gtk_combo_box_set_active(GTK_COMBO_BOX(data->PO_cat), 0);
DB( g_print("\n[reptime] dispose\n") );
+ g_queue_free (data->txn_queue);
+
da_filter_free(data->filter);
g_free(data);
{
struct ui_reptime_data *data;
struct WinGeometry *wg;
-GtkWidget *window, *mainvbox, *hbox, *vbox, *hbox2, *notebook, *treeview;
-GtkWidget *label, *widget, *table, *alignment;
+GtkWidget *window, *mainvbox, *hbox, *vbox, *notebook, *treeview;
+GtkWidget *label, *widget, *table;
gint row;
GtkUIManager *ui;
GtkActionGroup *actions;
gtk_window_set_title (GTK_WINDOW (window), _("Trend Time Report"));
//set the window icon
- //homebank_window_set_icon_from_file(GTK_WINDOW (window), "report_stats.svg");
- gtk_window_set_icon_name(GTK_WINDOW (window), HB_STOCK_REP_TIME);
+ gtk_window_set_icon_name(GTK_WINDOW (window), ICONNAME_HB_REP_TIME);
//window contents
- mainvbox = gtk_vbox_new (FALSE, 0);
+ mainvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), mainvbox);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (mainvbox), hbox, TRUE, TRUE, 0);
//control part
- table = gtk_table_new (6, 3, FALSE);
- // gtk_alignment_new(xalign, yalign, xscale, yscale)
- alignment = gtk_alignment_new(0.0, 0.0, 0.0, 0.0);
- gtk_container_add(GTK_CONTAINER(alignment), table);
- gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
+ table = gtk_grid_new ();
+ gtk_widget_set_hexpand (GTK_WIDGET(table), FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (table), HB_BOX_SPACING);
- gtk_table_set_row_spacings (GTK_TABLE (table), HB_TABROW_SPACING);
- gtk_table_set_col_spacings (GTK_TABLE (table), HB_TABCOL_SPACING);
+ gtk_container_set_border_width (GTK_CONTAINER (table), SPACING_SMALL);
+ gtk_grid_set_row_spacing (GTK_GRID (table), SPACING_SMALL);
+ gtk_grid_set_column_spacing (GTK_GRID (table), SPACING_MEDIUM);
row = 0;
- label = make_label(_("Display"), 0.0, 0.5);
- gimp_label_set_attributes(GTK_LABEL(label), PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD, -1);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 3, row, row+1);
+ label = make_label_group(_("Display"));
+ gtk_grid_attach (GTK_GRID (table), label, 0, row, 3, 1);
row++;
- label = make_label(_("_For:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+ label = make_label_widget(_("_For:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = make_cycle(label, CYA_TIMESELECT);
data->CY_for = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), data->CY_for, 2, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
- notebook = gtk_notebook_new();
- data->GR_select = notebook;
- gtk_widget_show(notebook);
- gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
- gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), notebook, 1, 3, row, row+1);
-
- //account
- hbox2 = gtk_hbox_new (FALSE, HB_BOX_SPACING);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox2, NULL);
- label = gtk_label_new_with_mnemonic (_("_Account:"));
- gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
+ label = make_label_widget(_("A_ccount:"));
+ data->LB_acc = label;
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = ui_acc_comboboxentry_new(label);
data->PO_acc = widget;
- gtk_box_pack_start (GTK_BOX (hbox2), widget, TRUE, TRUE, 0);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
- //category
- hbox2 = gtk_hbox_new (FALSE, HB_BOX_SPACING);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox2, NULL);
- label = gtk_label_new_with_mnemonic (_("_Category:"));
- gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
+ row++;
+ label = make_label_widget(_("_Category:"));
+ data->LB_cat = label;
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = ui_cat_comboboxentry_new(label);
data->PO_cat = widget;
- gtk_box_pack_start (GTK_BOX (hbox2), widget, TRUE, TRUE, 0);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
- //payee
- hbox2 = gtk_hbox_new (FALSE, HB_BOX_SPACING);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox2, NULL);
- label = gtk_label_new_with_mnemonic (_("_Payee:"));
- gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
+ row++;
+ label = make_label_widget(_("_Payee:"));
+ data->LB_pay = label;
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = ui_pay_comboboxentry_new(label);
data->PO_pay = widget;
- gtk_box_pack_start (GTK_BOX (hbox2), widget, TRUE, TRUE, 0);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
widget = gtk_check_button_new_with_mnemonic (_("Select _all"));
data->CM_all = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 1, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
widget = gtk_check_button_new_with_mnemonic (_("_Cumulate"));
data->CM_cumul = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 1, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
- label = make_label(_("_View by:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+ label = make_label_widget(_("_View by:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = make_cycle(label, CYA_VIEWBY);
data->CY_view = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 2, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
- widget = gtk_check_button_new_with_mnemonic (_("_Minor currency"));
+ widget = gtk_check_button_new_with_mnemonic (_("Euro _minor"));
data->CM_minor = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 1, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
- label = make_label(_("_Zoom X:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+ label = make_label_widget(_("_Zoom X:"));
+ data->LB_zoomx = label;
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
widget = make_scale(label);
data->RG_zoomx = widget;
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 2, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);
row++;
- widget = gtk_hseparator_new();
- gtk_table_attach_defaults (GTK_TABLE (table), widget, 0, 3, row, row+1);
+ widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
+ gtk_grid_attach (GTK_GRID (table), widget, 0, row, 3, 1);
row++;
- label = make_label(_("Date filter"), 0.0, 0.5);
- gimp_label_set_attributes(GTK_LABEL(label), PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD, -1);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 3, row, row+1);
+ label = make_label_group(_("Date filter"));
+ gtk_grid_attach (GTK_GRID (table), label, 0, row, 3, 1);
row++;
- label = make_label(_("_Range:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
+ label = make_label_widget(_("_Range:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
data->CY_range = make_daterange(label, FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), data->CY_range, 2, 3, row, row+1);
+ gtk_grid_attach (GTK_GRID (table), data->CY_range, 2, row, 1, 1);
row++;
- label = make_label(_("_From:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
- data->PO_mindate = gtk_dateentry_new();
- gtk_table_attach_defaults (GTK_TABLE (table), data->PO_mindate, 2, 3, row, row+1);
+ label = make_label_widget(_("_From:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
+ data->PO_mindate = gtk_date_entry_new();
+ gtk_grid_attach (GTK_GRID (table), data->PO_mindate, 2, row, 1, 1);
row++;
- label = make_label(_("_To:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
- data->PO_maxdate = gtk_dateentry_new();
- gtk_table_attach_defaults (GTK_TABLE (table), data->PO_maxdate, 2, 3, row, row+1);
+ label = make_label_widget(_("_To:"));
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
+ data->PO_maxdate = gtk_date_entry_new();
+ gtk_grid_attach (GTK_GRID (table), data->PO_maxdate, 2, row, 1, 1);
//part: info + report
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
//ui manager
action = gtk_action_group_get_action(actions, "Line");
g_object_set(action, "is_important", TRUE, NULL);
+ /*action = gtk_action_group_get_action(actions, "Column");
+ g_object_set(action, "is_important", TRUE, NULL);*/
+
action = gtk_action_group_get_action(actions, "Detail");
g_object_set(action, "is_important", TRUE, NULL);
gtk_box_pack_start (GTK_BOX (vbox), data->TB_bar, FALSE, FALSE, 0);
//infos
- hbox = gtk_hbox_new (FALSE, HB_BOX_SPACING);
- gtk_container_set_border_width (GTK_CONTAINER(hbox), HB_BOX_SPACING);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, SPACING_SMALL);
+ gtk_container_set_border_width (GTK_CONTAINER(hbox), SPACING_SMALL);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ label = gtk_label_new(NULL);
+ data->TX_info = label;
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
widget = make_label(NULL, 0.5, 0.5);
gimp_label_set_attributes (GTK_LABEL (widget), PANGO_ATTR_SCALE, PANGO_SCALE_SMALL, -1);
gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
//page: list
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, NULL);
widget = gtk_scrolled_window_new (NULL, NULL);
//gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW (widget), GTK_CORNER_TOP_RIGHT);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- treeview = create_list_transaction(TRN_LIST_TYPE_DETAIL, PREFS->lst_ope_columns);
+ treeview = create_list_transaction(LIST_TXN_TYPE_DETAIL, PREFS->lst_ope_columns);
data->LV_detail = treeview;
gtk_container_add (GTK_CONTAINER(widget), treeview);
g_signal_connect (gtk_tree_view_get_selection(GTK_TREE_VIEW(data->LV_report)), "changed", G_CALLBACK (ui_reptime_selection), NULL);
+ g_signal_connect (GTK_TREE_VIEW(data->LV_detail), "row-activated", G_CALLBACK (ui_reptime_detail_onRowActivated), NULL);
/* toolbar */
else
gtk_widget_hide(data->CM_minor);
+ ui_reptime_update_for(window, data);
//gtk_widget_hide(data->GR_detail);
gdouble value;
gchar *color;
gchar buf[G_ASCII_DTOSTR_BUF_SIZE];
-//guint32 kcur = (guint32)g_object_get_data(G_OBJECT(gtk_tree_view_column_get_tree_view(col)), "kcur_data");
+guint32 kcur = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(gtk_tree_view_column_get_tree_view(col)), "kcur_data"));
gtk_tree_model_get(model, iter, GPOINTER_TO_INT(user_data), &value, -1);
if( value )
{
- mystrfmon(buf, G_ASCII_DTOSTR_BUF_SIZE-1, value, GLOBALS->minor);
- //hb_strfmon(buf, G_ASCII_DTOSTR_BUF_SIZE-1, value, kcur);
+ hb_strfmon(buf, G_ASCII_DTOSTR_BUF_SIZE-1, value, kcur, GLOBALS->minor);
color = get_normal_color_amount(value);
return column;
}
-/*
+
static void ui_reptime_list_set_cur(GtkTreeView *treeview, guint32 kcur)
{
- g_object_set_data(G_OBJECT(treeview), "kcur_data", (guint32)kcur);
-}*/
+ g_object_set_data(G_OBJECT(treeview), "kcur_data", GUINT_TO_POINTER(kcur));
+}
view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), PREFS->rules_hint);
+ gtk_tree_view_set_grid_lines (GTK_TREE_VIEW (view), PREFS->grid_lines);
/* column: Name */
column = gtk_tree_view_column_new();
projects / chaz / homebank / blobdiff