lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: add patch of Franois LEGASTELOIS

Browse Source
This commit is contained in:
Regis Houssin 2010-11-06 20:55:52 +00:00
parent 7cd617ac0b
commit 4e12effab1
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
htdocs/projet/activity/list.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2010 François Legastelois <flegastelois@teclib.com>
*
* 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
@ -68,33 +69,31 @@ if ($_POST["action"] == 'createtask' && $user->rights->projet->creer)
if ($_POST["action"] == 'addtime' && $user->rights->projet->creer)
{
// TODO probleme si que des minutes
foreach ($_POST as $key => $time)
{
if (substr($key,-4) == 'hour')
{
if ($time > 0)
{
$id = str_replace("hour","",$key);
foreach($_POST as $key => $time)
{
if(intval($time)>0)
{
// Hours or minutes
if(preg_match("/([0-9]+)(hour|min)/",$key,$matches))
{
$task = new Task($db);
$task->fetch($matches[1]);
// We store HOURS in seconds
if($matches[2]=='hour') $task->timespent_duration = $time*60*60;
$task = new Task($db);
$task->fetch($id);
$task->timespent_fk_user = $user->id;
$task->timespent_duration = $_POST[$id."hour"]*60*60; // We store duration in seconds
$task->timespent_duration+= $_POST[$id."min"]*60; // We store duration in seconds
$task->timespent_date = dol_mktime(12,0,0,$_POST["$id"."month"],$_POST["$id"."day"],$_POST["$id"."year"]);
$task->addTimeSpent($user);
}
else
{
if ($time != '') $mesg='<div class="error">'.$langs->trans("ErrorBadValue").'</div>';
}
}
}
}
// We store MINUTES in seconds
if($matches[2]=='min') $task->timespent_duration = $time*60;
$task->timespent_fk_user = $user->id;
$task->timespent_date = dol_mktime(12,0,0,$_POST["{$matches[1]}month"],$_POST["{$matches[1]}day"],$_POST["{$matches[1]}year"]);
$task->addTimeSpent($user);
}
}
if(intval($time)<0) $mesg='<div class="error">'.$langs->trans("ErrorBadValue").'</div>';
}
}
/*
* View