Fix: management of time spent in task card
This commit is contained in:
parent
1f52da3e99
commit
dfd0895925
@ -269,14 +269,30 @@ if ($_GET["id"] > 0)
|
|||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
// Time spent
|
// Time spent
|
||||||
$heure = intval($task_time->task_duration);
|
print '<td align="right">';
|
||||||
$minutes = round((($task_time->task_duration - $heure) * 60),0);
|
if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
|
||||||
$minutes = substr("00"."$minutes", -2);
|
{
|
||||||
print '<td align="right">'.$heure." h ".$minutes."</td>\n";
|
print '<input size="4" type="text" class="flat" name="timespent_duration" value="'.$task_time->task_duration.'">';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// TODO add function
|
||||||
|
$hour = intval($task_time->task_duration);
|
||||||
|
$minutes = round((($task_time->task_duration - $hour) * 60),0);
|
||||||
|
$minutes = substr("00"."$minutes", -2);
|
||||||
|
print $hour." h ".$minutes;
|
||||||
|
}
|
||||||
|
print '</td>';
|
||||||
|
|
||||||
// Edit and delete icon
|
// Edit and delete icon
|
||||||
print '<td align="right" nowrap>';
|
print '<td align="center" valign="middle">';
|
||||||
if ($user->rights->projet->creer && $userAccess)
|
if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
|
||||||
|
{
|
||||||
|
print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
|
||||||
|
print '<br>';
|
||||||
|
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
|
||||||
|
}
|
||||||
|
else if ($user->rights->projet->creer && $userAccess)
|
||||||
{
|
{
|
||||||
print ' ';
|
print ' ';
|
||||||
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'&action=editline&lineid='.$task_time->rowid.'">';
|
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'&action=editline&lineid='.$task_time->rowid.'">';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user