From d9cb1da4d5de3403d85b639e9c04c39a9e3d6d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Mon, 24 Mar 2014 15:22:35 +0100 Subject: [PATCH 1/2] Project: make tasks accept a time --- htdocs/core/lib/project.lib.php | 8 ++++---- htdocs/projet/tasks.php | 13 +++++++------ htdocs/projet/tasks/task.php | 12 ++++++------ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 751ebbdfc5f..4a73db2dc40 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -330,12 +330,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t // Date start print ''; - print dol_print_date($lines[$i]->date_start,'day'); + print dol_print_date($lines[$i]->date_start,'dayhour'); print ''; // Date end print ''; - print dol_print_date($lines[$i]->date_end,'day'); + print dol_print_date($lines[$i]->date_end,'dayhour'); print ''; // Planned Workload (in working hours) @@ -480,12 +480,12 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr // Date start print ''; - print dol_print_date($lines[$i]->date_start,'day'); + print dol_print_date($lines[$i]->date_start,'dayhour'); print ''; // Date end print ''; - print dol_print_date($lines[$i]->date_end,'day'); + print dol_print_date($lines[$i]->date_end,'dayhour'); print ''; // Planned Workload diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 794a1198c35..f0a35c14767 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -85,8 +85,8 @@ if ($action == 'createtask' && $user->rights->projet->creer) { $error=0; - $date_start = dol_mktime(0,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']); - $date_end = dol_mktime(0,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']); + $date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyeassskr'],'user'); + $date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user'); if (empty($_POST["cancel"])) { @@ -234,12 +234,12 @@ if ($id > 0 || ! empty($ref)) // Date start print ''.$langs->trans("DateStart").''; - print dol_print_date($object->date_start,'day'); + print dol_print_date($object->date_start,'dayhour'); print ''; // Date end print ''.$langs->trans("DateEnd").''; - print dol_print_date($object->date_end,'day'); + print dol_print_date($object->date_end,'dayhour'); print ''; // Other options @@ -304,12 +304,13 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->socie // Date start print ''.$langs->trans("DateStart").''; - print $form->select_date(($date_start?$date_start:''),'dateo',0,0,0,'',1,1); + var_dump($date_start); + print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1); print ''; // Date end print ''.$langs->trans("DateEnd").''; - 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 ''; // planned workload diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 5e2f20729cc..566813b4e85 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -87,8 +87,8 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer) $object->description = $_POST['description']; $object->fk_task_parent = $task_parent; $object->planned_workload = $planned_workload; - $object->date_start = dol_mktime(0,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']); - $object->date_end = dol_mktime(0,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']); + $object->date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user'); + $object->date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user'); $object->progress = $_POST['progress']; // Fill array 'array_options' with data from add form @@ -326,12 +326,12 @@ if ($id > 0 || ! empty($ref)) // Date start print ''.$langs->trans("DateStart").''; - print $form->select_date($object->date_start,'dateo'); + print $form->select_date($object->date_start,'dateo',1,1); print ''; // Date end print ''.$langs->trans("DateEnd").''; - 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 ''; // Planned workload @@ -415,12 +415,12 @@ if ($id > 0 || ! empty($ref)) // Date start print ''.$langs->trans("DateStart").''; - print dol_print_date($object->date_start,'day'); + print dol_print_date($object->date_start,'dayhour'); print ''; // Date end print ''.$langs->trans("DateEnd").''; - print dol_print_date($object->date_end,'day'); + print dol_print_date($object->date_end,'dayhour'); print ''; // Planned workload From 7d0853d9e57e1ea72b3cb63688da772d68e0f2f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Tue, 25 Mar 2014 11:36:22 +0100 Subject: [PATCH 2/2] Removed debug code --- htdocs/projet/tasks.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index f0a35c14767..c8cff281985 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -304,7 +304,6 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->socie // Date start print ''.$langs->trans("DateStart").''; - var_dump($date_start); print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1); print '';