diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 821d87dcd82..1b4500cdb27 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6584,7 +6584,7 @@ class Form
// phpcs:enable
global $langs;
- $retstring = '';
+ $retstring = '';
$hourSelected = 0;
$minSelected = 0;
@@ -6616,7 +6616,7 @@ class Form
if ($typehour != 'text') {
$retstring .= ' '.$langs->trans('HourShort');
} else {
- $retstring .= ': ';
+ $retstring .= ': ';
}
// Minutes
@@ -6644,7 +6644,7 @@ class Form
$retstring .= ' '.$langs->trans('MinuteShort');
}
- //$retstring.=" ";
+ $retstring.=" ";
if (!empty($nooutput)) {
return $retstring;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 90a67991413..15162c8b273 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1561,8 +1561,8 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
$disabledtask = 1;
}
- // Form to add new time
- print '
';
+ // Select hour
+ print ' ';
$tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
print $tableCell;
print ' ';
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index b743dffbc53..c840ff3438a 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -349,7 +349,7 @@ $next_day = $next['mday'];
$title = $langs->trans("TimeSpent");
-$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess, (empty($usertoprocess->id) ? 2 : 0), 1); // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project
+$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess, (empty($usertoprocess->id) ? 2 : 0), 1); // Return all project i have permission on (assigned to me+public). I want my tasks and some of my task may be on a public projet that is not my project
if ($id) {
$project->fetch($id);
@@ -476,12 +476,12 @@ if ($usertoprocess->id != $user->id) {
$titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
}
print '';
-print img_picto('', 'projecttask');
+print img_picto('', 'projecttask', 'class="pictofixedwidth"');
$formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
print '
';
print ' ';
print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
-print ' ';
+print ' ';
print '';
print '
';
@@ -596,10 +596,10 @@ $extrafieldsobjectkey = 'projet_task';
$extrafieldsobjectprefix = 'efpt.';
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
if (!empty($arrayfields['t.planned_workload']['checked'])) {
- print ''.$langs->trans("PlannedWorkload").' ';
+ print ''.$langs->trans("PlannedWorkload").' ';
}
if (!empty($arrayfields['t.progress']['checked'])) {
- print ''.$langs->trans("ProgressDeclared").' ';
+ print 'trans("ProgressDeclared")).'">'.$langs->trans("ProgressDeclared").' ';
}
if (!empty($arrayfields['timeconsumed']['checked'])) {
print ''.$langs->trans("TimeSpent").' ';
@@ -608,7 +608,7 @@ if (!empty($arrayfields['timeconsumed']['checked'])) {
print ''.$langs->trans("Everybody").' ';
print '';
print ' ';
- print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ''.$usertoprocess->getNomUrl(-2).''.dol_trunc($usertoprocess->firstname, 10).' ' : '').' ';
+ print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ''.$usertoprocess->getNomUrl(-2).''.dol_trunc($usertoprocess->firstname, 10).' ' : '').' ';
}
print ''.$langs->trans("HourStart").'';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 763ecefe650..385565c7616 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -119,6 +119,7 @@ $extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
+// Definition of fields for list
$arrayfields = array();
/*$arrayfields=array(
// Project
@@ -441,7 +442,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
// Show navigation bar
$nav = ''.img_previous($langs->trans("Previous"))." \n";
-$nav .= " ".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." \n";
+$nav .= ' '.dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." \n";
$nav .= ''.img_next($langs->trans("Next"))." \n";
$nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
$nav .= ' ';
@@ -652,10 +653,10 @@ $extrafieldsobjectkey = 'projet_task';
$extrafieldsobjectprefix = 'efpt.';
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
if (!empty($arrayfields['t.planned_workload']['checked'])) {
- print ' '.$langs->trans("PlannedWorkload").' ';
+ print ''.$langs->trans("PlannedWorkload").' ';
}
if (!empty($arrayfields['t.progress']['checked'])) {
- print ''.$langs->trans("ProgressDeclared").' ';
+ print ''.$langs->trans("ProgressDeclared").' ';
}
if (!empty($arrayfields['timeconsumed']['checked'])) {
print ''.$langs->trans("TimeSpent").' ';
@@ -664,7 +665,7 @@ if (!empty($arrayfields['timeconsumed']['checked'])) {
print ''.$langs->trans("Everybody").' ';
print '';
print ' ';
- print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ''.$usertoprocess->getNomUrl(-2).''.dol_trunc($usertoprocess->firstname, 10).' ' : '').' ';
+ print ''.$langs->trans("TimeSpent").($usertoprocess->firstname ? ''.$usertoprocess->getNomUrl(-2).''.dol_trunc($usertoprocess->firstname, 10).' ' : '').' ';
}
for ($idw = 0; $idw < 7; $idw++) {
$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $idw, 'd'); // $firstdaytoshow is a date with hours = 0
@@ -691,7 +692,7 @@ for ($idw = 0; $idw < 7; $idw++) {
$cssonholiday .= 'onholidayafternoon ';
}
- print '';
+ print ' ';
print dol_print_date($dayinloopfromfirstdaytoshow, '%a');
print ' '.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').' ';
}
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 70c093f46e3..2ca72552fa4 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -180,7 +180,7 @@ print ' ';
print '