From e4f3434a95f4b9872bea241ff46d3238fba92547 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Tue, 1 Nov 2011 12:41:15 -0400
Subject: [PATCH] Formatting changes, and added total for restricted funds.

---
 fund-report.plx | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/fund-report.plx b/fund-report.plx
index 9d6a31b..e690b13 100755
--- a/fund-report.plx
+++ b/fund-report.plx
@@ -107,23 +107,26 @@ foreach my $type ('Income', 'Expenses') {
   }
 }
 
-my $format = "%-${ACCT_WIDTH}.${ACCT_WIDTH}s       \$%11.2f       \$%11.2f\n";
-my($totDeb, $totCred) = ($ZERO, $ZERO);
+my($totStart, $totEnd) = ($ZERO, $ZERO);
 
 foreach my $fund (sort keys %funds) {
   print "Fund: $fund\n";
-  print "      Balance as of $startDate: ", sprintf("\$%11.2f\n\n", $funds{$fund}{starting});
-  print "      Income during period:     ", sprintf("\$%11.2f\n", $funds{$fund}{Income});
-  print "      Expenses during period:    ", sprintf("\$%11.2f\n\n", $funds{$fund}{Expenses});
-  print "      Balance as of $endDate: ", sprintf("\$%11.2f\n", $funds{$fund}{ending});
+  print "      Balance as of $startDate: ", sprintf("\$%15.2f\n\n", $funds{$fund}{starting});
+  print "      Income during period:     ", sprintf("\$%15.2f\n", $funds{$fund}{Income});
+  print "      Expenses during period:   ", sprintf("\$%15.2f\n\n", $funds{$fund}{Expenses});
+  print "      Balance as of $endDate: ", sprintf("\$%15.2f\n", $funds{$fund}{ending});
   print "\n\n";
   # Santity check:
-  if ($funds{$fund}{ending} ==
-      ($funds{$fund}{starting} + $funds{$fund}{Income} + $funds{$fund}{Expenses})) {
+  if ($funds{$fund}{ending} !=
+      ( ($funds{$fund}{starting} - $funds{$fund}{Income}) - $funds{$fund}{Expenses})) {
     print "$fund FAILED SANITY CHECK\n\n\n";
     die "$fund FAILED SANITY CHECK";
   }
+  $totStart += $funds{$fund}{starting};
+  $totEnd += $funds{$fund}{ending};
 }
+print "\n\n\nTotal Restricted Funds as of $startDate: ", sprintf("\$%15.2f\n", $totStart);
+print "\nTotal Restricted Funds as of $endDate: ", sprintf("\$%15.2f\n", $totEnd);
 ###############################################################################
 #
 # Local variables: