From f01eac5b7b46899391c40e8e9c0bc09f06d85576 Mon Sep 17 00:00:00 2001 From: james Date: Wed, 7 Oct 2009 17:58:11 +0000 Subject: [PATCH] Add a date class for all date entry boxes to use Update fundraising dashboard to pull all To-Do list items from the corresponding database tables/fields Update donor contacts code to not be crazy Update donor organization info page as per carolyn's suggestions --- admin/donors.php | 187 +++++++++++++++++++++----------- admin/donors_search.php | 6 +- admin/fundraising.php | 84 +++++++++++++- admin/fundraising_campaigns.php | 25 ++--- theme/default/sfiab.css | 6 +- 5 files changed, 222 insertions(+), 86 deletions(-) diff --git a/admin/donors.php b/admin/donors.php index 29683ab2..1742523a 100644 --- a/admin/donors.php +++ b/admin/donors.php @@ -65,7 +65,8 @@ switch($_GET['action']) { //FIXME accept the logo //"logo='".mysql_escape_string(stripslashes($_POST['logo']))."', ". - save_activityinfo("Updated organization info for " . mysql_escape_string(stripslashes($_POST['organization'])), $id); +//($comment , $donorId, $userId, $type, $campaign_id=null){ + save_activityinfo("Updated organization info for {$_POST['organization']}", $id, $_SESSION['user_uid'],"System"); } exit; break; @@ -100,7 +101,14 @@ switch($_GET['action']) { exit; break; case 'activityinfo_save': - if(save_activityinfo()){ +//($comment , $donorId, $userId, $type, $campaign_id=null){ + if(save_activityinfo( + $_POST['comment'], + $_GET['id'], + $_SESSION['users_uid'], + $_POST['type'], + $_POST['fundraising_campaigns_id'] + )){ happy_("Activity Logged"); }else{ error_("Unable to save activity log"); @@ -125,7 +133,8 @@ function delete_contact(){ user_delete($uid); happy_("Deleted contact %1", array($name)); - save_activityinfo("Deleted contact \"" . $name . "\""); +//($comment , $donorId, $userId, $type, $campaign_id=null){ + save_activityinfo("Deleted contact \"$name\"",$_GET['id'],$_SESSION['users_uid'],'System' ); } } @@ -170,11 +179,12 @@ function save_contact(){ } else { /* Unset all other primaries */ mysql_query("UPDATE users_sponsor SET `primary`='no' - WHERE sponsors_id='$sponsor_id'"); + WHERE sponsors_id='$sponsor_id' AND users_id != '$id'"); } // we now know whether or not they're the primary user. Update them with that, // along with all of the user info that's been submitted. + echo "setting primary $p"; $u['primary']=$p; $u['salutation']=$_POST['salutation']; $u['firstname']=$_POST['firstname']; @@ -189,7 +199,8 @@ function save_contact(){ $u['sponsors_id']=$sponsor_id; user_save($u); $name = trim($u['firstname'] . ' ' . $u['lastname']); - save_activityinfo($successLog . '"' . $name . '"'); +//($comment , $donorId, $userId, $type, $campaign_id=null){ + save_activityinfo($successLog . '"' . $name . '"',$sponsor_id,$_SESSION['users_uid'],'System'); happy_($successMessage); }else{ // something's wrong with the user data submitted. Should flag the fields where @@ -223,7 +234,7 @@ function draw_contactsinfo_form($contact = null){ } // start our accordion - echo "
\n"; + echo "
\n"; // loop through each contact and draw a form with their data in it. @@ -273,10 +284,10 @@ function draw_contact_form($sponsor_id, $contact = null){ echo "\n"; } ?> - +
- + @@ -327,78 +338,98 @@ function draw_contact_form($sponsor_id, $contact = null){ function draw_activityinfo_form(){ + global $config; $sponsorid = $_GET['id']; // we'll start by drawing the table header ?> -
+
- + + + + + + + + + + + "; - $results = mysql_query($query); - $row = mysql_fetch_array($results); - if($row){ - do{ - echo "\n"; - }while($row = mysql_fetch_array($results)); + $q = mysql_query($query); + echo mysql_error(); + if(mysql_num_rows($q)) { + while($r = mysql_fetch_array($q)) { + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; + } }else{ - echo ""; + echo ""; } ?> - - - - - +
Date UserContact TypeCampaign Notes
" onClick="return activityinfo_save()" /> + "; + echo "\n"; + $logtypes=array("Campaign","Phone Call","Email","Personal Visit","Other"); + foreach($logtypes AS $lt) { + echo "\n"; + } + echo "\n"; + ?> + + "; + echo "\n"; + while($r=mysql_fetch_object($q)) { + echo "\n"; + } + echo "\n"; + ?> +
" . $query . "
" . $row["dt"]; - echo "" . $row["name"]; - echo "" . $row["log"]; - echo "
" . $r["dt"] . "" . $r["name"] . "" . $r["type"] . "" . $r["campaignname"] . "" . $r["log"] . "
" . i18n("No records") . "
" . i18n("No records") . "
" onClick="return activityinfo_save()" />