lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix graph

Browse Source
This commit is contained in:
Laurent Destailleur 2020-03-06 01:29:59 +01:00
parent 52c236570b
commit 7b5f9e1b11
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/conf.class.php
View File

@ -683,7 +683,7 @@ class Conf
if (!isset($this->global->MAIN_USE_OLD_TITLE_BUTTON)) $this->global->MAIN_USE_OLD_TITLE_BUTTON = 0; if (!isset($this->global->MAIN_USE_OLD_TITLE_BUTTON)) $this->global->MAIN_USE_OLD_TITLE_BUTTON = 0;
if (!isset($conf->global->MAIN_JS_GRAPH)) $conf->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library if (!isset($this->global->MAIN_JS_GRAPH)) $this->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library
if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com'; if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) $this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567'; if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) $this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';

9
htdocs/core/customreports.php
View File

@ -230,7 +230,9 @@ if (is_array($search_groupby) && count($search_groupby)) {
} }
while ($obj = $db->fetch_object($resql)) { while ($obj = $db->fetch_object($resql)) {
$valuetranslated = $obj->val; if (is_null($obj->val)) $valuetranslated = $langs->transnoentitiesnoconv("NotDefined");
else if ($obj->val === '') $valuetranslated = $langs->transnoentitiesnoconv("Empty");
else $valuetranslated = $obj->val;
if (!empty($object->fields[$gvalwithoutprefix]['arrayofkeyval'])) { if (!empty($object->fields[$gvalwithoutprefix]['arrayofkeyval'])) {
$valuetranslated = $object->fields[$gvalwithoutprefix]['arrayofkeyval'][$obj->val]; $valuetranslated = $object->fields[$gvalwithoutprefix]['arrayofkeyval'][$obj->val];
} }
@ -321,7 +323,7 @@ if ($object->isextrafieldmanaged) {
} }
} }
} }
print '<div class="inline-block opacitymedium"><span class="fas fa-chart-line paddingright" title="'.$langs->trans("Measures").'"></span>'.$langs->trans("Measures").'</div> '; print '<div class="inline-block"><span class="fas fa-chart-line paddingright" title="'.$langs->trans("Measures").'"></span>'.$langs->trans("Measures").'</div> ';
print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth500', 1); print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth500', 1);
print '</div>'; print '</div>';
@ -399,7 +401,7 @@ $arrayofxaxislabel = array();
foreach ($arrayofxaxis as $key => $val) { foreach ($arrayofxaxis as $key => $val) {
$arrayofxaxislabel[$key] = $val['label']; $arrayofxaxislabel[$key] = $val['label'];
} }
print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-horizontal paddingright" title="'.$langs->trans("XAxis").'"></span>'.$langs->trans("XAxis").'</div> '; print '<div class="inline-block"><span class="fas fa-ruler-horizontal paddingright" title="'.$langs->trans("XAxis").'"></span>'.$langs->trans("XAxis").'</div> ';
print $form->multiselectarray('search_xaxis', $arrayofxaxislabel, $search_xaxis, 0, 0, 'minwidth250', 1); print $form->multiselectarray('search_xaxis', $arrayofxaxislabel, $search_xaxis, 0, 0, 'minwidth250', 1);
print '</div>'; print '</div>';
@ -665,7 +667,6 @@ if ($sql) {
$totalnbofrecord = count($data); $totalnbofrecord = count($data);
} }
//var_dump($data);
print '<div class="customreportsoutput'.($totalnbofrecord ? '' : ' customreportsoutputnotdata').'">'; print '<div class="customreportsoutput'.($totalnbofrecord ? '' : ' customreportsoutputnotdata').'">';