From e8c7e797296c3055d82f403e3e33c25665368ba5 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 10 Dec 2003 10:30:53 +0000
Subject: [PATCH] fix bookkeeping bugs

---
 stepmania/src/Bookkeeper.cpp        | 31 +++++++++++++++++------------
 stepmania/src/Bookkeeper.h          |  2 +-
 stepmania/src/ProfileManager.cpp    | 15 +++++++++++++-
 stepmania/src/ScreenBookkeeping.cpp |  2 +-
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/stepmania/src/Bookkeeper.cpp b/stepmania/src/Bookkeeper.cpp
index e2082372d3..a4f885743e 100644
--- a/stepmania/src/Bookkeeper.cpp
+++ b/stepmania/src/Bookkeeper.cpp
@@ -28,9 +28,9 @@ static const CString COINS_DAT = "Data/Coins.dat";
 
 const int COINS_DAT_VERSION = 1;
 
-tm GetDaysAgo( tm start, int iDaysAgo )
+tm AddDays( tm start, int iDaysToMove )
 {
-	start.tm_mday -= iDaysAgo;
+	start.tm_mday += iDaysToMove;
 	time_t seconds = mktime( &start );
 	ASSERT( seconds != (time_t)-1 );
 	tm time = *localtime( &seconds );
@@ -39,17 +39,19 @@ tm GetDaysAgo( tm start, int iDaysAgo )
 
 tm GetYesterday( tm start )
 {
-	return GetDaysAgo( start, -1 );
+	return AddDays( start, -1 );
 }
 
 int GetDayOfWeek( tm time )
 {
-	return time.tm_wday;
+	int iDayOfWeek = time.tm_wday;
+	ASSERT( iDayOfWeek < DAYS_IN_WEEK );
+	return iDayOfWeek;
 }
 
-tm GetLastSunday( tm start )
+tm GetNextSunday( tm start )
 {
-	return GetDaysAgo( start, -GetDayOfWeek(start) );
+	return AddDays( start, DAYS_IN_WEEK-GetDayOfWeek(start) );
 }
 
 
@@ -163,16 +165,18 @@ void Bookkeeper::UpdateLastSeenTime()
 
 		m_iCoinsByHourForYear[tOld.tm_yday][tOld.tm_hour] = 0;
 	}
+
+	m_iLastSeenTime = lNewTime;
 }
 
 void Bookkeeper::CoinInserted()
 {
 	UpdateLastSeenTime();
 
-	long lOldTime = m_iLastSeenTime;
-    tm *pNewTime = localtime( &lOldTime );
+	long lTime = m_iLastSeenTime;
+    tm *pTime = localtime( &lTime );
 
-	m_iCoinsByHourForYear[pNewTime->tm_yday][pNewTime->tm_hour]++;
+	m_iCoinsByHourForYear[pTime->tm_yday][pTime->tm_hour]++;
 }
 
 int Bookkeeper::GetCoinsForDay( int iDayOfYear )
@@ -193,8 +197,8 @@ void Bookkeeper::GetCoinsLastDays( int coins[NUM_LAST_DAYS] )
 
 	for( int i=0; i<NUM_LAST_DAYS; i++ )
 	{
-		time = GetYesterday( time );
 		coins[i] = GetCoinsForDay( time.tm_yday );
+		time = GetYesterday( time );
 	}
 }
 
@@ -206,7 +210,8 @@ void Bookkeeper::GetCoinsLastWeeks( int coins[NUM_LAST_WEEKS] )
 	long lOldTime = m_iLastSeenTime;
     tm time = *localtime( &lOldTime );
 
-	time = GetLastSunday( time );
+	time = GetNextSunday( time );
+	time = GetYesterday( time );
 
 	for( int w=0; w<NUM_LAST_WEEKS; w++ )
 	{
@@ -214,8 +219,8 @@ void Bookkeeper::GetCoinsLastWeeks( int coins[NUM_LAST_WEEKS] )
 
 		for( int d=0; d<DAYS_IN_WEEK; d++ )
 		{
-			time = GetYesterday( time );
 			coins[w] += GetCoinsForDay( time.tm_yday );
+			time = GetYesterday( time );
 		}
 	}
 }
@@ -232,8 +237,8 @@ void Bookkeeper::GetCoinsByDayOfWeek( int coins[DAYS_IN_WEEK] )
 
 	for( int d=0; d<DAYS_PER_YEAR; d++ )
 	{
-		time = GetYesterday( time );
 		coins[GetDayOfWeek(time)] += GetCoinsForDay( time.tm_yday );
+		time = GetYesterday( time );
 	}
 }
 
diff --git a/stepmania/src/Bookkeeper.h b/stepmania/src/Bookkeeper.h
index 3c3c969c71..9c1a7965e1 100644
--- a/stepmania/src/Bookkeeper.h
+++ b/stepmania/src/Bookkeeper.h
@@ -31,7 +31,7 @@ const CString LAST_DAYS_NAME[NUM_LAST_DAYS] =
 	"7 Days Ago",
 };
 
-const CString DAY_TO_NAME[DAYS_IN_WEEK] =
+const CString DAY_OF_WEEK_TO_NAME[DAYS_IN_WEEK] =
 {
 	"Sunday",
 	"Monday",
diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index e5ca3de412..d8fbb1365b 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -1290,11 +1290,24 @@ void ProfileManager::SaveStatsWebPageToDir( CString sDir, MemoryCard mc )
 			PRINT_DIV_END;
 		}
 
+		// GetCoinsByDayOfWeek
+		{
+			int coins[DAYS_IN_WEEK];
+			BOOKKEEPER->GetCoinsByDayOfWeek( coins );
+			PRINT_DIV_START( "Coins by Day of Week" );
+			for( int i=0; i<DAYS_IN_WEEK; i++ )
+			{
+				CString sDay = DAY_OF_WEEK_TO_NAME[i];
+				PRINT_LINE_I( sDay.c_str(), coins[i] );
+			}
+			PRINT_DIV_END;
+		}
+
 		// GetCoinsByHour
 		{
 			int coins[HOURS_PER_DAY];
 			BOOKKEEPER->GetCoinsByHour( coins );
-			PRINT_DIV_START( ssprintf("Coins for Last %d Weeks",HOURS_PER_DAY).c_str() );
+			PRINT_DIV_START( ssprintf("Coins for Last %d Hours",HOURS_PER_DAY).c_str() );
 			for( int i=0; i<HOURS_PER_DAY; i++ )
 			{
 				CString sHour = ssprintf("hour %d",i);
diff --git a/stepmania/src/ScreenBookkeeping.cpp b/stepmania/src/ScreenBookkeeping.cpp
index 7b07ed110c..eebd2ca527 100644
--- a/stepmania/src/ScreenBookkeeping.cpp
+++ b/stepmania/src/ScreenBookkeeping.cpp
@@ -187,7 +187,7 @@ void ScreenBookkeeping::ChangeView( View newView )
 			CString sTitle, sData;
 			for( int i=0; i<DAYS_IN_WEEK; i++ )
 			{
-				sTitle += DAY_TO_NAME[i] + "\n";
+				sTitle += DAY_OF_WEEK_TO_NAME[i] + "\n";
 				sData += ssprintf("%d",coins[i]) + "\n";
 			}