Skip to content
Snippets Groups Projects
Commit bd5acceb authored by Prasad's avatar Prasad
Browse files

Fixes: Date format display in report for special fields

parent 0ae5abe3
No related branches found
No related tags found
No related merge requests found
......@@ -219,14 +219,21 @@ function getReportFieldValue ($report, $picklistArray, $dbField, $valueArray, $f
} elseif ($fieldType == 'double' && $operation != 'ExcelExport') {
if($current_user->truncate_trailing_zeros == true)
$fieldvalue = decimalFormat($fieldvalue);
}
} else {
// special fields
if ( ($report->primarymodule == "Emails" && $dbField->name == "Date_Sent") || $dbField->name == "Emails_Date_Sent") {
$fieldvalue = DateTimeField::convertToUserFormat($fieldvalue);
}
}
if($fieldType == 'currency' && $value == "" && $operation != 'ExcelExport'){
$currencyField = new CurrencyField($value);
$fieldvalue = $currencyField->getDisplayValue();
return $fieldvalue;
} else if($fieldvalue == "" && $operation != 'ExcelExport') {
return "";
}
}
$fieldvalue = str_replace("<", "&lt;", $fieldvalue);
$fieldvalue = str_replace(">", "&gt;", $fieldvalue);
$fieldvalue = decode_html($fieldvalue);
......@@ -356,4 +363,4 @@ function getReportSearchCondition($searchParams, $filterId) {
return false;
}
?>
\ No newline at end of file
?>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment