[Xrms-cvs] xrms/activities activities-widget.php,1.6,1.7

[Justin C. <dat...@us...>]

Update of /cvsroot/xrms/xrms/activities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25060

Modified Files:
	activities-widget.php 
Log Message:
moved creation of title html link to GetActivitiesPagerData and added popup/tooltip containing activity description; add on_what_table criteria to query; add description as available column in pager

Index: activities-widget.php
===================================================================
RCS file: /cvsroot/xrms/xrms/activities/activities-widget.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** activities-widget.php	30 Jun 2005 04:40:23 -0000	1.6
--- activities-widget.php	30 Jun 2005 18:00:23 -0000	1.7
***************
*** 37,40 ****
--- 37,43 ----
  function GetActivitiesWidget($con, $search_terms, $form_name, $caption, $session_user_id, $return_url, $extra_where='', $end_rows='', $default_columns = null) {
  
+ // This should probably be a system preference.
+ $description_substring_length = 80;
+ 
  $calendar_date_field = 'calendar_start_date';
  
***************
*** 79,83 ****
      //echo "init date is $initial_calendar_date<br>";
  
!     // actually, let's create the Calendar object here, then we can let it do the thing with the stuff.
      $calendar = new CalendarView($con, $form_name, $initial_calendar_date, 'calendar_start_date', $calendar_range);
  
--- 82,86 ----
      //echo "init date is $initial_calendar_date<br>";
  
!     //create the Calendar object here, so that we can use it to generate the SQL offset
      $calendar = new CalendarView($con, $form_name, $initial_calendar_date, 'calendar_start_date', $calendar_range);
  
***************
*** 86,90 ****
  }
  
- 
  if(!$activities_widget_type) {
      $activities_widget_type = 'list';
--- 89,92 ----
***************
*** 99,103 ****
    ." at.activity_type_pretty_name AS type, "
    . $con->Concat("'<a id=\"'", "cont.last_name", "'_'" ,"cont.first_names","'\" href=\"../contacts/one.php?contact_id='", "cont.contact_id", "'\">'", "cont.first_names", "' '", "cont.last_name", "'</a>'") . " AS contact, "
!   . $con->Concat("'<a id=\"'", "activity_title", "'\" href=\"../activities/one.php?activity_id='", "a.activity_id", "'&amp;return_url=$return_url\">'", "activity_title", "'</a>'") . " AS title, "
    . $con->SQLDate('Y-m-d','a.scheduled_at') . " AS scheduled, "
    . $con->SQLDate('Y-m-d','a.ends_at') . " AS due, "
--- 101,109 ----
    ." at.activity_type_pretty_name AS type, "
    . $con->Concat("'<a id=\"'", "cont.last_name", "'_'" ,"cont.first_names","'\" href=\"../contacts/one.php?contact_id='", "cont.contact_id", "'\">'", "cont.first_names", "' '", "cont.last_name", "'</a>'") . " AS contact, "
! 
!   . "'$return_url' as return_url, "
! 
!   .	$con->substr."(activity_description, 1, $description_substring_length) AS description_brief, " 
! 
    . $con->SQLDate('Y-m-d','a.scheduled_at') . " AS scheduled, "
    . $con->SQLDate('Y-m-d','a.ends_at') . " AS due, "
***************
*** 118,132 ****
  $sql .= " WHERE a.company_id = c.company_id $extra_where ";
  
- 
- /*
- 
-     vestigal code from activities/some.php...should be replaced with a generic on_what_table handler!
- 
- 
- if($sort_column == 9 || $campaign_id) {
-     $sql .= " AND a.on_what_table='opportunities'
-   AND a.on_what_id=o.opportunity_id ";
- }
- */
  $sql .= " AND a.activity_record_status = 'a'
    AND at.activity_type_id = a.activity_type_id
--- 124,127 ----
***************
*** 226,229 ****
--- 221,229 ----
  }
  
+ 
+ if($search_terms['on_what_table']) {
+     $sql .= " AND a.on_what_table='{$search_terms['on_what_table']}' and a.on_what_id={$search_terms['on_what_id']}";
+ }
+ 
  if($search_terms['campaign_id']) {
      $sql .= " AND o.campaign_id = " . $search_terms['campaign_id'];
***************
*** 247,250 ****
--- 247,251 ----
  // end build query
  
+ // save query for mail merge
  $_SESSION["search_sql"] = $sql;
  
***************
*** 313,316 ****
--- 314,318 ----
      $columns[] = array('name' => _('Contact'), 'index_sql' => 'contact', 'sql_sort_column' => 'cont.last_name,cont.first_names', 'type' => 'url');
      $columns[] = array('name' => _('Summary'), 'index_sql' => 'title', 'sql_sort_column' => 'activity_title', 'type' => 'url');
+     $columns[] = array('name' => _('Description'), 'index_calc' => 'description_brief', 'sql_sort_column' => 'activity_description', 'type' => 'url');
      $columns[] = array('name' => _('Priority'), 'index_sql' => 'case_priority_pretty_name', 'sql_sort_column'=>'a.activity_priority_id'); 
      $columns[] = array('name' => _('Scheduled Start'), 'index_sql' => 'scheduled', 'sql_sort_column' => 'a.scheduled_at');
***************
*** 321,325 ****
      $columns[] = array('name' => _('Resolution'), 'index_sql' => 'resolution_short_name', 'sql_sort_column'=>'a.activity_resolution_type_id'); 
  	
- 	
  	// selects the columns this user is interested in
  	$pager_columns = new Pager_Columns('ActivitiesPager'.$form_name, $columns, $default_columns, $form_name);
--- 323,326 ----
***************
*** 416,419 ****
--- 417,423 ----
  /**
  * $Log$
+ * Revision 1.7  2005/06/30 18:00:23  daturaarutad
+ * moved creation of title html link to GetActivitiesPagerData and added popup/tooltip containing activity description; add on_what_table criteria to query; add description as available column in pager
+ *
  * Revision 1.6  2005/06/30 04:40:23  vanmer
  * - added extra joins and fields to display resolution type and activity priority on activities widget