diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index d954ba08320..9aa54498edc 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -1145,8 +1145,8 @@ class DolGraph /** * Output HTML string to show graph * - * @param int $shownographyet Show graph to say there is not enough data - * @return string HTML string to show graph + * @param int|string $shownographyet Show graph to say there is not enough data or the message in $shownographyet if it is a string. + * @return string HTML string to show graph */ public function show($shownographyet = 0) { @@ -1155,7 +1155,13 @@ class DolGraph if ($shownographyet) { $s = '
'; - $s .= '
'.$langs->trans("NotEnoughDataYet").'
'; + $s .= '
'; + if (is_numeric($shownographyet)) { + $s .= $langs->trans("NotEnoughDataYet"); + } else { + $s .= $shownographyet; + } + $s .= '
'; return $s; } diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 43331220bd0..de3ea66d682 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1014,4 +1014,5 @@ ContactDefault_ticketsup=Ticket ContactAddedAutomatically=Contact added from contact thirdparty roles More=More ShowDetails=Show details -CustomReports=Custom reports \ No newline at end of file +CustomReports=Custom reports +SelectYourGraphOptionsFirst=Select your graph options to build a graph \ No newline at end of file diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 0f96bb15d62..000f303fde5 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4376,6 +4376,18 @@ pre#editfilecontentaceeditorid { } +/* ============================================================================== */ +/* Custom reports */ +/* ============================================================================== */ + +.customreportsoutput, .customreportsoutputnotdata { + padding-top: 20px; +} +.customreportsoutputnotdata { + text-align: center; +} + + /* ============================================================================== */ /* Holiday */ /* ============================================================================== */ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 0806cb47d1e..91adb3b7cdf 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -4518,6 +4518,18 @@ pre#editfilecontentaceeditorid { } +/* ============================================================================== */ +/* Custom reports */ +/* ============================================================================== */ + +.customreportsoutput, .customreportsoutputnotdata { + padding-top: 20px; +} +.customreportsoutputnotdata { + text-align: center; +} + + /* ============================================================================== */ /* Holiday */ /* ============================================================================== */