Changeset 12900

Timestamp:

06/29/09 07:37:49 (7 months ago)

Author:

asha

Message:

Reports Module Changes - Sandeep
================================

1. Fix for the issue when folder shown up with empty name created with special characters.
2. Fix for the issue where reports having custom fields with utf-8 characters are not generated.
3. fix for issue where calendar custom fields are not being shown to select.
4. Start date & end date field being disabled from selected lists
5. Fix for the issue where unit price is showing up as currency id for some currency fields Like Product Unit Price.

Files:

• vtigercrm/branches/5.1/Smarty/templates/Reports.tpl (modified) (1 diff)
• vtigercrm/branches/5.1/include/js/en_us.lang.js (modified) (1 diff)
• vtigercrm/branches/5.1/modules/Reports/AdvancedFilter.php (modified) (2 diffs)
• vtigercrm/branches/5.1/modules/Reports/ReportColumns.php (modified) (2 diffs)
• vtigercrm/branches/5.1/modules/Reports/ReportGrouping.php (modified) (4 diffs)
• vtigercrm/branches/5.1/modules/Reports/ReportRun.php (modified) (4 diffs)
• vtigercrm/branches/5.1/modules/Reports/Reports.php (modified) (5 diffs)
• vtigercrm/branches/5.1/modules/Reports/Save.php (modified) (1 diff)
• vtigercrm/branches/5.1/modules/Reports/SaveAndRun.php (modified) (1 diff)

vtigercrm/branches/5.1/Smarty/templates/Reports.tpl

@@ -177 +177 @@
-                {literal}
-        }
-\+]/) || (getObj('folder_desc').value).match(/['"
-    
-    alert(alert_arr.NO_QUOTES
-    
-    
+<>/\+]/) || (getObj('folder_desc').value).match(/['"<>/
+
+alert(alert_arr.SPECIAL_CHARS+' '+alert_arr.NOT_ALLOWED
+
+
-        /*else if((!CharValidation(getObj('folder_name').value,'namespace')) || (!CharValidation(getObj('folder_desc').value,'namespace')))
-        {
-
+ 
-                        return false;
-        }*/

vtigercrm/branches/5.1/include/js/en_us.lang.js

@@ -293 +293 @@
-                                RSS: 'RSS',
-                                Default: 'Default',
-
+
+
-                        };

vtigercrm/branches/5.1/modules/Reports/AdvancedFilter.php

@@ -113 +113 @@
-function getPrimaryColumns_AdvFilterHTML($module,$selected="")
-{
-    
+
-        $mod_strings = return_module_language($current_language,$module);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                                {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                                        }else
-                                        {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                }
-
-
-
+
+
+
+
-}
-
@@ -161 +163 @@
-function getSecondaryColumns_AdvFilterHTML($module,$selected="")
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                                }else
-                                                                {
-
-
-
-
-
-
-
+
-                                                                }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
+
+
+
+
-}
-

vtigercrm/branches/5.1/modules/Reports/ReportColumns.php

@@ -83 +83 @@
-        $id_added=false;
-        $mod_strings = return_module_language($current_language,$module);
+        $block_listed = array();
-        foreach($ogReport->module_list[$module] as $key=>$value)
-        {
-key])
+value]) && !$block_listed[$value]
-                {
-
-key
+$block_listed[$value] = true;
+value
-                        if($id_added==false){
-                                $shtml .= "<option value=\"vtiger_crmentity:crmid:".$module."_ID:crmid:I\">".getTranslatedString(getTranslatedString($module).' ID')."</option>";
-                                $id_added=true;
-                        }
-key
+value
-                        {
-                                if(isset($mod_strings[$fieldlabel]))
@@ -128 +129 @@
-                        $mod_strings = return_module_language($current_language,$secmodule[$i]);
-                        if(vtlib_isModuleActive($secmodule[$i])){
+                                $block_listed = array();
-                                foreach($ogReport->module_list[$secmodule[$i]] as $key=>$value)
-                                {
-key])
+value]) && !$block_listed[$value]
-                                        {
-
-
+
+
+
-                                                {
-                                                        if(isset($mod_strings[$fieldlabel]))

vtigercrm/branches/5.1/modules/Reports/ReportGrouping.php

@@ -87 +87 @@
-function getPrimaryColumns_GroupingHTML($module,$selected="")
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        {
-
-
-       $shtml .= "<optgroup label=\"".$app_list_strings['moduleList'][$module]." ".getTranslatedString($key)."\" class=\"select\" style=\"border:none\">";
-if($id_added==false){
-       $shtml .= "<option value=\"vtiger_crmentity:crmid:".$module."_ID:crmid:I\">".getTranslatedString(getTranslatedString($module).' ID')."</option>";
-d_added=true
+
+
+if($id_added==false){
+$is_selected ='';
+if($selected == "vtiger_crmentity:crmid:".$module."_ID:crmid:I"){
+s_selected = 'selected'
-                                }
-
+
+
+
+
+
+
-                                {
-
-
-
-
-
-
-
-
-
+
+
+
-                                        }else
-                                        {
-
-
-
-
-
-
-
-
+
-                                        }
+                                }else
+                                {
+                                        if($selected == decode_html($field))
+                                        {
+                                                $shtml .= "<option selected value=\"".$field."\">".$fieldlabel."</option>";
+                                        }else
+                                        {
+                                                $shtml .= "<option value=\"".$field."\">".$fieldlabel."</option>";
+                                        }
+        
-                                }
-
-
-
+
+
+
+
-}
-
@@ -141 +147 @@
-        global $current_language;
-        
+        $selected = decode_html($selected);
-        if($module != "")
-        {
@@ -148 +155 @@
-                        $mod_strings = return_module_language($current_language,$secmodule[$i]);
-                        if(vtlib_isModuleActive($secmodule[$i])){
+                                $block_listed = array();
-                                foreach($ogReport->module_list[$secmodule[$i]] as $key=>$value)
-                                {
-
-
-
+
+
+
+
-                                                {
-                                                        if(isset($mod_strings[$fieldlabel])) {
-$field
+decode_html($field)
-                                                                        $shtml .= "<option selected value=\"".$field."\">".$mod_strings[$fieldlabel]."</option>";
-                                                                } else {
@@ -161 +170 @@
-                                                                }
-                                                        } else {
-$field
+decode_html($field)
-                                                                        $shtml .= "<option selected value=\"".$field."\">".$fieldlabel."</option>";
-                                                                } else {

vtigercrm/branches/5.1/modules/Reports/ReportRun.php

@@ -176 +176 @@
-                                                $columnslist[$fieldcolname] = 'vtiger_productsCampaigns.productname AS "'.$header_label.'"';
-                                        }
+                                        elseif($selectedfields[0] == 'vtiger_products' && $selectedfields[1] == 'unit_price')//handled for product fields in Campaigns Module Reports
+                                        {
+                                        $columnslist[$fieldcolname] = 'concat('.$selectedfields[0].'.currency_id,"::",innerProduct.actual_unit_price) as "' . $header_label .'"';
+                                        }
-                                        elseif(in_array($selectedfields[2], $this->append_currency_symbol_to_value)) {
-                                                $columnslist[$fieldcolname] = 'concat('.$selectedfields[0].'.currency_id,"::",'.$selectedfields[0].'.'.$selectedfields[1].') as "' . $header_label .'"';
@@ -192 +196 @@
-                                        }elseif($selectedfields[0] == 'vtiger_potential' && $selectedfields[1] == 'related_to'){
-                                                $columnslist[$fieldcolname] = "case when vtiger_accountPotentials.accountid is not NULL then vtiger_accountPotentials.accountname else concat(vtiger_contactdetailsPotentials.lastname, ' ', vtiger_contactdetailsPotentials.firstname) end as '$selectedfields[2]'";
+                                        }
+                                        elseif(stristr($selectedfields[1],'cf_')==true && stripos($selectedfields[1],'cf_')==0)
+                                        {
+                                                $columnslist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1].' AS "'.$adb->sql_escape_string(decode_html($header_label)).'"';
-                                        }
-                                        else
@@ -1160 +1168 @@
-                                if($selectedfields[0] == "vtiger_crmentity".$this->primarymodule)
-                                        $selectedfields[0] = "vtiger_crmentity";        
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                {
-                                        $this->groupbylist[$fieldcolname] = $selectedfields[0].".".$selectedfields[1]." ".$selectedfields[2];
@@ -1651 +1662 @@
-                                $modprefixedlabel = getTabModuleName($currencyfieldrow['tabid']).' '.$currencyfieldrow['fieldlabel'];
-                                $modprefixedlabel = str_replace(' ','_',$modprefixedlabel);                             
-
+ && !in_array($modprefixedlabel, $this->append_currency_symbol_to_value)
-                                        $this->convert_currency[] = $modprefixedlabel;
-                                }

vtigercrm/branches/5.1/modules/Reports/Reports.php

@@ -254 +254 @@
-                                                continue; 
-                                        }
-
+
+
+
+
+
+
+
-                                        $this->module_list[$resultrow['name']] = array();
-                                }
@@ -262 +268 @@
-                                        $adb->pquery("SELECT blockid, blocklabel, tabid FROM vtiger_blocks WHERE tabid IN (" .generateQuestionMarks($moduleids) .")",
-                                                array($moduleids));
-
+$prev_block_label = '';
-                                if($adb->num_rows($reportblocks)) {
-                                        while($resultrow = $adb->fetch_array($reportblocks)) {
@@ -276 +282 @@
-                                                }
-                                                
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                        }
-                                }
@@ -487 +498 @@
-                foreach($this->module_list[$module] as $key=>$value)
-                {
-
+
+
+
+
+
-                }
-                $this->pri_module_columnslist = $ret_module_list;
@@ -510 +525 @@
-                                        foreach($this->module_list[$secmodule[$i]] as $key=>$value)
-                                        {
-
+
+
+
+
+
-                                        }
-                                        $this->sec_module_columnslist[$secmodule[$i]] = $ret_module_list[$secmodule[$i]];

vtigercrm/branches/5.1/modules/Reports/Save.php

@@ -16 +16 @@
-
-//<<<<<<<selectcolumn>>>>>>>>>
-vtlib_purify($_REQUEST["selectedColumnsString"])
+$_REQUEST["selectedColumnsString"]
-//<<<<<<<selectcolumn>>>>>>>>>
-

vtigercrm/branches/5.1/modules/Reports/SaveAndRun.php

@@ -89 +89 @@
-                $BLOCK1 .= getSecondaryStdFilterHTML($ogReport->secmodule,$ogReport->stdselectedcolumn);
-                // Check if selectedcolumn is found in the filters (Fix for ticket #4866)
-$ogReport->stdselectedcolumn
+decode_html($ogReport->stdselectedcolumn)
-                if (!$is_admin && isset($ogReport->stdselectedcolumn) && strpos($BLOCK1, $selectedcolumnvalue) === false) {
-                        $BLOCK1 .= "<option selected value='Not Accessible'>".$app_strings['LBL_NOT_ACCESSIBLE']."</option>";