Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v15

Browse Source
This commit is contained in:
Laurent Destailleur
2022-01-03 03:06:18 +01:00
parent 219ca9b610
commit f7871be6cd
9 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/categories/class/categorie.class.php
View File

@@ -1355,7 +1355,7 @@ class Categorie extends CommonObject
* @param string $addpicto Add picto into link
* @return array
*/
public function print_all_ways($sep = ' >> ', $url = '', $nocolor = 0, $addpicto = 0)
public function print_all_ways($sep = '>>', $url = '', $nocolor = 0, $addpicto = 0)
{
// phpcs:enable
$ways = array();
@@ -1369,8 +1369,8 @@ class Categorie extends CommonObject
$i++;
if (empty($nocolor)) {
$forced_color = 'toreplace';
if ($i == count($way)) {
$forced_color = 'colortoreplace';
if ($i == count($way)) { // Last category in hierarchy
// Check contrast with background and correct text color
$forced_color = 'categtextwhite';
if ($cat->color) {
@@ -1384,16 +1384,16 @@ class Categorie extends CommonObject
if ($url == '') {
$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
$linkend = '</a>';
$w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
$w[] = $link.(($addpicto && $i == 1) ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
} elseif ($url == 'none') {
$link = '<span class="'.$forced_color.'">';
$linkend = '</span>';
$w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
$w[] = $link.(($addpicto && $i == 1) ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
} else {
$w[] = '<a class="'.$forced_color.'" href="'.DOL_URL_ROOT.'/'.$url.'?catid='.$cat->id.'">'.($addpicto ? img_object('', 'category') : '').$cat->label.'</a>';
}
}
$newcategwithpath = preg_replace('/toreplace/', $forced_color, implode($sep, $w));
$newcategwithpath = preg_replace('/colortoreplace/', $forced_color, implode('<span class="inline-block valignmiddle paddingleft paddingright '.$forced_color.'">'.$sep.'</span>', $w));
$ways[] = $newcategwithpath;
}

2
htdocs/core/class/html.form.class.php
View File

@@ -8208,7 +8208,7 @@ class Form
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.$way.'</li>';
}
}
return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
return '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
}
if ($rendermode == 0) {

2
htdocs/core/modules/modWorkstation.class.php
View File

@@ -62,7 +62,7 @@ class modWorkstation extends DolibarrModules
// Used only if file README.md and README-LL.md not found.
$this->descriptionlong = "WorkstationsDescription";
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
$this->version = 'development';
$this->version = 'experimental';
// Url to the file with your last numberversion of this module
//$this->url_last_version = 'http://www.example.com/versionmodule.txt';

2
htdocs/langs/en_US/main.lang
View File

@@ -212,6 +212,8 @@ User=User
Users=Users
Group=Group
Groups=Groups
UserGroup=User group
UserGroups=User groups
NoUserGroupDefined=No user group defined
Password=Password
PasswordRetype=Retype your password

15
htdocs/theme/eldy/global.inc.php
View File

@@ -1168,6 +1168,18 @@ select.flat.selectlimit {
text-overflow: ellipsis;
white-space: nowrap;
}
.tdoverflowmax60 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 60px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.tdoverflowmax80 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 80px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.tdoverflowmax100 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 100px;
overflow: hidden;
@@ -6122,11 +6134,12 @@ span#select2-boxbookmark-container {
box-shadow: none;
-webkit-box-shadow: none !important;
box-shadow: none !important;
margin-top: 1px !important;
margin-bottom: 0 !important;
}
span.noborderoncategories a, li.noborderoncategories a {
line-height: normal;
vertical-align: top;
/* vertical-align: top; */
}
span.noborderoncategories {
padding: 4px 5px 0px 5px;

12
htdocs/theme/md/style.css.php
View File

@@ -1278,6 +1278,18 @@ select.flat.selectlimit {
text-overflow: ellipsis;
white-space: nowrap;
}
.tdoverflowmax60 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 60px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.tdoverflowmax80 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 80px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.tdoverflowmax100 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 100px;
overflow: hidden;

8
htdocs/workstation/class/workstation.class.php
View File

@@ -111,8 +111,8 @@ class Workstation extends CommonObject
'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>512, 'notnull'=>-1, 'visible'=>-2,),
'nb_operators_required' => array('type'=>'integer', 'label'=>'NbOperatorsRequired', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp','label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
'thm_machine_estimated' => array('type'=>'double', 'help'=>'THMMachineEstimatedHelp', 'label'=>'THMMachineEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp','label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right'),
'thm_machine_estimated' => array('type'=>'double', 'help'=>'THMMachineEstimatedHelp', 'label'=>'THMMachineEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right'),
'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled'),),
);
public $rowid;
@@ -855,8 +855,8 @@ class Workstation extends CommonObject
}
$statusType = 'status'.$status;
//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
//if ($status == self::STATUS_CANCELED) $statusType = 'status6';
//if ($status == self::STATUS_DISABLED) $statusType = 'status6';
if ($status == self::STATUS_ENABLED) $statusType = 'status4';
return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}

14
htdocs/workstation/workstation_card.php
View File

@@ -392,26 +392,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Groups
if ($object->type !== 'MACHINE') {
$toprint = array();
$g = new UserGroup($db);
foreach ($object->usergroups as $id_group) {
$g = new UserGroup($db);
$g->fetch($id_group);
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $g->getNomUrl(1) . '</li>';
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
}
print '<tr><td>' . $langs->trans('Groups') . '</td><td>';
print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
print '</td></tr>';
}
// Resources
if ($object->type !== 'HUMAN') {
$toprint = array();
$r = new Dolresource($db);
foreach ($object->resources as $id_resource) {
$r = new Dolresource($db);
$r->fetch($id_resource);
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $r->getNomUrl(1) . '</li>';
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
}
print '<tr><td>' . $langs->trans('Machines') . '</td><td>';
print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
print '</td></tr>';
}

26
htdocs/workstation/workstation_list.php
View File

@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2007-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2020 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2020 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -120,7 +120,7 @@ foreach ($object->fields as $key => $val) {
}
$arrayfields['wug.fk_usergroup'] = array(
'label'=>$langs->trans('Groups'),
'label'=>$langs->trans('UserGroups'),
'checked'=>(($visible < 0) ? 0 : 1),
'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
'position'=>1000,
@@ -633,25 +633,39 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
if (!empty($arrayfields['wug.fk_usergroup']['checked'])) {
$toprint = array();
$cssforli = '';
if (count($object->usergroups) >= 4) {
$cssforli = 'tdoverflowmax60';
} elseif (count($object->usergroups) >= 2) {
$cssforli = 'tdoverflowmax80';
}
foreach ($object->usergroups as $id_group) {
$g = new UserGroup($db);
$g->fetch($id_group);
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $g->getNomUrl(1) . '</li>';
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
}
print '<td>';
print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
print '</td>';
}
if (!empty($arrayfields['wr.fk_resource']['checked'])) {
$toprint = array();
$cssforli = '';
if (count($object->resources) >= 4) {
$cssforli = 'tdoverflowmax60';
} elseif (count($object->resources) >= 2) {
$cssforli = 'tdoverflowmax80';
}
foreach ($object->resources as $id_resource) {
$r = new Dolresource($db);
$r->fetch($id_resource);
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $r->getNomUrl(1) . '</li>';
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
}
print '<td>';
print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
print '</td>';
}