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

Merge pull request #1507 from GPCsolutions/3.5-taskswithtime

Browse Source 
Project: make tasks accept a time
This commit is contained in:
Laurent Destailleur 2014-03-27 15:56:26 +01:00
commit c2b7e40aa1
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/project.lib.php
View File

@ -342,12 +342,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
// Date start // Date start
print '<td align="center">'; print '<td align="center">';
print dol_print_date($lines[$i]->date_start,'day'); print dol_print_date($lines[$i]->date_start,'dayhour');
print '</td>'; print '</td>';
// Date end // Date end
print '<td align="center">'; print '<td align="center">';
print dol_print_date($lines[$i]->date_end,'day'); print dol_print_date($lines[$i]->date_end,'dayhour');
print '</td>'; print '</td>';
// Planned Workload (in working hours) // Planned Workload (in working hours)
@ -500,12 +500,12 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
// Date start // Date start
print '<td align="center">'; print '<td align="center">';
print dol_print_date($lines[$i]->date_start,'day'); print dol_print_date($lines[$i]->date_start,'dayhour');
print '</td>'; print '</td>';
// Date end // Date end
print '<td align="center">'; print '<td align="center">';
print dol_print_date($lines[$i]->date_end,'day'); print dol_print_date($lines[$i]->date_end,'dayhour');
print '</td>'; print '</td>';
// Planned Workload // Planned Workload

12
htdocs/projet/tasks.php
View File

@ -83,8 +83,8 @@ if ($action == 'createtask' && $user->rights->projet->creer)
{ {
$error=0; $error=0;
$date_start = dol_mktime(0,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']); $date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyeassskr'],'user');
$date_end = dol_mktime(0,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']); $date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
if (empty($_POST["cancel"])) if (empty($_POST["cancel"]))
{ {
@ -232,12 +232,12 @@ if ($id > 0 || ! empty($ref))
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($object->date_start,'day'); print dol_print_date($object->date_start,'dayhour');
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($object->date_end,'day'); print dol_print_date($object->date_end,'dayhour');
print '</td></tr>'; print '</td></tr>';
// Other options // Other options
@ -302,12 +302,12 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->socie
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print $form->select_date(($date_start?$date_start:''),'dateo',0,0,0,'',1,1); print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1);
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print $form->select_date(($date_end?$date_end:-1),'datee',0,0,0,'',1,1); print $form->select_date(($date_end?$date_end:-1),'datee',1,1,0,'',1,1);
print '</td></tr>'; print '</td></tr>';
// planned workload // planned workload

12
htdocs/projet/tasks/task.php
View File

@ -83,8 +83,8 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
$object->description = $_POST['description']; $object->description = $_POST['description'];
$object->fk_task_parent = $task_parent; $object->fk_task_parent = $task_parent;
$object->planned_workload = $planned_workload; $object->planned_workload = $planned_workload;
$object->date_start = dol_mktime(0,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']); $object->date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
$object->date_end = dol_mktime(0,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']); $object->date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
$object->progress = $_POST['progress']; $object->progress = $_POST['progress'];
// Fill array 'array_options' with data from add form // Fill array 'array_options' with data from add form
@ -322,12 +322,12 @@ if ($id > 0 || ! empty($ref))
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print $form->select_date($object->date_start,'dateo'); print $form->select_date($object->date_start,'dateo',1,1);
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print $form->select_date($object->date_end?$object->date_end:-1,'datee'); print $form->select_date($object->date_end?$object->date_end:-1,'datee',1,1);
print '</td></tr>'; print '</td></tr>';
// Planned workload // Planned workload
@ -411,12 +411,12 @@ if ($id > 0 || ! empty($ref))
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
print dol_print_date($object->date_start,'day'); print dol_print_date($object->date_start,'dayhour');
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">';
print dol_print_date($object->date_end,'day'); print dol_print_date($object->date_end,'dayhour');
print '</td></tr>'; print '</td></tr>';
// Planned workload // Planned workload