mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Debug the new workboard
This commit is contained in:
Laurent Destailleur
parent
b8e1cc8d16
commit
3f105a97bf
|
|
@ -3273,7 +3273,7 @@ class Propal extends CommonObject
|
|||
$delay_warning=$conf->propal->cloture->warning_delay;
|
||||
$statut = self::STATUS_VALIDATED;
|
||||
$label = $langs->trans("PropalsToClose");
|
||||
$labelShort = $langs->trans("ToClose");
|
||||
$labelShort = $langs->trans("ToAcceptRefuse");
|
||||
}
|
||||
if ($mode == 'signed') {
|
||||
$delay_warning=$conf->propal->facturation->warning_delay;
|
||||
|
|
|
|||
|
|
@ -3412,7 +3412,7 @@ class Commande extends CommonOrder
|
|||
$response = new WorkboardResponse();
|
||||
$response->warning_delay=$conf->commande->client->warning_delay/60/60/24;
|
||||
$response->label=$langs->trans("OrdersToProcess");
|
||||
$response->labelShort = $langs->trans("ToProcess");
|
||||
$response->labelShort = $langs->trans("Opened");
|
||||
$response->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3&mainmenu=commercial&leftmenu=orders';
|
||||
$response->img=img_object('', "order");
|
||||
|
||||
|
|
|
|||
|
|
@ -2199,7 +2199,7 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
|
|||
* @param array $arraycolor Array
|
||||
* @param string $colorifnotfound Color code to return if entry not defined or not a RGB format
|
||||
* @return string RGB hex value (without # before). For example: 'FF00FF', '01FF02'
|
||||
* @see colorStringToArray()
|
||||
* @see colorStringToArray(), colorHexToRgb()
|
||||
*/
|
||||
function colorArrayToHex($arraycolor, $colorifnotfound = '888888')
|
||||
{
|
||||
|
|
@ -2216,7 +2216,7 @@ function colorArrayToHex($arraycolor, $colorifnotfound = '888888')
|
|||
* @param string $stringcolor String with hex (FFFFFF) or comma RGB ('255,255,255')
|
||||
* @param array $colorifnotfound Color code array to return if entry not defined
|
||||
* @return array RGB hex value (without # before). For example: FF00FF
|
||||
* @see colorArrayToHex()
|
||||
* @see colorArrayToHex(), colorHexToRgb()
|
||||
*/
|
||||
function colorStringToArray($stringcolor, $colorifnotfound = array(88,88,88))
|
||||
{
|
||||
|
|
@ -2233,13 +2233,12 @@ function colorStringToArray($stringcolor, $colorifnotfound = array(88,88,88))
|
|||
}
|
||||
|
||||
/**
|
||||
* @param string $color the color you need to valid
|
||||
* @param boolean $allow_white in case of white isn't valid
|
||||
* @param string $color the color you need to valid
|
||||
* @param boolean $allow_white in case of white isn't valid
|
||||
* @return boolean
|
||||
*/
|
||||
function colorValidateHex($color, $allow_white = true)
|
||||
{
|
||||
|
||||
if(!$allow_white && ($color === '#fff' || $color === '#ffffff') ) return false;
|
||||
|
||||
if(preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid
|
||||
|
|
@ -2249,7 +2248,6 @@ function colorValidateHex($color, $allow_white = true)
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Change color to make it less aggressive (ratio is negative) or more aggressive (ratio is positive)
|
||||
*
|
||||
|
|
@ -2347,10 +2345,10 @@ function colorLighten($hex, $percent)
|
|||
|
||||
|
||||
/**
|
||||
* @param string $hex color in hex
|
||||
* @param float $alpha 0 to 1
|
||||
* @param bool $returnArray set to 1 to return an array instead of string
|
||||
* @return string|array
|
||||
* @param string $hex color in hex
|
||||
* @param float $alpha 0 to 1 to add alpha channel
|
||||
* @param bool $return Array set to 1 to return an array instead of string
|
||||
* @return string|array String or array
|
||||
*/
|
||||
function colorHexToRgb($hex, $alpha = false, $returnArray = false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2835,7 +2835,7 @@ class CommandeFournisseur extends CommonOrder
|
|||
$response = new WorkboardResponse();
|
||||
$response->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24;
|
||||
$response->label=$langs->trans("SuppliersOrdersToProcess");
|
||||
$response->labelShort=$langs->trans("ToProcess");
|
||||
$response->labelShort=$langs->trans("Opened");
|
||||
$response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2,3&mainmenu=commercial&leftmenu=orders_suppliers';
|
||||
$response->img=img_object('', "order");
|
||||
|
||||
|
|
|
|||
|
|
@ -538,36 +538,36 @@ $dashboardgroup = array (
|
|||
'stats' =>
|
||||
array ('propal_opened','propal_signed'),
|
||||
),
|
||||
'supplier_proposal' =>
|
||||
array (
|
||||
'groupName' => 'SupplierProposals',
|
||||
'stats' =>
|
||||
array ('supplier_proposal_opened','supplier_proposal_signed'),
|
||||
),
|
||||
'commande' =>
|
||||
array (
|
||||
'groupName' => 'Orders',
|
||||
'stats' =>
|
||||
array ('commande'),
|
||||
),
|
||||
'order_supplier' =>
|
||||
array (
|
||||
'groupName' => 'SuppliersOrders',
|
||||
'stats' =>
|
||||
array ('order_supplier'),
|
||||
),
|
||||
'contrat' =>
|
||||
array (
|
||||
'groupName' => 'Contracts',
|
||||
'stats' =>
|
||||
array ('contrat_inactive','contrat_active'),
|
||||
),
|
||||
'facture' =>
|
||||
array (
|
||||
'groupName' => 'Invoices',
|
||||
'stats' =>
|
||||
array ('facture'),
|
||||
),
|
||||
'contrat' =>
|
||||
array (
|
||||
'groupName' => 'Contracts',
|
||||
'stats' =>
|
||||
array ('contrat_inactive','contrat_active'),
|
||||
),
|
||||
'supplier_proposal' =>
|
||||
array (
|
||||
'groupName' => 'SupplierProposals',
|
||||
'stats' =>
|
||||
array ('supplier_proposal_opened','supplier_proposal_signed'),
|
||||
),
|
||||
'order_supplier' =>
|
||||
array (
|
||||
'groupName' => 'SuppliersOrders',
|
||||
'stats' =>
|
||||
array ('order_supplier'),
|
||||
),
|
||||
'invoice_supplier' =>
|
||||
array (
|
||||
'groupName' => 'BillsSuppliers',
|
||||
|
|
@ -580,12 +580,6 @@ $dashboardgroup = array (
|
|||
'stats' =>
|
||||
array ('bank_account','RemiseCheque'),
|
||||
),
|
||||
/*'RemiseCheque' =>
|
||||
array (
|
||||
'groupName' => 'BankChecks',
|
||||
'stats' =>
|
||||
array ('RemiseCheque'),
|
||||
),*/
|
||||
'Adherent' =>
|
||||
array (
|
||||
'groupName' => 'Members',
|
||||
|
|
@ -713,8 +707,7 @@ if (!empty($valid_dashboardlines))
|
|||
$openedDashBoard.= ' <div class="info-box '.$openedDashBoardSize.'">'."\n";
|
||||
$openedDashBoard.= ' <span class="info-box-icon bg-infoxbox-'.$groupKeyLowerCase.'"><i class="fa fa-dol-'.$groupKeyLowerCase.'"></i></span>'."\n";
|
||||
$openedDashBoard.= ' <div class="info-box-content">'."\n";
|
||||
|
||||
$openedDashBoard .= ' <span class="info-box-title" title="'.strip_tags($groupName).'">'.$groupName.'</span>' . "\n";
|
||||
$openedDashBoard .= ' <span class="info-box-title" title="'.dol_escape_htmltag($groupName).'">'.$groupName.'</span>' . "\n";
|
||||
|
||||
foreach($boards as $board) {
|
||||
if(!empty($board->labelShort)){
|
||||
|
|
@ -764,8 +757,6 @@ if (!empty($valid_dashboardlines))
|
|||
else $text=$langs->transnoentitiesnoconv("NoItemLate");
|
||||
$text.='. '.$langs->transnoentitiesnoconv("LateDesc");
|
||||
|
||||
|
||||
|
||||
$weatherDashBoard= '<div class="box-flex-item '.$appendClass.'">'."\n";
|
||||
$weatherDashBoard.= ' <div class="info-box '.$openedDashBoardSize.' info-box-weather info-box-weather-level'.$weather->level.'">'."\n";
|
||||
$weatherDashBoard.= ' <span class="info-box-icon">';
|
||||
|
|
@ -774,13 +765,13 @@ if (!empty($valid_dashboardlines))
|
|||
$weatherDashBoard.= ' <div class="info-box-content">'."\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="progress-description">'.$langs->trans('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";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -989,3 +989,4 @@ ToApprove=To approve
|
|||
GlobalOpenedElemView=Global view
|
||||
NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
|
||||
NoArticlesFoundForTheCategory=No article found for the category
|
||||
ToAcceptRefuse=To accept | refuse
|
||||
|
|
@ -2279,13 +2279,13 @@ class SupplierProposal extends CommonObject
|
|||
$delay_warning=$conf->supplier_proposal->cloture->warning_delay;
|
||||
$statut = self::STATUS_VALIDATED;
|
||||
$label = $langs->trans("SupplierProposalsToClose");
|
||||
$labelShort = $langs->trans("ToClose");
|
||||
$labelShort = $langs->trans("ToAcceptRefuse");
|
||||
}
|
||||
if ($mode == 'signed') {
|
||||
$delay_warning=$conf->supplier_proposal->facturation->warning_delay;
|
||||
$statut = self::STATUS_SIGNED;
|
||||
$label = $langs->trans("SupplierProposalsToProcess"); // May be billed or ordered
|
||||
$labelShort = $langs->trans("ToProcess");
|
||||
$labelShort = $langs->trans("ToClose");
|
||||
}
|
||||
|
||||
$response = new WorkboardResponse();
|
||||
|
|
|
|||
|
|
@ -3255,7 +3255,7 @@ span.dashboardlineko {
|
|||
vertical-align: middle;
|
||||
}
|
||||
.boxtable {
|
||||
margin-bottom: 8px !important;
|
||||
margin-bottom: 25px !important;
|
||||
border-bottom-width: 1px;
|
||||
|
||||
border-top: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ a.info-box-text{ text-decoration: none;}
|
|||
}
|
||||
|
||||
<?php
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib/php';
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
||||
if (! isset($conf->global->THEME_AGRESSIVITY_RATIO)) $conf->global->THEME_AGRESSIVITY_RATIO=-75;
|
||||
if (GETPOSTISSET('THEME_AGRESSIVITY_RATIO')) $conf->global->THEME_AGRESSIVITY_RATIO=GETPOST('THEME_AGRESSIVITY_RATIO', 'int');
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -33,16 +33,19 @@
|
|||
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
|
||||
$theme_bordercolor = array(235,235,224);
|
||||
$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 166, 90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
|
||||
if (! defined('ISLOADEDBYSTEELSHEET')) // File is run after an include of a php page, not by the style sheet, if the constant is not defined.
|
||||
{
|
||||
if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
|
||||
if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
|
||||
{
|
||||
$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0,166,90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
}
|
||||
else
|
||||
{
|
||||
// for now we use the same configuration for all types of color blind
|
||||
$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
|
||||
{
|
||||
$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0,166,90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
}
|
||||
else
|
||||
{
|
||||
// for now we use the same configuration for all types of color blind
|
||||
$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ a.info-box-text{ text-decoration: none;}
|
|||
color: #000 !important;
|
||||
}
|
||||
<?php
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib/php';
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
||||
if (! isset($conf->global->THEME_AGRESSIVITY_RATIO)) $conf->global->THEME_AGRESSIVITY_RATIO=-100;
|
||||
if (GETPOSTISSET('THEME_AGRESSIVITY_RATIO')) $conf->global->THEME_AGRESSIVITY_RATIO=GETPOST('THEME_AGRESSIVITY_RATIO', 'int');
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -29,16 +29,19 @@
|
|||
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
|
||||
$theme_bordercolor = array(235,235,224);
|
||||
$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 166, 90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
|
||||
if (! defined('ISLOADEDBYSTEELSHEET')) // File is run after an include of a php page, not by the style sheet, if the constant is not defined.
|
||||
{
|
||||
if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
|
||||
if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
|
||||
{
|
||||
$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250,190,30), array(221, 75, 57), array(0, 166, 90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
}
|
||||
else
|
||||
{
|
||||
// for now we use the same configuration for all types of color blind
|
||||
$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
|
||||
{
|
||||
$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250,190,30), array(221, 75, 57), array(0, 166, 90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
}
|
||||
else
|
||||
{
|
||||
// for now we use the same configuration for all types of color blind
|
||||
$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85,135,150), array(150,135,80), array(150,80,150));
|
||||
}
|
||||
}
|
||||
}
|
||||
$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user