Merge lp:~veselkovsd/homebank/ignore_week-end into lp:homebank/trunk

[Sergey Veselkov]

add "ignore" week-end behavior

Add the ability to ignore weekends in scheduled transactions.

[lp:~veselkovsd/homebank/ignore_week-end]

69. By Sergey Veselkov on 2020-12-06

setting weekend behavior for week unit is not allowed

Unmerged revisions

69. By Sergey Veselkov on 2020-12-06

setting weekend behavior for week unit is not allowed

68. By Sergey Veselkov on 2020-12-06

add "ignore" week-end behavior

=== modified file 'src/hb-archive.c'
--- src/hb-archive.c	2020-09-06 09:50:00 +0000
+++ src/hb-archive.c	2020-12-06 12:27:16 +0000
@@ -348,6 +348,7 @@
 static guint32 _sched_date_get_next_post(GDate *tmpdate, Archive *arc, guint32 nextdate)
 {
 guint32 nextpostdate = nextdate;
+GDateWeekday wday;
 
 	//DB( g_print("\n[scheduled] date_get_next_post\n") );
 
@@ -355,21 +356,27 @@
 
 	//DB( g_print("in : %2d-%2d-%4d\n", g_date_get_day(tmpdate), g_date_get_month (tmpdate), g_date_get_year(tmpdate) ) );
 
-	switch(arc->unit)
-	{
-		case AUTO_UNIT_DAY:
-			g_date_add_days(tmpdate, arc->every);
-			break;
-		case AUTO_UNIT_WEEK:
-			g_date_add_days(tmpdate, 7 * arc->every);
-			break;
-		case AUTO_UNIT_MONTH:
-			g_date_add_months(tmpdate, arc->every);
-			break;
-		case AUTO_UNIT_YEAR:
-			g_date_add_years(tmpdate, arc->every);
-			break;
-	}
+	do {
+		switch(arc->unit)
+		{
+			case AUTO_UNIT_DAY:
+				g_date_add_days(tmpdate, arc->every);
+				break;
+			case AUTO_UNIT_WEEK:
+				g_date_add_days(tmpdate, 7 * arc->every);
+				break;
+			case AUTO_UNIT_MONTH:
+				g_date_add_months(tmpdate, arc->every);
+				break;
+			case AUTO_UNIT_YEAR:
+				g_date_add_years(tmpdate, arc->every);
+				break;
+		}
+
+		wday = g_date_get_weekday(tmpdate);
+	/* ignore weekend */
+	} while ( arc->weekend == 3 && wday >= G_DATE_SATURDAY );
+	
 
 	//DB( g_print("out: %2d-%2d-%4d\n", g_date_get_day(tmpdate), g_date_get_month (tmpdate), g_date_get_year(tmpdate) ) );
 

=== modified file 'src/ui-archive.c'
--- src/ui-archive.c	2020-05-21 19:33:21 +0000
+++ src/ui-archive.c	2020-12-06 12:27:16 +0000
@@ -455,6 +455,7 @@
 GtkTreeModel *model;
 GtkTreeIter iter;
 Archive *arc;
+gushort active_unit;
 gboolean selected, sensitive;
 
 	DB( g_print("\n[ui_scheduled] update\n") );
@@ -475,7 +476,10 @@
 		gtk_tree_model_get(model, &iter, LST_DEFARC_DATAS, &arc, -1);
 
 		if( arc->flags & OF_AUTO )
+		{
 			sensitive = TRUE;
+			active_unit = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_unit));
+		}
 	}
 	
 	gtk_widget_set_sensitive(data->LB_next, sensitive);
@@ -484,8 +488,9 @@
 	gtk_widget_set_sensitive(data->LB_every, sensitive);
 	gtk_widget_set_sensitive(data->NB_every, sensitive);
 
-	gtk_widget_set_sensitive(data->LB_weekend, sensitive);
-	gtk_widget_set_sensitive(data->CY_weekend, sensitive);
+	/* setting weekend behavior for week unit is not allowed */
+	gtk_widget_set_sensitive(data->LB_weekend, (sensitive == TRUE) ? active_unit != AUTO_UNIT_WEEK : FALSE);
+	gtk_widget_set_sensitive(data->CY_weekend, (sensitive == TRUE) ? active_unit != AUTO_UNIT_WEEK : FALSE);
 
 	gtk_widget_set_sensitive(data->EX_options, sensitive);
 	
@@ -913,6 +918,23 @@
 	//g_print(" toggle type=%d\n", gtk_toggle_button_get_active(button));
 }
 
+static void ui_arc_manage_cb_unit_changed (GtkComboBox *combo_box, gpointer user_data)
+{
+struct ui_arc_manage_data *data;
+GtkWidget *widget;
+gushort active_unit;
+
+	widget = GTK_WIDGET(combo_box);
+	active_unit = gtk_combo_box_get_active(combo_box);
+	
+	if ( active_unit == AUTO_UNIT_WEEK )
+	{
+		data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
+		gtk_combo_box_set_active(GTK_COMBO_BOX(data->CY_weekend), 0);
+	}
+
+	ui_arc_manage_update(widget, user_data);
+}
 
 static gboolean
 ui_arc_manage_cleanup(struct ui_arc_manage_data *data, gint result)
@@ -1204,7 +1226,9 @@
 	
 	g_signal_connect (data->CM_auto,  "notify::active", G_CALLBACK (ui_arc_manage_cd_schedule_changed), NULL);
 	g_signal_connect (data->CM_limit, "toggled", G_CALLBACK (ui_arc_manage_cd_schedule_changed), NULL);
-	
+
+	g_signal_connect (data->CY_unit, "changed", G_CALLBACK(ui_arc_manage_cb_unit_changed), NULL);
+
 	//setup, init and show dialog
 	ui_arc_manage_setup(data);
 	ui_arc_manage_update(data->LV_arc, NULL);

=== modified file 'src/ui-archive.h'
--- src/ui-archive.h	2020-05-21 19:33:21 +0000
+++ src/ui-archive.h	2020-12-06 12:27:16 +0000
@@ -53,7 +53,7 @@
 	GtkWidget	*CM_auto;
 	GtkWidget	*LB_next, *PO_next;
 	GtkWidget	*LB_every, *NB_every;
-	GtkWidget   *LB_weekend, *CY_weekend;
+	GtkWidget	*LB_weekend, *CY_weekend;
 	GtkWidget	*CY_unit;
 
 	GtkWidget	*EX_options;

=== modified file 'src/ui-widgets-data.c'
--- src/ui-widgets-data.c	2020-05-21 19:33:21 +0000
+++ src/ui-widgets-data.c	2020-12-06 12:27:16 +0000
@@ -139,6 +139,7 @@
 	N_("Possible"), 
 	N_("Before"), 
 	N_("After"), 
+	N_("Ignore"), 
 	NULL
 };