Fixes towards CRM-12490, performance improvements, adherence to options settings

diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index 0b7b1a490ef263b6297f010bbbf393c49be51a4f..3e7e4fc38d342d004b4460568382800f58e55ddb 100644 (file)
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -353,10 +353,9 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
       array('title' => ts('Include'),
         'type' => 'select',
         'options' => array(
-          '' => '-select-',
-          1 => ts('Contributions Only'),
-          2 => ts('Soft Credits Only'),
-          3 => ts('Both'),
+          'contributions_only' => ts('Contributions Only'),
+          'soft_credits_only'  => ts('Soft Credits Only'),
+          'both' => ts('Both'),
         ),
       ),
     );
@@ -441,14 +440,21 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
         FROM  civicrm_contact      {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
               INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
                       ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND {$this->_aliases['civicrm_contribution']}.is_test = 0";
+    if ($this->_params['include_set'] == 'soft_credits_only') {
+      $this->_from .= "
+               INNER JOIN civicrm_contribution_soft contribution_soft_civireport
+                       ON contribution_soft_civireport.contribution_id = {$this->_aliases['civicrm_contribution']}.id";
+    }
 
     if ($softcredit) {
       $this->_from = "
-        FROM  civicrm_contact      {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
-               INNER JOIN civicrm_contribution_soft contribution_soft_civireport
-                       ON contribution_soft_civireport.contact_id = {$this->_aliases['civicrm_contact']}.id
+        FROM  civireport_contribution_detail_temp1 temp1_civireport
                INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
-                       ON contribution_soft_civireport.contribution_id = {$this->_aliases['civicrm_contribution']}.id";
+                       ON temp1_civireport.civicrm_contribution_contribution_id = {$this->_aliases['civicrm_contribution']}.id
+               INNER JOIN civicrm_contribution_soft contribution_soft_civireport
+                       ON contribution_soft_civireport.contribution_id = {$this->_aliases['civicrm_contribution']}.id
+               INNER JOIN civicrm_contact      {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
+                       ON {$this->_aliases['civicrm_contact']}.id = contribution_soft_civireport.contact_id";
     }
 
     if (!empty($this->_params['ordinality_value'])) {
@@ -549,25 +555,39 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form {
     );
 
     // Stats for soft credits
-    $totalAmount = $average = array();
-    $count = 0;
-    $select = "
+    if ($this->_params['include_set'] != 'contributions_only') {
+      $totalAmount = $average = array();
+      $count  = 0;
+      $select = "
 SELECT COUNT(contribution_soft_civireport.amount ) as count,
        SUM(contribution_soft_civireport.amount ) as amount,
        ROUND(AVG(contribution_soft_civireport.amount), 2) as avg,
        {$this->_aliases['civicrm_contribution']}.currency as currency";
-    $sql   = "{$select} {$this->_softFrom} {$this->_where} GROUP BY {$this->_aliases['civicrm_contribution']}.currency";
-    $dao = CRM_Core_DAO::executeQuery($sql);
-    while ($dao->fetch()) {
-      $totalAmount[] = CRM_Utils_Money::format($dao->amount, $dao->currency)."(".$dao->count.")";
-      $average[] =   CRM_Utils_Money::format($dao->avg, $dao->currency);
-      $count += $dao->count;
+      $sql = "
+{$select} 
+{$this->_softFrom} 
+GROUP BY {$this->_aliases['civicrm_contribution']}.currency";
+      $dao = CRM_Core_DAO::executeQuery($sql);
+      while ($dao->fetch()) {
+        $totalAmount[] = CRM_Utils_Money::format($dao->amount, $dao->currency)."(".$dao->count.")";
+        $average[] =   CRM_Utils_Money::format($dao->avg, $dao->currency);
+        $count += $dao->count;
+      }
+      $statistics['counts']['softamount'] = array(
+        'title' => ts('Total Amount (Soft Credits)'),
+        'value' => implode(',  ', $totalAmount),
+        'type' => CRM_Utils_Type::T_STRING,
+      );
+      $statistics['counts']['softcount'] = array(
+        'title' => ts('Total Soft Credits'),
+        'value' => $count,
+      );
+      $statistics['counts']['softavg'] = array(
+        'title' => ts('Average (Soft Credits)'),
+        'value' => implode(',  ', $average),
+        'type' => CRM_Utils_Type::T_STRING,
+      );
     }
-    if (!empty($totalAmount)) 
-      $statistics['counts']['amount']['value'] = $statistics['counts']['amount']['value'] . ' [Soft Credits: ' . implode(',  ', $totalAmount) . ']';
-
-    if (!empty($average)) 
-      $statistics['counts']['avg']['value'] = $statistics['counts']['avg']['value'] . ' [Soft Credits: ' . implode(',  ', $average) . ']';
 
     return $statistics;
   }
@@ -579,43 +599,54 @@ SELECT COUNT(contribution_soft_civireport.amount ) as count,
     $this->buildACLClause($this->_aliases['civicrm_contact']);
 
     $this->beginPostProcess();
-
+    
     // 1. use main contribution query to build temp table 1
     $sql = $this->buildQuery();
     $tempQuery = 'CREATE TEMPORARY TABLE civireport_contribution_detail_temp1 AS ' . $sql;
     CRM_Core_DAO::executeQuery($tempQuery);
     $this->setPager();
 
-    // 2. customize main contribution query for soft credit, and build temp table 2 with soft credit contributions
+    // 2. customize main contribution query for soft credit, and build temp table 2 with soft credit contributions only
     $this->from(TRUE);
     $select = str_ireplace('contribution_civireport.total_amount', 'contribution_soft_civireport.amount', $this->_select);
     $select = str_ireplace("'Contribution' as", "'Soft Credit' as", $select);
     // we inner join with temp1 to restrict soft contributions to those in temp1 table
-    $sql = "{$select} {$this->_from} 
-INNER JOIN civireport_contribution_detail_temp1 temp1_civireport ON contribution_soft_civireport.contribution_id = temp1_civireport.civicrm_contribution_contribution_id
-{$this->_where} {$this->_groupBy} {$this->_having} {$this->_orderBy}";
+    $sql = "{$select} {$this->_from} {$this->_groupBy}";
     $tempQuery = 'CREATE TEMPORARY TABLE civireport_contribution_detail_temp2 AS ' . $sql;
     CRM_Core_DAO::executeQuery($tempQuery);
+    if ($this->_params['include_set'] == 'soft_credits_only') {
+      // revise pager : prev, next based on soft-credits only
+      $this->setPager();
+    }    
 
     // copy _from for later use of stats calculation for soft credits, and reset $this->_from to main query
     $this->_softFrom = $this->_from;
     $this->from(); // simple reset of ->_from
 
-    // 3. build temp table 3 which is a combination of temp1 and temp2, keeping the order by preference of that of many query / temp1
+    // 3. Decide where to populate temp3 table from
+    if ($this->_params['include_set'] == 'contributions_only') {
+      $tempQuery = "(SELECT * FROM civireport_contribution_detail_temp1 WHERE civicrm_contribution_contribution_id=%1)";
+    } else if ($this->_params['include_set'] == 'soft_credits_only') {
+      $tempQuery = "(SELECT * FROM civireport_contribution_detail_temp2 WHERE civicrm_contribution_contribution_id=%1)";
+    } else {
+      $tempQuery = "
+(SELECT * FROM civireport_contribution_detail_temp1 WHERE civicrm_contribution_contribution_id=%1)
+UNION ALL
+(SELECT * FROM civireport_contribution_detail_temp2 WHERE civicrm_contribution_contribution_id=%1)";
+    }
+
+    // 4. build temp table 3
     $query = "select distinct civicrm_contribution_contribution_id FROM civireport_contribution_detail_temp1";
     $dao   = CRM_Core_DAO::executeQuery($query);
     while ($dao->fetch()) {
       $temp3 = $temp3 ? 'INSERT INTO civireport_contribution_detail_temp3' : 'CREATE TEMPORARY TABLE civireport_contribution_detail_temp3 AS';
-      $sql   = "{$temp3}
-(SELECT * FROM civireport_contribution_detail_temp1 WHERE civicrm_contribution_contribution_id={$dao->civicrm_contribution_contribution_id})
-UNION ALL
-(SELECT * FROM civireport_contribution_detail_temp2 WHERE civicrm_contribution_contribution_id={$dao->civicrm_contribution_contribution_id})";
-      CRM_Core_DAO::executeQuery($sql);
+      $sql   = "{$temp3} {$tempQuery}";
+      CRM_Core_DAO::executeQuery($sql, array(1 => array($dao->civicrm_contribution_contribution_id, 'Integer')));
     }
 
-    // 4. show result set from temp table 3
-    $sql = "SELECT * FROM civireport_contribution_detail_temp3";
+    // 5. show result set from temp table 3
     $rows = array();
+    $sql  = "SELECT * FROM civireport_contribution_detail_temp3";
     $this->buildRows($sql, $rows);
 
     // format result set.
@@ -750,14 +781,15 @@ UNION ALL
         array_key_exists('civicrm_contribution_contribution_id', $row)
       ) {
         $query = "
-SELECT civicrm_contact_id, civicrm_contact_sort_name, civicrm_contribution_total_amount_sum 
+SELECT civicrm_contact_id, civicrm_contact_sort_name, civicrm_contribution_total_amount_sum, civicrm_contribution_currency 
 FROM   civireport_contribution_detail_temp2
 WHERE  civicrm_contribution_contribution_id={$row['civicrm_contribution_contribution_id']}";
         $dao   = CRM_Core_DAO::executeQuery($query);
         $string = '';
         while ($dao->fetch()) {
           $url    = CRM_Utils_System::url("civicrm/contact/view", 'reset=1&cid=' . $dao->civicrm_contact_id);
-          $string = $string . "\n<a href='{$url}'>{$dao->civicrm_contact_sort_name}</a> {$dao->civicrm_contribution_total_amount_sum}";
+          $string = $string . "\n<a href='{$url}'>{$dao->civicrm_contact_sort_name}</a> " . 
+            CRM_Utils_Money::format($dao->civicrm_contribution_total_amount_sum, $dao->civicrm_contribution_currency);
         }
         $rows[$rowNum]['civicrm_contribution_soft_credits'] = $string;
       }