diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index e028c3cbbd8bf770e5d6358bb40368dce7a68d28..f744508d9bf28c5c72509930ccd0f2fe54951536 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -555,10 +555,12 @@ function projectLinesPerTime(&$inc, $parent, $lines, &$level, &$projectsrole, &$
for ($k = 0 ; $k < $level ; $k++) print " ";
$taskstatic->id=$lines[$i]->id;
$taskstatic->ref=$lines[$i]->label;
+ $taskstatic->date_start=$lines[$i]->date_start;
+ $taskstatic->date_end=$lines[$i]->date_end;
print $taskstatic->getNomUrl(0);
- print "<br>";
- for ($k = 0 ; $k < $level ; $k++) print " ";
- print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+ //print "<br>";
+ //for ($k = 0 ; $k < $level ; $k++) print " ";
+ //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
print "</td>\n";
// Planned Workload
@@ -714,10 +716,12 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t
for ($k = 0 ; $k < $level ; $k++) print " ";
$taskstatic->id=$lines[$i]->id;
$taskstatic->ref=$lines[$i]->label;
+ $taskstatic->date_start=$lines[$i]->date_start;
+ $taskstatic->date_end=$lines[$i]->date_end;
print $taskstatic->getNomUrl(0);
- print "<br>";
- for ($k = 0 ; $k < $level ; $k++) print " ";
- print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+ //print "<br>";
+ //for ($k = 0 ; $k < $level ; $k++) print " ";
+ //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
print "</td>\n";
// Planned Workload
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 9ca8f95ac4584edc146305fd9076d229d1173f56..abec2e8cf7c5a9cbc37e02f602646e2a732c3e66 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -108,10 +108,45 @@ llxHeader("",$title,"",'','','',array('/core/js/timesheet.js'));
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
-print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'">';
+$startdayarray=dol_get_first_day_week($day, $month, $year);
+
+$prev = $startdayarray;
+$prev_year = $prev['prev_year'];
+$prev_month = $prev['prev_month'];
+$prev_day = $prev['prev_day'];
+$first_day = $prev['first_day'];
+$first_month= $prev['first_month'];
+$first_year = $prev['first_year'];
+$week = $prev['week'];
+
+$day = (int) $day;
+$next = dol_get_next_week($first_day, $week, $first_month, $first_year);
+$next_year = $next['year'];
+$next_month = $next['month'];
+$next_day = $next['day'];
+
+// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
+$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year);
+$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd');
+
+$tmpday = $first_day;
+
+// Show navigation bar
+$nav ="<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
+$nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
+$nav.=" </span>\n";
+$nav.="<a href=\"?year=".$next_year."&month=".$next_month."&day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
+$nav.=" (<a href=\"?year=".$nowyear."&month=".$nowmonth."&day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+$picto='calendarweek';
+
+
+print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="addtime">';
print '<input type="hidden" name="mode" value="'.$mode.'">';
+print '<input type="hidden" name="day" value="'.$day.'">';
+print '<input type="hidden" name="month" value="'.$month.'">';
+print '<input type="hidden" name="year" value="'.$year.'">';
$head=project_timesheet_prepare_head($mode);
dol_fiche_head($head, 'inputperday', '', 0, 'task');
@@ -146,36 +181,6 @@ print "\n";
*/
-$startdayarray=dol_get_first_day_week($day, $month, $year);
-
-$prev = $startdayarray;
-$prev_year = $prev['prev_year'];
-$prev_month = $prev['prev_month'];
-$prev_day = $prev['prev_day'];
-$first_day = $prev['first_day'];
-$first_month= $prev['first_month'];
-$first_year = $prev['first_year'];
-$week = $prev['week'];
-
-$day = (int) $day;
-$next = dol_get_next_week($first_day, $week, $first_month, $first_year);
-$next_year = $next['year'];
-$next_month = $next['month'];
-$next_day = $next['day'];
-
-// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year);
-$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd');
-
-$tmpday = $first_day;
-
-// Show navigation bar
-$nav ="<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
-$nav.=" <span id=\"month_name\">".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week;
-$nav.=" </span>\n";
-$nav.="<a href=\"?year=".$next_year."&month=".$next_month."&day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
-$nav.=" (<a href=\"?year=".$nowyear."&month=".$nowmonth."&day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
-$picto='calendarweek';
print '<div align="right">'.$nav.'</div>';
@@ -230,7 +235,7 @@ print '<input type="hidden" id="numberOfLines" name="numberOfLines" value="'.cou
dol_fiche_end();
print '<div class="center">';
-print '<input type="button" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
print '</div>';
print '</form>'."\n\n";
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index f9e07ab6e9d7418c234ad5845cdb4028e41ea763..c322e0be3cc665ec1d65ce3e5bddca050af867fa 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -506,9 +506,18 @@ class Task extends CommonObject
global $langs;
$result='';
- $label=$langs->trans("ShowTask").': '.$this->ref.($this->label?' - '.$this->label:'');
+ $label = '<u>' . $langs->trans("ShowTask") . '</u>';
+ if (! empty($this->ref))
+ $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+ if (! empty($this->title))
+ $label .= '<br><b>' . $langs->trans('LabelTask') . ':</b> ' . $this->label;
+ if ($this->date_start || $this->date_end)
+ {
+ $label .= "<br>".get_date_range($this->date_start,$this->date_end,'',$langs,0);
+ }
+ $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
- $lien = '<a href="'.DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option=='withproject'?'&withproject=1':'').'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+ $lien = '<a href="'.DOL_URL_ROOT.'/projet/tasks/'.$mode.'.php?id='.$this->id.($option=='withproject'?'&withproject=1':'').$linkclose;
$lienfin='</a>';
$picto='projecttask';