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

Merge pull request #11786 from aspangaro/11.0_workboard

Browse Source 
NEW Add constant MAIN_DISABLE_GLOBAL_WORKBOARD to disable workboard in home page
This commit is contained in:
Laurent Destailleur 2019-09-03 17:50:46 +02:00 committed by GitHub
commit c90f780812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 395 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
htdocs/index.php
View File

@ -366,6 +366,7 @@ if (empty($user->societe_id) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTAT
/* /*
* Dolibarr Working Board with weather * Dolibarr Working Board with weather
*/ */
if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
$showweather = (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO == 2) ? 1 : 0; $showweather = (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO == 2) ? 1 : 0;
//Array that contains all WorkboardResponse classes to process them //Array that contains all WorkboardResponse classes to process them
@ -375,32 +376,28 @@ $dashboardlines=array();
require_once DOL_DOCUMENT_ROOT . '/core/class/workboardresponse.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/workboardresponse.class.php';
// Number of actions to do (late) // Number of actions to do (late)
if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) {
{
include_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php'; include_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
$board = new ActionComm($db); $board = new ActionComm($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of project opened // Number of project opened
if (! empty($conf->projet->enabled) && $user->rights->projet->lire) if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
{
include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
$board = new Project($db); $board = new Project($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of tasks to do (late) // Number of tasks to do (late)
if (! empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
{
include_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php'; include_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
$board = new Task($db); $board = new Task($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of commercial proposals opened (expired) // Number of commercial proposals opened (expired)
if (! empty($conf->propal->enabled) && $user->rights->propale->lire) if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
{
include_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php'; include_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
$board = new Propal($db); $board = new Propal($db);
$dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened"); $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
@ -409,8 +406,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
} }
// Number of commercial proposals opened (expired) // Number of commercial proposals opened (expired)
if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
{
include_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php'; include_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
$board = new SupplierProposal($db); $board = new SupplierProposal($db);
$dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened"); $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
@ -419,24 +415,21 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
} }
// Number of customer orders a deal // Number of customer orders a deal
if (! empty($conf->commande->enabled) && $user->rights->commande->lire) if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
{
include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php'; include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
$board = new Commande($db); $board = new Commande($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of suppliers orders a deal // Number of suppliers orders a deal
if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {
{
include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php'; include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
$board = new CommandeFournisseur($db); $board = new CommandeFournisseur($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of services enabled (delayed) // Number of services enabled (delayed)
if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
{
include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php'; include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
$board = new Contrat($db); $board = new Contrat($db);
$dashboardlines[$board->element . '_inactive'] = $board->load_board($user, "inactive"); $dashboardlines[$board->element . '_inactive'] = $board->load_board($user, "inactive");
@ -444,68 +437,59 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
$dashboardlines[$board->element . '_active'] = $board->load_board($user, "active"); $dashboardlines[$board->element . '_active'] = $board->load_board($user, "active");
} }
// Number of invoices customers (has paid) // Number of invoices customers (has paid)
if (! empty($conf->facture->enabled) && $user->rights->facture->lire) if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
{
include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
$board = new Facture($db); $board = new Facture($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of supplier invoices (has paid) // Number of supplier invoices (has paid)
if (! empty($conf->supplier_invoice->enabled) && ! empty($user->rights->fournisseur->facture->lire)) if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {
{
include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
$board = new FactureFournisseur($db); $board = new FactureFournisseur($db);
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
// Number of transactions to conciliate // Number of transactions to conciliate
if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id) if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id) {
{
include_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php'; include_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
$board = new Account($db); $board = new Account($db);
$nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate
if ($nb > 0) if ($nb > 0) {
{
$dashboardlines[$board->element] = $board->load_board($user); $dashboardlines[$board->element] = $board->load_board($user);
} }
} }
// Number of cheque to send // Number of cheque to send
if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
{
include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php'; include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
$board = new RemiseCheque($db); $board = new RemiseCheque($db);
$dashboardlines['RemiseCheque'] = $board->load_board($user); $dashboardlines['RemiseCheque'] = $board->load_board($user);
} }
// Number of foundation members // Number of foundation members
if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $user->societe_id) if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->societe_id) {
{
include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php'; include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
$board = new Adherent($db); $board = new Adherent($db);
$dashboardlines['Adherent'] = $board->load_board($user); $dashboardlines['Adherent'] = $board->load_board($user);
} }
// Number of expense reports to approve // Number of expense reports to approve
if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
{
include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php'; include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
$board = new ExpenseReport($db); $board = new ExpenseReport($db);
$dashboardlines['ExpenseReport'] = $board->load_board($user, 'toapprove'); $dashboardlines['ExpenseReport'] = $board->load_board($user, 'toapprove');
} }
// Number of expense reports to pay // Number of expense reports to pay
if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
{
include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php'; include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
$board = new ExpenseReport($db); $board = new ExpenseReport($db);
$dashboardlines['ExpenseReport'] = $board->load_board($user, 'topay'); $dashboardlines['ExpenseReport'] = $board->load_board($user, 'topay');
} }
// Number of holidays to approve // Number of holidays to approve
if (! empty($conf->holiday->enabled) && $user->rights->holiday->approve) if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) {
{
include_once DOL_DOCUMENT_ROOT . '/holiday/class/holiday.class.php'; include_once DOL_DOCUMENT_ROOT . '/holiday/class/holiday.class.php';
$board = new Holiday($db); $board = new Holiday($db);
$dashboardlines['Holiday'] = $board->load_board($user); $dashboardlines['Holiday'] = $board->load_board($user);
@ -514,7 +498,8 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->approve)
$object = new stdClass(); $object = new stdClass();
$parameters = array(); $parameters = array();
$action = ''; $action = '';
$reshook=$hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object,
$action); // Note that $action and $object may have been modified by some hooks
if ($reshook == 0) { if ($reshook == 0) {
$dashboardlines = array_merge($dashboardlines, $hookmanager->resArray); $dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);
} }
@ -603,7 +588,8 @@ $object=new stdClass();
$parameters = array( $parameters = array(
'dashboardgroup' => $dashboardgroup 'dashboardgroup' => $dashboardgroup
); );
$reshook=$hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object,
$action); // Note that $action and $object may have been modified by some hooks
if ($reshook == 0) { if ($reshook == 0) {
$dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray); $dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray);
} }
@ -615,14 +601,14 @@ $totallate=$totaltodo=0;
//Remove any invalid response //Remove any invalid response
//load_board can return an integer if failed or WorkboardResponse if OK //load_board can return an integer if failed or WorkboardResponse if OK
$valid_dashboardlines = array(); $valid_dashboardlines = array();
foreach($dashboardlines as $infoKey => $tmp) foreach ($dashboardlines as $infoKey => $tmp) {
{ if ($tmp instanceof WorkboardResponse) {
if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[$infoKey] = $tmp; $valid_dashboardlines[$infoKey] = $tmp;
}
} }
// We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop // We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
foreach($valid_dashboardlines as $board) foreach ($valid_dashboardlines as $board) {
{
if ($board->nbtodolate > 0) { if ($board->nbtodolate > 0) {
$totaltodo += $board->nbtodo; $totaltodo += $board->nbtodo;
$totallate += $board->nbtodolate; $totallate += $board->nbtodolate;
@ -639,17 +625,22 @@ foreach ($dashboardgroup as $dashbordelement){
$totalLateNumber = $totallate; $totalLateNumber = $totallate;
$totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0); $totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0);
if(! empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totallate = $totallatePercentage; if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$totallate = $totallatePercentage;
}
$boxwork = ''; $boxwork = '';
$boxwork .= '<div class="box">'; $boxwork .= '<div class="box">';
$boxwork .= '<table summary="' . dol_escape_htmltag($langs->trans("WorkingBoard")) . '" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">' . "\n"; $boxwork .= '<table summary="' . dol_escape_htmltag($langs->trans("WorkingBoard")) . '" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">' . "\n";
$boxwork .= '<tr class="liste_titre">'; $boxwork .= '<tr class="liste_titre">';
$boxwork .= '<th class="liste_titre"><div class="inline-block valignmiddle">' . $langs->trans("DolibarrWorkBoard") . '</div>'; $boxwork .= '<th class="liste_titre"><div class="inline-block valignmiddle">' . $langs->trans("DolibarrWorkBoard") . '</div>';
if ($showweather) if ($showweather) {
{ if ($totallate > 0) {
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')'; $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate") . ' (' . $langs->transnoentitiesnoconv("NActionsLate",
else $text=$langs->transnoentitiesnoconv("NoItemLate"); $totallate . (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')) . ')';
} else {
$text = $langs->transnoentitiesnoconv("NoItemLate");
}
$text .= '. ' . $langs->transnoentitiesnoconv("LateDesc"); $text .= '. ' . $langs->transnoentitiesnoconv("LateDesc");
//$text.=$form->textwithpicto('',$langs->trans("LateDesc")); //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
$options = 'height="24px" style="float: right"'; $options = 'height="24px" style="float: right"';
@ -661,8 +652,7 @@ $boxwork.='</tr>'."\n";
// Show dashboard // Show dashboard
$nbworkboardempty = 0; $nbworkboardempty = 0;
$isIntopOpenedDashBoard = array(); $isIntopOpenedDashBoard = array();
if (!empty($valid_dashboardlines)) if (!empty($valid_dashboardlines)) {
{
$openedDashBoard = ''; $openedDashBoard = '';
$boxwork .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer centpercent"><div style="display: flex: flex-wrap: wrap">'; $boxwork .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer centpercent"><div style="display: flex: flex-wrap: wrap">';
@ -670,20 +660,16 @@ if (!empty($valid_dashboardlines))
foreach ($dashboardgroup as $groupKey => $groupElement) { foreach ($dashboardgroup as $groupKey => $groupElement) {
$boards = array(); $boards = array();
if(!empty($conf->global->MAIN_DISPLAY_NEW_OPENED_DASH_BOARD) || !empty($conf->global->MAIN_FEATURES_LEVEL)) if (!empty($conf->global->MAIN_DISPLAY_NEW_OPENED_DASH_BOARD) || !empty($conf->global->MAIN_FEATURES_LEVEL)) {
{ foreach ($groupElement['stats'] as $infoKey) {
foreach ($groupElement['stats'] as $infoKey) if (!empty($valid_dashboardlines[$infoKey])) {
{
if(!empty($valid_dashboardlines[$infoKey]))
{
$boards[] = $valid_dashboardlines[$infoKey]; $boards[] = $valid_dashboardlines[$infoKey];
$isIntopOpenedDashBoard[] = $infoKey; $isIntopOpenedDashBoard[] = $infoKey;
} }
} }
} }
if(!empty($boards)) if (!empty($boards)) {
{
$groupName = $langs->trans($groupElement['groupName']); $groupName = $langs->trans($groupElement['groupName']);
$groupKeyLowerCase = strtolower($groupKey); $groupKeyLowerCase = strtolower($groupKey);
@ -696,8 +682,7 @@ if (!empty($valid_dashboardlines))
foreach ($boards as $board) { foreach ($boards as $board) {
if (!empty($board->labelShort)) { if (!empty($board->labelShort)) {
$infoName = '<span title="' . $board->label . '">' . $board->labelShort . '</span>'; $infoName = '<span title="' . $board->label . '">' . $board->labelShort . '</span>';
} } else {
else{
$infoName = $board->label; $infoName = $board->label;
} }
@ -705,8 +690,7 @@ if (!empty($valid_dashboardlines))
$textLateTitle .= ' (' . $langs->trans("Late") . ' = ' . $langs->trans("DateReference") . ' > ' . $langs->trans("DateToday") . ' ' . (ceil($board->warning_delay) >= 0 ? '+' : '') . ceil($board->warning_delay) . ' ' . $langs->trans("days") . ')'; $textLateTitle .= ' (' . $langs->trans("Late") . ' = ' . $langs->trans("DateReference") . ' > ' . $langs->trans("DateToday") . ' ' . (ceil($board->warning_delay) >= 0 ? '+' : '') . ceil($board->warning_delay) . ' ' . $langs->trans("days") . ')';
$textLate = ''; $textLate = '';
if($board->nbtodolate>0) if ($board->nbtodolate > 0) {
{
$textLate .= ' <span title="' . dol_htmlentities($textLateTitle) . '" class="classfortooltip badge badge-danger">'; $textLate .= ' <span title="' . dol_htmlentities($textLateTitle) . '" class="classfortooltip badge badge-danger">';
$textLate .= '<i class="fa fa-exclamation-triangle"></i> ' . $board->nbtodolate; $textLate .= '<i class="fa fa-exclamation-triangle"></i> ' . $board->nbtodolate;
$textLate .= '</span>'; $textLate .= '</span>';
@ -731,14 +715,17 @@ if (!empty($valid_dashboardlines))
} }
} }
if ($showweather && !empty($isIntopOpenedDashBoard)) if ($showweather && !empty($isIntopOpenedDashBoard)) {
{
$appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : ''; $appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '';
$weather = getWeatherStatus($totallate); $weather = getWeatherStatus($totallate);
$text = ''; $text = '';
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')'; if ($totallate > 0) {
else $text=$langs->transnoentitiesnoconv("NoItemLate"); $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate") . ' (' . $langs->transnoentitiesnoconv("NActionsLate",
$totallate . (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')) . ')';
} else {
$text = $langs->transnoentitiesnoconv("NoItemLate");
}
$text .= '. ' . $langs->transnoentitiesnoconv("LateDesc"); $text .= '. ' . $langs->transnoentitiesnoconv("LateDesc");
$weatherDashBoard = '<div class="box-flex-item ' . $appendClass . '">' . "\n"; $weatherDashBoard = '<div class="box-flex-item ' . $appendClass . '">' . "\n";
@ -750,13 +737,16 @@ if (!empty($valid_dashboardlines))
$weatherDashBoard .= ' <span class="info-box-title">' . $langs->trans('GlobalOpenedElemView') . '</span>' . "\n"; $weatherDashBoard .= ' <span class="info-box-title">' . $langs->trans('GlobalOpenedElemView') . '</span>' . "\n";
if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) { if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
$weatherDashBoard.= ' <span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate", price($totallatePercentage).'%').'</span>' . "\n"; $weatherDashBoard .= ' <span class="info-box-number">' . $langs->transnoentitiesnoconv("NActionsLate",
$weatherDashBoard.= ' <span class="progress-description">'.$langs->trans('NActionsLate', $totalLateNumber).'</span>' . "\n"; price($totallatePercentage) . '%') . '</span>' . "\n";
} $weatherDashBoard .= ' <span class="progress-description">' . $langs->trans('NActionsLate',
else{ $totalLateNumber) . '</span>' . "\n";
$weatherDashBoard.= ' <span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate", $totalLateNumber).'</span>' . "\n"; } else {
$weatherDashBoard .= ' <span class="info-box-number">' . $langs->transnoentitiesnoconv("NActionsLate",
$totalLateNumber) . '</span>' . "\n";
if ($totallatePercentage > 0) { if ($totallatePercentage > 0) {
$weatherDashBoard.= ' <span class="progress-description">'.$langs->trans('NActionsLate', price($totallatePercentage).'%').'</span>' . "\n"; $weatherDashBoard .= ' <span class="progress-description">' . $langs->trans('NActionsLate',
price($totallatePercentage) . '%') . '</span>' . "\n";
} }
} }
@ -768,22 +758,22 @@ if (!empty($valid_dashboardlines))
$openedDashBoard = $weatherDashBoard . $openedDashBoard; $openedDashBoard = $weatherDashBoard . $openedDashBoard;
} }
if(!empty($isIntopOpenedDashBoard)) if (!empty($isIntopOpenedDashBoard)) {
{
for ($i = 1; $i <= 10; $i++) { for ($i = 1; $i <= 10; $i++) {
$openedDashBoard .= '<div class="box-flex-item filler"></div>'; $openedDashBoard .= '<div class="box-flex-item filler"></div>';
} }
} }
$nbworkboardcount = 0; $nbworkboardcount = 0;
foreach($valid_dashboardlines as $infoKey => $board) foreach ($valid_dashboardlines as $infoKey => $board) {
{
if (in_array($infoKey, $isIntopOpenedDashBoard)) { if (in_array($infoKey, $isIntopOpenedDashBoard)) {
// skip if info is present on top // skip if info is present on top
continue; continue;
} }
if (empty($board->nbtodo)) $nbworkboardempty++; if (empty($board->nbtodo)) {
$nbworkboardempty++;
}
$nbworkboardcount++; $nbworkboardcount++;
@ -795,17 +785,16 @@ if (!empty($valid_dashboardlines))
$boxwork .= '<div class="boxstatscontent">'; $boxwork .= '<div class="boxstatscontent">';
$boxwork .= '<span class="boxstatstext" title="' . dol_escape_htmltag($board->label) . '">' . $board->img . ' ' . $board->label . '</span><br>'; $boxwork .= '<span class="boxstatstext" title="' . dol_escape_htmltag($board->label) . '">' . $board->img . ' ' . $board->label . '</span><br>';
$boxwork .= '<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . $board->nbtodo . '</span></a>'; $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . $board->nbtodo . '</span></a>';
if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
{
$boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . price($board->total) . '</span></a>'; $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="' . $board->url . '"><span class="dashboardlineindicator' . (($board->nbtodo == 0) ? ' dashboardlineok' : '') . '">' . price($board->total) . '</span></a>';
} }
$boxwork .= '</div>'; $boxwork .= '</div>';
if ($board->nbtodolate > 0) if ($board->nbtodolate > 0) {
{
$boxwork .= '<div class="dashboardlinelatecoin nowrap">'; $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
$boxwork .= '<a title="' . dol_escape_htmltag($textlate) . '" class="valignmiddle dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '" href="' . ((!$board->url_late) ? $board->url : $board->url_late) . '">'; $boxwork .= '<a title="' . dol_escape_htmltag($textlate) . '" class="valignmiddle dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '" href="' . ((!$board->url_late) ? $board->url : $board->url_late) . '">';
//$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').''; //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
$boxwork .= img_picto($textlate, "warning_white", 'class="inline-block hideonsmartphone valigntextbottom"').''; $boxwork .= img_picto($textlate, "warning_white",
'class="inline-block hideonsmartphone valigntextbottom"') . '';
$boxwork .= '<span class="dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '">'; $boxwork .= '<span class="dashboardlineindicatorlate' . ($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok') . '">';
$boxwork .= $board->nbtodolate; $boxwork .= $board->nbtodolate;
$boxwork .= '</span>'; $boxwork .= '</span>';
@ -823,9 +812,7 @@ if (!empty($valid_dashboardlines))
$boxwork .= '</div>'; $boxwork .= '</div>';
$boxwork .= '</td></tr>'; $boxwork .= '</td></tr>';
} } else {
else
{
$boxwork .= '<tr class="nohover">'; $boxwork .= '<tr class="nohover">';
$boxwork .= '<td class="nohover valignmiddle opacitymedium">'; $boxwork .= '<td class="nohover valignmiddle opacitymedium">';
$boxwork .= $langs->trans("NoOpenedElementToProcess"); $boxwork .= $langs->trans("NoOpenedElementToProcess");
@ -845,6 +832,9 @@ if(!empty($isIntopOpenedDashBoard)) {
print '</div>'; print '</div>';
} }
}
print '<div class="clearboth"></div>'; print '<div class="clearboth"></div>';
print '<div class="fichecenter fichecenterbis">'; print '<div class="fichecenter fichecenterbis">';