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

Fix edit of progess only

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-09 14:28:33 +02:00
parent 0e4dcb301c
commit 03dbf6e747
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/projet/activity/perday.php
View File

@ -236,7 +236,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
} }
else else
{ {
setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors'); setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
} }
} }

28
htdocs/projet/activity/perweek.php
View File

@ -100,7 +100,7 @@ if (GETPOST('submitdateselect'))
$action = ''; $action = '';
} }
if ($action == 'addtime' && GETPOST('assigntask')) if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask'))
{ {
$action = 'assigntask'; $action = 'assigntask';
@ -185,9 +185,10 @@ if ($action == 'addtime' && $user->rights->projet->lire)
} }
else else
{ {
foreach($timetoadd as $taskid => $value) foreach($timetoadd as $taskid => $value) // Loop on each task
{ {
foreach($value as $key => $val) $updateoftaskdone=0;
foreach($value as $key => $val) // Loop on each day
{ {
$amountoadd=$timetoadd[$taskid][$key]; $amountoadd=$timetoadd[$taskid][$key];
if (! empty($amountoadd)) if (! empty($amountoadd))
@ -201,7 +202,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
if ($newduration > 0) if ($newduration > 0)
{ {
$object->fetch($taskid); $object->fetch($taskid);
$object->progress = GETPOST($taskid . 'progress', 'int'); $object->progress = GETPOST($taskid . 'progress', 'int');
$object->timespent_duration = $newduration; $object->timespent_duration = $newduration;
$object->timespent_fk_user = $usertoprocess->id; $object->timespent_fk_user = $usertoprocess->id;
$object->timespent_date = dol_time_plus_duree($firstdaytoshow, $key, 'd'); $object->timespent_date = dol_time_plus_duree($firstdaytoshow, $key, 'd');
@ -213,9 +214,28 @@ if ($action == 'addtime' && $user->rights->projet->lire)
$error++; $error++;
break; break;
} }
$updateoftaskdone++;
} }
} }
} }
if (! $updateoftaskdone) // Check to update progress if no update were done on task.
{
$object->fetch($taskid);
//var_dump($object->progress);var_dump(GETPOST($taskid . 'progress', 'int')); exit;
if ($object->progress != GETPOST($taskid . 'progress', 'int'))
{
$object->progress = GETPOST($taskid . 'progress', 'int');
$result=$object->update($user);
if ($result < 0)
{
setEventMessages($object->error, $object->errors, 'errors');
$error++;
break;
}
}
}
} }
if (! $error) if (! $error)