Implement weekly scheduled transaction

fix #127

Author: korli

locales/en.catkeys

@@ -1,4 +1,4 @@
-1	English	application/x-vnd.wgp-CapitalBe	3533405837
+1	English	application/x-vnd.wgp-CapitalBe	2962703943
 Year	ReportWindow		Year
 None	ReportWindow		None
 Export to QIF file…	MainWindow		Export to QIF file…
@@ -226,6 +226,7 @@ Tools	MainWindow		Tools
 This month	FilterView		This month
 Type	TransactionReport	Type of transaction, expenses or income	Type
 Not enough accounts for a transfer	MainWindow		Not enough accounts for a transfer
+Weekly	ScheduleAddWindow		Weekly
 Delete…	MainWindow		Delete…
 The file '%filename%' appears not to be a CapitalBe ledger.\nOr it doesn't have the 'CapitalBe ledger' filetype.\n	App		The file '%filename%' appears not to be a CapitalBe ledger.\nOr it doesn't have the 'CapitalBe ledger' filetype.\n
 CapitalBe has run into a bug. This shouldn't happen, but it has.\nWould you like to:\n\n1) Save the bug to a text file for uploading to\nCapitalBe's issue tracker (https://github.com/HaikuArchives/CapitalBe/issues)\n\n2) Just quit and do nothing\n	Locale		CapitalBe has run into a bug. This shouldn't happen, but it has.\nWould you like to:\n\n1) Save the bug to a text file for uploading to\nCapitalBe's issue tracker (https://github.com/HaikuArchives/CapitalBe/issues)\n\n2) Just quit and do nothing\n

src/Database.cpp

@@ -1047,11 +1047,7 @@ Database::AddScheduledTransaction(const ScheduledTransData& data, const bool& ne
 			}
 			case SCHEDULED_WEEKLY:
 			{
-				// TODO: Add weekly scheduling support
-				//				data.SetNextDueDate(IncrementDateByMonth(data.Date()));
-				ShowBug(
-					"Unimplemented Weekly scheduling support in "
-					"Database::AddScheduledTransaction()");
+				nextdate = IncrementDateByWeek(data.Date());
 				break;
 			}
 			case SCHEDULED_QUARTERLY:

src/ScheduleAddWindow.cpp

@@ -102,13 +102,15 @@ ScheduleAddWindow::ScheduleAddWindow(const BRect& frame, const TransactionData&
 	memo->SetEnabled(false);
 
 	fIntervalMenu = new BMenu("Frequency");
+	fIntervalMenu->AddItem(
+		new BMenuItem(B_TRANSLATE("Weekly"), new BMessage(M_SCHEDULED_WEEKLY)));
 	fIntervalMenu->AddItem(
 		new BMenuItem(B_TRANSLATE("Monthly"), new BMessage(M_SCHEDULED_MONTHLY)));
 	fIntervalMenu->AddItem(
 		new BMenuItem(B_TRANSLATE("Quarterly"), new BMessage(M_SCHEDULED_QUARTERLY)));
 	fIntervalMenu->AddItem(
 		new BMenuItem(B_TRANSLATE("Annually"), new BMessage(M_SCHEDULED_ANNUALLY)));
-	fIntervalMenu->ItemAt(0)->SetMarked(true);
+	fIntervalMenu->ItemAt(1)->SetMarked(true);
 	fIntervalMenu->SetLabelFromMarked(true);
 
 	BMenuField* intervalfield
@@ -247,15 +249,20 @@ ScheduleAddWindow::MessageReceived(BMessage* msg)
 			switch (fIntervalMenu->IndexOf(intervalitem)) {
 				case 0:
 				{
-					stdata.SetInterval(SCHEDULED_MONTHLY);
+					stdata.SetInterval(SCHEDULED_WEEKLY);
 					break;
 				}
 				case 1:
 				{
-					stdata.SetInterval(SCHEDULED_QUARTERLY);
+					stdata.SetInterval(SCHEDULED_MONTHLY);
 					break;
 				}
 				case 2:
+				{
+					stdata.SetInterval(SCHEDULED_QUARTERLY);
+					break;
+				}
+				case 3:
 				{
 					stdata.SetInterval(SCHEDULED_ANNUALLY);
 					break;

src/ScheduledTransData.cpp

@@ -73,11 +73,7 @@ ScheduledTransData::CalculateNextDueDate()
 		}
 		case SCHEDULED_WEEKLY:
 		{
-			// TODO: Add weekly scheduling support
-			//				data.SetNextDueDate(IncrementDateByMonth(data.Date()));
-			ShowBug(
-				"Unimplemented Weekly scheduling support in "
-				"ScheduledTransData::CalculateNextDueDate()");
+			fNextDate = IncrementDateByWeek(Date());
 			break;
 		}
 		case SCHEDULED_QUARTERLY:

src/TimeSupport.cpp

@@ -28,6 +28,16 @@ DecrementDateByDay(const time_t& t)
 }
 
 
+time_t
+IncrementDateByWeek(const time_t& t)
+{
+	struct tm timestruct = *localtime(&t);
+	for (int i = 0; i < 7; i++)
+		timestruct.tm_mday++;
+	return mktime(&timestruct);
+}
+
+
 time_t
 IncrementDateByMonth(const time_t& t)
 {

src/TimeSupport.h

@@ -19,6 +19,7 @@
 time_t IncrementDateByDay(const time_t& t);
 time_t DecrementDateByDay(const time_t& t);
 
+time_t IncrementDateByWeek(const time_t& t);
 time_t IncrementDateByMonth(const time_t& t);
 time_t DecrementDateByMonth(const time_t& t);
 time_t IncrementDateByQuarter(const time_t& t);