From ebf6c0e79ba6eb93ebd3fc05e9d0bb8e80331dac Mon Sep 17 00:00:00 2001
From: james <james>
Date: Tue, 13 Oct 2009 01:01:48 +0000
Subject: [PATCH] Update fundraising dashboard and colourchange overdue
 thankyous

---
 admin/fundraising.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/admin/fundraising.php b/admin/fundraising.php
index 0da80b0..cda239f 100644
--- a/admin/fundraising.php
+++ b/admin/fundraising.php
@@ -122,13 +122,15 @@ $q=mysql_query("SELECT * FROM fundraising_goals WHERE fiscalyear='{$config['FISC
 <br />
 
 <h3><?=i18n("To Do List")?></h3>
-<h4>Thank You's</h4>
+<h4><?=i18n("Thank You's")?></h4>
 <?
-$q=mysql_query("SELECT value, thanked, status, users_uid, sponsors_id, datereceived
+$q=mysql_query("SELECT value, thanked, status, users_uid, sponsors_id, datereceived,
+	DATE_ADD(datereceived, INTERVAL 1 MONTH) < NOW() AS onemonth,
+	DATE_ADD(datereceived, INTERVAL 2 MONTH) < NOW() AS twomonth
     FROM fundraising_donations
     WHERE thanked='no' AND status='received'
-    AND fiscalyear='{$config['FISCALYEAR']} 
-    ORDER BY datereceived'
+    AND fiscalyear='{$config['FISCALYEAR']}' 
+    ORDER BY datereceived
     ");
     //AND (users.year IS NULL OR users.year='{$config['FISCALYEAR']}')
 echo mysql_error();
@@ -141,15 +143,20 @@ if(mysql_num_rows($q)) {
     echo "</tr>\n";
 
     while($r=mysql_fetch_object($q)) {
+		/*
         if($r->users_uid) {
             $dq=mysql_query("SELECT CONCAT(firstname,' ',lastname) AS name FROM users WHERE uid='$r->users_uid' ORDER BY fairyear DESC LIMIT 1");
-
         }
         else if ($r->sponsors_id) {
+			*/
             $dq=mysql_query("SELECT organization AS name FROM sponsors WHERE id='$r->sponsors_id'");
-        }
+       // }
         $dr=mysql_fetch_object($dq);
-        echo "<tr>";
+		if($r->twomonth) $s="style=\"background-color: ".colour_to_percent(0).";\"";
+		else if($r->onemonth) $s="style=\"background-color: ".colour_to_percent(50).";\"";
+		else $s="";
+
+        echo "<tr $s>";
         echo " <td>$dr->name</td>";
         echo " <td>".format_date($r->datereceived)."</td>";
         echo " <td style=\"text-align: right;\">".format_money($r->value)."</td>";
@@ -165,7 +172,7 @@ if(mysql_num_rows($q)) {
 ?>
 
 <br />
-<h4>Appeal Follow-Ups</h4>
+<h4><?=i18n("Appeal Follow-Ups")?></h4>
 <?
 $q=mysql_query("SELECT * FROM fundraising_campaigns WHERE followupdate>=NOW() ORDER BY followupdate LIMIT 5");
 echo mysql_error();