projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #22644 from demeritcowboy/fix-add-version
[civicrm-core.git]
/
CRM
/
Utils
/
Chart.php
diff --git
a/CRM/Utils/Chart.php
b/CRM/Utils/Chart.php
index c8745fa0a5f0b745c958bbacea851f0311e43480..ff74cf8fbfdfe6564921801b0597874e17989e43 100644
(file)
--- a/
CRM/Utils/Chart.php
+++ b/
CRM/Utils/Chart.php
@@
-21,26
+21,7
@@
class CRM_Utils_Chart {
/**
class CRM_Utils_Chart {
/**
- * Colours.
- * @var array
- */
- private static $_colours = [
- "#C3CC38",
- "#C8B935",
- "#CEA632",
- "#D3932F",
- "#D9802C",
- "#FA6900",
- "#DC9B57",
- "#F78F01",
- "#5AB56E",
- "#6F8069",
- "#C92200",
- "#EB6C5C",
- ];
-
- /**
- * Build The Bar Gharph.
+ * Build The Bar Graph.
*
* @param array $params
* Assoc array of name/value pairs.
*
* @param array $params
* Assoc array of name/value pairs.
@@
-145,9
+126,9
@@
class CRM_Utils_Chart {
}
/**
}
/**
- * @param $rows
- * @param $chart
- * @param $interval
+ * @param
array
$rows
+ * @param
string
$chart
+ * @param
string
$interval
*
* @return array
*/
*
* @return array
*/
@@
-205,14
+186,14
@@
class CRM_Utils_Chart {
}
// rotate the x labels.
}
// rotate the x labels.
- $chartData['xLabelAngle'] =
CRM_Utils_Array::value('xLabelAngle', $rows, 0)
;
+ $chartData['xLabelAngle'] =
$rows['xLabelAngle'] ?? 0
;
if (!empty($rows['tip'])) {
$chartData['tip'] = $rows['tip'];
}
// legend
if (!empty($rows['tip'])) {
$chartData['tip'] = $rows['tip'];
}
// legend
- $chartData['xname'] =
CRM_Utils_Array::value('xname', $rows)
;
- $chartData['yname'] =
CRM_Utils_Array::value('yname', $rows)
;
+ $chartData['xname'] =
$rows['xname'] ?? NULL
;
+ $chartData['yname'] =
$rows['yname'] ?? NULL
;
// carry some chart params if pass.
foreach ([
// carry some chart params if pass.
foreach ([
@@
-229,10
+210,10
@@
class CRM_Utils_Chart {
}
/**
}
/**
- * @param $rows
- * @param $chart
- * @param $interval
- * @param $chartInfo
+ * @param
array
$rows
+ * @param
string
$chart
+ * @param
array
$interval
+ * @param
array
$chartInfo
*
* @return array
*/
*
* @return array
*/
@@
-270,7
+251,7
@@
class CRM_Utils_Chart {
/**
* @param array $params
/**
* @param array $params
- * @param $chart
+ * @param
string
$chart
*
* @return array
*/
*
* @return array
*/