From 063cf15bcb83f0f2deebf165e7cdc6f7a18ce8bb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2020 20:16:51 +0100 Subject: [PATCH] Clean code --- htdocs/core/lib/project.lib.php | 45 ++++++++++++-------------------- htdocs/theme/eldy/global.inc.php | 2 ++ 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index ee80a525f04..71c1c277483 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -358,7 +358,7 @@ function project_admin_prepare_head() */ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0, $filterprogresscalc = '', $showbilltime = 0) { - global $user, $bc, $langs, $conf, $db; + global $user, $langs, $conf, $db; global $projectstatic, $taskstatic; $lastprojectid = 0; @@ -450,7 +450,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t $lastprojectid = $lines[$i]->fk_project; } - print ''."\n"; + print ''."\n"; $projectstatic->id = $lines[$i]->fk_project; $projectstatic->ref = $lines[$i]->projectref; @@ -758,7 +758,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t */ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0) { - global $conf, $db, $user, $bc, $langs; + global $conf, $db, $user, $langs; global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic; $lastprojectid = 0; @@ -986,7 +986,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec */ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0, $arrayfields = array(), $extrafields = null) { - global $conf, $db, $user, $bc, $langs; + global $conf, $db, $user, $langs; global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic; $lastprojectid = 0; @@ -1177,15 +1177,12 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr // Ref print ''; print ''; - for ($k = 0; $k < $level; $k++) print "   "; + for ($k = 0; $k < $level; $k++) print '
'; print $taskstatic->getNomUrl(1, 'withproject', 'time'); // Label task print '
'; - for ($k = 0; $k < $level; $k++) print "   "; - print $taskstatic->label; - //print "
"; - //for ($k = 0 ; $k < $level ; $k++) print "   "; - //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0); + print ''.$taskstatic->label.''; + for ($k = 0; $k < $level; $k++) print "
"; print "\n"; // TASK extrafields @@ -1365,7 +1362,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr */ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $arrayfields = array(), $extrafields = null) { - global $conf, $db, $user, $bc, $langs; + global $conf, $db, $user, $langs; global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic; $numlines = count($lines); @@ -1556,16 +1553,12 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$ // Ref print ''; print ''; - for ($k = 0; $k < $level; $k++) print "   "; + for ($k = 0; $k < $level; $k++) print '
'; print $taskstatic->getNomUrl(1, 'withproject', 'time'); // Label task print '
'; - for ($k = 0; $k < $level; $k++) print "   "; - //print $taskstatic->getNomUrl(0, 'withproject', 'time'); - print $taskstatic->label; - //print "
"; - //for ($k = 0 ; $k < $level ; $k++) print "   "; - //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0); + print ''.$taskstatic->label.''; + for ($k = 0; $k < $level; $k++) print "
"; print "\n"; // TASK extrafields @@ -1732,7 +1725,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$ */ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $TWeek = array()) { - global $conf, $db, $user, $bc, $langs; + global $conf, $db, $user, $langs; global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic; $numlines = count($lines); @@ -1840,16 +1833,12 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, & // Ref print ''; print ''; - for ($k = 0; $k < $level; $k++) print "   "; + for ($k = 0; $k < $level; $k++) print '
'; print $taskstatic->getNomUrl(1, 'withproject', 'time'); // Label task print '
'; - for ($k = 0; $k < $level; $k++) print "   "; - //print $taskstatic->getNomUrl(0, 'withproject', 'time'); - print $taskstatic->label; - //print "
"; - //for ($k = 0 ; $k < $level ; $k++) print "   "; - //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0); + print ''.$taskstatic->label.''; + for ($k = 0; $k < $level; $k++) print "
"; print "\n"; // Planned Workload @@ -1917,7 +1906,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, & $alttitle = $langs->trans("AddHereTimeSpentForWeek", $weekNb); - $tableCell = ''; + $tableCell = ''; $placeholder = ''; if ($alreadyspent) { @@ -2029,7 +2018,7 @@ function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole) */ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks = 0, $status = -1, $listofoppstatus = array(), $hiddenfields = array()) { - global $langs, $conf, $user, $bc; + global $langs, $conf, $user; global $theme_datacolor; require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index e590532a11f..eb1a2450521 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -298,12 +298,14 @@ td.onholidaymorning, td.onholidayafternoon { td.onholidayallday { background-color: #f4eede; } +/* td.leftborder, td.hide0 { border-left: 1px solid #ccc; } td.leftborder, td.hide6 { border-right: 1px solid #ccc; } +*/ td.rightborder { border-right: 1px solid #ccc; }