diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 0b713de80ff..a4ee48f256b 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -600,7 +600,7 @@ class DolGraph
/**
- * Build a graph onto disk using Artichow library
+ * Build a graph onto disk using Artichow library and return img string to it
*
* @param string $file Image file name to use if we save onto disk
* @param string $fileurl Url path to show image if saved onto disk
@@ -779,7 +779,7 @@ class DolGraph
/**
- * Build a graph onto disk using JFlot library. Input when calling this method should be:
+ * Build a graph using JFlot library. Input when calling this method should be:
* $this->data = array(array( 0=>'labelxA', 1=>yA), array('labelxB',yB)); or
* $this->data = array(array('label'=>'labelxA','data'=>yA), array('labelxB',yB)); // TODO Syntax not supported. Removed when dol_print_graph_removed
* $this->data = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn)); // when there is n series to show for each x
@@ -788,9 +788,10 @@ class DolGraph
* $this->mode = 'depth' ???
* $this->bgcolorgrid
* $this->datacolor
+ * $this->shownodatagraph
*
* @param string $file Image file name to use to save onto disk (also used as javascript unique id)
- * @param string $fileurl Url path to show image if saved onto disk
+ * @param string $fileurl Url path to show image if saved onto disk. Never used here.
* @return void
*/
private function draw_jflot($file,$fileurl)
@@ -849,7 +850,14 @@ class DolGraph
$this->stringtoshow =''."\n";
if (! empty($this->title)) $this->stringtoshow.=''.$this->title.'
';
+ if (! empty($this->shownographyet))
+ {
+ $this->stringtoshow.='
';
+ $this->stringtoshow.=''.$langs->trans("NotEnoughDataYet").'
';
+ return;
+ }
$this->stringtoshow.='
'."\n";
+
$this->stringtoshow.='';
}
- else print 'BadValueForPArameterType';
+ else print 'BadValueForParameterType';
}
}
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index adae0e1800e..4b69e2c0dde 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -28,6 +28,7 @@ NoTemplateDefined=No template defined for this email type
AvailableVariables=Available substitution variables
NoTranslation=No translation
NoRecordFound=No record found
+NotEnoughDataYet=Not enough data
NoError=No error
Error=Error
Errors=Errors
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index b59d725fecd..9f9dbc3bd2c 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -454,7 +454,7 @@ if ($action == 'create' && $user->rights->projet->creer)
// Ref
$suggestedref=($_POST["ref"]?$_POST["ref"]:$defaultref);
- print ''.$langs->trans("Ref").' '.$langs->trans("Ref").' '.$langs->trans("Description").' ';
print '';
- print '';
+ print '';
print ' '.$langs->trans("Ref").' ';
+ print ''.$langs->trans("Ref").' ';
print ''.$langs->trans("Description").' ';
print '';
- print '';
+ print '';
print ' ';
- $data=array('series'=>$dataseries);
- dol_print_graph('stats',400,180,$data,1,'pie',0,'',0);
+ $data=array('series'=>$dataseries);
+ dol_print_graph('stats',400,180,$data,1,'pie',0,'',0,$totaloppnb?0:1);
print '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+ Openclipart
+
+
+ Icon Set Graph
+ 2012-09-06T20:29:21
+ Check others icons on my "Minimal Icon Set" collection.\nSet of simple icons useful for gui design and applications use interface. Icons representing various graph and plotting
+ https://openclipart.org/detail/172197/icon-set-graph-by-mi_brami-172197
+
+
+ mi_brami
+
+
+
+
+ Icon
+ area
+ b&w
+ barcode
+ bars
+ black
+ data
+ graph
+ gray
+ icon
+ pie
+ plot
+ round
+ scatter
+ table
+ transparent
+ white
+ xy
+
+
+
+
+
+
+
+
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f7519e16f61..91fa27e5c33 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2878,9 +2878,20 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
.logo_setup
{
- content:url();
+ content:url(); /* content is used to best fit the container */
display: inline-block;
}
+.nographyet
+{
+ content:url();
+ display: inline-block;
+ opacity: 0.1;
+ background-repeat: no-repeat;
+}
+.nographyettext
+{
+ opacity: 0.5;
+}
div.titre {
font-family: ;
diff --git a/htdocs/theme/md/img/nographyet.svg b/htdocs/theme/md/img/nographyet.svg
new file mode 100644
index 00000000000..ba3b9faf92a
--- /dev/null
+++ b/htdocs/theme/md/img/nographyet.svg
@@ -0,0 +1,875 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+ Openclipart
+
+
+ Icon Set Graph
+ 2012-09-06T20:29:21
+ Check others icons on my "Minimal Icon Set" collection.\nSet of simple icons useful for gui design and applications use interface. Icons representing various graph and plotting
+ https://openclipart.org/detail/172197/icon-set-graph-by-mi_brami-172197
+
+
+ mi_brami
+
+
+
+
+ Icon
+ area
+ b&w
+ barcode
+ bars
+ black
+ data
+ graph
+ gray
+ icon
+ pie
+ plot
+ round
+ scatter
+ table
+ transparent
+ white
+ xy
+
+
+
+
+
+
+
+
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9b5bbc5966e..35c1220a0b8 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2707,9 +2707,20 @@ td.legendLabel { padding: 2px 2px 2px 0 !important; }
.logo_setup
{
- content:url();
+ content:url(); /* content is used to best fit the container */
display: inline-block;
}
+.nographyet
+{
+ content:url();
+ display: inline-block;
+ opacity: 0.1;
+ background-repeat: no-repeat;
+}
+.nographyettext
+{
+ opacity: 0.5;
+}
div.titre {
font-family: ;